X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fmacros.h;h=c42cddd5050ca163a612e9f1744f9b7aaf03da5b;hp=33ada7321801a14b438a27dca246ec8fbfb0c897;hb=5e5c14cef3eee00b7b3b218beed85d1a4ee2d71d;hpb=eac6ee118d39b8fd835c9afa1a1e2b6ff70c7eb6

diff --git a/src/common/macros.h b/src/common/macros.h
index 33ada7321..c42cddd50 100644
--- a/src/common/macros.h
+++ b/src/common/macros.h
@@ -79,6 +79,10 @@ void *zmalloc(size_t len)
 #define min(a, b) ((a) < (b) ? (a) : (b))
 #endif
 
+#ifndef min_t
+#define min_t(type, a, b)	((type) min(a, b))
+#endif
+
 #ifndef LTTNG_PACKED
 #define LTTNG_PACKED __attribute__((__packed__))
 #endif
@@ -102,6 +106,8 @@ void *zmalloc(size_t len)
 
 #define member_sizeof(type, field)	sizeof(((type *) 0)->field)
 
+#define ASSERT_LOCKED(lock) assert(pthread_mutex_trylock(&lock))
+
 /*
  * lttng_strncpy returns 0 on success, or nonzero on failure.
  * It checks that the @src string fits into @dst_len before performing