remove rcu initialization as it is not needed with urcu-bp

[ust.git] / libust / tracectl.c

diff --git a/libust/tracectl.c b/libust/tracectl.c
index c34a3ce4ad3f673393ef3df9da5f89baa965d7e8..57218a6bd62765b217a27338104b1cbb88a21061 100644 (file)
--- 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");
@@ -1473,6 +1457,9 @@ static void ust_fork(void)
                list_del(&bc->list);
        }
 
+       ustcomm_free_app(&ustcomm_app);
+
+       buffers_to_export = 0;
        have_listener = 0;
        init_socket();
        create_listener();