Add support for auto session creation

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

diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c
index 76834558ae32a58da62eabfef864ac90f6230287..241a1cffd32533ee56f11299e7748b043b4a7da1 100644 (file)
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@ -35,7 +35,7 @@
 
 #include <urcu/list.h>         /* URCU list library (-lurcu) */
 #include <ust/ustctl.h>                /* UST control lib (-lust) */
-#include <lttng/liblttngctl.h>
+#include <lttng/lttng.h>
 
 #include "liblttsessiondcomm.h"
 #include "ltt-sessiond.h"
@@ -242,6 +242,7 @@ static int connect_app(pid_t pid)
        lta = find_app_by_pid(pid);
        if (lta == NULL) {
                /* App not found */
+               DBG("Application pid %d not found", pid);
                return -1;
        }
 
@@ -309,6 +310,11 @@ static int ust_create_trace(pid_t pid)
        /* Init */
        trace->pid = pid;
        trace->shmid = 0;
+       /* NOTE: to be removed. Trace name will no longer be
+        * required for LTTng userspace tracer. For now, we set it
+        * to 'auto' for API compliance.
+        */
+       snprintf(trace->name, 5, "auto");
 
        /* Connect to app using ustctl API */
        sock = connect_app(pid);
@@ -317,7 +323,7 @@ static int ust_create_trace(pid_t pid)
                goto error;
        }
 
-       ret = ustctl_create_trace(sock, "auto");
+       ret = ustctl_create_trace(sock, trace->name);
        if (ret < 0) {
                ret = LTTCOMM_CREATE_FAIL;
                goto error;
@@ -326,6 +332,7 @@ static int ust_create_trace(pid_t pid)
        /* Check if current session is valid */
        if (current_session) {
                cds_list_add(&trace->list, &current_session->ust_traces);
+               current_session->ust_trace_count++;
        }
 
 error:
@@ -368,6 +375,42 @@ error:
        return ret;
 }
 
+/*
+ *  ust_stop_trace
+ *
+ *  Stop a trace. This trace, identified by the pid, must be
+ *  in the current session ust_traces list.
+ */
+static int ust_stop_trace(pid_t pid)
+{
+       int sock, ret;
+       struct ltt_ust_trace *trace;
+
+       DBG("Stopping trace for pid %d", pid);
+
+       trace = find_session_ust_trace_by_pid(current_session, pid);
+       if (trace == NULL) {
+               ret = LTTCOMM_NO_TRACE;
+               goto error;
+       }
+
+       /* Connect to app using ustctl API */
+       sock = connect_app(pid);
+       if (sock < 0) {
+               ret = LTTCOMM_NO_TRACEABLE;
+               goto error;
+       }
+
+       ret = ustctl_stop_trace(sock, trace->name);
+       if (ret < 0) {
+               ret = LTTCOMM_STOP_FAIL;
+               goto error;
+       }
+
+error:
+       return ret;
+}
+
 /*
  *  copy_common_data
  *
@@ -497,6 +540,25 @@ static int process_client_msg(int sock, struct lttcomm_session_msg *lsm)
                        /* No auxiliary data so only send the llm struct. */
                        goto end;
                }
+               case LTTNG_LIST_TRACES:
+               {
+                       unsigned int trace_count = get_trace_count_per_session(current_session);
+
+                       if (trace_count == 0) {
+                               ret = LTTCOMM_NO_TRACE;
+                               goto end;
+                       }
+
+                       buf_size = setup_data_buffer(&send_buf,
+                                       sizeof(struct lttng_trace) * trace_count, &llm);
+                       if (buf_size < 0) {
+                               ret = LTTCOMM_FATAL;
+                               goto end;
+                       }
+
+                       get_traces_per_session(current_session, (struct lttng_trace *)(send_buf + header_size));
+                       break;
+               }
                case UST_CREATE_TRACE:
                {
                        ret = ust_create_trace(lsm->pid);
@@ -539,6 +601,13 @@ static int process_client_msg(int sock, struct lttcomm_session_msg *lsm)
                        /* No auxiliary data so only send the llm struct. */
                        goto end;
                }
+               case UST_STOP_TRACE:
+               {
+                       ret = ust_stop_trace(lsm->pid);
+
+                       /* No auxiliary data so only send the llm struct. */
+                       goto end;
+               }
                case LTTNG_LIST_SESSIONS:
                {
                        unsigned int session_count = get_session_count();
@@ -577,6 +646,7 @@ static int process_client_msg(int sock, struct lttcomm_session_msg *lsm)
        return ret;
 
 end:
+       DBG("Return code to client %d", ret);
        /* Notify client of error */
        llm.ret_code = ret;
        llm.size_payload = 0;