Add jul.c/.h to sessiond code

[lttng-tools.git] / src / bin / lttng-sessiond / main.c

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 5ec39649969f9fef523e10b7e94896149d5812c1..028f5f9d233a0933ddd9199e9171bf620065fbba 100644 (file)
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -419,8 +419,8 @@ static void close_consumer_sockets(void)
 static void cleanup(void)
 {
        int ret;
-       char *cmd = NULL;
        struct ltt_session *sess, *stmp;
+       char path[PATH_MAX];
 
        DBG("Cleaning up");
 
@@ -441,18 +441,54 @@ static void cleanup(void)
                }
        }
 
-       DBG("Removing %s directory", rundir);
-       ret = asprintf(&cmd, "rm -rf %s", rundir);
-       if (ret < 0) {
-               ERR("asprintf failed. Something is really wrong!");
-       }
+       DBG("Removing sessiond and consumerd content of directory %s", rundir);
+
+       /* sessiond */
+       snprintf(path, PATH_MAX,
+               "%s/%s",
+               rundir, DEFAULT_LTTNG_SESSIOND_PIDFILE);
+       DBG("Removing %s", path);
+       (void) unlink(path);
+
+       /* kconsumerd */
+       snprintf(path, PATH_MAX,
+               DEFAULT_KCONSUMERD_ERR_SOCK_PATH,
+               rundir);
+       DBG("Removing %s", path);
+       (void) unlink(path);
+
+       snprintf(path, PATH_MAX,
+               DEFAULT_KCONSUMERD_PATH,
+               rundir);
+       DBG("Removing directory %s", path);
+       (void) rmdir(path);
+
+       /* ust consumerd 32 */
+       snprintf(path, PATH_MAX,
+               DEFAULT_USTCONSUMERD32_ERR_SOCK_PATH,
+               rundir);
+       DBG("Removing %s", path);
+       (void) unlink(path);
+
+       snprintf(path, PATH_MAX,
+               DEFAULT_USTCONSUMERD32_PATH,
+               rundir);
+       DBG("Removing directory %s", path);
+       (void) rmdir(path);
+
+       /* ust consumerd 64 */
+       snprintf(path, PATH_MAX,
+               DEFAULT_USTCONSUMERD64_ERR_SOCK_PATH,
+               rundir);
+       DBG("Removing %s", path);
+       (void) unlink(path);
+
+       snprintf(path, PATH_MAX,
+               DEFAULT_USTCONSUMERD64_PATH,
+               rundir);
+       DBG("Removing directory %s", path);
+       (void) rmdir(path);
 
-       /* Remove lttng run directory */
-       ret = system(cmd);
-       if (ret < 0) {
-               ERR("Unable to clean %s", rundir);
-       }
-       free(cmd);
        free(rundir);
 
        DBG("Cleaning up all sessions");
@@ -1289,18 +1325,6 @@ static void *thread_manage_apps(void *data)
                                                goto error;
                                        }
 
-                                       /*
-                                        * Set socket timeout for both receiving and ending.
-                                        * app_socket_timeout is in seconds, whereas
-                                        * lttcomm_setsockopt_rcv_timeout and
-                                        * lttcomm_setsockopt_snd_timeout expect msec as
-                                        * parameter.
-                                        */
-                                       (void) lttcomm_setsockopt_rcv_timeout(sock,
-                                                       app_socket_timeout * 1000);
-                                       (void) lttcomm_setsockopt_snd_timeout(sock,
-                                                       app_socket_timeout * 1000);
-
                                        DBG("Apps with sock %d added to poll set", sock);
 
                                        health_code_update();
@@ -1803,6 +1827,18 @@ static void *thread_registration_apps(void *data)
                                                goto error;
                                        }
 
+                                       /*
+                                        * Set socket timeout for both receiving and ending.
+                                        * app_socket_timeout is in seconds, whereas
+                                        * lttcomm_setsockopt_rcv_timeout and
+                                        * lttcomm_setsockopt_snd_timeout expect msec as
+                                        * parameter.
+                                        */
+                                       (void) lttcomm_setsockopt_rcv_timeout(sock,
+                                                       app_socket_timeout * 1000);
+                                       (void) lttcomm_setsockopt_snd_timeout(sock,
+                                                       app_socket_timeout * 1000);
+
                                        /*
                                         * Set the CLOEXEC flag. Return code is useless because
                                         * either way, the show must go on.
@@ -2708,6 +2744,11 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
                }
 
                break;
+       case LTTNG_DOMAIN_JUL:
+       {
+               ret = LTTNG_ERR_UNKNOWN_DOMAIN;
+               goto error;
+       }
        case LTTNG_DOMAIN_UST:
        {
                if (!ust_app_supported()) {
@@ -2799,6 +2840,7 @@ skip_domain:
        if (cmd_ctx->lsm->cmd_type == LTTNG_START_TRACE ||
                        cmd_ctx->lsm->cmd_type == LTTNG_STOP_TRACE) {
                switch (cmd_ctx->lsm->domain.type) {
+               case LTTNG_DOMAIN_JUL:
                case LTTNG_DOMAIN_UST:
                        if (uatomic_read(&ust_consumerd_state) != CONSUMER_STARTED) {
                                ret = LTTNG_ERR_NO_USTCONSUMERD;