X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fltt-sessiond.c;h=f257ddb0904de50d1eb2ab83c7db2f95c4bd6f29;hp=d846c89e58293016b3ffa4abb4c15b96655d8991;hb=5716705821202372fd16168f66f347ba293ef6b4;hpb=e065084a507dd07b658b3d26c58b1ddd519e25a0

diff --git a/ltt-sessiond/ltt-sessiond.c b/ltt-sessiond/ltt-sessiond.c
index d846c89e5..f257ddb09 100644
--- a/ltt-sessiond/ltt-sessiond.c
+++ b/ltt-sessiond/ltt-sessiond.c
@@ -48,7 +48,6 @@ const char default_global_apps_pipe[] = DEFAULT_GLOBAL_APPS_PIPE;
 static int set_signal_handler(void);
 static int set_socket_perms(void);
 static void sighandler(int);
-static void daemonize(void);
 static void cleanup(void);
 static void copy_common_data(struct lttcomm_lttng_msg *llm, struct lttcomm_session_msg *lsm);
 static int check_existing_daemon(void);
@@ -57,6 +56,7 @@ static int connect_app(pid_t);
 static int init_daemon_socket(void);
 static int process_client_msg(int sock, struct lttcomm_session_msg*);
 static int send_unix_sock(int sock, void *buf, size_t len);
+static size_t ust_list_apps(pid_t **pids);
 
 static void *thread_manage_clients(void *);
 static void *thread_manage_apps(void *);
@@ -69,8 +69,10 @@ static struct ltt_session *find_session(uuid_t);
 /* Variables */
 const char *progname;
 const char *opt_tracing_group;
+static int opt_sig_parent;
 static int opt_daemon;
 static int is_root;			/* Set to 1 if the daemon is running as root */
+static pid_t ppid;
 
 static char apps_unix_sock_path[PATH_MAX];			/* Global application Unix socket path */
 static char client_unix_sock_path[PATH_MAX];		/* Global client Unix socket path */
@@ -185,6 +187,13 @@ static void *thread_manage_clients(void *data)
 		goto error;
 	}
 
+	/* Notify parent pid that we are ready
+	 * to accept command for client side.
+	 */
+	if (opt_sig_parent) {
+		kill(ppid, SIGCHLD);
+	}
+
 	while (1) {
 		/* Blocking call, waiting for transmission */
 		sock = lttcomm_accept_unix_sock(client_socket);
@@ -479,6 +488,29 @@ static int process_client_msg(int sock, struct lttcomm_session_msg *lsm)
 
 			break;
 		}
+		case LTTNG_LIST_SESSIONS:
+		{
+			struct ltt_session *iter = NULL;
+
+			llm.num_pckt = session_count;
+			if (llm.num_pckt == 0) {
+				ret = LTTCOMM_NO_SESS;
+				goto error;
+			}
+
+			cds_list_for_each_entry(iter, &ltt_session_list.head, list) {
+				uuid_unparse(iter->uuid, llm.u.list_sessions.uuid);
+				strncpy(llm.u.list_sessions.name, iter->name,
+						sizeof(llm.u.list_sessions.name));
+				ret = send_unix_sock(sock, (void*) &llm, sizeof(llm));
+				if (ret < 0) {
+					goto send_error;
+				}
+				llm.num_pckt--;
+			}
+
+			break;
+		}
 		default:
 		{
 			/* Undefined command */
@@ -511,7 +543,8 @@ static void usage(void)
 			"\t-a, --apps-sock PATH\t\tSpecify path for apps unix socket.\n"
 			"\t-d, --daemonize\t\tStart as a daemon.\n"
 			"\t-g, --group NAME\t\tSpecify the tracing group name. (default: tracing)\n"
-			"\t-V, --version\t\tShow version number.\n",
+			"\t-V, --version\t\tShow version number.\n"
+			"\t-S, --sig-parent\t\tSend SIGCHLD to parent pid to notify readiness.\n",
 			progname);
 }
 
@@ -526,6 +559,7 @@ static int parse_args(int argc, char **argv)
 		{ "client-sock", 1, 0, 'c' },
 		{ "apps-sock", 1, 0, 'a' },
 		{ "daemonize", 0, 0, 'd' },
+		{ "sig-parent", 0, 0, 'S' },
 		{ "help", 0, 0, 'h' },
 		{ "group", 1, 0, 'g' },
 		{ "version", 0, 0, 'V' },
@@ -534,7 +568,7 @@ static int parse_args(int argc, char **argv)
 
 	while (1) {
 		int option_index = 0;
-		c = getopt_long(argc, argv, "dhV" "a:c:g:s:", long_options, &option_index);
+		c = getopt_long(argc, argv, "dhVS" "a:c:g:s:", long_options, &option_index);
 		if (c == -1) {
 			break;
 		}
@@ -564,6 +598,9 @@ static int parse_args(int argc, char **argv)
 		case 'V':
 			fprintf(stdout, "%s\n", VERSION);
 			exit(EXIT_SUCCESS);
+		case 'S':
+			opt_sig_parent = 1;
+			break;
 		default:
 			/* Unknown option or other error.
 			 * Error is printed by getopt, just return */
@@ -688,48 +725,6 @@ end:
 	return ret;
 }
 
-/*
- * 	daemonize
- *
- * 	Daemonize ltt-sessiond.
- */
-static void daemonize(void)
-{
-	pid_t pid, sid;
-	const char *home_dir = get_home_dir();
-
-	/* Fork off the parent process */
-	if ((pid = fork()) < 0) {
-		perror("fork");
-		exit(EXIT_FAILURE);
-	}
-
-	/* Parent can now exit */
-	if (pid > 0) {
-		exit(EXIT_SUCCESS);
-	}
-
-	/* Change the file mode mask */
-	umask(0);
-
-	/* Create a new SID for the child process */
-	if ((sid = setsid()) < 0) {
-		perror("setsid");
-		exit(EXIT_FAILURE);
-	}
-
-	/* Change the current working directory */
-	if ((chdir(home_dir)) < 0) {
-		perror("chdir");
-		exit(EXIT_FAILURE);
-	}
-
-	/* Close out the standard file descriptors */
-	close(STDIN_FILENO);
-	close(STDOUT_FILENO);
-	close(STDERR_FILENO);
-}
-
 /*
  *	set_signal_handler
  *
@@ -822,7 +817,11 @@ int main(int argc, char **argv)
 
 	/* Daemonize */
 	if (opt_daemon) {
-		daemonize();
+		ret = daemon(0, 0);
+		if (ret < 0) {
+			perror("daemon");
+			goto error;
+		}
 	}
 
 	/* Check if daemon is UID = 0 */
@@ -874,6 +873,11 @@ int main(int argc, char **argv)
 		goto error;
 	}
 
+	/* Get parent pid if -S, --sig-parent is specified. */
+	if (opt_sig_parent) {
+		ppid = getppid();
+	}
+
 	while (1) {
 		/* Create thread to manage the client socket */
 		ret = pthread_create(&threads[0], NULL, thread_manage_clients, (void *) NULL);