X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=libust%2Ftracectl.c;h=bafe1a94d5a56ac5e7b57f179f75aadbfd520201;hb=909bc43f70be2b1d3efcefe33121ee1e99d9895b;hp=220d37f6f0bb347b22587c98bbcee6ee6e0857cf;hpb=cedc01558f93f0d28c027a4d99bbe3e364ca4b97;p=ust.git

diff --git a/libust/tracectl.c b/libust/tracectl.c
index 220d37f..bafe1a9 100644
--- a/libust/tracectl.c
+++ b/libust/tracectl.c
@@ -17,6 +17,7 @@
 
 #define _GNU_SOURCE
 #include <stdio.h>
+#include <stdlib.h>
 #include <stdint.h>
 #include <signal.h>
 #include <sys/types.h>
@@ -26,8 +27,7 @@
 #include <fcntl.h>
 #include <poll.h>
 #include <regex.h>
-
-#include <urcu-bp.h>
+#include <urcu/uatomic_arch.h>
 
 #include <ust/marker.h>
 #include <ust/tracectl.h>
@@ -125,15 +125,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)
 {
@@ -695,7 +686,7 @@ static int do_cmd_get_subbuffer(const char *recvbuf, struct ustcomm_source *src)
 			/* 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) {
+			if(uatomic_read(&buf->consumed) == 0) {
 				DBG("decrementing buffers_to_export");
 				buffers_to_export--;
 			}
@@ -828,8 +819,6 @@ void *listener_main(void *p)
 {
 	int result;
 
-	ust_register_thread();
-
 	DBG("LISTENER");
 
 	for(;;) {
@@ -1191,16 +1180,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");
@@ -1478,6 +1459,8 @@ static void ust_fork(void)
 		list_del(&bc->list);
 	}
 
+	ustcomm_free_app(&ustcomm_app);
+
 	buffers_to_export = 0;
 	have_listener = 0;
 	init_socket();