X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=3625bba0f2d6d1f64049984f5209626d5d1dfcb1;hb=81f04d5fd1680ff7cf705e19b3cbfc022272bbf3;hp=76d087a1e5c90c1198afa870f19be9a4ae526d49;hpb=b723c447e99a0aa57fd3d5313273c05bb416a517;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 76d087a1e..3625bba0f 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -1445,7 +1445,17 @@ error_poll:
 }
 
 /*
- * This thread manage application communication.
+ * This thread receives application command sockets (FDs) on the
+ * apps_cmd_pipe and waits (polls) on them until they are closed
+ * or an error occurs.
+ *
+ * At that point, it flushes the data (tracing and metadata) associated
+ * with this application and tears down ust app sessions and other
+ * associated data structures through ust_app_unregister().
+ *
+ * Note that this thread never sends commands to the applications
+ * through the command sockets; it merely listens for hang-ups
+ * and errors on those sockets and cleans-up as they occur.
  */
 static void *thread_manage_apps(void *data)
 {
@@ -2413,9 +2423,9 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 			 * fallback on the 32-bit one,
 			 */
 			DBG3("Looking for a kernel consumer at these locations:");
-			DBG3("	1) %s", config.consumerd64_bin_path.value);
+			DBG3("	1) %s", config.consumerd64_bin_path.value ? : "NULL");
 			DBG3("	2) %s/%s", INSTALL_BIN_PATH, DEFAULT_CONSUMERD_FILE);
-			DBG3("	3) %s", config.consumerd32_bin_path.value);
+			DBG3("	3) %s", config.consumerd32_bin_path.value ? : "NULL");
 			if (stat(config.consumerd64_bin_path.value, &st) == 0) {
 				DBG3("Found location #1");
 				consumer_to_use = config.consumerd64_bin_path.value;
@@ -2440,33 +2450,30 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 			break;
 		case LTTNG_CONSUMER64_UST:
 		{
-			char *tmpnew = NULL;
-
-			if (config.consumerd64_lib_dir.value[0] != '\0') {
+			if (config.consumerd64_lib_dir.value) {
 				char *tmp;
 				size_t tmplen;
+				char *tmpnew;
 
 				tmp = lttng_secure_getenv("LD_LIBRARY_PATH");
 				if (!tmp) {
 					tmp = "";
 				}
-				tmplen = strlen("LD_LIBRARY_PATH=")
-					+ strlen(config.consumerd64_lib_dir.value) + 1 /* : */ + strlen(tmp);
+				tmplen = strlen(config.consumerd64_lib_dir.value) + 1 /* : */ + strlen(tmp);
 				tmpnew = zmalloc(tmplen + 1 /* \0 */);
 				if (!tmpnew) {
 					ret = -ENOMEM;
 					goto error;
 				}
-				strcpy(tmpnew, "LD_LIBRARY_PATH=");
 				strcat(tmpnew, config.consumerd64_lib_dir.value);
 				if (tmp[0] != '\0') {
 					strcat(tmpnew, ":");
 					strcat(tmpnew, tmp);
 				}
-				ret = putenv(tmpnew);
+				ret = setenv("LD_LIBRARY_PATH", tmpnew, 1);
+				free(tmpnew);
 				if (ret) {
 					ret = -errno;
-					free(tmpnew);
 					goto error;
 				}
 			}
@@ -2476,40 +2483,34 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 					"--consumerd-err-sock", consumer_data->err_unix_sock_path,
 					"--group", config.tracing_group_name.value,
 					NULL);
-			if (config.consumerd64_lib_dir.value[0] != '\0') {
-				free(tmpnew);
-			}
 			break;
 		}
 		case LTTNG_CONSUMER32_UST:
 		{
-			char *tmpnew = NULL;
-
-			if (config.consumerd32_lib_dir.value[0] != '\0') {
+			if (config.consumerd32_lib_dir.value) {
 				char *tmp;
 				size_t tmplen;
+				char *tmpnew;
 
 				tmp = lttng_secure_getenv("LD_LIBRARY_PATH");
 				if (!tmp) {
 					tmp = "";
 				}
-				tmplen = strlen("LD_LIBRARY_PATH=")
-					+ strlen(config.consumerd32_lib_dir.value) + 1 /* : */ + strlen(tmp);
+				tmplen = strlen(config.consumerd32_lib_dir.value) + 1 /* : */ + strlen(tmp);
 				tmpnew = zmalloc(tmplen + 1 /* \0 */);
 				if (!tmpnew) {
 					ret = -ENOMEM;
 					goto error;
 				}
-				strcpy(tmpnew, "LD_LIBRARY_PATH=");
 				strcat(tmpnew, config.consumerd32_lib_dir.value);
 				if (tmp[0] != '\0') {
 					strcat(tmpnew, ":");
 					strcat(tmpnew, tmp);
 				}
-				ret = putenv(tmpnew);
+				ret = setenv("LD_LIBRARY_PATH", tmpnew, 1);
+				free(tmpnew);
 				if (ret) {
 					ret = -errno;
-					free(tmpnew);
 					goto error;
 				}
 			}
@@ -2519,14 +2520,11 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 					"--consumerd-err-sock", consumer_data->err_unix_sock_path,
 					"--group", config.tracing_group_name.value,
 					NULL);
-			if (config.consumerd32_lib_dir.value[0] != '\0') {
-				free(tmpnew);
-			}
 			break;
 		}
 		default:
-			PERROR("unknown consumer type");
-			exit(EXIT_FAILURE);
+			ERR("unknown consumer type");
+			errno = 0;
 		}
 		if (errno != 0) {
 			PERROR("Consumer execl()");