X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Flttng-ust-comm.c;h=4432a5da396d1a2f574ab74d5200e209ada277a3;hb=e450e3396b0bfe998e3bde6aef7dc3b4232f8edb;hp=9d0c010d502079a164e453cb67778f3a547cc2d1;hpb=94be38e8fd2d71397f79c0a368ba95678052e32d;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index 9d0c010d..4432a5da 100644
--- 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>
@@ -41,6 +42,7 @@
 #include <urcu/futex.h>
 #include <urcu/compiler.h>
 
+#include <lttng/align.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-abi.h>
 #include <lttng/ust.h>
@@ -264,7 +266,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 +434,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 +483,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 +529,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;
 }
@@ -1171,7 +1174,7 @@ void cleanup_sock_info(struct sock_info *sock_info, int exiting)
 	if (sock_info->wait_shm_mmap) {
 		long page_size;
 
-		page_size = sysconf(_SC_PAGE_SIZE);
+		page_size = LTTNG_UST_PAGE_SIZE;
 		if (page_size <= 0) {
 			if (!page_size) {
 				errno = EINVAL;
@@ -2063,6 +2066,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();
 }