X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt-sessiond%2Fmain.c;h=eb02b69fa090659df8dfe33171e193f26a4cb1f7;hb=2c58cc2eccbb85063cc547c0259d276a2be5c0a4;hp=07a4ba6de0e7284d98a2aa8f383777ed839bd4d6;hpb=4f58e6273aa4799c0d7f40bad34398ff8e118c5c;p=lttng-tools.git

diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c
index 07a4ba6de..eb02b69fa 100644
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@ -1491,12 +1491,13 @@ static int mount_debugfs(char *path)
 
 	ret = mkdir_recursive(path, S_IRWXU | S_IRWXG, geteuid(), getegid());
 	if (ret < 0) {
+		PERROR("Cannot create debugfs path");
 		goto error;
 	}
 
 	ret = mount(type, path, type, 0, NULL);
 	if (ret < 0) {
-		perror("mount debugfs");
+		PERROR("Cannot mount debugfs");
 		goto error;
 	}
 
@@ -1546,6 +1547,7 @@ static void init_kernel_tracer(void)
 		}
 		ret = mount_debugfs(debugfs_path);
 		if (ret < 0) {
+			perror("Cannot mount debugfs");
 			goto error;
 		}
 	}
@@ -1798,6 +1800,9 @@ static void list_lttng_events(struct ltt_kernel_channel *kchan,
 			case LTTNG_KERNEL_SYSCALL:
 				events[i].type = LTTNG_EVENT_SYSCALL;
 				break;
+			case LTTNG_KERNEL_ALL:
+				assert(0);
+				break;
 		}
 		i++;
 	}
@@ -1969,7 +1974,7 @@ static int cmd_disable_event(struct ltt_session *session, int domain,
 			goto error;
 		}
 
-		ret = event_kernel_disable(session->kernel_session, kchan, event_name);
+		ret = event_kernel_disable_tracepoint(session->kernel_session, kchan, event_name);
 		if (ret != LTTCOMM_OK) {
 			goto error;
 		}
@@ -2086,7 +2091,7 @@ static int cmd_enable_event(struct ltt_session *session, int domain,
 			goto error;
 		}
 
-		ret = event_kernel_enable(session->kernel_session, kchan, event);
+		ret = event_kernel_enable_tracepoint(session->kernel_session, kchan, event);
 		if (ret != LTTCOMM_OK) {
 			goto error;
 		}
@@ -2136,18 +2141,28 @@ static int cmd_enable_event_all(struct ltt_session *session, int domain,
 			goto error;
 		}
 
-		if (event_type == LTTNG_KERNEL_SYSCALL) {
-			ret = event_kernel_enable_syscalls(session->kernel_session,
+		switch (event_type) {
+		case LTTNG_KERNEL_SYSCALL:
+			ret = event_kernel_enable_all_syscalls(session->kernel_session,
 					kchan, kernel_tracer_fd);
-		} else {
+			break;
+		case LTTNG_KERNEL_TRACEPOINT:
 			/*
-			 * This call enables all LTTNG_KERNEL_TRACEPOINTS and events
-			 * already registered to the channel.
+			 * This call enables all LTTNG_KERNEL_TRACEPOINTS and
+			 * events already registered to the channel.
 			 */
+			ret = event_kernel_enable_all_tracepoints(session->kernel_session,
+					kchan, kernel_tracer_fd);
+			break;
+		case LTTNG_KERNEL_ALL:
+			/* Enable syscalls and tracepoints */
 			ret = event_kernel_enable_all(session->kernel_session,
 					kchan, kernel_tracer_fd);
+			break;
+		default:
+			ret = LTTCOMM_KERN_ENABLE_FAIL;
+			goto error;
 		}
-
 		if (ret != LTTCOMM_OK) {
 			goto error;
 		}