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

diff --git a/ltt-sessiond/ltt-sessiond.c b/ltt-sessiond/ltt-sessiond.c
index c3b117da3..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 *);
@@ -488,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 */
@@ -702,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
  *
@@ -836,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 */