Add debug statements to session daemon

Signed-off-by: David Goulet <david.goulet@polymtl.ca>

diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c
index 450a6ffc8c075c4f905fd465f6298c8add38a760..76834558ae32a58da62eabfef864ac90f6230287 100644 (file)
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@ -101,6 +101,8 @@ static void *thread_manage_apps(void *data)
                uid_t uid;
        } reg_msg;
 
+       DBG("[thread] Manage apps started");
+
        /* Notify all applications to register */
        notify_apps(default_global_apps_pipe);
 
@@ -157,6 +159,8 @@ static void *thread_manage_clients(void *data)
        int sock, ret;
        struct lttcomm_session_msg lsm;
 
+       DBG("[thread] Manage client started");
+
        ret = lttcomm_listen_unix_sock(client_socket);
        if (ret < 0) {
                goto error;
@@ -233,6 +237,8 @@ static int connect_app(pid_t pid)
        int sock;
        struct ltt_traceable_app *lta;
 
+       DBG("Connect to application pid %d", pid);
+
        lta = find_app_by_pid(pid);
        if (lta == NULL) {
                /* App not found */
@@ -261,6 +267,8 @@ static int notify_apps(const char *name)
        int fd;
        int ret = -1;
 
+       DBG("Notify the global application pipe");
+
        /* Try opening the global pipe */
        fd = open(name, O_WRONLY);
        if (fd < 0) {
@@ -289,6 +297,8 @@ static int ust_create_trace(pid_t pid)
        int sock, ret;
        struct ltt_ust_trace *trace;
 
+       DBG("Creating trace for pid %d", pid);
+
        trace = malloc(sizeof(struct ltt_ust_trace));
        if (trace == NULL) {
                perror("malloc");
@@ -427,6 +437,8 @@ static int process_client_msg(int sock, struct lttcomm_session_msg *lsm)
        char *send_buf = NULL;
        struct lttcomm_lttng_msg llm;
 
+       DBG("Processing client message");
+
        /* Copy common data to identify the response
         * on the lttng client side.
         */
@@ -771,6 +783,8 @@ static int set_socket_perms(void)
                perror("chown");
        }
 
+       DBG("Sockets permissions set");
+
 end:
        return ret;
 }
@@ -810,6 +824,8 @@ static int set_signal_handler(void)
                return ret;
        }
 
+       DBG("Signal handler set for SIGTERM, SIGPIPE and SIGINT");
+
        return ret;
 }
 
@@ -822,9 +838,14 @@ static void sighandler(int sig)
 {
        switch (sig) {
                case SIGPIPE:
+                       DBG("SIGPIPE catched");
                        return;
                case SIGINT:
+                       DBG("SIGINT catched");
+                       cleanup();
+                       break;
                case SIGTERM:
+                       DBG("SIGTERM catched");
                        cleanup();
                        break;
                default:
@@ -841,6 +862,8 @@ static void sighandler(int sig)
  */
 static void cleanup()
 {
+       DBG("Cleaning up");
+
        /* <fun> */
        MSG("\n%c[%d;%dm*** assert failed *** ==> %c[%dm", 27,1,31,27,0);
        MSG("%c[%d;%dmMatthew, BEET driven development works!%c[%dm",27,1,33,27,0);

diff --git a/ltt-sessiond/session.c b/ltt-sessiond/session.c
index 9e93d89cef07814fffa795fdfac74ad59f2ed63d..da1ceee4ac97b10b23f2fc7597bd9f1bcb79e452 100644 (file)
--- a/ltt-sessiond/session.c
+++ b/ltt-sessiond/session.c
@@ -144,6 +144,7 @@ int destroy_session(uuid_t *uuid)
 
        cds_list_for_each_entry(iter, &ltt_session_list.head, list) {
                if (uuid_compare(iter->uuid, *uuid) == 0) {
+                       DBG("Destroying session %s", iter->name);
                        del_session_list(iter);
                        free(iter);
                        found = 1;
@@ -164,6 +165,8 @@ int create_session(char *name, uuid_t *session_id)
 {
        struct ltt_session *new_session;
 
+       DBG("Creating session %s", name);
+
        new_session = find_session_by_name(name);
        if (new_session != NULL) {
                goto error;
@@ -225,6 +228,8 @@ void get_lttng_session(struct lttng_session *lt)
        struct ltt_session *iter;
        struct lttng_session lsess;
 
+       DBG("Getting all available session");
+
        /* Iterate over session list and append data after
         * the control struct in the buffer.
         */

diff --git a/ltt-sessiond/traceable-app.c b/ltt-sessiond/traceable-app.c
index bbb1b539ff8faebff8e54a8bd11db36720d40c7e..e141efcb214f8898414db573244ad567f5b0df40 100644 (file)
--- a/ltt-sessiond/traceable-app.c
+++ b/ltt-sessiond/traceable-app.c
@@ -94,7 +94,7 @@ int register_traceable_app(pid_t pid, uid_t uid)
        lta->uid = uid;
        lta->pid = pid;
        add_traceable_app(lta);
-       DBG("PID %d registered", pid);
+       DBG("Application %d registered with UID %d", pid, uid);
 
        return 0;
 }