X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=liblttngctl%2Fliblttngctl.c;h=e05496a9449891f5f6174af5ed4de3c9ce1f5f0e;hp=658f646f0fe7fc4c49e21d3917b7b08592959def;hb=94cf3c47fe93b891dac6206bbcf712d042d15727;hpb=5716705821202372fd16168f66f347ba293ef6b4

diff --git a/liblttngctl/liblttngctl.c b/liblttngctl/liblttngctl.c
index 658f646f0..e05496a94 100644
--- a/liblttngctl/liblttngctl.c
+++ b/liblttngctl/liblttngctl.c
@@ -24,43 +24,33 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <lttng/liblttngctl.h>
+#include <lttng/lttng.h>
 
 #include "liblttsessiondcomm.h"
 #include "lttngerr.h"
+#include "lttng-share.h"
 
 /* Socket to session daemon for communication */
 static int sessiond_socket;
 static char sessiond_sock_path[PATH_MAX];
 
 /* Communication structure to ltt-sessiond */
-static struct lttcomm_lttng_msg llm;
 static struct lttcomm_session_msg lsm;
-
-/* Prototypes */
-static int check_tracing_group(const char *grp_name);
-static int ask_sessiond(void);
-static int recvfrom_sessiond(void);
-static int set_session_daemon_path(void);
-static void reset_data_struct(void);
-
-int lttng_connect_sessiond(void);
-int lttng_create_session(const char *name, char *session_id);
-int lttng_check_session_daemon(void);
+static struct lttcomm_lttng_msg llm;
 
 /* Variables */
 static char *tracing_group;
 static int connected;
 
 /*
- *  ask_sessiond
+ *  send_data_sessiond
  *
  *  Send lttcomm_session_msg to the session daemon.
  *
  *  On success, return 0
  *  On error, return error code
  */
-static int ask_sessiond(void)
+static int send_data_sessiond(void)
 {
 	int ret;
 
@@ -76,14 +66,14 @@ end:
 }
 
 /*
- *  recvfrom_sessiond
+ *  recv_data_sessiond
  *
  *  Receive data from the sessiond socket.
  *
  *  On success, return 0
  *  On error, return recv() error code
  */
-static int recvfrom_sessiond(void)
+static int recv_data_sessiond(void *buf, size_t len)
 {
 	int ret;
 
@@ -92,210 +82,401 @@ static int recvfrom_sessiond(void)
 		goto end;
 	}
 
-	ret = lttcomm_recv_unix_sock(sessiond_socket, &llm, sizeof(llm));
+	ret = lttcomm_recv_unix_sock(sessiond_socket, buf, len);
+
+end:
+	return ret;
+}
+
+/*
+ *  ask_sessiond
+ *
+ *  Ask the session daemon a specific command and put the data into buf.
+ *
+ *  Return size of data (only payload, not header).
+ */
+static int ask_sessiond(enum lttcomm_sessiond_command lct, void **buf)
+{
+	int ret;
+	size_t size;
+	void *data = NULL;
+
+	ret = lttng_connect_sessiond();
 	if (ret < 0) {
 		goto end;
 	}
 
-	/* Check return code */
+	lsm.cmd_type = lct;
+
+	/* Send command to session daemon */
+	ret = send_data_sessiond();
+	if (ret < 0) {
+		goto end;
+	}
+
+	/* Get header from data transmission */
+	ret = recv_data_sessiond(&llm, sizeof(llm));
+	if (ret < 0) {
+		goto end;
+	}
+
+	/* Check error code if OK */
 	if (llm.ret_code != LTTCOMM_OK) {
 		ret = -llm.ret_code;
 		goto end;
 	}
 
+	size = llm.data_size;
+	if (size == 0) {
+		goto end;
+	}
+
+	data = (void*) malloc(size);
+
+	/* Get payload data */
+	ret = recv_data_sessiond(data, size);
+	if (ret < 0) {
+		free(data);
+		goto end;
+	}
+
+	*buf = data;
+	ret = size;
+
 end:
+	lttng_disconnect_sessiond();
 	return ret;
 }
 
 /*
- *  lttng_get_readable_code
+ *  check_tracing_group
  *
- *  Return a human readable string of code
+ *  Check if the specified group name exist.
+ *  If yes, 0, else -1
  */
-const char *lttng_get_readable_code(int code)
+static int check_tracing_group(const char *grp_name)
 {
-	if (code > -LTTCOMM_OK) {
-		return "Ended with errors";
+	struct group *grp_tracing;	/* no free(). See getgrnam(3) */
+	gid_t *grp_list;
+	int grp_list_size, grp_id, i;
+	int ret = -1;
+
+	/* Get GID of group 'tracing' */
+	grp_tracing = getgrnam(grp_name);
+	if (grp_tracing == NULL) {
+		/* NULL means not found also. getgrnam(3) */
+		if (errno != 0) {
+			perror("getgrnam");
+		}
+		goto end;
 	}
 
-	return lttcomm_get_readable_code(code);
+	/* Get number of supplementary group IDs */
+	grp_list_size = getgroups(0, NULL);
+	if (grp_list_size < 0) {
+		perror("getgroups");
+		goto end;
+	}
+
+	/* Alloc group list of the right size */
+	grp_list = malloc(grp_list_size * sizeof(gid_t));
+	grp_id = getgroups(grp_list_size, grp_list);
+	if (grp_id < -1) {
+		perror("getgroups");
+		goto free_list;
+	}
+
+	for (i = 0; i < grp_list_size; i++) {
+		if (grp_list[i] == grp_tracing->gr_gid) {
+			ret = 0;
+			break;
+		}
+	}
+
+free_list:
+	free(grp_list);
+
+end:
+	return ret;
 }
 
 /*
- *  lttng_create_session
- *
- *  Create a tracing session using "name" to the session daemon.
- *  If no name is given, the auto session creation is set and
- *  the daemon will take care of finding a name.
+ *  set_session_daemon_path
  *
- *  On success, return 0 and session_id point to the uuid str.
- *  On error, negative value is returned.
+ *  Set sessiond socket path by putting it in 
+ *  the global sessiond_sock_path variable.
  */
-int lttng_create_session(const char *name, char *session_id)
+static int set_session_daemon_path(void)
 {
 	int ret;
 
-	lsm.cmd_type = LTTNG_CREATE_SESSION;
-	if (name == NULL) {
-		lsm.u.create_session.auto_session = 1;
+	/* Are we in the tracing group ? */
+	ret = check_tracing_group(tracing_group);
+	if (ret < 0 && getuid() != 0) {
+		if (sprintf(sessiond_sock_path, DEFAULT_HOME_CLIENT_UNIX_SOCK,
+					getenv("HOME")) < 0) {
+			return -ENOMEM;
+		}
 	} else {
-		strncpy(lsm.session_name, name, strlen(name));
-		lsm.u.create_session.auto_session = 0;
-	}
-
-	/* Ask the session daemon */
-	ret = ask_sessiond();
-	if (ret < 0) {
-		goto end;
+		strncpy(sessiond_sock_path, DEFAULT_GLOBAL_CLIENT_UNIX_SOCK,
+				sizeof(DEFAULT_GLOBAL_CLIENT_UNIX_SOCK));
 	}
 
-	/* Unparse session ID */
-	uuid_unparse(llm.session_id, session_id);
-
-end:
-	reset_data_struct();
-
-	return ret;
+	return 0;
 }
 
 /*
- *  lttng_ust_list_apps
+ *  lttng_start_tracing
  *
- *  Ask the session daemon for all UST traceable
- *  applications.
+ *  Start tracing for all trace of the session.
+ */
+int lttng_start_tracing(char *session_name)
+{
+	strncpy(lsm.session_name, session_name, NAME_MAX);
+	return ask_sessiond(LTTNG_START_TRACE, NULL);
+}
+
+/*
+ *  lttng_stop_tracing
  *
- *  Return the size of pids.
+ *  Stop tracing for all trace of the session.
  */
-size_t lttng_ust_list_apps(pid_t **pids)
+int lttng_stop_tracing(char *session_name)
 {
-	int ret, first = 0;
-	size_t size = 0;
-	pid_t *p = NULL;
+	strncpy(lsm.session_name, session_name, NAME_MAX);
+	return ask_sessiond(LTTNG_STOP_TRACE, NULL);
+}
 
-	lsm.cmd_type = UST_LIST_APPS;
+/*
+ * BEGIN Kernel control API
+ */
 
-	ret = ask_sessiond();
-	if (ret < 0) {
-		goto error;
+/*
+ *  lttng_kernel_add_context
+ */
+int lttng_kernel_add_context(struct lttng_kernel_context *ctx,
+		char *event_name, char *channel_name)
+{
+	if (channel_name != NULL) {
+		strncpy(lsm.u.context.channel_name, channel_name, NAME_MAX);
 	}
 
-	do {
-		ret = recvfrom_sessiond();
-		if (ret < 0) {
-			goto error;
-		}
+	if (event_name != NULL) {
+		strncpy(lsm.u.context.event_name, event_name, NAME_MAX);
+	}
 
-		if (first == 0) {
-			first = 1;
-			size = llm.num_pckt;
-			p = malloc(sizeof(pid_t) * size);
-		}
-		p[size - llm.num_pckt] = llm.u.list_apps.pid;
-	} while ((llm.num_pckt-1) != 0);
+	memcpy(&lsm.u.context.ctx, ctx, sizeof(struct lttng_kernel_context));
+	return ask_sessiond(LTTNG_KERNEL_ADD_CONTEXT, NULL);
+}
 
-	*pids = p;
+/*
+ *  lttng_kernel_enable_event
+ */
+int lttng_kernel_enable_event(struct lttng_event *ev, char *channel_name)
+{
+	int ret;
 
-	return size;
+	if (channel_name == NULL) {
+		strncpy(lsm.u.enable.channel_name, DEFAULT_CHANNEL_NAME, NAME_MAX);
+	} else {
+		strncpy(lsm.u.enable.channel_name, channel_name, NAME_MAX);
+	}
+
+	if (ev == NULL) {
+		ret = ask_sessiond(LTTNG_KERNEL_ENABLE_ALL_EVENT, NULL);
+	} else {
+		memcpy(&lsm.u.enable.event, ev, sizeof(struct lttng_event));
+		ret = ask_sessiond(LTTNG_KERNEL_ENABLE_EVENT, NULL);
+	}
 
-error:
 	return ret;
 }
 
 /*
- *  lttng_list_sessions
- *
- *  Ask the session daemon for all available sessions.
+ *  lttng_kernel_disable_event
  *
- *  Return number of sessions
+ *  Disable an event in the kernel tracer.
  */
-size_t lttng_list_sessions(struct lttng_session **sessions)
+int lttng_kernel_disable_event(char *name, char *channel_name)
 {
-	int ret, first = 0;
-	size_t size = 0;
-	struct lttng_session *ls = NULL;
+	int ret;
 
-	lsm.cmd_type = LTTNG_LIST_SESSIONS;
+	if (channel_name == NULL) {
+		strncpy(lsm.u.disable.channel_name, DEFAULT_CHANNEL_NAME, NAME_MAX);
+	} else {
+		strncpy(lsm.u.disable.channel_name, channel_name, NAME_MAX);
+	}
 
-	ret = ask_sessiond();
-	if (ret < 0) {
-		goto error;
+	if (name == NULL) {
+		ret = ask_sessiond(LTTNG_KERNEL_DISABLE_ALL_EVENT, NULL);
+	} else {
+		strncpy(lsm.u.disable.name, name, NAME_MAX);
+		ret = ask_sessiond(LTTNG_KERNEL_DISABLE_EVENT, NULL);
 	}
 
-	do {
-		ret = recvfrom_sessiond();
-		if (ret < 0) {
-			goto error;
-		}
+	return ret;
+}
 
-		if (first == 0) {
-			first = 1;
-			size = llm.num_pckt;
-			ls = malloc(sizeof(struct lttng_session) * size);
-		}
-		strncpy(ls[size - llm.num_pckt].name, llm.u.list_sessions.name,
-				sizeof(ls[size - llm.num_pckt].name));
-		strncpy(ls[size - llm.num_pckt].uuid, llm.u.list_sessions.uuid,
-				sizeof(ls[size - llm.num_pckt].uuid));
-	} while ((llm.num_pckt - 1) != 0);
+/*
+ *  lttng_kernel_enable_channel
+ *
+ *  Enable recording for a channel for the kernel tracer.
+ */
+int lttng_kernel_enable_channel(char *name)
+{
+	strncpy(lsm.u.enable.channel_name, name, NAME_MAX);
+	return ask_sessiond(LTTNG_KERNEL_ENABLE_CHANNEL, NULL);
+}
+
+/*
+ *  lttng_kernel_disable_channel
+ *
+ *  Disable recording for the channel for the kernel tracer.
+ */
+int lttng_kernel_disable_channel(char *name)
+{
+	strncpy(lsm.u.disable.channel_name, name, NAME_MAX);
+	return ask_sessiond(LTTNG_KERNEL_DISABLE_CHANNEL, NULL);
+}
+
+/*
+ *  lttng_kernel_create_channel
+ *
+ *  Create a channel in the kernel tracer.
+ */
+int lttng_kernel_create_channel(struct lttng_channel *chan)
+{
+	memcpy(&lsm.u.channel.chan, chan, sizeof(struct lttng_channel));
+	return ask_sessiond(LTTNG_KERNEL_CREATE_CHANNEL, NULL);
+}
 
-	*sessions = ls;
+/*
+ *  lttng_list_events
+ *
+ *  List all available events in the kernel.
+ *
+ *  Return the size (bytes) of the list and set the event_list array.
+ *  On error, return negative value.
+ */
+int lttng_kernel_list_events(char **event_list)
+{
+	return ask_sessiond(LTTNG_KERNEL_LIST_EVENTS, (void **) event_list);
+}
 
-	return size;
+/*
+ * END Kernel control API
+ */
 
-error:
-	return ret;
+/*
+ *  lttng_get_readable_code
+ *
+ *  Return a human readable string of code
+ */
+const char *lttng_get_readable_code(int code)
+{
+	if (code > -LTTCOMM_OK) {
+		return "Ended with errors";
+	}
+
+	return lttcomm_get_readable_code(code);
 }
 
 /*
- *  lttng_connect_sessiond
+ *  lttng_ust_list_apps
  *
- *  Connect to the LTTng session daemon.
- *  On success, return 0
- *  On error, return a negative value
+ *  Ask the session daemon for all UST traceable applications.
+ *
+ *  Return the number of pids.
+ *  On error, return negative value.
  */
-int lttng_connect_sessiond(void)
+int lttng_ust_list_traceable_apps(pid_t **pids)
 {
 	int ret;
 
-	ret = set_session_daemon_path();
+	ret = ask_sessiond(LTTNG_LIST_TRACEABLE_APPS, (void**) pids);
 	if (ret < 0) {
 		return ret;
 	}
 
-	/* Connect to the sesssion daemon */
-	ret = lttcomm_connect_unix_sock(sessiond_sock_path);
+	return ret / sizeof(pid_t);
+}
+
+/*
+ *  lttng_list_traces
+ *
+ *  Ask the session daemon for all traces (kernel and ust) for the session
+ *  identified by name.
+ *
+ *  Return the number of traces.
+ *  On error, return negative value.
+ */
+/*
+int lttng_list_traces(char *session_name, struct lttng_trace **traces)
+{
+	int ret;
+
+	strncpy(lsm.session_name, session_name, NAME_MAX);
+
+	ret = ask_sessiond(LTTNG_LIST_TRACES, (void **) traces);
 	if (ret < 0) {
 		return ret;
 	}
 
-	sessiond_socket = ret;
-	connected = 1;
+	return ret / sizeof(struct lttng_trace);
+}
+*/
 
-	return 0;
+/*
+ *  lttng_create_session
+ *
+ *  Create a brand new session using name.
+ */
+int lttng_create_session(char *name, char *path)
+{
+	strncpy(lsm.session_name, name, NAME_MAX);
+	strncpy(lsm.path, path, PATH_MAX);
+	return ask_sessiond(LTTNG_CREATE_SESSION, NULL);
 }
 
 /*
- *  lttng_set_tracing_group
+ *  lttng_destroy_session
  *
- *  Set tracing group variable with name. This function
- *  allocate memory pointed by tracing_group.
+ *  Destroy session using name.
  */
-int lttng_set_tracing_group(const char *name)
+int lttng_destroy_session(char *name)
 {
-	if (asprintf(&tracing_group, "%s", name) < 0) {
-		return -ENOMEM;
+	strncpy(lsm.session_name, name, NAME_MAX);
+	return ask_sessiond(LTTNG_DESTROY_SESSION, NULL);
+}
+
+/*
+ *  lttng_list_sessions
+ *
+ *  Ask the session daemon for all available sessions.
+ *
+ *  Return number of session.
+ *  On error, return negative value.
+ */
+int lttng_list_sessions(struct lttng_session **sessions)
+{
+	int ret;
+
+	ret = ask_sessiond(LTTNG_LIST_SESSIONS, (void**) sessions);
+	if (ret < 0) {
+		return ret;
 	}
 
-	return 0;
+	return ret / sizeof(struct lttng_session);
 }
 
 /*
- *  lttng_check_session_daemon
+ *  lttng_connect_sessiond
  *
- *  Return 0 if a sesssion daemon is available
- *  else return -1
+ *  Connect to the LTTng session daemon.
+ *  On success, return 0
+ *  On error, return a negative value
  */
-int lttng_check_session_daemon(void)
+int lttng_connect_sessiond(void)
 {
 	int ret;
 
@@ -304,101 +485,82 @@ int lttng_check_session_daemon(void)
 		return ret;
 	}
 
-	/* If socket exist, we consider the daemon started */
-	ret = access(sessiond_sock_path, F_OK);
+	/* Connect to the sesssion daemon */
+	ret = lttcomm_connect_unix_sock(sessiond_sock_path);
 	if (ret < 0) {
 		return ret;
 	}
 
+	sessiond_socket = ret;
+	connected = 1;
+
 	return 0;
 }
 
 /*
- *  reset_data_struct
+ *  lttng_disconnect_sessiond
  *
- *  Reset session daemon structures.
+ *  Clean disconnect the session daemon.
  */
-static void reset_data_struct(void)
+int lttng_disconnect_sessiond(void)
+{
+	int ret = 0;
+
+	if (connected) {
+		ret = lttcomm_close_unix_sock(sessiond_socket);
+		sessiond_socket = 0;
+		connected = 0;
+	}
+
+	return ret;
+}
+
+void lttng_set_session_name(char *name)
 {
-	memset(&lsm, 0, sizeof(lsm));
-	memset(&llm, 0, sizeof(llm));
+	strncpy(lsm.session_name, name, NAME_MAX);
 }
 
 /*
- *  set_session_daemon_path
+ *  lttng_set_tracing_group
  *
- *  Set sessiond socket path by putting it in 
- *  the global sessiond_sock_path variable.
+ *  Set tracing group variable with name. This function
+ *  allocate memory pointed by tracing_group.
  */
-static int set_session_daemon_path(void)
+int lttng_set_tracing_group(const char *name)
 {
-	int ret;
-
-	/* Are we in the tracing group ? */
-	ret = check_tracing_group(tracing_group);
-	if (ret < 0) {
-		if (sprintf(sessiond_sock_path, DEFAULT_HOME_CLIENT_UNIX_SOCK,
-					getenv("HOME")) < 0) {
-			return -ENOMEM;
-		}
-	} else {
-		strncpy(sessiond_sock_path, DEFAULT_GLOBAL_CLIENT_UNIX_SOCK,
-				sizeof(DEFAULT_GLOBAL_CLIENT_UNIX_SOCK));
+	if (asprintf(&tracing_group, "%s", name) < 0) {
+		return -ENOMEM;
 	}
 
 	return 0;
 }
 
 /*
- *  check_tracing_group
+ *  lttng_check_session_daemon
  *
- *  Check if the specified group name exist.
- *  If yes, 0, else -1
+ *  Yes, return 1
+ *  No, return 0
+ *  Error, return negative value
  */
-static int check_tracing_group(const char *grp_name)
+int lttng_session_daemon_alive(void)
 {
-	struct group *grp_tracing;	/* no free(). See getgrnam(3) */
-	gid_t *grp_list;
-	int grp_list_size, grp_id, i;
-	int ret = -1;
-
-	/* Get GID of group 'tracing' */
-	grp_tracing = getgrnam(grp_name);
-	if (grp_tracing == NULL) {
-		/* NULL means not found also. getgrnam(3) */
-		if (errno != 0) {
-			perror("getgrnam");
-		}
-		goto end;
-	}
-
-	/* Get number of supplementary group IDs */
-	grp_list_size = getgroups(0, NULL);
-	if (grp_list_size < 0) {
-		perror("getgroups");
-		goto end;
-	}
+	int ret;
 
-	/* Alloc group list of the right size */
-	grp_list = malloc(grp_list_size * sizeof(gid_t));
-	grp_id = getgroups(grp_list_size, grp_list);
-	if (grp_id < -1) {
-		perror("getgroups");
-		goto free_list;
+	ret = set_session_daemon_path();
+	if (ret < 0) {
+		/* Error */
+		return ret;
 	}
 
-	for (i = 0; i < grp_list_size; i++) {
-		if (grp_list[i] == grp_tracing->gr_gid) {
-			ret = 0;
-			break;
-		}
+	/* If socket exist, we consider the daemon started */
+	ret = access(sessiond_sock_path, F_OK);
+	if (ret < 0) {
+		/* Not alive */
+		return 0;
 	}
 
-free_list:
-	free(grp_list);
-
-end:
-	return ret;
+	/* Is alive */
+	return 1;
 }
 
 /*
@@ -407,5 +569,5 @@ end:
 static void __attribute__((constructor)) init()
 {
 	/* Set default session group */
-	lttng_set_tracing_group(DEFAULT_TRACING_GROUP);
+	lttng_set_tracing_group(LTTNG_DEFAULT_TRACING_GROUP);
 }