port: fix pthread_setname_np integration

[lttng-ust.git] / liblttng-ust / lttng-ust-comm.c

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index 9d0c010d502079a164e453cb67778f3a547cc2d1..b265bcd3c61e254c9e8dc889d56fef389f2c18e1 100644 (file)
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -20,7 +20,8 @@
  */
 
 #define _LGPL_SOURCE
-#define _GNU_SOURCE
+#include <stddef.h>
+#include <stdint.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/mman.h>
@@ -264,7 +265,7 @@ struct sock_info {
        int statedump_pending;
        int initial_statedump_done;
        /* Keep procname for statedump */
-       char procname[LTTNG_UST_PROCNAME_LEN];
+       char procname[LTTNG_UST_ABI_PROCNAME_LEN];
 };
 
 /* Socket from app (connect) to session daemon (listen) for communication */
@@ -432,6 +433,7 @@ void lttng_ust_fixup_tls(void)
        lttng_fixup_cgroup_ns_tls();
        lttng_fixup_ipc_ns_tls();
        lttng_fixup_net_ns_tls();
+       lttng_fixup_time_ns_tls();
        lttng_fixup_uts_ns_tls();
 }
 
@@ -480,7 +482,7 @@ int setup_global_apps(void)
        }
 
        global_apps.allowed = 1;
-       lttng_ust_getprocname(global_apps.procname);
+       lttng_pthread_getname_np(global_apps.procname, LTTNG_UST_ABI_PROCNAME_LEN);
 error:
        return ret;
 }
@@ -526,7 +528,7 @@ int setup_local_apps(void)
                goto end;
        }
 
-       lttng_ust_getprocname(local_apps.procname);
+       lttng_pthread_getname_np(local_apps.procname, LTTNG_UST_ABI_PROCNAME_LEN);
 end:
        return ret;
 }
@@ -2063,6 +2065,7 @@ void ust_context_ns_reset(void)
        lttng_context_mnt_ns_reset();
        lttng_context_net_ns_reset();
        lttng_context_user_ns_reset();
+       lttng_context_time_ns_reset();
        lttng_context_uts_ns_reset();
 }