X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-comm.c;h=475110cfc0a5b3ba5e8c2ef1e3ece796faf50c68;hb=89c5b6ec519764a8311bc4be7544c029f2615d83;hp=86af682b110024c5b1c6f73bb4b34d4ccc29d648;hpb=a0a3bef9e447a220a36fb7cb4c3f60e4eafdec4d;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index 86af682b..475110cf 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -188,6 +188,22 @@ extern void lttng_ring_buffer_client_discard_exit(void);
 extern void lttng_ring_buffer_client_discard_rt_exit(void);
 extern void lttng_ring_buffer_metadata_client_exit(void);
 
+/*
+ * Returns the HOME directory path. Caller MUST NOT free(3) the returned
+ * pointer.
+ */
+static
+const char *get_lttng_home_dir(void)
+{
+       const char *val;
+
+       val = (const char *) getenv("LTTNG_HOME");
+       if (val != NULL) {
+               return val;
+       }
+       return (const char *) getenv("HOME");
+}
+
 /*
  * Force a read (imply TLS fixup for dlopen) of TLS variables.
  */
@@ -209,10 +225,12 @@ void print_cmd(int cmd, int handle)
 {
 	const char *cmd_name = "Unknown";
 
-	if (cmd_name_mapping[cmd]) {
+	if (cmd >= 0 && cmd < LTTNG_ARRAY_SIZE(cmd_name_mapping)
+			&& cmd_name_mapping[cmd]) {
 		cmd_name = cmd_name_mapping[cmd];
 	}
-	DBG("Message Received \"%s\", Handle \"%s\" (%d)", cmd_name,
+	DBG("Message Received \"%s\" (%d), Handle \"%s\" (%d)",
+		cmd_name, cmd,
 		lttng_ust_obj_get_name(handle), handle);
 }
 
@@ -230,7 +248,7 @@ int setup_local_apps(void)
 		assert(local_apps.allowed == 0);
 		return 0;
 	}
-	home_dir = (const char *) getenv("HOME");
+	home_dir = get_lttng_home_dir();
 	if (!home_dir) {
 		WARN("HOME environment variable not set. Disabling LTTng-UST per-user tracing.");
 		assert(local_apps.allowed == 0);
@@ -443,6 +461,7 @@ int handle_message(struct sock_info *sock_info,
 					goto error;
 				}
 				ret = len;
+				free(bytecode);
 				goto end;
 			} else {
 				DBG("incorrect filter data message size: %zd", len);
@@ -624,6 +643,25 @@ void cleanup_sock_info(struct sock_info *sock_info, int exiting)
 {
 	int ret;
 
+	if (sock_info->root_handle != -1) {
+		ret = lttng_ust_objd_unref(sock_info->root_handle, 1);
+		if (ret) {
+			ERR("Error unref root handle");
+		}
+		sock_info->root_handle = -1;
+	}
+	sock_info->constructor_sem_posted = 0;
+
+	/*
+	 * wait_shm_mmap, socket and notify socket are used by listener
+	 * threads outside of the ust lock, so we cannot tear them down
+	 * ourselves, because we cannot join on these threads. Leave
+	 * responsibility of cleaning up these resources to the OS
+	 * process exit.
+	 */
+	if (exiting)
+		return;
+
 	if (sock_info->socket != -1) {
 		ret = ustcomm_close_unix_sock(sock_info->socket);
 		if (ret) {
@@ -638,21 +676,7 @@ void cleanup_sock_info(struct sock_info *sock_info, int exiting)
 		}
 		sock_info->notify_socket = -1;
 	}
-	if (sock_info->root_handle != -1) {
-		ret = lttng_ust_objd_unref(sock_info->root_handle, 1);
-		if (ret) {
-			ERR("Error unref root handle");
-		}
-		sock_info->root_handle = -1;
-	}
-	sock_info->constructor_sem_posted = 0;
-	/*
-	 * wait_shm_mmap is used by listener threads outside of the
-	 * ust lock, so we cannot tear it down ourselves, because we
-	 * cannot join on these threads. Leave this task to the OS
-	 * process exit.
-	 */
-	if (!exiting && sock_info->wait_shm_mmap) {
+	if (sock_info->wait_shm_mmap) {
 		ret = munmap(sock_info->wait_shm_mmap, sysconf(_SC_PAGE_SIZE));
 		if (ret) {
 			ERR("Error unmapping wait shm");
@@ -909,11 +933,6 @@ restart:
 		has_waited = 1;
 		prev_connect_failed = 0;
 	}
-	ust_lock();
-
-	if (lttng_ust_comm_should_quit) {
-		goto quit;
-	}
 
 	if (sock_info->socket != -1) {
 		ret = ustcomm_close_unix_sock(sock_info->socket);
@@ -938,6 +957,13 @@ restart:
 		if (ret < 0) {
 			DBG("Info: sessiond not accepting connections to %s apps socket", sock_info->name);
 			prev_connect_failed = 1;
+
+			ust_lock();
+
+			if (lttng_ust_comm_should_quit) {
+				goto quit;
+			}
+
 			/*
 			 * If we cannot find the sessiond daemon, don't delay
 			 * constructor execution.
@@ -975,6 +1001,12 @@ restart:
 		WARN("Unsuppoorted timeout value %ld", timeout);
 	}
 
+	ust_lock();
+
+	if (lttng_ust_comm_should_quit) {
+		goto quit;
+	}
+
 	/*
 	 * Create only one root handle per listener thread for the whole
 	 * process lifetime, so we ensure we get ID which is statically