Add debug statements to session daemon

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

diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c
index 720d23439c99b855546617f503ad2fc609373b46..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.
         */
@@ -587,6 +599,7 @@ static void usage(void)
        fprintf(stderr, "  -V, --version             Show version number.\n");
        fprintf(stderr, "  -S, --sig-parent          Send SIGCHLD to parent pid to notify readiness.\n");
        fprintf(stderr, "  -q, --quiet               No output at all.\n");
+       fprintf(stderr, "  -v, --verbose             Verbose mode. Activate DBG() macro.\n");
 }
 
 /*
@@ -605,12 +618,13 @@ static int parse_args(int argc, char **argv)
                { "group", 1, 0, 'g' },
                { "version", 0, 0, 'V' },
                { "quiet", 0, 0, 'q' },
+               { "verbose", 0, 0, 'v' },
                { NULL, 0, 0, 0 }
        };
 
        while (1) {
                int option_index = 0;
-               c = getopt_long(argc, argv, "dhqVS" "a:c:g:s:", long_options, &option_index);
+               c = getopt_long(argc, argv, "dhqvVS" "a:c:g:s:", long_options, &option_index);
                if (c == -1) {
                        break;
                }
@@ -646,6 +660,9 @@ static int parse_args(int argc, char **argv)
                case 'q':
                        opt_quiet = 1;
                        break;
+               case 'v':
+                       opt_verbose = 1;
+                       break;
                default:
                        /* Unknown option or other error.
                         * Error is printed by getopt, just return */
@@ -766,6 +783,8 @@ static int set_socket_perms(void)
                perror("chown");
        }
 
+       DBG("Sockets permissions set");
+
 end:
        return ret;
 }
@@ -805,6 +824,8 @@ static int set_signal_handler(void)
                return ret;
        }
 
+       DBG("Signal handler set for SIGTERM, SIGPIPE and SIGINT");
+
        return ret;
 }
 
@@ -817,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:
@@ -836,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);