X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=a7f2394fda6041ed6692dee9971ee20f0ed98b0a;hb=18a720cd7bbc2eeea6d075903668e21337b5d916;hp=fac06e0f75c62512e67ea2e87f2b469a5b2a1d90;hpb=1b2ef7fe9e5d6396484002b5ba20b798b45519f9;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index fac06e0f7..a7f2394fd 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -157,6 +157,7 @@ static const struct option long_options[] = {
 	{ "config", 1, 0, 'f' },
 	{ "load", 1, 0, 'l' },
 	{ "kmod-probes", 1, 0, 'P' },
+	{ "extra-kmod-probes", 1, 0, 'e' },
 	{ NULL, 0, 0, 0 }
 };
 
@@ -2593,6 +2594,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 +2639,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:
@@ -2873,7 +2876,6 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 	switch (cmd_ctx->lsm->cmd_type) {
 	case LTTNG_DISABLE_CHANNEL:
 	case LTTNG_DISABLE_EVENT:
-	case LTTNG_DISABLE_ALL_EVENT:
 		switch (cmd_ctx->lsm->domain.type) {
 		case LTTNG_DOMAIN_KERNEL:
 			if (!cmd_ctx->session->kernel_session) {
@@ -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;
@@ -3116,17 +3121,11 @@ skip_domain:
 	}
 	case LTTNG_DISABLE_EVENT:
 	{
+		/* FIXME: passing packed structure to non-packed pointer */
+		/* TODO: handle filter */
 		ret = cmd_disable_event(cmd_ctx->session, cmd_ctx->lsm->domain.type,
 				cmd_ctx->lsm->u.disable.channel_name,
-				cmd_ctx->lsm->u.disable.name);
-		break;
-	}
-	case LTTNG_DISABLE_ALL_EVENT:
-	{
-		DBG("Disabling all events");
-
-		ret = cmd_disable_event_all(cmd_ctx->session, cmd_ctx->lsm->domain.type,
-				cmd_ctx->lsm->u.disable.channel_name);
+				&cmd_ctx->lsm->u.disable.event);
 		break;
 	}
 	case LTTNG_ENABLE_CHANNEL:
@@ -3241,16 +3240,6 @@ skip_domain:
 				kernel_poll_pipe[1]);
 		break;
 	}
-	case LTTNG_ENABLE_ALL_EVENT:
-	{
-		DBG("Enabling all events");
-
-		ret = cmd_enable_event_all(cmd_ctx->session, &cmd_ctx->lsm->domain,
-				cmd_ctx->lsm->u.enable.channel_name,
-				cmd_ctx->lsm->u.enable.event.type, NULL, NULL,
-				kernel_poll_pipe[1]);
-		break;
-	}
 	case LTTNG_LIST_TRACEPOINTS:
 	{
 		struct lttng_event *events;
@@ -4209,6 +4198,7 @@ static void usage(void)
 	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");
+	fprintf(stderr, "      --extra-kmod-probes            Specify extra kernel module probes to load\n");
 }
 
 /*
@@ -4395,6 +4385,14 @@ static int set_option(int opt, const char *arg, const char *optname)
 			ret = -ENOMEM;
 		}
 		break;
+	case 'e':
+		free(kmod_extra_probes_list);
+		kmod_extra_probes_list = strdup(arg);
+		if (!kmod_extra_probes_list) {
+			perror("strdup");
+			ret = -ENOMEM;
+		}
+		break;
 	case 'f':
 		/* This is handled in set_options() thus silent break. */
 		break;