X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=6880973a10a08a08d2ec6475021aef8e7f3cf760;hb=032b44f037bc3aeeb21a2e1679fa88eba2e3b551;hp=12322837e7f681038e0ed6fe54d2ac72e035668d;hpb=ca2eb7f43cf00d12f563905d741a6789c3d130ee;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 12322837e..6880973a1 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -2,18 +2,18 @@
  * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
  *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; only version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _GNU_SOURCE
@@ -81,14 +81,10 @@ const char default_tracing_group[] = DEFAULT_TRACING_GROUP;
 const char default_ust_sock_dir[] = DEFAULT_UST_SOCK_DIR;
 const char default_global_apps_pipe[] = DEFAULT_GLOBAL_APPS_PIPE;
 
-/* Variables */
-int opt_verbose;    /* Not static for lttngerr.h */
-int opt_verbose_consumer;    /* Not static for lttngerr.h */
-int opt_quiet;      /* Not static for lttngerr.h */
-
 const char *progname;
 const char *opt_tracing_group;
 static int opt_sig_parent;
+static int opt_verbose_consumer;
 static int opt_daemon;
 static int opt_no_kernel;
 static int is_root;			/* Set to 1 if the daemon is running as root */
@@ -599,7 +595,7 @@ static int send_kconsumer_session_streams(struct consumer_data *consumer_data,
 		lkm.u.channel.channel_key = session->metadata->fd;
 		lkm.u.channel.max_sb_size = session->metadata->conf->attr.subbuf_size;
 		lkm.u.channel.mmap_len = 0;	/* for kernel */
-		DBG("Sending metadata channel %d to consumer", lkm.u.stream.stream_key);
+		DBG("Sending metadata channel %d to consumer", lkm.u.channel.channel_key);
 		ret = lttcomm_send_unix_sock(sock, &lkm, sizeof(lkm));
 		if (ret < 0) {
 			PERROR("send consumer channel");
@@ -2850,7 +2846,8 @@ static int cmd_start_trace(struct ltt_session *session)
 	usess = session->ust_session;
 
 	if (session->enabled) {
-		ret = LTTCOMM_UST_START_FAIL;
+		/* Already started. */
+		ret = LTTCOMM_TRACE_ALREADY_STARTED;
 		goto error;
 	}
 
@@ -2942,7 +2939,7 @@ static int cmd_stop_trace(struct ltt_session *session)
 	usess = session->ust_session;
 
 	if (!session->enabled) {
-		ret = LTTCOMM_UST_STOP_FAIL;
+		ret = LTTCOMM_TRACE_ALREADY_STOPPED;
 		goto error;
 	}
 
@@ -3801,7 +3798,7 @@ static void *thread_manage_clients(void *data)
 				PERROR("close");
 			}
 			sock = -1;
-			free(cmd_ctx);
+			clean_command_ctx(&cmd_ctx);
 			continue;
 		}
 
@@ -3988,11 +3985,11 @@ static int parse_args(int argc, char **argv)
 			opt_no_kernel = 1;
 			break;
 		case 'q':
-			opt_quiet = 1;
+			lttng_opt_quiet = 1;
 			break;
 		case 'v':
 			/* Verbose level can increase using multiple -v */
-			opt_verbose += 1;
+			lttng_opt_verbose += 1;
 			break;
 		case 'Z':
 			opt_verbose_consumer += 1;
@@ -4255,10 +4252,11 @@ static int set_consumer_sockets(struct consumer_data *consumer_data,
 	ret = mkdir(path, S_IRWXU);
 	if (ret < 0) {
 		if (errno != EEXIST) {
+			PERROR("mkdir");
 			ERR("Failed to create %s", path);
 			goto error;
 		}
-		ret = 0;
+		ret = -1;
 	}
 
 	/* Create the kconsumerd error unix socket */
@@ -4518,6 +4516,12 @@ int main(int argc, char **argv)
 		goto error;
 	}
 
+	/*
+	 * Init UST app hash table. Alloc hash table before this point since
+	 * cleanup() can get called after that point.
+	 */
+	ust_app_ht_alloc();
+
 	/* After this point, we can safely call cleanup() with "goto exit" */
 
 	/*
@@ -4583,9 +4587,6 @@ int main(int argc, char **argv)
 	/* Init UST command queue. */
 	cds_wfq_init(&ust_cmd_queue.queue);
 
-	/* Init UST app hash table */
-	ust_app_ht_alloc();
-
 	/*
 	 * Get session list pointer. This pointer MUST NOT be free(). This list is
 	 * statically declared in session.c