X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=liblttng-ust-comm%2Flttng-ust-fd-tracker.c;fp=liblttng-ust-comm%2Flttng-ust-fd-tracker.c;h=9909c0606a45044ab33f37ed09603d87d60dcf3c;hb=595c15773def8e249145c4dead560ba7329810c7;hp=9659f349e54ac85a3afad50b2cfc2055abcfacfc;hpb=1a3b8784434bb597b623100a591aeeb835fccf16;p=deliverable%2Flttng-ust.git

diff --git a/liblttng-ust-comm/lttng-ust-fd-tracker.c b/liblttng-ust-comm/lttng-ust-fd-tracker.c
index 9659f349..9909c060 100644
--- a/liblttng-ust-comm/lttng-ust-fd-tracker.c
+++ b/liblttng-ust-comm/lttng-ust-fd-tracker.c
@@ -42,6 +42,7 @@
 #include <helper.h>
 #include <lttng/ust-error.h>
 #include <usterr-signal-safe.h>
+#include <lttng/ust-cancelstate.h>
 
 #include "../liblttng-ust/compat.h"
 
@@ -69,12 +70,6 @@
  */
 static pthread_mutex_t ust_safe_guard_fd_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-/*
- * Cancel state when grabbing the ust_safe_guard_fd_mutex. Saved when
- * locking, restored on unlock. Protected by ust_safe_guard_fd_mutex.
- */
-static int ust_safe_guard_saved_cancelstate;
-
 /*
  * Track whether we are within lttng-ust or application, for close
  * system call override by LD_PRELOAD library. This also tracks whether
@@ -139,11 +134,10 @@ void lttng_ust_init_fd_tracker(void)
 void lttng_ust_lock_fd_tracker(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 (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);
@@ -157,7 +151,6 @@ void lttng_ust_lock_fd_tracker(void)
 		 */
 		cmm_barrier();
 		pthread_mutex_lock(&ust_safe_guard_fd_mutex);
-		ust_safe_guard_saved_cancelstate = oldstate;
 	}
 	ret = pthread_sigmask(SIG_SETMASK, &orig_mask, NULL);
 	if (ret) {
@@ -168,8 +161,7 @@ void lttng_ust_lock_fd_tracker(void)
 void lttng_ust_unlock_fd_tracker(void)
 {
 	sigset_t sig_all_blocked, orig_mask;
-	int ret, newstate, oldstate;
-	bool restore_cancel = false;
+	int ret;
 
 	sigfillset(&sig_all_blocked);
 	ret = pthread_sigmask(SIG_SETMASK, &sig_all_blocked, &orig_mask);
@@ -182,19 +174,14 @@ void lttng_ust_unlock_fd_tracker(void)
 	 */
 	cmm_barrier();
 	if (!--URCU_TLS(ust_fd_mutex_nest)) {
-		newstate = ust_safe_guard_saved_cancelstate;
-		restore_cancel = true;
 		pthread_mutex_unlock(&ust_safe_guard_fd_mutex);
 	}
 	ret = pthread_sigmask(SIG_SETMASK, &orig_mask, NULL);
 	if (ret) {
 		ERR("pthread_sigmask: %s", strerror(ret));
 	}
-	if (restore_cancel) {
-		ret = pthread_setcancelstate(newstate, &oldstate);
-		if (ret) {
-			ERR("pthread_setcancelstate: %s", strerror(ret));
-		}
+	if (lttng_ust_cancelstate_disable_pop()) {
+		ERR("lttng_ust_cancelstate_disable_pop");
 	}
 }