Version 2.5.7

[lttng-ust.git] / include / usterr.h

diff --git a/include/usterr.h b/include/usterr.h
index dc51d840b42879d6e8f11e1f7567a9f05dc2edad..dc151b0aae2002504422d705966416fe5868f619 100644 (file)
--- a/include/usterr.h
+++ b/include/usterr.h
@@ -1,9 +1,14 @@
-/* Copyright (C) 2009  Pierre-Marc Fournier
+#ifndef _USTERR_H
+#define _USTERR_H
+
+/*
+ * Copyright (C) 2009  Pierre-Marc Fournier
+ * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * License as published by the Free Software Foundation; version 2.1 of
+ * the License.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,20 +20,29 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef _USTERR_H
-#define _USTERR_H
-
 #include <string.h>
 #include <sys/types.h>
-#include <sys/syscall.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
 
-#include <ust/core.h>
-
+#include "lttng/ust-tid.h"
 #include "share.h"
 
+enum ust_loglevel {
+       UST_LOGLEVEL_UNKNOWN = 0,
+       UST_LOGLEVEL_NORMAL,
+       UST_LOGLEVEL_DEBUG,
+};
+
+extern volatile enum ust_loglevel ust_loglevel;
+void init_usterr(void);
+
+static inline int ust_debug(void)
+{
+       return ust_loglevel == UST_LOGLEVEL_DEBUG;
+}
+
 #ifndef UST_COMPONENT
 #define UST_COMPONENT libust
 #endif
@@ -37,28 +51,45 @@
 #define XSTR(d) STR(d)
 #define STR(s) #s
 
-/* A dummy function to force format checking */
-static inline void __attribute__ ((format (printf, 1, 2)))
-       __check_ust_safe_fmt(const char *fmt, ...)
-{
-}
-
 #define UST_STR_COMPONENT XSTR(UST_COMPONENT)
 
-#define ERRMSG(fmt, args...) do { fprintf(stderr, UST_STR_COMPONENT "[%ld/%ld]: " fmt " (in %s() at " __FILE__ ":" XSTR(__LINE__) ")\n", (long) getpid(), (long) syscall(SYS_gettid), ## args, __func__); } while(0)
+#define ERRMSG(fmt, args...)                                   \
+       do {                                                    \
+               fprintf(stderr, UST_STR_COMPONENT "[%ld/%ld]: " fmt " (in %s() at " __FILE__ ":" XSTR(__LINE__) ")\n",                          \
+                       (long) getpid(),                        \
+                       (long) gettid(),                        \
+                       ## args,                                \
+                       __func__);                              \
+       } while(0)
 
-#ifdef UST_DEBUG
-# define DBG(fmt, args...) ERRMSG(fmt, ## args)
-# define DBG_raw(fmt, args...) do { fprintf(stderr, fmt, ## args); } while(0)
+#ifdef LTTNG_UST_DEBUG
+# define DBG(fmt, args...)             ERRMSG(fmt, ## args)
+# define DBG_raw(fmt, args...)                                 \
+       do {                                                    \
+                fprintf(stderr, fmt, ## args);                 \
+       } while(0)
 #else
-# define DBG(fmt, args...) __check_ust_safe_fmt(fmt, ## args)
-# define DBG_raw(fmt, args...) __check_ust_safe_fmt(fmt, ## args)
+# define DBG(fmt, args...)                                     \
+       do {                                                    \
+               if (ust_debug())                                \
+                       ERRMSG(fmt, ## args);                   \
+       } while (0)
+# define DBG_raw(fmt, args...)                                 \
+       do {                                                    \
+               if (ust_debug()) {                              \
+                       fprintf(stderr, fmt, ## args);          \
+               }                                               \
+       } while(0)
 #endif
+
 #define WARN(fmt, args...) ERRMSG("Warning: " fmt, ## args)
 #define ERR(fmt, args...) ERRMSG("Error: " fmt, ## args)
 #define BUG(fmt, args...) ERRMSG("BUG: " fmt, ## args)
 
-#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE)
+#if !defined(__linux__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE))
+/*
+ * Version using XSI strerror_r.
+ */
 #define PERROR(call, args...)\
        do { \
                char buf[200] = "Error in strerror_r()"; \
@@ -66,6 +97,9 @@ static inline void __attribute__ ((format (printf, 1, 2)))
                ERRMSG("Error: " call ": %s", ## args, buf); \
        } while(0);
 #else
+/*
+ * Version using GNU strerror_r, for linux with appropriate defines.
+ */
 #define PERROR(call, args...)\
        do { \
                char *buf; \
@@ -75,8 +109,16 @@ static inline void __attribute__ ((format (printf, 1, 2)))
        } while(0);
 #endif
 
-#define BUG_ON(condition) do { if (unlikely(condition)) ERR("condition not respected (BUG)"); } while(0)
-#define WARN_ON(condition) do { if (unlikely(condition)) WARN("condition not respected on line %s:%d", __FILE__, __LINE__); } while(0)
+#define BUG_ON(condition)                                      \
+       do {                                                    \
+               if (caa_unlikely(condition))                    \
+                       ERR("condition not respected (BUG) on line %s:%d", __FILE__, __LINE__); \
+       } while(0)
+#define WARN_ON(condition)                                     \
+       do {                                                    \
+               if (caa_unlikely(condition))                    \
+                       WARN("condition not respected on line %s:%d", __FILE__, __LINE__); \
+       } while(0)
 #define WARN_ON_ONCE(condition) WARN_ON(condition)
 
 #endif /* _USTERR_H */