X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=3c2d2a756b71b704666b3d5b81792d9c02c50708;hb=db58870b8a78ae1a466949318f1a7c9ef1ba3b3e;hp=0df0b1f2e04bc4601149088740b6feec2b0bfdb2;hpb=78f1416ae5653e08758df32eeb0338e0f5c22acd;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 0df0b1f2e..3c2d2a756 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -1868,12 +1868,16 @@ static void *thread_dispatch_ust_registration(void *data)
 
 	DBG("[thread] Dispatch UST command started");
 
-	while (!CMM_LOAD_SHARED(dispatch_thread_exit)) {
+	for (;;) {
 		health_code_update();
 
 		/* Atomically prepare the queue futex */
 		futex_nto1_prepare(&ust_cmd_queue.futex);
 
+		if (CMM_LOAD_SHARED(dispatch_thread_exit)) {
+			break;
+		}
+
 		do {
 			struct ust_app *app = NULL;
 			ust_cmd = NULL;
@@ -2522,7 +2526,7 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 			} else {
 				DBG("Could not find any valid consumerd executable");
 				ret = -EINVAL;
-				break;
+				goto error;
 			}
 			DBG("Using kernel consumer at: %s",  consumer_to_use);
 			ret = execl(consumer_to_use,
@@ -2619,7 +2623,7 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 			break;
 		}
 		default:
-			PERROR("unknown consumer type");
+			ERR("unknown consumer type");
 			exit(EXIT_FAILURE);
 		}
 		if (errno != 0) {
@@ -2712,7 +2716,6 @@ static int init_kernel_tracer(void)
 	kernel_tracer_fd = open(module_proc_lttng, O_RDWR);
 	if (kernel_tracer_fd < 0) {
 		DBG("Failed to open %s", module_proc_lttng);
-		ret = -1;
 		goto error_open;
 	}
 
@@ -5522,6 +5525,44 @@ error:
 	return ret;
 }
 
+static int set_clock_plugin_env(void)
+{
+	int ret = 0;
+	const char *original_env_value;
+	char *full_path = NULL;
+	char *new_env_value = NULL;
+
+	original_env_value = getenv("LTTNG_UST_CLOCK_PLUGIN");
+	if (!original_env_value) {
+		goto end;
+	}
+
+	full_path = utils_expand_path(original_env_value);
+	if (!full_path) {
+		ERR("Failed to expand LTTNG_UST_CLOCK_PLUGIN path \"%s\"",
+				original_env_value);
+		ret = -1;
+		goto end;
+	}
+        ret = asprintf(&new_env_value, "LTTNG_UST_CLOCK_PLUGIN=%s",
+			full_path);
+	free(full_path);
+	if (ret < 0) {
+		PERROR("asprintf");
+		goto end;
+	}
+
+	DBG("Updating environment: %s", new_env_value);
+	ret = putenv(new_env_value);
+	if (ret) {
+		free(new_env_value);
+		PERROR("putenv of LTTNG_UST_CLOCK_PLUGIN");
+		goto end;
+	}
+end:
+	return ret;
+}
+
 /*
  * main
  */
@@ -5563,6 +5604,12 @@ int main(int argc, char **argv)
 		goto exit_options;
 	}
 
+	ret = set_clock_plugin_env();
+	if (ret) {
+		retval = -1;
+		goto exit_options;
+	}
+
 	/* Daemonize */
 	if (opt_daemon || opt_background) {
 		int i;