X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttngctl%2Fliblttngctl.c;h=2cf79f4ed96987a9b95c59bb373ee1d80d44d1d0;hb=7e8c38c672e816ea3b0d9a7accdcae4d6e01c668;hp=38be54774049532c8d9cef30a67c244454109b96;hpb=5461b305aef403f7f2e48c977c188b5526746c6e;p=lttng-tools.git

diff --git a/liblttngctl/liblttngctl.c b/liblttngctl/liblttngctl.c
index 38be54774..2cf79f4ed 100644
--- a/liblttngctl/liblttngctl.c
+++ b/liblttngctl/liblttngctl.c
@@ -154,10 +154,79 @@ static int ask_sessiond(enum lttcomm_sessiond_command lct, void **buf)
 
 end:
 	lttng_disconnect_sessiond();
-	memset(&lsm, 0, sizeof(lsm));
 	return ret;
 }
 
+/*
+ * BEGIN KERNEL CONTROL
+ */
+
+/*
+ *  lttng_kernel_enable_event
+ *
+ *  Enable an event in the kernel tracer.
+ */
+int lttng_kernel_enable_event(char *event_name)
+{
+	strncpy(lsm.u.event.event_name, event_name, NAME_MAX);
+	return ask_sessiond(KERNEL_ENABLE_EVENT, NULL);
+}
+
+/*
+ *  lttng_kernel_disable_event
+ *
+ *  Disable an event in the kernel tracer.
+ */
+int lttng_kernel_disable_event(char *event_name)
+{
+	strncpy(lsm.u.event.event_name, event_name, NAME_MAX);
+	return ask_sessiond(KERNEL_DISABLE_EVENT, NULL);
+}
+
+/*
+ *  lttng_kernel_create_session
+ *
+ *  Create a session in the kernel tracer.
+ */
+int lttng_kernel_create_session(void)
+{
+	return ask_sessiond(KERNEL_CREATE_SESSION, NULL);
+}
+
+/*
+ *  lttng_kernel_create_channel
+ *
+ *  Create a channel in the kernel tracer.
+ */
+int lttng_kernel_create_channel(void)
+{
+	return ask_sessiond(KERNEL_CREATE_CHANNEL, NULL);
+}
+
+/*
+ *  lttng_kernel_start_tracing
+ *
+ *  Start kernel tracing.
+ */
+int lttng_kernel_start_tracing(void)
+{
+	return ask_sessiond(KERNEL_START_TRACE, NULL);
+}
+
+/*
+ *  lttng_kernel_stop_tracing
+ *
+ *  Stop kernel tracing.
+ */
+int lttng_kernel_stop_tracing(void)
+{
+	return ask_sessiond(KERNEL_STOP_TRACE, NULL);
+}
+
+/*
+ * END KERNEL CONTROL
+ */
+
 /*
  *  lttng_get_readable_code
  *
@@ -263,10 +332,9 @@ int lttng_list_traces(uuid_t *uuid, struct lttng_trace **traces)
 /*
  *  lttng_create_session
  *
- *  Create a brand new session using name. Allocate
- *  the session_id param pointing to the UUID.
+ *  Create a brand new session using name.
  */
-int lttng_create_session(char *name, uuid_t *session_id)
+int lttng_create_session(char *name)
 {
 	int ret;
 
@@ -278,8 +346,6 @@ int lttng_create_session(char *name, uuid_t *session_id)
 		goto end;
 	}
 
-	uuid_copy(*session_id, llm.session_uuid);
-
 end:
 	return ret;
 }
@@ -431,7 +497,7 @@ static int set_session_daemon_path(void)
 
 	/* Are we in the tracing group ? */
 	ret = check_tracing_group(tracing_group);
-	if (ret < 0) {
+	if (ret < 0 && getuid() != 0) {
 		if (sprintf(sessiond_sock_path, DEFAULT_HOME_CLIENT_UNIX_SOCK,
 					getenv("HOME")) < 0) {
 			return -ENOMEM;