X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=665aba57d7cb80f37656c670fe6d3760747eb7a0;hp=aae0e4fa5708ed4fd6c6416d5074c867da4bc62f;hb=0c82ac624169ec9ec062f395e55abfe992d0fd91;hpb=0e1155633b00241b8b1e5a9bb683cf91b28f5eeb

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index aae0e4fa5..665aba57d 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -19,7 +19,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <grp.h>
 #include <errno.h>
@@ -220,19 +220,19 @@ int lttng_check_tracing_group(void)
 	/* Get number of supplementary group IDs */
 	grp_list_size = getgroups(0, NULL);
 	if (grp_list_size < 0) {
-		perror("getgroups");
+		PERROR("getgroups");
 		goto end;
 	}
 
 	/* Alloc group list of the right size */
-	grp_list = malloc(grp_list_size * sizeof(gid_t));
+	grp_list = zmalloc(grp_list_size * sizeof(gid_t));
 	if (!grp_list) {
-		perror("malloc");
+		PERROR("malloc");
 		goto end;
 	}
 	grp_id = getgroups(grp_list_size, grp_list);
 	if (grp_id < 0) {
-		perror("getgroups");
+		PERROR("getgroups");
 		goto free_list;
 	}
 
@@ -274,7 +274,7 @@ static int try_connect_sessiond(const char *sock_path)
 
 	ret = lttcomm_close_unix_sock(ret);
 	if (ret < 0) {
-		perror("lttcomm_close_unix_sock");
+		PERROR("lttcomm_close_unix_sock");
 	}
 
 	return 0;
@@ -445,7 +445,11 @@ int lttng_ctl_ask_sessiond_varlen(struct lttcomm_session_msg *lsm,
 		goto end;
 	}
 
-	data = (void*) malloc(size);
+	data = zmalloc(size);
+	if (!data) {
+		ret = -ENOMEM;
+		goto end;
+	}
 
 	/* Get payload data */
 	ret = recv_data_sessiond(data, size);
@@ -485,7 +489,7 @@ struct lttng_handle *lttng_create_handle(const char *session_name,
 		goto end;
 	}
 
-	handle = malloc(sizeof(struct lttng_handle));
+	handle = zmalloc(sizeof(struct lttng_handle));
 	if (handle == NULL) {
 		PERROR("malloc handle");
 		goto end;
@@ -754,7 +758,7 @@ error:
 }
 
 /*
- * Generate the filter bytecode from a give filter expression string. Put the
+ * Generate the filter bytecode from a given filter expression string. Put the
  * newly allocated parser context in ctxp and populate the lsm object with the
  * expression len.
  *
@@ -853,7 +857,7 @@ static int generate_filter(char *filter_expression,
 
 	/* No need to keep the memory stream. */
 	if (fclose(fmem) != 0) {
-		perror("fclose");
+		PERROR("fclose");
 	}
 
 	*ctxp = ctx;
@@ -864,7 +868,7 @@ parse_error:
 	filter_parser_ctx_free(ctx);
 filter_alloc_error:
 	if (fclose(fmem) != 0) {
-		perror("fclose");
+		PERROR("fclose");
 	}
 error:
 	return ret;
@@ -995,7 +999,8 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
 	/* Put exclusion names first in the data */
 	while (exclusion_count--) {
 		strncpy(varlen_data + LTTNG_SYMBOL_NAME_LEN * exclusion_count,
-			*(exclusion_list + exclusion_count), LTTNG_SYMBOL_NAME_LEN);
+			*(exclusion_list + exclusion_count),
+			LTTNG_SYMBOL_NAME_LEN - 1);
 	}
 	/* Add filter expression next */
 	if (lsm.u.enable.expression_len != 0) {
@@ -1086,10 +1091,6 @@ int lttng_disable_event_ext(struct lttng_handle *handle,
 	}
 
 	lsm.cmd_type = LTTNG_DISABLE_EVENT;
-	if (ev->name[0] == '\0') {
-		/* Disable all events */
-		lttng_ctl_copy_string(ev->name, "*", sizeof(ev->name));
-	}
 
 	lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
 	/* FIXME: copying non-packed struct to packed struct. */
@@ -1211,6 +1212,7 @@ int lttng_disable_event(struct lttng_handle *handle, const char *name,
 	struct lttng_event ev;
 
 	memset(&ev, 0, sizeof(ev));
+	ev.loglevel = -1;
 	ev.type = LTTNG_EVENT_ALL;
 	lttng_ctl_copy_string(ev.name, name, sizeof(ev.name));
 	return lttng_disable_event_ext(handle, &ev, channel_name, NULL);
@@ -1274,6 +1276,62 @@ int lttng_disable_channel(struct lttng_handle *handle, const char *name)
 	return lttng_ctl_ask_sessiond(&lsm, NULL);
 }
 
+/*
+ *  Add PID to session tracker.
+ *  Return 0 on success else a negative LTTng error code.
+ */
+int lttng_track_pid(struct lttng_handle *handle, int pid)
+{
+	struct lttcomm_session_msg lsm;
+
+	/*
+	 * NULL arguments are forbidden. No default values.
+	 */
+	if (handle == NULL) {
+		return -LTTNG_ERR_INVALID;
+	}
+
+	memset(&lsm, 0, sizeof(lsm));
+
+	lsm.cmd_type = LTTNG_TRACK_PID;
+	lsm.u.pid_tracker.pid = pid;
+
+	lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
+
+	lttng_ctl_copy_string(lsm.session.name, handle->session_name,
+			sizeof(lsm.session.name));
+
+	return lttng_ctl_ask_sessiond(&lsm, NULL);
+}
+
+/*
+ *  Remove PID from session tracker.
+ *  Return 0 on success else a negative LTTng error code.
+ */
+int lttng_untrack_pid(struct lttng_handle *handle, int pid)
+{
+	struct lttcomm_session_msg lsm;
+
+	/*
+	 * NULL arguments are forbidden. No default values.
+	 */
+	if (handle == NULL) {
+		return -LTTNG_ERR_INVALID;
+	}
+
+	memset(&lsm, 0, sizeof(lsm));
+
+	lsm.cmd_type = LTTNG_UNTRACK_PID;
+	lsm.u.pid_tracker.pid = pid;
+
+	lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
+
+	lttng_ctl_copy_string(lsm.session.name, handle->session_name,
+			sizeof(lsm.session.name));
+
+	return lttng_ctl_ask_sessiond(&lsm, NULL);
+}
+
 /*
  *  Lists all available tracepoints of domain.
  *  Sets the contents of the events array.
@@ -1446,6 +1504,26 @@ int lttng_list_sessions(struct lttng_session **sessions)
 	return ret / sizeof(struct lttng_session);
 }
 
+int lttng_set_session_shm_path(const char *session_name,
+		const char *shm_path)
+{
+	struct lttcomm_session_msg lsm;
+
+	if (session_name == NULL) {
+		return -LTTNG_ERR_INVALID;
+	}
+
+	memset(&lsm, 0, sizeof(lsm));
+	lsm.cmd_type = LTTNG_SET_SESSION_SHM_PATH;
+
+	lttng_ctl_copy_string(lsm.session.name, session_name,
+			sizeof(lsm.session.name));
+	lttng_ctl_copy_string(lsm.u.set_shm_path.shm_path, shm_path,
+			sizeof(lsm.u.set_shm_path.shm_path));
+
+	return lttng_ctl_ask_sessiond(&lsm, NULL);
+}
+
 /*
  *  Ask the session daemon for all available domains of a session.
  *  Sets the contents of the domains array.
@@ -1798,6 +1876,7 @@ int lttng_data_pending(const char *session_name)
 {
 	int ret;
 	struct lttcomm_session_msg lsm;
+	uint8_t *pending = NULL;
 
 	if (session_name == NULL) {
 		return -LTTNG_ERR_INVALID;
@@ -1809,18 +1888,18 @@ int lttng_data_pending(const char *session_name)
 	lttng_ctl_copy_string(lsm.session.name, session_name,
 			sizeof(lsm.session.name));
 
-	ret = lttng_ctl_ask_sessiond(&lsm, NULL);
-
-	/*
-	 * The lttng_ctl_ask_sessiond function negate the return code if it's not
-	 * LTTNG_OK so getting -1 means that the reply ret_code was 1 thus meaning
-	 * that the data is available. Yes it is hackish but for now this is the
-	 * only way.
-	 */
-	if (ret == -1) {
-		ret = 1;
+	ret = lttng_ctl_ask_sessiond(&lsm, (void **) &pending);
+	if (ret < 0) {
+		goto end;
+	} else if (ret != 1) {
+		/* Unexpected payload size */
+		ret = -LTTNG_ERR_INVALID;
+		goto end;
 	}
 
+	ret = (int) *pending;
+end:
+	free(pending);
 	return ret;
 }
 
@@ -1872,7 +1951,7 @@ int lttng_create_session_live(const char *name, const char *url,
 	struct lttcomm_session_msg lsm;
 	struct lttng_uri *uris = NULL;
 
-	if (name == NULL) {
+	if (name == NULL || timer_interval == 0) {
 		return -LTTNG_ERR_INVALID;
 	}
 
@@ -1908,6 +1987,52 @@ end:
 	return ret;
 }
 
+/*
+ * List PIDs in the tracker.
+ *
+ * enabled is set to whether the PID tracker is enabled.
+ * pids is set to an allocated array of PIDs currently tracked. On
+ * success, pids must be freed by the caller.
+ * nr_pids is set to the number of entries contained by the pids array.
+ *
+ * Returns 0 on success, else a negative LTTng error code.
+ */
+int lttng_list_tracker_pids(struct lttng_handle *handle,
+		int *_enabled, int32_t **_pids, size_t *_nr_pids)
+{
+	int ret;
+	int enabled = 1;
+	struct lttcomm_session_msg lsm;
+	size_t nr_pids;
+	int32_t *pids;
+
+	if (handle == NULL) {
+		return -LTTNG_ERR_INVALID;
+	}
+
+	memset(&lsm, 0, sizeof(lsm));
+	lsm.cmd_type = LTTNG_LIST_TRACKER_PIDS;
+	lttng_ctl_copy_string(lsm.session.name, handle->session_name,
+			sizeof(lsm.session.name));
+	lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
+
+	ret = lttng_ctl_ask_sessiond(&lsm, (void **) &pids);
+	if (ret < 0) {
+		return ret;
+	}
+	nr_pids = ret / sizeof(int32_t);
+	if (nr_pids == 1 && pids[0] == -1) {
+		free(pids);
+		pids = NULL;
+		enabled = 0;
+		nr_pids = 0;
+	}
+	*_enabled = enabled;
+	*_pids = pids;
+	*_nr_pids = nr_pids;
+	return 0;
+}
+
 /*
  * lib constructor
  */