X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=libust%2Ftracectl.c;h=57218a6bd62765b217a27338104b1cbb88a21061;hb=02c8b050c0fbb61aa8625ecaf8776e642449c838;hp=c72d013d7535a5539960e4d111ad24b39bcc6e54;hpb=31d392f1a565abd0751302d8c52b9f9e695e051e;p=ust.git

diff --git a/libust/tracectl.c b/libust/tracectl.c
index c72d013..57218a6 100644
--- a/libust/tracectl.c
+++ b/libust/tracectl.c
@@ -27,8 +27,6 @@
 #include <poll.h>
 #include <regex.h>
 
-#include <urcu-bp.h>
-
 #include <ust/marker.h>
 #include <ust/tracectl.h>
 #include "tracer.h"
@@ -125,15 +123,6 @@ static void print_markers(FILE *fp)
 
 static int init_socket(void);
 
-/* This needs to be called whenever a new thread is created. It notifies
- * liburcu of the new thread.
- */
-
-void ust_register_thread(void)
-{
-	rcu_register_thread();
-}
-
 int fd_notif = -1;
 void notif_cb(void)
 {
@@ -357,10 +346,7 @@ static int do_cmd_get_shmid(const char *recvbuf, struct ustcomm_source *src)
 		}
 	}
 
-	if(found) {
-		buffers_to_export--;
-	}
-	else {
+	if(!found) {
 		ERR("channel not found (%s)", channel_and_cpu);
 	}
 
@@ -695,6 +681,14 @@ static int do_cmd_get_subbuffer(const char *recvbuf, struct ustcomm_source *src)
 
 			list_add(&bc->list, &blocked_consumers);
 
+			/* Being here is the proof the daemon has mapped the buffer in its
+			 * memory. We may now decrement buffers_to_export.
+			 */
+			if(atomic_long_read(&buf->consumed) == 0) {
+				DBG("decrementing buffers_to_export");
+				buffers_to_export--;
+			}
+
 			break;
 		}
 	}
@@ -823,8 +817,6 @@ void *listener_main(void *p)
 {
 	int result;
 
-	ust_register_thread();
-
 	DBG("LISTENER");
 
 	for(;;) {
@@ -1186,16 +1178,8 @@ static void __attribute__((constructor)) init()
 	 */
 	pidunique = make_pidunique();
 
-	/* Initialize RCU in case the constructor order is not good. */
-	rcu_init();
-
-	/* It is important to do this before events start to be generated. */
-	ust_register_thread();
-
 	DBG("Tracectl constructor");
 
-	/* Must create socket before signal handler to prevent races.
-         */
 	result = init_socket();
 	if(result == -1) {
 		ERR("init_socket error");
@@ -1455,6 +1439,10 @@ static void ust_fork(void)
 
 	/* FIXME: technically, the locks could have been taken before the fork */
 	DBG("ust: forking");
+
+	/* break lock if necessary */
+	ltt_unlock_traces();
+
 	ltt_trace_stop("auto");
 	ltt_trace_destroy("auto", 1);
 	/* Delete all active connections */
@@ -1469,9 +1457,12 @@ static void ust_fork(void)
 		list_del(&bc->list);
 	}
 
+	ustcomm_free_app(&ustcomm_app);
+
+	buffers_to_export = 0;
 	have_listener = 0;
-	create_listener();
 	init_socket();
+	create_listener();
 	ltt_trace_setup("auto");
 	result = ltt_trace_set_type("auto", "ustrelay");
 	if(result < 0) {