X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=e5054735efd6279aec0fe5648a122dca3f366943;hb=834978fd9e2392f20867351ca99bf7bdf31b4f56;hp=22dd28e1e9df1538baa242e595284580db67dc60;hpb=6e911cad03751b6814fddd65b19a592acdc2b7b7;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 22dd28e1e..e5054735e 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -70,6 +70,7 @@
 #include "agent-thread.h"
 #include "save.h"
 #include "load-session-thread.h"
+#include "syscall.h"
 
 #define CONSUMERD_FILE	"lttng-consumerd"
 
@@ -642,6 +643,7 @@ static void cleanup(void)
 		}
 		DBG("Unloading kernel modules");
 		modprobe_remove_lttng_all();
+		free(syscall_table);
 	}
 
 	close_consumer_sockets();
@@ -2826,6 +2828,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 	case LTTNG_LIST_DOMAINS:
 	case LTTNG_LIST_CHANNELS:
 	case LTTNG_LIST_EVENTS:
+	case LTTNG_LIST_SYSCALLS:
 		break;
 	default:
 		/* Setup lttng message with no payload */
@@ -2844,6 +2847,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 	case LTTNG_CALIBRATE:
 	case LTTNG_LIST_SESSIONS:
 	case LTTNG_LIST_TRACEPOINTS:
+	case LTTNG_LIST_SYSCALLS:
 	case LTTNG_LIST_TRACEPOINT_FIELDS:
 	case LTTNG_SAVE_SESSION:
 		need_tracing_session = 0;
@@ -2876,7 +2880,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) {
@@ -3129,16 +3132,6 @@ skip_domain:
 				&cmd_ctx->lsm->u.disable.event);
 		break;
 	}
-	case LTTNG_DISABLE_ALL_EVENT:
-	{
-		DBG("Disabling all events");
-
-		/* FIXME: passing packed structure to non-packed pointer */
-		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:
 	{
 		ret = cmd_enable_channel(cmd_ctx->session, &cmd_ctx->lsm->domain,
@@ -3251,16 +3244,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;
@@ -3329,6 +3312,37 @@ skip_domain:
 		ret = LTTNG_OK;
 		break;
 	}
+	case LTTNG_LIST_SYSCALLS:
+	{
+		struct lttng_event *events;
+		ssize_t nb_events;
+
+		nb_events = cmd_list_syscalls(&events);
+		if (nb_events < 0) {
+			/* Return value is a negative lttng_error_code. */
+			ret = -nb_events;
+			goto error;
+		}
+
+		/*
+		 * Setup lttng message with payload size set to the event list size in
+		 * bytes and then copy list into the llm payload.
+		 */
+		ret = setup_lttng_msg(cmd_ctx, sizeof(struct lttng_event) * nb_events);
+		if (ret < 0) {
+			free(events);
+			goto setup_error;
+		}
+
+		/* Copy event list into message payload */
+		memcpy(cmd_ctx->llm->payload, events,
+				sizeof(struct lttng_event) * nb_events);
+
+		free(events);
+
+		ret = LTTNG_OK;
+		break;
+	}
 	case LTTNG_SET_CONSUMER_URI:
 	{
 		size_t nb_uri, len;
@@ -5216,6 +5230,11 @@ int main(int argc, char **argv)
 		/* Setup kernel tracer */
 		if (!opt_no_kernel) {
 			init_kernel_tracer();
+			ret = syscall_init_table();
+			if (ret < 0) {
+				ERR("Unable to populate syscall table. Syscall tracing won't"
+						" work for this session daemon.");
+			}
 		}
 
 		/* Set ulimit for open files */