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);
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 *);
/* 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 */
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);
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, <t_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 */
"\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);
}
{ "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' },
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;
}
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 */
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
*
/* Daemonize */
if (opt_daemon) {
- daemonize();
+ ret = daemon(0, 0);
+ if (ret < 0) {
+ perror("daemon");
+ goto error;
+ }
}
/* Check if daemon is UID = 0 */
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);