X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=libust%2Fmarker.c;h=fd16860ecf85a9c070f6df1ee4d751bbae89c5d2;hb=12e81b07455a1aef2e2bcc73004f14a7b73596fa;hp=ef6f029ac65a2dc75ccb6d84a69c823f74c6af20;hpb=dc2848112a55ee60632491148089cc60984f683d;p=ust.git

diff --git a/libust/marker.c b/libust/marker.c
index ef6f029..fd16860 100644
--- a/libust/marker.c
+++ b/libust/marker.c
@@ -20,6 +20,7 @@
 #include <errno.h>
 #define _LGPL_SOURCE
 #include <urcu-bp.h>
+#include <urcu/rculist.h>
 
 #include <ust/kernelcompat.h>
 #include <ust/marker.h>
@@ -576,36 +577,36 @@ static int set_marker(struct marker_entry *entry, struct marker *elem,
 	smp_wmb();
 	elem->ptype = entry->ptype;
 
-//ust//	if (elem->tp_name && (active ^ _imv_read(elem->state))) {
-//ust//		WARN_ON(!elem->tp_cb);
-//ust//		/*
-//ust//		 * It is ok to directly call the probe registration because type
-//ust//		 * checking has been done in the __trace_mark_tp() macro.
-//ust//		 */
-//ust//
-//ust//		if (active) {
-//ust//			/*
-//ust//			 * try_module_get should always succeed because we hold
-//ust//			 * markers_mutex to get the tp_cb address.
-//ust//			 */
+	if (elem->tp_name && (active ^ _imv_read(elem->state))) {
+		WARN_ON(!elem->tp_cb);
+		/*
+		 * It is ok to directly call the probe registration because type
+		 * checking has been done in the __trace_mark_tp() macro.
+		 */
+
+		if (active) {
+			/*
+			 * try_module_get should always succeed because we hold
+			 * markers_mutex to get the tp_cb address.
+			 */
 //ust//			ret = try_module_get(__module_text_address(
 //ust//				(unsigned long)elem->tp_cb));
 //ust//			BUG_ON(!ret);
-//ust//			ret = tracepoint_probe_register_noupdate(
-//ust//				elem->tp_name,
-//ust//				elem->tp_cb);
-//ust//		} else {
-//ust//			ret = tracepoint_probe_unregister_noupdate(
-//ust//				elem->tp_name,
-//ust//				elem->tp_cb);
-//ust//			/*
-//ust//			 * tracepoint_probe_update_all() must be called
-//ust//			 * before the module containing tp_cb is unloaded.
-//ust//			 */
+			ret = tracepoint_probe_register_noupdate(
+				elem->tp_name,
+				elem->tp_cb);
+		} else {
+			ret = tracepoint_probe_unregister_noupdate(
+				elem->tp_name,
+				elem->tp_cb);
+			/*
+			 * tracepoint_probe_update_all() must be called
+			 * before the module containing tp_cb is unloaded.
+			 */
 //ust//			module_put(__module_text_address(
 //ust//				(unsigned long)elem->tp_cb));
-//ust//		}
-//ust//	}
+		}
+	}
 	elem->state__imv = active;
 
 	return ret;
@@ -619,24 +620,24 @@ static int set_marker(struct marker_entry *entry, struct marker *elem,
  */
 static void disable_marker(struct marker *elem)
 {
-//ust//	int ret;
-//ust//
-//ust//	/* leave "call" as is. It is known statically. */
-//ust//	if (elem->tp_name && _imv_read(elem->state)) {
-//ust//		WARN_ON(!elem->tp_cb);
-//ust//		/*
-//ust//		 * It is ok to directly call the probe registration because type
-//ust//		 * checking has been done in the __trace_mark_tp() macro.
-//ust//		 */
-//ust//		ret = tracepoint_probe_unregister_noupdate(elem->tp_name,
-//ust//			elem->tp_cb);
-//ust//		WARN_ON(ret);
-//ust//		/*
-//ust//		 * tracepoint_probe_update_all() must be called
-//ust//		 * before the module containing tp_cb is unloaded.
-//ust//		 */
+	int ret;
+
+	/* leave "call" as is. It is known statically. */
+	if (elem->tp_name && _imv_read(elem->state)) {
+		WARN_ON(!elem->tp_cb);
+		/*
+		 * It is ok to directly call the probe registration because type
+		 * checking has been done in the __trace_mark_tp() macro.
+		 */
+		ret = tracepoint_probe_unregister_noupdate(elem->tp_name,
+			elem->tp_cb);
+		WARN_ON(ret);
+		/*
+		 * tracepoint_probe_update_all() must be called
+		 * before the module containing tp_cb is unloaded.
+		 */
 //ust//		module_put(__module_text_address((unsigned long)elem->tp_cb));
-//ust//	}
+	}
 	elem->state__imv = 0;
 	elem->single.func = __mark_empty_function;
 	/* Update the function before setting the ptype */
@@ -745,7 +746,7 @@ static void marker_update_probes(void)
 	/* Markers in modules. */
 //ust//	module_update_markers();
 	lib_update_markers();
-//ust//	tracepoint_probe_update_all();
+	tracepoint_probe_update_all();
 	/* Update immediate values */
 	core_imv_update();
 //ust//	module_imv_update(); /* FIXME: need to port for libs? */
@@ -1382,11 +1383,28 @@ int marker_register_lib(struct marker *markers_start, int markers_count)
 	return 0;
 }
 
-int marker_unregister_lib(struct marker *markers_start, int markers_count)
+int marker_unregister_lib(struct marker *markers_start)
 {
+	struct lib *lib;
+
 	/*FIXME: implement; but before implementing, marker_register_lib must
           have appropriate locking. */
 
+	lock_markers();
+
+	/* FIXME: we should probably take a mutex here on libs */
+//ust//	mutex_lock(&module_mutex);
+	list_for_each_entry(lib, &libs, list) {
+		if(lib->markers_start == markers_start) {
+			struct lib *lib2free = lib;
+			list_del(&lib->list);
+			free(lib2free);
+			break;
+		}
+	}
+
+	unlock_markers();
+
 	return 0;
 }
 
@@ -1396,7 +1414,11 @@ void __attribute__((constructor)) init_markers(void)
 {
 	if(!initialized) {
 		marker_register_lib(__start___markers, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker));
-		//DBG("markers_start: %p, markers_stop: %p\n", __start___markers, __stop___markers);
 		initialized = 1;
 	}
 }
+
+void __attribute__((constructor)) destroy_markers(void)
+{
+	marker_unregister_lib(__start___markers);
+}