Update version to 0.16

[ust.git] / libust / tracectl.c

diff --git a/libust/tracectl.c b/libust/tracectl.c
index ef7184fe7787696764088a82e56e0adf28661d90..410b1c72e75cb52a2fd24a2898c590f31c011455 100644 (file)
--- a/libust/tracectl.c
+++ b/libust/tracectl.c
@@ -34,7 +34,7 @@
 #include <fcntl.h>
 #include <poll.h>
 #include <regex.h>
-#include <urcu/uatomic_arch.h>
+#include <urcu/uatomic.h>
 #include <urcu/list.h>
 
 #include <ust/marker.h>
@@ -126,7 +126,6 @@ static void print_trace_events(FILE *fp)
 {
        struct trace_event_iter iter;
 
-       lock_trace_events();
        trace_event_iter_reset(&iter);
        trace_event_iter_start(&iter);
 
@@ -134,7 +133,7 @@ static void print_trace_events(FILE *fp)
                fprintf(fp, "trace_event: %s\n", (*iter.trace_event)->name);
                trace_event_iter_next(&iter);
        }
-       unlock_trace_events();
+       trace_event_iter_stop(&iter);
 }
 
 static int connect_ustconsumer(void)
@@ -1710,7 +1709,6 @@ static void ust_after_fork_common(ust_fork_info_t *fork_info)
 
        pthread_mutex_unlock(&listen_sock_mutex);
        pthread_mutex_unlock(&listener_thread_data_mutex);
-
         /* Restore signals */
         result = sigprocmask(SIG_SETMASK, &fork_info->orig_sigs, NULL);
         if (result == -1) {
@@ -1734,7 +1732,7 @@ void ust_after_fork_child(ust_fork_info_t *fork_info)
        /* Sanitize the child */
        ust_fork();
 
-       /* Then release mutexes and reenable signals */
+       /* Release mutexes and reenable signals */
        ust_after_fork_common(fork_info);
 }