From owner-p4-projects Wed Mar 5 12:37:51 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27F3837B406; Wed, 5 Mar 2003 12:37:49 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C920837B405 for ; Wed, 5 Mar 2003 12:37:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 028C043F3F for ; Wed, 5 Mar 2003 12:37:46 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h25Kbk0U091442 for ; Wed, 5 Mar 2003 12:37:46 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h25KbkQJ091439 for perforce@freebsd.org; Wed, 5 Mar 2003 12:37:46 -0800 (PST) Date: Wed, 5 Mar 2003 12:37:46 -0800 (PST) Message-Id: <200303052037.h25KbkQJ091439@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 26387 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26387 Change 26387 by jhb@jhb_laptop on 2003/03/05 12:36:48 Revert previous optimizations since the armchair generals aren't happy with the semantics. Affected files ... .. //depot/projects/smpng/sys/sys/mutex.h#32 edit Differences ... ==== //depot/projects/smpng/sys/sys/mutex.h#32 (text+ko) ==== @@ -254,8 +254,6 @@ _mtx_lock_flags((m), (opts), LOCK_FILE, LOCK_LINE) #define mtx_unlock_flags(m, opts) \ _mtx_unlock_flags((m), (opts), LOCK_FILE, LOCK_LINE) -#define mtx_trylock_flags(m, opts) \ - _mtx_trylock((m), (opts), LOCK_FILE, LOCK_LINE) #define mtx_lock_spin_flags(m, opts) \ _mtx_lock_spin_flags((m), (opts), LOCK_FILE, LOCK_LINE) #define mtx_unlock_spin_flags(m, opts) \ @@ -265,8 +263,6 @@ _get_sleep_lock((m), curthread, (opts), LOCK_FILE, LOCK_LINE) #define mtx_unlock_flags(m, opts) \ _rel_sleep_lock((m), curthread, (opts), LOCK_FILE, LOCK_LINE) -#define mtx_trylock_flags(m, opts) \ - (_obtain_lock((m), curthread)) #ifndef SMPnotyet #define mtx_lock_spin_flags(m, opts) \ _get_spin_lock((m), curthread, (opts), LOCK_FILE, LOCK_LINE) @@ -278,6 +274,9 @@ #endif /* SMP */ #endif /* LOCK_DEBUG */ +#define mtx_trylock_flags(m, opts) \ + _mtx_trylock((m), (opts), LOCK_FILE, LOCK_LINE) + #define mtx_initialized(m) ((m)->mtx_object.lo_flags & LO_INITIALIZED) #define mtx_owned(m) (((m)->mtx_lock & MTX_FLAGMASK) == (uintptr_t)curthread) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message