From: Pierre-Marc Fournier <pierre-marc.fournier@polymtl.ca>
Date: Tue, 16 Jun 2009 21:02:35 +0000 (-0400)
Subject: reduce default verbosity
X-Git-Tag: v1.9.1~963
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=1767488580719803a824d07e6662381df81328d7;p=lttng-ust.git

reduce default verbosity
---

diff --git a/libust/serialize.c b/libust/serialize.c
index b8df1b3c..c7ba8480 100644
--- a/libust/serialize.c
+++ b/libust/serialize.c
@@ -677,7 +677,7 @@ notrace void ltt_vtrace(const struct marker *mdata, void *probe_data,
 		/* Out-of-order commit */
 		ltt_commit_slot(channel, &transport_data, buf_offset,
 				data_size, slot_size);
-		printf("just commited event at offset %ld and size %zd\n", buf_offset, slot_size);
+		DBG("just commited event at offset %ld and size %zd\n", buf_offset, slot_size);
 	}
 //ust//	__get_cpu_var(ltt_nesting)--;
 	ltt_nesting--;
diff --git a/share/usterr.h b/share/usterr.h
index a2d04313..9c4be7ee 100644
--- a/share/usterr.h
+++ b/share/usterr.h
@@ -1,11 +1,16 @@
 #ifndef USTERR_H
 #define USTERR_H
 
-#define DBG(fmt, args...) fprintf(stderr, fmt "\n", ## args); fflush(stderr)
-#define WARN(fmt, args...) fprintf(stderr, "usertrace: WARNING: " fmt "\n", ## args); fflush(stderr)
-#define ERR(fmt, args...) fprintf(stderr, "usertrace: ERROR: " fmt "\n", ## args); fflush(stderr)
-#define BUG(fmt, args...) fprintf(stderr, "usertrace: BUG: " fmt "\n", ## args); fflush(stderr)
-#define PERROR(call) perror("usertrace: ERROR: " call)
+//#define DEBUG
+#ifdef DEBUG
+# define DBG(fmt, args...) do { fprintf(stderr, fmt "\n", ## args); fflush(stderr); } while(0)
+#else
+# define DBG(fmt, args...) do {} while(0)
+#endif
+#define WARN(fmt, args...) fprintf(stderr, "libust: WARNING: " fmt "\n", ## args); fflush(stderr)
+#define ERR(fmt, args...) fprintf(stderr, "libust: ERROR: " fmt "\n", ## args); fflush(stderr)
+#define BUG(fmt, args...) fprintf(stderr, "libust: BUG: " fmt "\n", ## args); fflush(stderr)
+#define PERROR(call) perror("ust: ERROR: " call)
 
 #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)
diff --git a/ustd/localerr.h b/ustd/localerr.h
index 803d8c6f..d4276eb5 100644
--- a/ustd/localerr.h
+++ b/ustd/localerr.h
@@ -1,6 +1,12 @@
 #include <stdio.h>
 
-#define DBG(fmt, args...) fprintf(stderr, "ustd: " fmt "\n", ## args); fflush(stderr)
+//#define DEBUG
+#ifdef DEBUG
+# define DBG(fmt, args...) fprintf(stderr, "ustd: " fmt "\n", ## args); fflush(stderr)
+#else
+# define DBG(fmt, args...) do {} while(0)
+#endif
+
 #define WARN(fmt, args...) fprintf(stderr, "ustd: WARNING: " fmt "\n", ## args); fflush(stderr)
 #define ERR(fmt, args...) fprintf(stderr, "ustd: ERROR: " fmt "\n", ## args); fflush(stderr)
 #define PERROR(a) perror(a)