Adding log4j agent support

[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 fdc53760330d6d12766dc9ed370b1a1b641f5290..c7fc178cdf09820809f14c218ac236f989439317 100644 (file)
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -67,7 +67,7 @@
 #include "health-sessiond.h"
 #include "testpoint.h"
 #include "ust-thread.h"
-#include "jul-thread.h"
+#include "agent-thread.h"
 #include "save.h"
 #include "load-session-thread.h"
 
@@ -153,7 +153,7 @@ static const struct option long_options[] = {
        { "verbose-consumer", 0, 0, 'Z' },
        { "no-kernel", 0, 0, 'N' },
        { "pidfile", 1, 0, 'p' },
-       { "jul-tcp-port", 1, 0, 'J' },
+       { "agent-tcp-port", 1, 0, 'J' },
        { "config", 1, 0, 'f' },
        { "load", 1, 0, 'l' },
        { "kmod-probes", 1, 0, 'P' },
@@ -204,7 +204,7 @@ static pthread_t kernel_thread;
 static pthread_t dispatch_thread;
 static pthread_t health_thread;
 static pthread_t ht_cleanup_thread;
-static pthread_t jul_reg_thread;
+static pthread_t agent_reg_thread;
 static pthread_t load_session_thread;
 
 /*
@@ -289,8 +289,8 @@ long page_size;
 /* Application health monitoring */
 struct health_app *health_sessiond;
 
-/* JUL TCP port for registration. Used by the JUL thread. */
-unsigned int jul_tcp_port = DEFAULT_JUL_TCP_PORT;
+/* Agent TCP port for registration. Used by the agent thread. */
+unsigned int agent_tcp_port = DEFAULT_AGENT_TCP_PORT;
 
 /* Am I root or not. */
 int is_root;                   /* Set to 1 if the daemon is running as root */
@@ -571,7 +571,7 @@ static void cleanup(void)
        (void) unlink(path);
 
        snprintf(path, PATH_MAX, "%s/%s", rundir,
-                       DEFAULT_LTTNG_SESSIOND_JULPORT_FILE);
+                       DEFAULT_LTTNG_SESSIOND_AGENTPORT_FILE);
        DBG("Removing %s", path);
        (void) unlink(path);
 
@@ -2593,6 +2593,7 @@ static int copy_session_consumer(int domain, struct ltt_session *session)
                dir_name = DEFAULT_KERNEL_TRACE_DIR;
                break;
        case LTTNG_DOMAIN_JUL:
+       case LTTNG_DOMAIN_LOG4J:
        case LTTNG_DOMAIN_UST:
                DBG3("Copying tracing session consumer output in UST session");
                if (session->ust_session->consumer) {
@@ -2637,6 +2638,7 @@ static int create_ust_session(struct ltt_session *session,
 
        switch (domain->type) {
        case LTTNG_DOMAIN_JUL:
+       case LTTNG_DOMAIN_LOG4J:
        case LTTNG_DOMAIN_UST:
                break;
        default:
@@ -2882,6 +2884,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
                        }
                        break;
                case LTTNG_DOMAIN_JUL:
+               case LTTNG_DOMAIN_LOG4J:
                case LTTNG_DOMAIN_UST:
                        if (!cmd_ctx->session->ust_session) {
                                ret = LTTNG_ERR_NO_CHANNEL;
@@ -2963,6 +2966,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 
                break;
        case LTTNG_DOMAIN_JUL:
+       case LTTNG_DOMAIN_LOG4J:
        case LTTNG_DOMAIN_UST:
        {
                if (!ust_app_supported()) {
@@ -3056,6 +3060,7 @@ skip_domain:
                        cmd_ctx->lsm->cmd_type == LTTNG_STOP_TRACE) {
                switch (cmd_ctx->lsm->domain.type) {
                case LTTNG_DOMAIN_JUL:
+               case LTTNG_DOMAIN_LOG4J:
                case LTTNG_DOMAIN_UST:
                        if (uatomic_read(&ust_consumerd_state) != CONSUMER_STARTED) {
                                ret = LTTNG_ERR_NO_USTCONSUMERD;
@@ -4205,7 +4210,7 @@ static void usage(void)
        fprintf(stderr, "  -p, --pidfile FILE                 Write a pid to FILE name overriding the default value.\n");
        fprintf(stderr, "      --verbose-consumer             Verbose mode for consumer. Activate DBG() macro.\n");
        fprintf(stderr, "      --no-kernel                    Disable kernel tracer\n");
-       fprintf(stderr, "      --jul-tcp-port                 JUL application registration TCP port\n");
+       fprintf(stderr, "      --agent-tcp-port               Agent registration TCP port\n");
        fprintf(stderr, "  -f  --config                       Load daemon configuration file\n");
        fprintf(stderr, "  -l  --load PATH                    Load session configuration\n");
        fprintf(stderr, "      --kmod-probes                  Specify kernel module probes to load\n");
@@ -4361,22 +4366,22 @@ static int set_option(int opt, const char *arg, const char *optname)
                        ret = -ENOMEM;
                }
                break;
-       case 'J': /* JUL TCP port. */
+       case 'J': /* Agent TCP port. */
        {
                unsigned long v;
 
                errno = 0;
                v = strtoul(arg, NULL, 0);
                if (errno != 0 || !isdigit(arg[0])) {
-                       ERR("Wrong value in --jul-tcp-port parameter: %s", arg);
+                       ERR("Wrong value in --agent-tcp-port parameter: %s", arg);
                        return -1;
                }
                if (v == 0 || v >= 65535) {
-                       ERR("Port overflow in --jul-tcp-port parameter: %s", arg);
+                       ERR("Port overflow in --agent-tcp-port parameter: %s", arg);
                        return -1;
                }
-               jul_tcp_port = (uint32_t) v;
-               DBG3("JUL TCP port set to non default: %u", jul_tcp_port);
+               agent_tcp_port = (uint32_t) v;
+               DBG3("Agent TCP port set to non default: %u", agent_tcp_port);
                break;
        }
        case 'l':
@@ -4916,9 +4921,9 @@ error:
 }
 
 /*
- * Write JUL TCP port using the rundir.
+ * Write agent TCP port using the rundir.
  */
-static void write_julport(void)
+static void write_agent_port(void)
 {
        int ret;
        char path[PATH_MAX];
@@ -4926,18 +4931,18 @@ static void write_julport(void)
        assert(rundir);
 
        ret = snprintf(path, sizeof(path), "%s/"
-                       DEFAULT_LTTNG_SESSIOND_JULPORT_FILE, rundir);
+                       DEFAULT_LTTNG_SESSIOND_AGENTPORT_FILE, rundir);
        if (ret < 0) {
-               PERROR("snprintf julport path");
+               PERROR("snprintf agent port path");
                goto error;
        }
 
        /*
-        * Create TCP JUL port file in rundir. Return value is of no importance.
+        * Create TCP agent port file in rundir. Return value is of no importance.
         * The execution will continue even though we are not able to write the
         * file.
         */
-       (void) utils_create_pid_file(jul_tcp_port, path);
+       (void) utils_create_pid_file(agent_tcp_port, path);
 
 error:
        return;
@@ -5174,8 +5179,8 @@ int main(int argc, char **argv)
         */
        ust_app_ht_alloc();
 
-       /* Initialize JUL domain subsystem. */
-       if ((ret = jul_init()) < 0) {
+       /* Initialize agent domain subsystem. */
+       if ((ret = agent_setup()) < 0) {
                /* ENOMEM at this point. */
                goto error;
        }
@@ -5279,7 +5284,7 @@ int main(int argc, char **argv)
        }
 
        write_pidfile();
-       write_julport();
+       write_agent_port();
 
        /* Initialize communication library */
        lttcomm_init();
@@ -5357,12 +5362,12 @@ int main(int argc, char **argv)
                goto exit_apps_notify;
        }
 
-       /* Create JUL registration thread. */
-       ret = pthread_create(&jul_reg_thread, NULL,
-                       jul_thread_manage_registration, (void *) NULL);
+       /* Create agent registration thread. */
+       ret = pthread_create(&agent_reg_thread, NULL,
+                       agent_thread_manage_registration, (void *) NULL);
        if (ret != 0) {
-               PERROR("pthread_create JUL");
-               goto exit_jul_reg;
+               PERROR("pthread_create agent");
+               goto exit_agent_reg;
        }
 
        /* Don't start this thread if kernel tracing is not requested nor root */
@@ -5388,13 +5393,13 @@ int main(int argc, char **argv)
        }
 
 exit_kernel:
-       ret = pthread_join(jul_reg_thread, &status);
+       ret = pthread_join(agent_reg_thread, &status);
        if (ret != 0) {
-               PERROR("pthread_join JUL");
+               PERROR("pthread_join agent");
                goto error;     /* join error, exit without cleanup */
        }
 
-exit_jul_reg:
+exit_agent_reg:
        ret = pthread_join(apps_notify_thread, &status);
        if (ret != 0) {
                PERROR("pthread_join apps notify");