X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=liblttngctl%2Flttngctl.c;h=c65760155347d4ca7e576ea7b24132b580d47e7f;hp=b83d5ca92c83b516ade2f4c05336be116839b3fc;hb=fc34caaa25f9780eb8509f243f910c3f2aaa5a69;hpb=1e307fab325060d9db4e989c0fdc3cddf46f50f6

diff --git a/liblttngctl/lttngctl.c b/liblttngctl/lttngctl.c
index b83d5ca92..c65760155 100644
--- a/liblttngctl/lttngctl.c
+++ b/liblttngctl/lttngctl.c
@@ -93,7 +93,7 @@ static int send_session_msg(struct lttcomm_session_msg *lsm)
 		goto end;
 	}
 
-	ret = lttcomm_send_unix_sock(sessiond_socket, lsm,
+	ret = lttcomm_send_creds_unix_sock(sessiond_socket, lsm,
 			sizeof(struct lttcomm_session_msg));
 
 end:
@@ -152,6 +152,10 @@ static int check_tracing_group(const char *grp_name)
 
 	/* Alloc group list of the right size */
 	grp_list = malloc(grp_list_size * sizeof(gid_t));
+	if (!grp_list) {
+		ret = -1;
+		goto end;
+	}
 	grp_id = getgroups(grp_list_size, grp_list);
 	if (grp_id < -1) {
 		perror("getgroups");
@@ -330,6 +334,10 @@ static int ask_sessiond(struct lttcomm_session_msg *lsm, void **buf)
 
 	size = llm.data_size;
 	if (size == 0) {
+		/* If client free with size 0 */
+		if (buf != NULL) {
+			*buf = NULL;
+		}
 		ret = 0;
 		goto end;
 	}
@@ -343,6 +351,16 @@ static int ask_sessiond(struct lttcomm_session_msg *lsm, void **buf)
 		goto end;
 	}
 
+	/*
+	 * Extra protection not to dereference a NULL pointer. If buf is NULL at
+	 * this point, an error is returned and data is freed.
+	 */
+	if (buf == NULL) {
+		ret = -1;
+		free(data);
+		goto end;
+	}
+
 	*buf = data;
 	ret = size;
 
@@ -407,17 +425,17 @@ int lttng_register_consumer(struct lttng_handle *handle,
 /*
  *  Start tracing for all trace of the session.
  */
-int lttng_start_tracing(struct lttng_handle *handle)
+int lttng_start_tracing(const char *session_name)
 {
 	struct lttcomm_session_msg lsm;
 
-	if (!handle) {
+	if (session_name == NULL) {
 		return -1;
 	}
 
 	lsm.cmd_type = LTTNG_START_TRACE;
-	copy_string(lsm.session.name, handle->session_name,
-			sizeof(lsm.session.name));
+
+	copy_string(lsm.session.name, session_name, sizeof(lsm.session.name));
 
 	return ask_sessiond(&lsm, NULL);
 }
@@ -425,13 +443,17 @@ int lttng_start_tracing(struct lttng_handle *handle)
 /*
  *  Stop tracing for all trace of the session.
  */
-int lttng_stop_tracing(struct lttng_handle *handle)
+int lttng_stop_tracing(const char *session_name)
 {
 	struct lttcomm_session_msg lsm;
 
+	if (session_name == NULL) {
+		return -1;
+	}
+
 	lsm.cmd_type = LTTNG_STOP_TRACE;
-	copy_string(lsm.session.name, handle->session_name,
-			sizeof(lsm.session.name));
+
+	copy_string(lsm.session.name, session_name, sizeof(lsm.session.name));
 
 	return ask_sessiond(&lsm, NULL);
 }
@@ -445,7 +467,8 @@ int lttng_add_context(struct lttng_handle *handle,
 {
 	struct lttcomm_session_msg lsm;
 
-	if (!handle) {
+	/* Safety check. Both are mandatory */
+	if (handle == NULL || ctx == NULL) {
 		return -1;
 	}
 
@@ -460,9 +483,7 @@ int lttng_add_context(struct lttng_handle *handle,
 
 	copy_lttng_domain(&lsm.domain, &handle->domain);
 
-	if (ctx) {
-		memcpy(&lsm.u.context.ctx, ctx, sizeof(struct lttng_event_context));
-	}
+	memcpy(&lsm.u.context.ctx, ctx, sizeof(struct lttng_event_context));
 
 	copy_string(lsm.session.name, handle->session_name,
 			sizeof(lsm.session.name));
@@ -478,10 +499,11 @@ int lttng_enable_event(struct lttng_handle *handle,
 {
 	struct lttcomm_session_msg lsm;
 
-	if (!handle) {
+	if (handle == NULL || ev == NULL) {
 		return -1;
 	}
 
+	/* If no channel name, we put the default name */
 	if (channel_name == NULL) {
 		copy_string(lsm.u.enable.channel_name, DEFAULT_CHANNEL_NAME,
 				sizeof(lsm.u.enable.channel_name));
@@ -492,12 +514,12 @@ int lttng_enable_event(struct lttng_handle *handle,
 
 	copy_lttng_domain(&lsm.domain, &handle->domain);
 
-	if (ev) {
+	if (ev->name[0] != '\0') {
 		lsm.cmd_type = LTTNG_ENABLE_EVENT;
-		memcpy(&lsm.u.enable.event, ev, sizeof(lsm.u.enable.event));
 	} else {
 		lsm.cmd_type = LTTNG_ENABLE_ALL_EVENT;
 	}
+	memcpy(&lsm.u.enable.event, ev, sizeof(lsm.u.enable.event));
 
 	copy_string(lsm.session.name, handle->session_name,
 			sizeof(lsm.session.name));
@@ -513,7 +535,7 @@ int lttng_disable_event(struct lttng_handle *handle, const char *name,
 {
 	struct lttcomm_session_msg lsm;
 
-	if (!handle) {
+	if (handle == NULL) {
 		return -1;
 	}
 
@@ -527,7 +549,7 @@ int lttng_disable_event(struct lttng_handle *handle, const char *name,
 
 	copy_lttng_domain(&lsm.domain, &handle->domain);
 
-	if (name == NULL) {
+	if (name != NULL) {
 		copy_string(lsm.u.disable.name, name, sizeof(lsm.u.disable.name));
 		lsm.cmd_type = LTTNG_DISABLE_EVENT;
 	} else {
@@ -548,13 +570,14 @@ int lttng_enable_channel(struct lttng_handle *handle,
 {
 	struct lttcomm_session_msg lsm;
 
-	if (!handle) {
+	/*
+	 * NULL arguments are forbidden. No default values.
+	 */
+	if (handle == NULL || chan == NULL) {
 		return -1;
 	}
 
-	if (chan) {
-		memcpy(&lsm.u.channel.chan, chan, sizeof(lsm.u.channel.chan));
-	}
+	memcpy(&lsm.u.channel.chan, chan, sizeof(lsm.u.channel.chan));
 
 	lsm.cmd_type = LTTNG_ENABLE_CHANNEL;
 
@@ -573,17 +596,16 @@ int lttng_disable_channel(struct lttng_handle *handle, const char *name)
 {
 	struct lttcomm_session_msg lsm;
 
-	if (!handle) {
+	/* Safety check. Both are mandatory */
+	if (handle == NULL || name == NULL) {
 		return -1;
 	}
 
-	if (name) {
-		copy_string(lsm.u.disable.channel_name, name,
-				sizeof(lsm.u.disable.channel_name));
-	}
-
 	lsm.cmd_type = LTTNG_DISABLE_CHANNEL;
 
+	copy_string(lsm.u.disable.channel_name, name,
+			sizeof(lsm.u.disable.channel_name));
+
 	copy_lttng_domain(&lsm.domain, &handle->domain);
 
 	copy_string(lsm.session.name, handle->session_name,
@@ -604,7 +626,7 @@ int lttng_list_tracepoints(struct lttng_handle *handle,
 	int ret;
 	struct lttcomm_session_msg lsm;
 
-	if (!handle) {
+	if (handle == NULL) {
 		return -1;
 	}
 
@@ -622,7 +644,7 @@ int lttng_list_tracepoints(struct lttng_handle *handle,
 /*
  *  Return a human readable string of code
  */
-const char *lttng_get_readable_code(int code)
+const char *lttng_strerror(int code)
 {
 	if (code > -LTTCOMM_OK) {
 		return "Ended with errors";
@@ -648,17 +670,17 @@ int lttng_create_session(const char *name, const char *path)
 /*
  *  Destroy session using name.
  */
-int lttng_destroy_session(struct lttng_handle *handle)
+int lttng_destroy_session(const char *session_name)
 {
 	struct lttcomm_session_msg lsm;
 
-	if (!handle) {
+	if (session_name == NULL) {
 		return -1;
 	}
 
 	lsm.cmd_type = LTTNG_DESTROY_SESSION;
-	copy_string(lsm.session.name, handle->session_name,
-			sizeof(lsm.session.name));
+
+	copy_string(lsm.session.name, session_name, sizeof(lsm.session.name));
 
 	return ask_sessiond(&lsm, NULL);
 }
@@ -686,20 +708,19 @@ int lttng_list_sessions(struct lttng_session **sessions)
 /*
  * List domain of a session.
  */
-int lttng_list_domains(struct lttng_handle *handle,
+int lttng_list_domains(const char *session_name,
 		struct lttng_domain **domains)
 {
 	int ret;
 	struct lttcomm_session_msg lsm;
 
-	if (!handle) {
+	if (session_name == NULL) {
 		return -1;
 	}
 
 	lsm.cmd_type = LTTNG_LIST_DOMAINS;
 
-	copy_string(lsm.session.name, handle->session_name,
-			sizeof(lsm.session.name));
+	copy_string(lsm.session.name, session_name, sizeof(lsm.session.name));
 
 	ret = ask_sessiond(&lsm, (void**) domains);
 	if (ret < 0) {
@@ -718,7 +739,7 @@ int lttng_list_channels(struct lttng_handle *handle,
 	int ret;
 	struct lttcomm_session_msg lsm;
 
-	if (!handle) {
+	if (handle == NULL) {
 		return -1;
 	}
 
@@ -745,7 +766,8 @@ int lttng_list_events(struct lttng_handle *handle,
 	int ret;
 	struct lttcomm_session_msg lsm;
 
-	if (!handle) {
+	/* Safety check. An handle and channel name are mandatory */
+	if (handle == NULL || channel_name == NULL) {
 		return -1;
 	}
 
@@ -766,13 +788,15 @@ int lttng_list_events(struct lttng_handle *handle,
 }
 
 /*
- *  lttng_set_tracing_group
- *
- *  Set tracing group variable with name. This function
- *  allocate memory pointed by tracing_group.
+ * Set tracing group variable with name. This function allocate memory pointed
+ * by tracing_group.
  */
 int lttng_set_tracing_group(const char *name)
 {
+	if (name == NULL) {
+		return -1;
+	}
+
 	if (asprintf(&tracing_group, "%s", name) < 0) {
 		return -ENOMEM;
 	}
@@ -788,7 +812,8 @@ int lttng_calibrate(struct lttng_handle *handle,
 {
 	struct lttcomm_session_msg lsm;
 
-	if (!handle) {
+	/* Safety check. NULL pointer are forbidden */
+	if (handle == NULL || calibrate == NULL) {
 		return -1;
 	}
 
@@ -800,6 +825,46 @@ int lttng_calibrate(struct lttng_handle *handle,
 	return ask_sessiond(&lsm, NULL);
 }
 
+/*
+ * Set default channel attributes.
+ */
+void lttng_channel_set_default_attr(struct lttng_domain *domain,
+		struct lttng_channel_attr *attr)
+{
+	/* Safety check */
+	if (attr == NULL || domain == NULL) {
+		return;
+	}
+
+	switch (domain->type) {
+	case LTTNG_DOMAIN_KERNEL:
+		attr->overwrite = DEFAULT_CHANNEL_OVERWRITE;
+		attr->switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER;
+		attr->read_timer_interval = DEFAULT_CHANNEL_READ_TIMER;
+
+		attr->subbuf_size = DEFAULT_KERNEL_CHANNEL_SUBBUF_SIZE;
+		attr->num_subbuf = DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM;
+		attr->output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
+		break;
+	case LTTNG_DOMAIN_UST:
+	case LTTNG_DOMAIN_UST_EXEC_NAME:
+	case LTTNG_DOMAIN_UST_PID:
+	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
+		attr->overwrite = DEFAULT_CHANNEL_OVERWRITE;
+		attr->switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER;
+		attr->read_timer_interval = DEFAULT_CHANNEL_READ_TIMER;
+
+		attr->subbuf_size = DEFAULT_UST_CHANNEL_SUBBUF_SIZE;
+		attr->num_subbuf = DEFAULT_UST_CHANNEL_SUBBUF_NUM;
+		attr->output = DEFAULT_UST_CHANNEL_OUTPUT;
+		break;
+	default:
+		/* Default behavior */
+		memset(attr, 0, sizeof(struct lttng_channel_attr));
+		break;
+	}
+}
+
 /*
  * Check if session daemon is alive.
  *