mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-18 10:35:55 +00:00
9ed346bab0
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
163 lines
4.8 KiB
C
163 lines
4.8 KiB
C
/*
|
|
* Copyright (c) 1992, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* @(#)profile.h 8.1 (Berkeley) 6/11/93
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _MACHINE_PROFILE_H_
|
|
#define _MACHINE_PROFILE_H_
|
|
|
|
#ifdef _KERNEL
|
|
|
|
/*
|
|
* Config generates something to tell the compiler to align functions on 16
|
|
* byte boundaries. A strict alignment is good for keeping the tables small.
|
|
*/
|
|
#define FUNCTION_ALIGNMENT 16
|
|
|
|
/*
|
|
* The kernel uses assembler stubs instead of unportable inlines.
|
|
* This is mainly to save a little time when profiling is not enabled,
|
|
* which is the usual case for the kernel.
|
|
*/
|
|
#define _MCOUNT_DECL void mcount
|
|
#define MCOUNT
|
|
|
|
#ifdef GUPROF
|
|
#define CALIB_SCALE 1000
|
|
#define KCOUNT(p,index) ((p)->kcount[(index) \
|
|
/ (HISTFRACTION * sizeof(HISTCOUNTER))])
|
|
#define MCOUNT_DECL(s)
|
|
#define MCOUNT_ENTER(s)
|
|
#define MCOUNT_EXIT(s)
|
|
#define PC_TO_I(p, pc) ((uintfptr_t)(pc) - (uintfptr_t)(p)->lowpc)
|
|
#else
|
|
#define MCOUNT_DECL(s) u_long s;
|
|
#ifdef SMP
|
|
#define MCOUNT_ENTER(s) { s = read_eflags(); \
|
|
__asm __volatile("cli" : : : "memory"); \
|
|
mtx_lock(&mcount_mtx); }
|
|
#define MCOUNT_EXIT(s) { mtx_unlock(&mcount_mtx); write_eflags(s); }
|
|
#else
|
|
#define MCOUNT_ENTER(s) { s = read_eflags(); disable_intr(); }
|
|
#define MCOUNT_EXIT(s) (write_eflags(s))
|
|
#endif
|
|
#endif /* GUPROF */
|
|
|
|
#else /* !_KERNEL */
|
|
|
|
#define FUNCTION_ALIGNMENT 4
|
|
|
|
#define _MCOUNT_DECL static __inline void _mcount
|
|
|
|
#define MCOUNT \
|
|
void \
|
|
mcount() \
|
|
{ \
|
|
uintfptr_t selfpc, frompc; \
|
|
/* \
|
|
* Find the return address for mcount, \
|
|
* and the return address for mcount's caller. \
|
|
* \
|
|
* selfpc = pc pushed by call to mcount \
|
|
*/ \
|
|
asm("movl 4(%%ebp),%0" : "=r" (selfpc)); \
|
|
/* \
|
|
* frompc = pc pushed by call to mcount's caller. \
|
|
* The caller's stack frame has already been built, so %ebp is \
|
|
* the caller's frame pointer. The caller's raddr is in the \
|
|
* caller's frame following the caller's caller's frame pointer. \
|
|
*/ \
|
|
asm("movl (%%ebp),%0" : "=r" (frompc)); \
|
|
frompc = ((uintfptr_t *)frompc)[1]; \
|
|
_mcount(frompc, selfpc); \
|
|
}
|
|
|
|
typedef unsigned int uintfptr_t;
|
|
|
|
#endif /* _KERNEL */
|
|
|
|
/*
|
|
* An unsigned integral type that can hold non-negative difference between
|
|
* function pointers.
|
|
*/
|
|
typedef u_int fptrdiff_t;
|
|
|
|
#ifdef _KERNEL
|
|
|
|
void mcount __P((uintfptr_t frompc, uintfptr_t selfpc));
|
|
|
|
#ifdef GUPROF
|
|
struct gmonparam;
|
|
|
|
void nullfunc_loop_profiled __P((void));
|
|
void nullfunc_profiled __P((void));
|
|
void startguprof __P((struct gmonparam *p));
|
|
void stopguprof __P((struct gmonparam *p));
|
|
#else
|
|
#define startguprof(p)
|
|
#define stopguprof(p)
|
|
#endif /* GUPROF */
|
|
|
|
#else /* !_KERNEL */
|
|
|
|
#include <sys/cdefs.h>
|
|
|
|
__BEGIN_DECLS
|
|
#ifdef __GNUC__
|
|
#ifdef __ELF__
|
|
void mcount __P((void)) __asm(".mcount");
|
|
#else
|
|
void mcount __P((void)) __asm("mcount");
|
|
#endif
|
|
#endif
|
|
static void _mcount __P((uintfptr_t frompc, uintfptr_t selfpc));
|
|
__END_DECLS
|
|
|
|
#endif /* _KERNEL */
|
|
|
|
#ifdef GUPROF
|
|
/* XXX doesn't quite work outside kernel yet. */
|
|
extern int cputime_bias;
|
|
|
|
__BEGIN_DECLS
|
|
int cputime __P((void));
|
|
void empty_loop __P((void));
|
|
void mexitcount __P((uintfptr_t selfpc));
|
|
void nullfunc __P((void));
|
|
void nullfunc_loop __P((void));
|
|
__END_DECLS
|
|
#endif
|
|
|
|
#endif /* !_MACHINE_PROFILE_H_ */
|