Fixed some bugs in macros:

- missing parenthesization of some macro args
- point of do-while(0) hack defeated by putting a semicolon after while(0)

Fixed some style bugs in macros:
- not splitting the line when the macro value cannot be lined up in much
  the same macros that didn't parenthesize their args
- braces around a 1-line statement
- do-while(0) hack not indented in the usual way in the same macros that
  defeated its point.
This commit is contained in:
bde 2003-11-15 03:47:50 +00:00
parent 854a76a79b
commit ed37af78c0

View File

@ -703,10 +703,10 @@ MALLOC_DECLARE(M_ZOMBIE);
TAILQ_FOREACH((td), &(p)->p_threads, td_plist)
/* XXXKSE the lines below should probably only be used in 1:1 code */
#define FIRST_THREAD_IN_PROC(p) TAILQ_FIRST(&p->p_threads)
#define FIRST_KSEGRP_IN_PROC(p) TAILQ_FIRST(&p->p_ksegrps)
#define FIRST_KSE_IN_KSEGRP(kg) TAILQ_FIRST(&kg->kg_kseq)
#define FIRST_KSE_IN_PROC(p) FIRST_KSE_IN_KSEGRP(FIRST_KSEGRP_IN_PROC(p))
#define FIRST_THREAD_IN_PROC(p) TAILQ_FIRST(&(p)->p_threads)
#define FIRST_KSEGRP_IN_PROC(p) TAILQ_FIRST(&(p)->p_ksegrps)
#define FIRST_KSE_IN_KSEGRP(kg) TAILQ_FIRST(&(kg)->kg_kseq)
#define FIRST_KSE_IN_PROC(p) FIRST_KSE_IN_KSEGRP(FIRST_KSEGRP_IN_PROC(p))
/*
* We use process IDs <= PID_MAX; PID_MAX + 1 must also fit in a pid_t,
@ -730,10 +730,9 @@ MALLOC_DECLARE(M_ZOMBIE);
#define _STOPEVENT(p, e, v) do { \
PROC_LOCK_ASSERT(p, MA_OWNED); \
WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &p->p_mtx.mtx_object, \
"checking stopevent %d", (e)); \
if ((p)->p_stops & (e)) { \
"checking stopevent %d", (e)); \
if ((p)->p_stops & (e)) \
stopevent((p), (e), (v)); \
} \
} while (0)
/* Lock and unlock a process. */
@ -749,17 +748,14 @@ MALLOC_DECLARE(M_ZOMBIE);
#define PGRP_LOCKED(pg) mtx_owned(&(pg)->pg_mtx)
#define PGRP_LOCK_ASSERT(pg, type) mtx_assert(&(pg)->pg_mtx, (type))
#define PGRP_LOCK_PGSIGNAL(pg) \
do { \
if ((pg) != NULL) \
PGRP_LOCK(pg); \
} while (0);
#define PGRP_UNLOCK_PGSIGNAL(pg) \
do { \
if ((pg) != NULL) \
PGRP_UNLOCK(pg); \
} while (0);
#define PGRP_LOCK_PGSIGNAL(pg) do { \
if ((pg) != NULL) \
PGRP_LOCK(pg); \
} while (0)
#define PGRP_UNLOCK_PGSIGNAL(pg) do { \
if ((pg) != NULL) \
PGRP_UNLOCK(pg); \
} while (0)
/* Lock and unlock a session. */
#define SESS_LOCK(s) mtx_lock(&(s)->s_mtx)