Improve trace output path and config path

[lttng-tools.git] / ltt-sessiond / main.c

diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c
index 2fcd923a1897d0f58b2b2f53568c83b2f526162d..75215b3f23039bb16caa3d5e45af5c854f3689db 100644 (file)
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@ -48,6 +48,7 @@
 #include "traceable-app.h"
 #include "lttng-kconsumerd.h"
 #include "libustctl.h"
+#include "utils.h"
 
 /*
  * TODO:
@@ -282,12 +283,10 @@ static int create_trace_dir(struct ltt_kernel_session *session)
        /* Create all channel directories */
        cds_list_for_each_entry(chan, &session->channel_list.head, list) {
                DBG("Creating trace directory at %s", chan->pathname);
-               // TODO: recursive create dir
-               ret = mkdir(chan->pathname, S_IRWXU | S_IRWXG );
+               ret = mkdir_recursive(chan->pathname, S_IRWXU | S_IRWXG );
                if (ret < 0) {
                        if (ret != EEXIST) {
-                               perror("mkdir trace path");
-                               ret = -errno;
+                               ERR("Trace directory creation error");
                                goto error;
                        }
                }
@@ -752,7 +751,7 @@ static int create_kernel_session(struct ltt_session *session)
 
        DBG("Creating default kernel channel %s", DEFAULT_CHANNEL_NAME);
 
-       ret = kernel_create_channel(session->kernel_session, chan);
+       ret = kernel_create_channel(session->kernel_session, chan, session->path);
        if (ret < 0) {
                ret = LTTCOMM_KERN_CHAN_FAIL;
                goto error;
@@ -944,7 +943,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
                DBG("Creating kernel channel");
 
                ret = kernel_create_channel(cmd_ctx->session->kernel_session,
-                               &cmd_ctx->lsm->u.channel.chan);
+                               &cmd_ctx->lsm->u.channel.chan, cmd_ctx->session->path);
                if (ret < 0) {
                        ret = LTTCOMM_KERN_CHAN_FAIL;
                        goto error;
@@ -1755,25 +1754,6 @@ static int check_existing_daemon()
        return ret;
 }
 
-/*
- *  get_home_dir
- *
- *  Return pointer to home directory path using
- *  the env variable HOME.
- *
- *  Default : /tmp
- */
-static const char *get_home_dir(void)
-{
-       const char *home_path;
-
-       if ((home_path = (const char *) getenv("HOME")) == NULL) {
-               home_path = default_home_dir;
-       }
-
-       return home_path;
-}
-
 /*
  *  set_permissions
  *
@@ -1989,6 +1969,7 @@ int main(int argc, char **argv)
 {
        int ret = 0;
        void *status;
+       const char *home_path;
 
        /* Parse arguments */
        progname = argv[0];
@@ -2036,15 +2017,22 @@ int main(int argc, char **argv)
                /* Set ulimit for open files */
                set_ulimit();
        } else {
+               home_path = get_home_dir();
+               if (home_path == NULL) {
+                       ERR("Can't get HOME directory for sockets creation.\n \
+                                Please specify --socket PATH.");
+                       goto error;
+               }
+
                if (strlen(apps_unix_sock_path) == 0) {
                        snprintf(apps_unix_sock_path, PATH_MAX,
-                                       DEFAULT_HOME_APPS_UNIX_SOCK, get_home_dir());
+                                       DEFAULT_HOME_APPS_UNIX_SOCK, home_path);
                }
 
                /* Set the cli tool unix socket path */
                if (strlen(client_unix_sock_path) == 0) {
                        snprintf(client_unix_sock_path, PATH_MAX,
-                                       DEFAULT_HOME_CLIENT_UNIX_SOCK, get_home_dir());
+                                       DEFAULT_HOME_CLIENT_UNIX_SOCK, home_path);
                }
        }