X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=a11215d750124d61ba708f9f5ef543d4725d9af5;hb=d6e4c56b9602d87147426b9e3f8dbaad9b936027;hp=9a2160533ee909a5b5efb3c924d96b56484a99b0;hpb=f8a9654412d256e2330aea5e93b135443b62a807;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 9a2160533..a11215d75 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -520,6 +520,7 @@ int lttng_register_consumer(struct lttng_handle *handle,
 		return -LTTNG_ERR_INVALID;
 	}
 
+	memset(&lsm, 0, sizeof(lsm));
 	lsm.cmd_type = LTTNG_REGISTER_CONSUMER;
 	lttng_ctl_copy_string(lsm.session.name, handle->session_name,
 			sizeof(lsm.session.name));
@@ -542,6 +543,7 @@ int lttng_start_tracing(const char *session_name)
 		return -LTTNG_ERR_INVALID;
 	}
 
+	memset(&lsm, 0, sizeof(lsm));
 	lsm.cmd_type = LTTNG_START_TRACE;
 
 	lttng_ctl_copy_string(lsm.session.name, session_name,
@@ -562,6 +564,7 @@ static int _lttng_stop_tracing(const char *session_name, int wait)
 		return -LTTNG_ERR_INVALID;
 	}
 
+	memset(&lsm, 0, sizeof(lsm));
 	lsm.cmd_type = LTTNG_STOP_TRACE;
 
 	lttng_ctl_copy_string(lsm.session.name, session_name,
@@ -733,23 +736,13 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
 				sizeof(lsm.u.enable.channel_name));
 	}
 
-	lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
-
-	/* figure out correct command type, based on if we have a filter or exclusions */
-	if (exclusion_count == 0) {
-		if (filter_expression == NULL) {
-			if (ev->name[0] != '\0') {
-				lsm.cmd_type = LTTNG_ENABLE_EVENT;
-			} else {
-				lsm.cmd_type = LTTNG_ENABLE_ALL_EVENT;
-			}
-		} else {
-			lsm.cmd_type = LTTNG_ENABLE_EVENT_WITH_FILTER;
-		}
+	if (ev->name[0] != '\0') {
+		lsm.cmd_type = LTTNG_ENABLE_EVENT;
 	} else {
-		lsm.cmd_type = LTTNG_ENABLE_EVENT_WITH_EXCLUSION;
+		lsm.cmd_type = LTTNG_ENABLE_ALL_EVENT;
 	}
 
+	lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
 	memcpy(&lsm.u.enable.event, ev, sizeof(lsm.u.enable.event));
 
 	lttng_ctl_copy_string(lsm.session.name, handle->session_name,
@@ -869,9 +862,8 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
 	}
 
 	ret = lttng_ctl_ask_sessiond_varlen(&lsm, varlen_data,
-			LTTNG_SYMBOL_NAME_LEN * lsm.u.enable.exclusion_count
-					+ lsm.u.enable.bytecode_len,
-			NULL);
+			(LTTNG_SYMBOL_NAME_LEN * lsm.u.enable.exclusion_count) +
+			lsm.u.enable.bytecode_len, NULL);
 
 	if (lsm.u.enable.exclusion_count != 0) {
 		free(varlen_data);
@@ -1015,6 +1007,7 @@ int lttng_list_tracepoints(struct lttng_handle *handle,
 		return -LTTNG_ERR_INVALID;
 	}
 
+	memset(&lsm, 0, sizeof(lsm));
 	lsm.cmd_type = LTTNG_LIST_TRACEPOINTS;
 	lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
 
@@ -1042,6 +1035,7 @@ int lttng_list_tracepoint_fields(struct lttng_handle *handle,
 		return -LTTNG_ERR_INVALID;
 	}
 
+	memset(&lsm, 0, sizeof(lsm));
 	lsm.cmd_type = LTTNG_LIST_TRACEPOINT_FIELDS;
 	lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
 
@@ -1110,6 +1104,7 @@ int lttng_destroy_session(const char *session_name)
 		return -LTTNG_ERR_INVALID;
 	}
 
+	memset(&lsm, 0, sizeof(lsm));
 	lsm.cmd_type = LTTNG_DESTROY_SESSION;
 
 	lttng_ctl_copy_string(lsm.session.name, session_name,
@@ -1129,6 +1124,7 @@ int lttng_list_sessions(struct lttng_session **sessions)
 	int ret;
 	struct lttcomm_session_msg lsm;
 
+	memset(&lsm, 0, sizeof(lsm));
 	lsm.cmd_type = LTTNG_LIST_SESSIONS;
 	ret = lttng_ctl_ask_sessiond(&lsm, (void**) sessions);
 	if (ret < 0) {
@@ -1154,6 +1150,7 @@ int lttng_list_domains(const char *session_name,
 		return -LTTNG_ERR_INVALID;
 	}
 
+	memset(&lsm, 0, sizeof(lsm));
 	lsm.cmd_type = LTTNG_LIST_DOMAINS;
 
 	lttng_ctl_copy_string(lsm.session.name, session_name,
@@ -1183,6 +1180,7 @@ int lttng_list_channels(struct lttng_handle *handle,
 		return -LTTNG_ERR_INVALID;
 	}
 
+	memset(&lsm, 0, sizeof(lsm));
 	lsm.cmd_type = LTTNG_LIST_CHANNELS;
 	lttng_ctl_copy_string(lsm.session.name, handle->session_name,
 			sizeof(lsm.session.name));
@@ -1214,6 +1212,7 @@ int lttng_list_events(struct lttng_handle *handle,
 		return -LTTNG_ERR_INVALID;
 	}
 
+	memset(&lsm, 0, sizeof(lsm));
 	lsm.cmd_type = LTTNG_LIST_EVENTS;
 	lttng_ctl_copy_string(lsm.session.name, handle->session_name,
 			sizeof(lsm.session.name));
@@ -1261,6 +1260,7 @@ int lttng_calibrate(struct lttng_handle *handle,
 		return -LTTNG_ERR_INVALID;
 	}
 
+	memset(&lsm, 0, sizeof(lsm));
 	lsm.cmd_type = LTTNG_CALIBRATE;
 	lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
 
@@ -1491,6 +1491,7 @@ int lttng_data_pending(const char *session_name)
 		return -LTTNG_ERR_INVALID;
 	}
 
+	memset(&lsm, 0, sizeof(lsm));
 	lsm.cmd_type = LTTNG_DATA_PENDING;
 
 	lttng_ctl_copy_string(lsm.session.name, session_name,
@@ -1568,16 +1569,20 @@ int lttng_create_session_live(const char *name, const char *url,
 	lsm.cmd_type = LTTNG_CREATE_SESSION_LIVE;
 	lttng_ctl_copy_string(lsm.session.name, name, sizeof(lsm.session.name));
 
-	size = uri_parse_str_urls(url, NULL, &uris);
-	if (size < 0) {
-		ret = -LTTNG_ERR_INVALID;
-		goto end;
-	}
+	if (url) {
+		size = uri_parse_str_urls(url, NULL, &uris);
+		if (size <= 0) {
+			ret = -LTTNG_ERR_INVALID;
+			goto end;
+		}
 
-	/* file:// is not accepted for live session. */
-	if (uris[0].dtype == LTTNG_DST_PATH) {
-		ret = -LTTNG_ERR_INVALID;
-		goto end;
+		/* file:// is not accepted for live session. */
+		if (uris[0].dtype == LTTNG_DST_PATH) {
+			ret = -LTTNG_ERR_INVALID;
+			goto end;
+		}
+	} else {
+		size = 0;
 	}
 
 	lsm.u.session_live.nb_uri = size;