X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libust%2Ftracectl.c;h=6e467aa4fe81861a7401c6f41e3f04eb52df6a68;hb=cfa0520d911287f5c470d74272c578bc041077bf;hp=ef7184fe7787696764088a82e56e0adf28661d90;hpb=b27f8e75a6e762ed01b889560431476516786d9f;p=lttng-ust.git diff --git a/libust/tracectl.c b/libust/tracectl.c index ef7184fe..6e467aa4 100644 --- a/libust/tracectl.c +++ b/libust/tracectl.c @@ -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); }