mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-18 10:35:55 +00:00
Code Issues Releases Activity

Fix some style bugs introduced in a previous commit (r233045)

Browse Source 
Reported by:	glebius, jmallet
Reviewed by:	jmallet
Approved by:	gnn (mentor)
MFC after:	2 days
This commit is contained in:
Davide Italiano 2012-04-14 23:53:31 +00:00
parent 4dca0ef478
commit 331805a5d3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=234302
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/conf/NOTES
View File

@ -300,7 +300,8 @@ options MPROF_HASH_SIZE="1543"
# Profiling for internal hash tables. # Profiling for internal hash tables.
options SLEEPQUEUE_PROFILING options SLEEPQUEUE_PROFILING
options TURNSTILE_PROFILING options TURNSTILE_PROFILING
options UMTX_PROFILING options UMTX_PROFILING
##################################################################### #####################################################################
# COMPATIBILITY OPTIONS # COMPATIBILITY OPTIONS

16
sys/kern/kern_umtx.c
View File

@ -271,15 +271,15 @@ umtxq_sysinit(void *arg __unused)
TAILQ_INIT(&umtxq_chains[i][j].uc_pi_list); TAILQ_INIT(&umtxq_chains[i][j].uc_pi_list);
umtxq_chains[i][j].uc_busy = 0; umtxq_chains[i][j].uc_busy = 0;
umtxq_chains[i][j].uc_waiters = 0; umtxq_chains[i][j].uc_waiters = 0;
#ifdef UMTX_PROFILING #ifdef UMTX_PROFILING
umtxq_chains[i][j].length = 0; umtxq_chains[i][j].length = 0;
umtxq_chains[i][j].max_length = 0; umtxq_chains[i][j].max_length = 0;
#endif #endif
} }
} }
#ifdef UMTX_PROFILING #ifdef UMTX_PROFILING
umtx_init_profiling(); umtx_init_profiling();
#endif #endif
mtx_init(&umtx_lock, "umtx lock", NULL, MTX_SPIN); mtx_init(&umtx_lock, "umtx lock", NULL, MTX_SPIN);
EVENTHANDLER_REGISTER(process_exec, umtx_exec_hook, NULL, EVENTHANDLER_REGISTER(process_exec, umtx_exec_hook, NULL,
EVENTHANDLER_PRI_ANY); EVENTHANDLER_PRI_ANY);
@ -430,14 +430,14 @@ umtxq_insert_queue(struct umtx_q *uq, int q)
TAILQ_INSERT_TAIL(&uh->head, uq, uq_link); TAILQ_INSERT_TAIL(&uh->head, uq, uq_link);
uh->length++; uh->length++;
#ifdef UMTX_PROFILING #ifdef UMTX_PROFILING
uc->length++; uc->length++;
if (uc->length > uc->max_length) { if (uc->length > uc->max_length) {
uc->max_length = uc->length; uc->max_length = uc->length;
if (uc->max_length > max_length) if (uc->max_length > max_length)
max_length = uc->max_length; max_length = uc->max_length;
} }
#endif #endif
uq->uq_flags |= UQF_UMTXQ; uq->uq_flags |= UQF_UMTXQ;
uq->uq_cur_queue = uh; uq->uq_cur_queue = uh;
return; return;
@ -455,9 +455,9 @@ umtxq_remove_queue(struct umtx_q *uq, int q)
uh = uq->uq_cur_queue; uh = uq->uq_cur_queue;
TAILQ_REMOVE(&uh->head, uq, uq_link); TAILQ_REMOVE(&uh->head, uq, uq_link);
uh->length--; uh->length--;
#ifdef UMTX_PROFILING #ifdef UMTX_PROFILING
uc->length--; uc->length--;
#endif #endif
uq->uq_flags &= ~UQF_UMTXQ; uq->uq_flags &= ~UQF_UMTXQ;
if (TAILQ_EMPTY(&uh->head)) { if (TAILQ_EMPTY(&uh->head)) {
KASSERT(uh->length == 0, KASSERT(uh->length == 0,