X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Fusterr.h;h=dc51d840b42879d6e8f11e1f7567a9f05dc2edad;hb=c34b3b36110c299c86b69f5a6d1f5879d081fab0;hp=1819f973069b99f670fd5411f6d7809c35daffee;hpb=fbca6b624335eef18c8d86194aeb101a720168f4;p=ust.git

diff --git a/include/usterr.h b/include/usterr.h
index 1819f97..dc51d84 100644
--- a/include/usterr.h
+++ b/include/usterr.h
@@ -1,16 +1,35 @@
-#ifndef USTERR_H
-#define USTERR_H
+/* Copyright (C) 2009  Pierre-Marc Fournier
+ *
+ * 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.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * 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 "share.h"
 
 #ifndef UST_COMPONENT
-//#error UST_COMPONENT is undefined
 #define UST_COMPONENT libust
 #endif
 
@@ -18,40 +37,22 @@
 #define XSTR(d) STR(d)
 #define STR(s) #s
 
-/* We sometimes print in the tracing path, and tracing can occur in
- * signal handlers, so we must use a print method which is signal safe.
- */
-
-#define sigsafe_print_err(fmt, args...) \
-{ \
-	/* Can't use dynamic allocation. Limit ourselves to 250 chars. */ \
-	char ____buf[250]; \
-	int ____saved_errno; \
-\
-	/* Save the errno. */ \
-	____saved_errno = errno; \
-\
-	snprintf(____buf, sizeof(____buf), fmt, ## args); \
-\
-	/* Add end of string in case of buffer overflow. */ \
-	____buf[sizeof(____buf)-1] = 0; \
-\
-	patient_write(STDERR_FILENO, ____buf, strlen(____buf)); \
-	/* Can't print errors because we are in the error printing code path. */ \
-\
-	/* Restore errno, in order to be async-signal safe. */ \
-	errno = ____saved_errno; \
+/* 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 { sigsafe_print_err(UST_STR_COMPONENT "[%ld/%ld]: " fmt " (" __FILE__ ":" XSTR(__LINE__) ")\n", (long) getpid(), (long) syscall(SYS_gettid), ## args); fflush(stderr); } 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) syscall(SYS_gettid), ## args, __func__); } while(0)
 
-#define DEBUG
-#ifdef DEBUG
+#ifdef 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...) do {} while(0)
+# define DBG(fmt, args...) __check_ust_safe_fmt(fmt, ## args)
+# define DBG_raw(fmt, args...) __check_ust_safe_fmt(fmt, ## args)
 #endif
 #define WARN(fmt, args...) ERRMSG("Warning: " fmt, ## args)
 #define ERR(fmt, args...) ERRMSG("Error: " fmt, ## args)
@@ -76,5 +77,6 @@
 
 #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 WARN_ON_ONCE(condition) WARN_ON(condition)
 
-#endif /* USTERR_H */
+#endif /* _USTERR_H */