lttngtop without arguments starts a local live trace

[lttngtop.git] / src / lttng-session.c

diff --git a/src/lttng-session.c b/src/lttng-session.c
index 75699b0852f2baa80b3a0a528af6ca5e58811be0..8b0f6414539eb5b20f52d4c0b0af18f004736e06 100644 (file)
--- a/src/lttng-session.c
+++ b/src/lttng-session.c
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <inttypes.h>

+#include <string.h>

 
 #define event_list "lttng_statedump_start,lttng_statedump_end," \
        "lttng_statedump_process_state,lttng_statedump_file_descriptor," \
 
 #define event_list "lttng_statedump_start,lttng_statedump_end," \
        "lttng_statedump_process_state,lttng_statedump_file_descriptor," \


@@ -314,7 +315,7 @@ end:
 }
 
 static
 }
 
 static

-int start(char *name, int sudo, int local)
+int start(char *name, int sudo, int local, int print)

 {
        int ret;
        char cmd[1024];
 {
        int ret;
        char cmd[1024];


@@ -333,11 +334,14 @@ int start(char *name, int sudo, int local)
                goto end;
        }
 
                goto end;
        }
 

+       if (!print)
+               goto end;
+

        if (local) {
                ret = sprintf(cmd, "%s lttng list|grep %s|cut -d'(' -f2|cut -d ')' -f1",
                                (sudo) ? "sudo" : " ", name);
        } else {
        if (local) {
                ret = sprintf(cmd, "%s lttng list|grep %s|cut -d'(' -f2|cut -d ')' -f1",
                                (sudo) ? "sudo" : " ", name);
        } else {

-               ret = sprintf(cmd, "lttngtop -r net://localhost|grep %s|cut -d' ' -f1",
+               ret = sprintf(cmd, "babeltrace -i lttng-live net://localhost|grep %s|cut -d' ' -f1",

                                name);
        }
        if (ret < 0) {
                                name);
        }
        if (ret < 0) {


@@ -357,6 +361,40 @@ end:
        return ret;
 }
 
        return ret;
 }
 

+static
+char *live_path(char *name)
+{
+       FILE *fp;
+       int ret;
+       char path[1035];
+       char cmd[1024];
+       char *out = NULL;
+
+       ret = sprintf(cmd, "lttngtop -r net://localhost|grep %s|cut -d' ' -f1",
+                       name);
+       if (ret < 0) {
+               fprintf(stderr, "allocating cmd\n");
+               goto end;
+       }
+
+       fp = popen(cmd, "r");
+       if (fp == NULL) {
+               printf("Failed to run command\n" );
+               goto end;
+       }
+
+       /* Read the output a line at a time - output it. */
+       out = fgets(path, sizeof(path)-1, fp);
+       if (out)
+               out = strdup(path);
+
+       /* close */
+       pclose(fp);
+
+end:
+       return out;
+}
+

 static
 int destroy(char *name)
 {
 static
 int destroy(char *name)
 {


@@ -427,7 +465,7 @@ int create_local_session()
                goto end_free;
        }
 
                goto end_free;
        }
 

-       ret = start(name, sudo, 1);
+       ret = start(name, sudo, 1, 1);

        if (ret < 0) {
                goto end_free;
        }
        if (ret < 0) {
                goto end_free;
        }


@@ -438,12 +476,12 @@ end:
        return ret;
 }
 
        return ret;
 }
 

-int destroy_session(char *name)
+int destroy_live_local_session(char *name)

 {
        return destroy(name);
 }
 
 {
        return destroy(name);
 }
 

-int create_live_local_session()
+int create_live_local_session(char **session_path, char **session_name, int print)

 {
        int ret;
        char *name;
 {
        int ret;
        char *name;


@@ -477,18 +515,20 @@ int create_live_local_session()
                goto end_free;
        }
 
                goto end_free;
        }
 

-       ret = start(name, sudo, 0);
+       ret = start(name, sudo, 0, print);

        if (ret < 0) {
                goto end_free;
        }
 
        if (ret < 0) {
                goto end_free;
        }
 

+       if (session_path)
+               *session_path = live_path(name);
+       if (session_name) {
+               *session_name = name;
+               goto end;
+       }
+

 end_free:
        free(name);
 end:
        return ret;
 }
 end_free:
        free(name);
 end:
        return ret;
 }

-
-/*
-int create_live_local_session();
-int destroy_live_local_session();
-*/