Add session name option to all command

[lttng-tools.git] / lttng / utils.c

diff --git a/lttng/utils.c b/lttng/utils.c
index b05fd2283f43798c781da4635121356826d2a57a..109532a4f60da1d94cf11ec5b907fc49ea68d2ca 100644 (file)
--- a/lttng/utils.c
+++ b/lttng/utils.c
@@ -20,7 +20,7 @@
 
 #include <lttng/lttng.h>
 
-#include "config.h"
+#include "conf.h"
 
 /*
  *  get_config_file_path
@@ -82,15 +82,19 @@ error:
  *
  *  Get session name and set it for the lttng control lib.
  */
-int set_session_name(void)
+int set_session_name(char *name)
 {
        int ret;
        char *session_name;
 
-       session_name = get_session_name();
-       if (session_name == NULL) {
-               ret = -1;
-               goto error;
+       if (name != NULL) {
+               session_name = name;
+       } else {
+               session_name = get_session_name();
+               if (session_name == NULL) {
+                       ret = -1;
+                       goto error;
+               }
        }
 
        lttng_set_session_name(session_name);