Sync ax_have_epoll.m4 with autoconf-archive

[lttng-tools.git] / src / common / macros.h

diff --git a/src/common/macros.h b/src/common/macros.h
index 7eaf27cdf3787cbf02d5c4fc2bc48eb43632b734..2120c64efcd2050186794f15cc2bfcd9475baf45 100644 (file)
--- a/src/common/macros.h
+++ b/src/common/macros.h
@@ -72,17 +72,27 @@ void *zmalloc(size_t len)
 #endif
 
 #ifndef max_t
-#define max_t(type, a, b)      ((type) max(a, b))
+#define max_t(type, a, b)      max((type) a, (type) b)
 #endif
 
 #ifndef min
 #define min(a, b) ((a) < (b) ? (a) : (b))
 #endif
 
+#ifndef min_t
+#define min_t(type, a, b)      min((type) a, (type) b)
+#endif
+
 #ifndef LTTNG_PACKED
 #define LTTNG_PACKED __attribute__((__packed__))
 #endif
 
+/*
+ * Align value to the next multiple of align. Returns val if it already is a
+ * multiple of align. Align must be a power of two.
+ */
+#define ALIGN_TO(value, align) ((value + (align - 1)) & ~(align - 1))
+
 /*
  * LTTNG_HIDDEN: set the hidden attribute for internal functions
  * On Windows, symbols are local unless explicitly exported,
@@ -96,6 +106,15 @@ void *zmalloc(size_t len)
 
 #define member_sizeof(type, field)     sizeof(((type *) 0)->field)
 
+#define ASSERT_LOCKED(lock) assert(pthread_mutex_trylock(&lock))
+
+/*
+ * Get an aligned pointer to a value. This is meant
+ * as a helper to pass an aligned pointer to a member in a packed structure
+ * to a function.
+ */
+#define ALIGNED_CONST_PTR(value) (((const typeof(value) []) { value }))
+
 /*
  * lttng_strncpy returns 0 on success, or nonzero on failure.
  * It checks that the @src string fits into @dst_len before performing
@@ -106,17 +125,11 @@ void *zmalloc(size_t len)
 static inline
 int lttng_strncpy(char *dst, const char *src, size_t dst_len)
 {
-       if (lttng_strnlen(src, dst_len) == dst_len) {
+       if (lttng_strnlen(src, dst_len) >= dst_len) {
                /* Fail since copying would result in truncation. */
                return -1;
        }
-       strncpy(dst, src, dst_len);
-       /*
-        * Be extra careful and put final \0 at the end after strncpy(),
-        * even though we checked the length before. This makes Coverity
-        * happy.
-        */
-       dst[dst_len - 1] = '\0';
+       strcpy(dst, src);
        return 0;
 }