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

diff --git a/libust/marker.c b/libust/marker.c
index da16e4f6..01a515d1 100644
--- a/libust/marker.c
+++ b/libust/marker.c
@@ -672,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
@@ -1517,10 +1535,12 @@ int marker_register_lib(struct marker *markers_start, struct marker_addr *marker
 #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();