X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Flttng-ust-comm.c;h=caba7452eaafab2dfb7ccf570bb8fa83bf11be9e;hb=2137460a3901f8abdae909cf72e43e6ac23507ec;hp=2a105bd7dcefe5c5cd976cb0010f2b23b2c9349e;hpb=ef9cd5c799d6a7dade15a0e1c5e18831d0ac534b;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/lttng-ust-comm.c b/src/lib/lttng-ust/lttng-ust-comm.c
index 2a105bd7..caba7452 100644
--- a/src/lib/lttng-ust/lttng-ust-comm.c
+++ b/src/lib/lttng-ust/lttng-ust-comm.c
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: LGPL-2.1-only
  *
- * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
@@ -38,6 +38,7 @@
 #include <lttng/ust-thread.h>
 #include <lttng/ust-tracer.h>
 #include <lttng/ust-common.h>
+#include <lttng/ust-cancelstate.h>
 #include <urcu/tls-compat.h>
 #include "lib/lttng-ust/futex.h"
 #include "common/ustcomm.h"
@@ -125,14 +126,10 @@ int lttng_ust_loaded __attribute__((weak));
 int ust_lock(void)
 {
 	sigset_t sig_all_blocked, orig_mask;
-	int ret, oldstate;
+	int ret;
 
-	ret = pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate);
-	if (ret) {
-		ERR("pthread_setcancelstate: %s", strerror(ret));
-	}
-	if (oldstate != PTHREAD_CANCEL_ENABLE) {
-		ERR("pthread_setcancelstate: unexpected oldstate");
+	if (lttng_ust_cancelstate_disable_push()) {
+		ERR("lttng_ust_cancelstate_disable_push");
 	}
 	sigfillset(&sig_all_blocked);
 	ret = pthread_sigmask(SIG_SETMASK, &sig_all_blocked, &orig_mask);
@@ -161,14 +158,10 @@ int ust_lock(void)
 void ust_lock_nocheck(void)
 {
 	sigset_t sig_all_blocked, orig_mask;
-	int ret, oldstate;
+	int ret;
 
-	ret = pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate);
-	if (ret) {
-		ERR("pthread_setcancelstate: %s", strerror(ret));
-	}
-	if (oldstate != PTHREAD_CANCEL_ENABLE) {
-		ERR("pthread_setcancelstate: unexpected oldstate");
+	if (lttng_ust_cancelstate_disable_push()) {
+		ERR("lttng_ust_cancelstate_disable_push");
 	}
 	sigfillset(&sig_all_blocked);
 	ret = pthread_sigmask(SIG_SETMASK, &sig_all_blocked, &orig_mask);
@@ -189,7 +182,7 @@ void ust_lock_nocheck(void)
 void ust_unlock(void)
 {
 	sigset_t sig_all_blocked, orig_mask;
-	int ret, oldstate;
+	int ret;
 
 	sigfillset(&sig_all_blocked);
 	ret = pthread_sigmask(SIG_SETMASK, &sig_all_blocked, &orig_mask);
@@ -202,12 +195,8 @@ void ust_unlock(void)
 	if (ret) {
 		ERR("pthread_sigmask: %s", strerror(ret));
 	}
-	ret = pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &oldstate);
-	if (ret) {
-		ERR("pthread_setcancelstate: %s", strerror(ret));
-	}
-	if (oldstate != PTHREAD_CANCEL_DISABLE) {
-		ERR("pthread_setcancelstate: unexpected oldstate");
+	if (lttng_ust_cancelstate_disable_pop()) {
+		ERR("lttng_ust_cancelstate_disable_pop");
 	}
 }
 
@@ -259,7 +248,7 @@ struct sock_info {
 	int statedump_pending;
 	int initial_statedump_done;
 	/* Keep procname for statedump */
-	char procname[LTTNG_UST_ABI_PROCNAME_LEN];
+	char procname[LTTNG_UST_CONTEXT_PROCNAME_LEN];
 };
 
 /* Socket from app (connect) to session daemon (listen) for communication */
@@ -482,7 +471,7 @@ int setup_global_apps(void)
 	}
 
 	global_apps.allowed = 1;
-	lttng_pthread_getname_np(global_apps.procname, LTTNG_UST_ABI_PROCNAME_LEN);
+	lttng_pthread_getname_np(global_apps.procname, LTTNG_UST_CONTEXT_PROCNAME_LEN);
 error:
 	return ret;
 }
@@ -528,7 +517,7 @@ int setup_local_apps(void)
 		goto end;
 	}
 
-	lttng_pthread_getname_np(local_apps.procname, LTTNG_UST_ABI_PROCNAME_LEN);
+	lttng_pthread_getname_np(local_apps.procname, LTTNG_UST_CONTEXT_PROCNAME_LEN);
 end:
 	return ret;
 }
@@ -1459,8 +1448,7 @@ void cleanup_sock_info(struct sock_info *sock_info, int exiting)
 		}
 		sock_info->root_handle = -1;
 	}
-	sock_info->registration_done = 0;
-	sock_info->initial_statedump_done = 0;
+
 
 	/*
 	 * wait_shm_mmap, socket and notify socket are used by listener
@@ -1472,6 +1460,9 @@ void cleanup_sock_info(struct sock_info *sock_info, int exiting)
 	if (exiting)
 		return;
 
+	sock_info->registration_done = 0;
+	sock_info->initial_statedump_done = 0;
+
 	if (sock_info->socket != -1) {
 		ret = ustcomm_close_unix_sock(sock_info->socket);
 		if (ret) {
@@ -2183,7 +2174,7 @@ void lttng_ust_ctor(void)
 	 * this library so it never becomes zero, thus never gets unloaded from the
 	 * address space of the process. Since we are already running in the
 	 * constructor of the LTTNG_UST_LIB_SONAME library, calling dlopen will
-	 * simply increment the refcount and no additionnal work is needed by the
+	 * simply increment the refcount and no additional work is needed by the
 	 * dynamic loader as the shared library is already loaded in the address
 	 * space. As a safe guard, we use the RTLD_NODELETE flag to prevent
 	 * unloading of the UST library if its refcount becomes zero (which should
@@ -2520,7 +2511,7 @@ void lttng_ust_after_fork_parent(sigset_t *restore_sigset)
 		return;
 	DBG("process %d", getpid());
 	lttng_ust_urcu_after_fork_parent();
-	/* Release mutexes and reenable signals */
+	/* Release mutexes and re-enable signals */
 	ust_after_fork_common(restore_sigset);
 }
 
@@ -2547,7 +2538,7 @@ void lttng_ust_after_fork_child(sigset_t *restore_sigset)
 	/* Release urcu mutexes */
 	lttng_ust_urcu_after_fork_child();
 	lttng_ust_cleanup(0);
-	/* Release mutexes and reenable signals */
+	/* Release mutexes and re-enable signals */
 	ust_after_fork_common(restore_sigset);
 	lttng_ust_ctor();
 }