X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-comm.c;h=eec049b31fb2a09de4add833adac706e2e4168ce;hb=364979886a80f7c993b3210af48a93f7d65f4530;hp=43728ff47613d2d2fb0b8e092268ea1c60243f79;hpb=6f626d284c2bb02ae8980da6e8053e191d604286;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index 43728ff4..eec049b3 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -86,7 +86,7 @@ static int initialized;
 static pthread_mutex_t ust_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 /* Allow nesting the ust_mutex within the same thread. */
-static DEFINE_URCU_TLS(int, ust_mutex_nest);
+static DEFINE_URCU_TLS_IE(int, ust_mutex_nest);
 
 /*
  * ust_exit_mutex protects thread_active variable wrt thread exit. It
@@ -535,26 +535,15 @@ int get_constructor_timeout(struct timespec *constructor_timeout)
 }
 
 static
-void get_blocking_retry_timeout(void)
+void get_allow_blocking(void)
 {
-	const char *str_blocking_retry_timeout =
-		lttng_getenv("LTTNG_UST_BLOCKING_RETRY_TIMEOUT");
-
-	if (str_blocking_retry_timeout) {
-		long timeout = strtol(str_blocking_retry_timeout, NULL, 10);
-
-		if (timeout < 0)
-			timeout = -1;
-		if (timeout > INT_MAX) {
-			WARN("Saturating %s value from %ld to %d\n",
-				"LTTNG_UST_BLOCKING_RETRY_TIMEOUT",
-				timeout, INT_MAX);
-			timeout = INT_MAX;
-		}
-		DBG("%s environment variable value is %ld",
-			"LTTNG_UST_BLOCKING_RETRY_TIMEOUT",
-			timeout);
-		lttng_ust_ringbuffer_set_retry_timeout(timeout);
+	const char *str_allow_blocking =
+		lttng_getenv("LTTNG_UST_ALLOW_BLOCKING");
+
+	if (str_allow_blocking) {
+		DBG("%s environment variable is set",
+			"LTTNG_UST_ALLOW_BLOCKING");
+		lttng_ust_ringbuffer_set_allow_blocking();
 	}
 }
 
@@ -1698,7 +1687,7 @@ void __attribute__((constructor)) lttng_ust_init(void)
 
 	timeout_mode = get_constructor_timeout(&constructor_timeout);
 
-	get_blocking_retry_timeout();
+	get_allow_blocking();
 
 	ret = sem_init(&constructor_wait, 0, 0);
 	if (ret) {