From 0a86131c629fc0f57598850ae76df2002f261b3e Mon Sep 17 00:00:00 2001 From: rpaulo Date: Mon, 2 Aug 2010 17:31:48 +0000 Subject: Fix another mismerge: bring back the definition of DT_MUTEX_HELD(). --- cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'cddl/contrib/opensolaris/lib/libdtrace/common') diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h index a7f8acd..bfdaecd 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h @@ -603,8 +603,16 @@ extern void dt_buffered_destroy(dtrace_hdl_t *); extern uint64_t dt_stddev(uint64_t *, uint64_t); +extern int dt_rw_read_held(pthread_rwlock_t *); +extern int dt_rw_write_held(pthread_rwlock_t *); +extern int dt_mutex_held(pthread_mutex_t *); extern int dt_options_load(dtrace_hdl_t *); +#define DT_RW_READ_HELD(x) dt_rw_read_held(x) +#define DT_RW_WRITE_HELD(x) dt_rw_write_held(x) +#define DT_RW_LOCK_HELD(x) (DT_RW_READ_HELD(x) || DT_RW_WRITE_HELD(x)) +#define DT_MUTEX_HELD(x) dt_mutex_held(x) + extern void dt_dprintf(const char *, ...); extern void dt_setcontext(dtrace_hdl_t *, dtrace_probedesc_t *); -- cgit v1.1