svn commit: r210776 - head/cddl/contrib/opensolaris/lib/libdtrace/common

[Rui Paulo]

Author: rpaulo
Date: Mon Aug  2 17:31:48 2010
New Revision: 210776
URL: http://svn.freebsd.org/changeset/base/210776

Log:
  Fix another mismerge: bring back the definition of DT_MUTEX_HELD().

Modified:
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h

Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h	Mon Aug  2 17:20:59 2010	(r210775)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h	Mon Aug  2 17:31:48 2010	(r210776)
@@ -603,8 +603,16 @@ extern void dt_buffered_destroy(dtrace_h
 
 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 *);