From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 18 Jun 2013 14:02:00 +0000 (-0400)
Subject: Clarify probe registration documentation/errors
X-Git-Tag: v2.0.7~2
X-Git-Url: http://git.liburcu.org/?a=commitdiff_plain;h=62708e69c8e0d69673f2a56a5ccee901f75908dc;p=lttng-ust.git

Clarify probe registration documentation/errors

Fixes #513

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/doc/man/lttng-ust.3 b/doc/man/lttng-ust.3
index 9bad1ecb..0de6b6a1 100644
--- a/doc/man/lttng-ust.3
+++ b/doc/man/lttng-ust.3
@@ -148,6 +148,11 @@ TRACEPOINT_EVENT(
 		ctf_float(double, doublefield, doublearg)
 	)
 )
+
+There can be an arbitrary number of tracepoint providers within an
+application, but they must each have their own provider name. Duplicate
+provider names are not allowed.
+
 .fi
 
 .SH "ASSIGNING LOGLEVEL TO EVENTS"
diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index 5f687090..f52ae961 100644
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -13,6 +13,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <urcu/compiler.h>
 #include <lttng/ust-events.h>
 #include <lttng/ringbuffer-config.h>
@@ -560,8 +561,10 @@ _TP_COMBINE_TOKENS(__lttng_events_init__, TRACEPOINT_PROVIDER)(void)
 	 * error will appear.
 	 */
 	_TP_COMBINE_TOKENS(__tracepoint_provider_check_, TRACEPOINT_PROVIDER)();
-	ret = ltt_probe_register(&_TP_COMBINE_TOKENS(__probe_desc___, TRACEPOINT_PROVIDER));
-	assert(!ret);
+	if (ret) {
+		fprintf(stderr, "LTTng-UST: Error (%d) while registering tracepoint probe. Duplicate registration of tracepoint probes having the same name is not allowed.\n", ret);
+		abort();
+	}
 }
 
 static void __attribute__((destructor))