X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.c;h=cdd137cc9193d3aed0efdfee037546b97c958402;hp=9a4b9aac90c50753b62524404a487dd0578c61cf;hb=178191b3899f114001f000c2e7f46909969f9c6f;hpb=1636365217be276e0a9e19ab4b8b6cdcb84afd90

diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index 9a4b9aac9..cdd137cc9 100644
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -301,6 +301,7 @@ int loglevel_str_to_value(const char *inputstr)
 static int enable_events(char *session_name)
 {
 	int err, ret = CMD_SUCCESS, warn = 0;
+	unsigned int event_enabled = 0;
 	char *event_name, *channel_name = NULL;
 	struct lttng_event ev;
 	struct lttng_domain dom;
@@ -358,7 +359,7 @@ static int enable_events(char *session_name)
 				ev.loglevel = loglevel_str_to_value(opt_loglevel);
 				if (ev.loglevel == -1) {
 					ERR("Unknown loglevel %s", opt_loglevel);
-					ret = -1;
+					ret = -LTTNG_ERR_INVALID;
 					goto error;
 				}
 			} else {
@@ -366,6 +367,9 @@ static int enable_events(char *session_name)
 			}
 		}
 
+		/* Reset flag before enabling a new event. */
+		event_enabled = 0;
+
 		ret = lttng_enable_event(handle, &ev, channel_name);
 		if (ret < 0) {
 			switch (-ret) {
@@ -380,6 +384,7 @@ static int enable_events(char *session_name)
 			}
 			goto end;
 		}
+		event_enabled = 1;
 
 		switch (opt_event_type) {
 		case LTTNG_EVENT_TRACEPOINT:
@@ -416,16 +421,20 @@ static int enable_events(char *session_name)
 			 */
 			goto error;
 		}
-		if (opt_filter) {
-			ret = lttng_set_event_filter(handle, ev.name, channel_name,
+		if (opt_filter && event_enabled) {
+			ret = lttng_set_event_filter(handle, &ev, channel_name,
 						opt_filter);
 			if (ret < 0) {
+				fprintf(stderr, "Ret filter: %d\n", ret);
 				switch (-ret) {
 				case LTTNG_ERR_FILTER_EXIST:
-					ERR("Filter on events is already enabled"
+					WARN("Filter on events is already enabled"
 							" (channel %s, session %s)",
 						channel_name, session_name);
 					break;
+				case LTTNG_ERR_FILTER_INVAL:
+				case LTTNG_ERR_FILTER_NOMEM:
+					ERR("%s", lttng_strerror(ret));
 				default:
 					ERR("Setting filter: '%s'", opt_filter);
 					/*
@@ -543,7 +552,7 @@ static int enable_events(char *session_name)
 				ev.loglevel = loglevel_str_to_value(opt_loglevel);
 				if (ev.loglevel == -1) {
 					ERR("Unknown loglevel %s", opt_loglevel);
-					ret = -1;
+					ret = -LTTNG_ERR_INVALID;
 					goto error;
 				}
 			} else {
@@ -555,6 +564,9 @@ static int enable_events(char *session_name)
 			goto error;
 		}
 
+		/* Reset flag before enabling a new event. */
+		event_enabled = 0;
+
 		ret = lttng_enable_event(handle, &ev, channel_name);
 		if (ret < 0) {
 			/* Turn ret to positive value to handle the positive error code */
@@ -572,17 +584,21 @@ static int enable_events(char *session_name)
 		} else {
 			MSG("%s event %s created in channel %s",
 					opt_kernel ? "kernel": "UST", event_name, channel_name);
+			event_enabled = 1;
 		}
-		if (opt_filter) {
-			ret = lttng_set_event_filter(handle, ev.name, channel_name,
+		if (opt_filter && event_enabled) {
+			ret = lttng_set_event_filter(handle, &ev, channel_name,
 					opt_filter);
 			if (ret < 0) {
 				switch (-ret) {
 				case LTTNG_ERR_FILTER_EXIST:
-					ERR("Filter on event %s is already enabled"
+					WARN("Filter on event %s is already enabled"
 							" (channel %s, session %s)",
 						event_name, channel_name, session_name);
 					break;
+				case LTTNG_ERR_FILTER_INVAL:
+				case LTTNG_ERR_FILTER_NOMEM:
+					ERR("%s", lttng_strerror(ret));
 				default:
 					ERR("Setting filter for event %s: '%s'", ev.name,
 							opt_filter);