Tracepoint and TRACEPOINT_EVENT API cleanup

[ust.git] / libust / tracectl.c

diff --git a/libust/tracectl.c b/libust/tracectl.c
index 9634f2270d58790cf088ef69e39b63e664ca5956..bd640c3ecd9ecb363285d92ce62dc225a1713808 100644 (file)
--- a/libust/tracectl.c
+++ b/libust/tracectl.c
@@ -21,6 +21,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -38,6 +39,7 @@
 
 #include <ust/marker.h>
 #include <ust/tracepoint.h>
+#include <ust/tracepoint-internal.h>
 #include <ust/tracectl.h>
 #include <ust/clock.h>
 #include "tracer.h"
@@ -112,7 +114,10 @@ static void print_ust_marker(FILE *fp)
                        (*iter.ust_marker)->name,
                        (int)(*iter.ust_marker)->state,
                        (*iter.ust_marker)->format,
-                       (*iter.ust_marker)->location);
+                       NULL);  /*
+                                * location is null for now, will be added
+                                * to a different table.
+                                */
                ust_marker_iter_next(&iter);
        }
        unlock_ust_marker();
@@ -1224,12 +1229,19 @@ static struct ustcomm_sock * init_app_socket(int epoll_fd)
        char *dir_name, *sock_name;
        int result;
        struct ustcomm_sock *sock = NULL;
+       time_t mtime;
 
        dir_name = ustcomm_user_sock_dir();
        if (!dir_name)
                return NULL;
 
-       result = asprintf(&sock_name, "%s/%d", dir_name, (int)getpid());
+       mtime = ustcomm_pid_st_mtime(getpid());
+       if (!mtime) {
+               goto free_dir_name;
+       }
+
+       result = asprintf(&sock_name, "%s/%d.%ld", dir_name,
+                         (int) getpid(), (long) mtime);
        if (result < 0) {
                ERR("string overflow allocating socket name, "
                    "UST thread bailing");