X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Fmarker.c;h=01a515d173c6c22be521cedafd8945c293c55498;hb=a53110051c34d7f46c584e3bccd927b213930d05;hp=47b6d11fc0c65f29873c951049d33a4ddbf7ccd9;hpb=636ca5d6fed61d16178a2e29038a6ffea26677fa;p=ust.git

diff --git a/libust/marker.c b/libust/marker.c
index 47b6d11..01a515d 100644
--- a/libust/marker.c
+++ b/libust/marker.c
@@ -46,8 +46,11 @@ volatile __thread long *ust_reg_stack_ptr = (long *) 0;
 
 extern struct marker __start___markers[] __attribute__((visibility("hidden")));
 extern struct marker __stop___markers[] __attribute__((visibility("hidden")));
+
+#ifdef CONFIG_UST_GDB_INTEGRATION
 extern struct marker_addr __start___marker_addr[] __attribute__((visibility("hidden")));
 extern struct marker_addr __stop___marker_addr[] __attribute__((visibility("hidden")));
+#endif
 
 /* Set to 1 to enable marker debug output */
 static const int marker_debug;
@@ -669,6 +672,24 @@ static void disable_marker(struct marker *elem)
 	 */
 }
 
+/*
+ * is_marker_enabled - Check if a marker is enabled
+ * @channel: channel name
+ * @name: marker name
+ *
+ * Returns 1 if the marker is enabled, 0 if disabled.
+ */
+int is_marker_enabled(const char *channel, const char *name)
+{
+	struct marker_entry *entry;
+
+	mutex_lock(&markers_mutex);
+	entry = get_marker(channel, name);
+	mutex_unlock(&markers_mutex);
+
+	return entry && !!entry->refcount;
+}
+
 /**
  * marker_update_probe_range - Update a probe range
  * @begin: beginning of the range
@@ -1509,13 +1530,17 @@ int marker_register_lib(struct marker *markers_start, struct marker_addr *marker
 	pl = (struct lib *) malloc(sizeof(struct lib));
 
 	pl->markers_start = markers_start;
+#ifdef CONFIG_UST_GDB_INTEGRATION
 	pl->markers_addr_start = marker_addr_start;
+#endif
 	pl->markers_count = markers_count;
 
+#ifdef CONFIG_UST_GDB_INTEGRATION
 	lock_markers();
 	for(addr = marker_addr_start; addr < marker_addr_start + markers_count; addr++)
 		addr->marker->location = addr->addr;
 	unlock_markers();
+#endif
 
 	/* FIXME: maybe protect this with its own mutex? */
 	lock_markers();
@@ -1545,7 +1570,11 @@ static int initialized = 0;
 void __attribute__((constructor)) init_markers(void)
 {
 	if(!initialized) {
+#ifdef CONFIG_UST_GDB_INTEGRATION
 		marker_register_lib(__start___markers, __start___marker_addr, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker));
+#else
+		marker_register_lib(__start___markers, NULL, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker));
+#endif
 		//DBG("markers_start: %p, markers_stop: %p\n", __start___markers, __stop___markers);
 		initialized = 1;
 	}