Index: tree/sys/conf/NOTES =================================================================== --- tree/sys/conf/NOTES (revision 233198) +++ tree/sys/conf/NOTES (working copy) @@ -300,8 +300,9 @@ # Profiling for internal hash tables. options SLEEPQUEUE_PROFILING options TURNSTILE_PROFILING -options UMTX_PROFILING +options UMTX_PROFILING + ##################################################################### # COMPATIBILITY OPTIONS Index: tree/sys/kern/kern_umtx.c =================================================================== --- tree/sys/kern/kern_umtx.c (revision 233198) +++ tree/sys/kern/kern_umtx.c (working copy) @@ -265,15 +265,15 @@ TAILQ_INIT(&umtxq_chains[i][j].uc_pi_list); umtxq_chains[i][j].uc_busy = 0; umtxq_chains[i][j].uc_waiters = 0; - #ifdef UMTX_PROFILING +#ifdef UMTX_PROFILING umtxq_chains[i][j].length = 0; umtxq_chains[i][j].max_length = 0; - #endif +#endif } } - #ifdef UMTX_PROFILING +#ifdef UMTX_PROFILING umtx_init_profiling(); - #endif +#endif mtx_init(&umtx_lock, "umtx lock", NULL, MTX_SPIN); EVENTHANDLER_REGISTER(process_exec, umtx_exec_hook, NULL, EVENTHANDLER_PRI_ANY); @@ -424,14 +424,14 @@ TAILQ_INSERT_TAIL(&uh->head, uq, uq_link); uh->length++; - #ifdef UMTX_PROFILING +#ifdef UMTX_PROFILING uc->length++; if (uc->length > uc->max_length) { uc->max_length = uc->length; if (uc->max_length > max_length) max_length = uc->max_length; } - #endif +#endif uq->uq_flags |= UQF_UMTXQ; uq->uq_cur_queue = uh; return; @@ -449,9 +449,9 @@ uh = uq->uq_cur_queue; TAILQ_REMOVE(&uh->head, uq, uq_link); uh->length--; - #ifdef UMTX_PROFILING +#ifdef UMTX_PROFILING uc->length--; - #endif +#endif uq->uq_flags &= ~UQF_UMTXQ; if (TAILQ_EMPTY(&uh->head)) { KASSERT(uh->length == 0,