d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use atomic ops for the interlocked increment and decrement routines

Browse Source 
in subr_ndis and subr_ntoskrnl. This is faster and avoids potential
LOR whinage from witness (an LOR couldn't happen with the old code
since the interlocked inc/dec routines could not sleep with a lock
held, but this will keep witness happy and it's more efficient
anyway. I think.)
This commit is contained in:
Bill Paul 2004-01-07 07:29:27 +00:00
parent e3c8d8194c
commit e157128762
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/compat/ndis/subr_ndis.c
View File

@ -72,6 +72,7 @@ __FBSDID("$FreeBSD$");
#include <net/if_dl.h>
#include <net/if_media.h>
#include <machine/atomic.h>
#include <machine/bus_memio.h>
#include <machine/bus_pio.h>
#include <machine/bus.h>
@ -1780,9 +1781,7 @@ __stdcall static uint32_t
ndis_interlock_inc(addend)
uint32_t *addend;
{
mtx_lock(&ndis_interlock);
(*addend)++;
mtx_unlock(&ndis_interlock);
atomic_add_long((u_long *)addend, 1);
return(*addend);
}
@ -1790,9 +1789,7 @@ __stdcall static uint32_t
ndis_interlock_dec(addend)
uint32_t *addend;
{
mtx_lock(&ndis_interlock);
(*addend)--;
mtx_unlock(&ndis_interlock);
atomic_subtract_long((u_long *)addend, 1);
return(*addend);
}

11
sys/compat/ndis/subr_ntoskrnl.c
View File

@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
#include <sys/callout.h>
#include <sys/kernel.h>
#include <machine/atomic.h>
#include <machine/clock.h>
#include <machine/bus_memio.h>
#include <machine/bus_pio.h>
@ -578,10 +579,7 @@ ntoskrnl_interlock_inc(/*addend*/ void)
__asm__ __volatile__ ("" : "=c" (addend));
mtx_lock(&ntoskrnl_interlock);
(*addend)++;
mtx_unlock(&ntoskrnl_interlock);
atomic_add_long((volatile u_long *)addend, 1);
return(*addend);
}
@ -592,10 +590,7 @@ ntoskrnl_interlock_dec(/*addend*/ void)
__asm__ __volatile__ ("" : "=c" (addend));
mtx_lock(&ntoskrnl_interlock);
(*addend)--;
mtx_unlock(&ntoskrnl_interlock);
atomic_subtract_long((volatile u_long *)addend, 1);
return(*addend);
}