X-Git-Url: http://git.lttng.org/?p=ust.git;a=blobdiff_plain;f=libust%2Ftracectl.c;fp=libust%2Ftracectl.c;h=ef7184fe7787696764088a82e56e0adf28661d90;hp=bd640c3ecd9ecb363285d92ce62dc225a1713808;hb=b27f8e75a6e762ed01b889560431476516786d9f;hpb=fd0a1aea7b67696a87ffe70b8d3d8c15424f0bca

diff --git a/libust/tracectl.c b/libust/tracectl.c
index bd640c3..ef7184f 100644
--- a/libust/tracectl.c
+++ b/libust/tracectl.c
@@ -104,7 +104,6 @@ static void print_ust_marker(FILE *fp)
 {
 	struct ust_marker_iter iter;
 
-	lock_ust_marker();
 	ust_marker_iter_reset(&iter);
 	ust_marker_iter_start(&iter);
 
@@ -120,7 +119,7 @@ static void print_ust_marker(FILE *fp)
 				 */
 		ust_marker_iter_next(&iter);
 	}
-	unlock_ust_marker();
+	ust_marker_iter_stop(&iter);
 }
 
 static void print_trace_events(FILE *fp)
@@ -1315,18 +1314,17 @@ static void __attribute__((constructor)) init()
 		DBG("UST traces will not be synchronized with LTTng traces");
 	}
 
+	if (getenv("UST_TRACE") || getenv("UST_AUTOPROBE")) {
+		/* Ensure ust_marker control is initialized */
+		init_ust_marker_control();
+	}
+
 	autoprobe_val = getenv("UST_AUTOPROBE");
 	if (autoprobe_val) {
 		struct ust_marker_iter iter;
 
 		DBG("Autoprobe enabled.");
 
-		/* Ensure ust_marker are initialized */
-		//init_ust_marker();
-
-		/* Ensure ust_marker control is initialized, for the probe */
-		init_ust_marker_control();
-
 		/* first, set the callback that will connect the
 		 * probe on new ust_marker
 		 */
@@ -1358,6 +1356,7 @@ static void __attribute__((constructor)) init()
 			auto_probe_connect(*iter.ust_marker);
 			ust_marker_iter_next(&iter);
 		}
+		ust_marker_iter_stop(&iter);
 	}
 
 	if (getenv("UST_OVERWRITE")) {
@@ -1401,12 +1400,6 @@ static void __attribute__((constructor)) init()
 
 		DBG("starting early tracing");
 
-		/* Ensure ust_marker control is initialized */
-		init_ust_marker_control();
-
-		/* Ensure ust_marker are initialized */
-		init_ust_marker();
-
 		/* Ensure buffers are initialized, for the transport to be available.
 		 * We are about to set a trace type and it will fail without this.
 		 */