X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.c;h=1a53448c647ebd8469871b916258726649a78c5b;hp=90172e50a58d554c95b4cf502132584e2d59097f;hb=025faf73cdb6942ebf437dc4c4f6631f0134b128;hpb=7671f53cf3b6029a3bf00e502a0a58ac7a82e378

diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index 90172e50a..1a53448c6 100644
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -358,7 +358,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,74 +366,80 @@ static int enable_events(char *session_name)
 			}
 		}
 
-		ret = lttng_enable_event(handle, &ev, channel_name);
-		if (ret < 0) {
-			switch (-ret) {
-			case LTTNG_ERR_KERN_EVENT_EXIST:
-				WARN("Kernel events already enabled (channel %s, session %s)",
-						channel_name, session_name);
+		if (!opt_filter) {
+			ret = lttng_enable_event(handle, &ev, channel_name);
+			if (ret < 0) {
+				switch (-ret) {
+				case LTTNG_ERR_KERN_EVENT_EXIST:
+					WARN("Kernel events already enabled (channel %s, session %s)",
+							channel_name, session_name);
+					break;
+				default:
+					ERR("Events: %s (channel %s, session %s)",
+							lttng_strerror(ret), channel_name, session_name);
+					break;
+				}
+				goto end;
+			}
+
+			switch (opt_event_type) {
+			case LTTNG_EVENT_TRACEPOINT:
+				if (opt_loglevel) {
+					MSG("All %s tracepoints are enabled in channel %s for loglevel %s",
+							opt_kernel ? "kernel" : "UST", channel_name,
+							opt_loglevel);
+				} else {
+					MSG("All %s tracepoints are enabled in channel %s",
+							opt_kernel ? "kernel" : "UST", channel_name);
+
+				}
 				break;
-			default:
-				ERR("Events: %s (channel %s, session %s)",
-						lttng_strerror(ret), channel_name, session_name);
+			case LTTNG_EVENT_SYSCALL:
+				if (opt_kernel) {
+					MSG("All kernel system calls are enabled in channel %s",
+							channel_name);
+				}
 				break;
+			case LTTNG_EVENT_ALL:
+				if (opt_loglevel) {
+					MSG("All %s events are enabled in channel %s for loglevel %s",
+							opt_kernel ? "kernel" : "UST", channel_name,
+							opt_loglevel);
+				} else {
+					MSG("All %s events are enabled in channel %s",
+							opt_kernel ? "kernel" : "UST", channel_name);
+				}
+				break;
+			default:
+				/*
+				 * We should not be here since lttng_enable_event should have
+				 * failed on the event type.
+				 */
+				goto error;
 			}
-			goto end;
 		}
 		if (opt_filter) {
-			ret = lttng_set_event_filter(handle, ev.name, channel_name,
+			ret = lttng_enable_event_with_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("Error setting filter");
+					ERR("Setting filter: '%s'", opt_filter);
 					break;
 				}
-
-				ret = -1;
 				goto error;
-			}
-		}
-
-		switch (opt_event_type) {
-		case LTTNG_EVENT_TRACEPOINT:
-			if (opt_loglevel) {
-				MSG("All %s tracepoints are enabled in channel %s for loglevel %s",
-					opt_kernel ? "kernel" : "UST", channel_name,
-					opt_loglevel);
 			} else {
-				MSG("All %s tracepoints are enabled in channel %s",
-					opt_kernel ? "kernel" : "UST", channel_name);
-
-			}
-			break;
-		case LTTNG_EVENT_SYSCALL:
-			if (opt_kernel) {
-				MSG("All kernel system calls are enabled in channel %s",
-						channel_name);
-			}
-			break;
-		case LTTNG_EVENT_ALL:
-			if (opt_loglevel) {
-				MSG("All %s events are enabled in channel %s for loglevel %s",
-					opt_kernel ? "kernel" : "UST", channel_name,
-					opt_loglevel);
-			} else {
-				MSG("All %s events are enabled in channel %s",
-					opt_kernel ? "kernel" : "UST", channel_name);
+				MSG("Filter '%s' successfully set", opt_filter);
 			}
-			break;
-		default:
-			/*
-			 * We should not be here since lttng_enable_event should have
-			 * failed on the event type.
-			 */
-			goto error;
 		}
 		goto end;
 	}
@@ -530,7 +536,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 {
@@ -542,41 +548,48 @@ static int enable_events(char *session_name)
 			goto error;
 		}
 
-		ret = lttng_enable_event(handle, &ev, channel_name);
-		if (ret < 0) {
-			/* Turn ret to positive value to handle the positive error code */
-			switch (-ret) {
-			case LTTNG_ERR_KERN_EVENT_EXIST:
-				WARN("Kernel event %s already enabled (channel %s, session %s)",
-						event_name, channel_name, session_name);
-				break;
-			default:
-				ERR("Event %s: %s (channel %s, session %s)", event_name,
-						lttng_strerror(ret), channel_name, session_name);
-				break;
+		if (!opt_filter) {
+			ret = lttng_enable_event(handle, &ev, channel_name);
+			if (ret < 0) {
+				/* Turn ret to positive value to handle the positive error code */
+				switch (-ret) {
+				case LTTNG_ERR_KERN_EVENT_EXIST:
+					WARN("Kernel event %s already enabled (channel %s, session %s)",
+							event_name, channel_name, session_name);
+					break;
+				default:
+					ERR("Event %s: %s (channel %s, session %s)", event_name,
+							lttng_strerror(ret), channel_name, session_name);
+					break;
+				}
+				warn = 1;
+			} else {
+				MSG("%s event %s created in channel %s",
+						opt_kernel ? "kernel": "UST", event_name, channel_name);
 			}
-			warn = 1;
-		} else {
-			MSG("%s event %s created in channel %s",
-					opt_kernel ? "kernel": "UST", event_name, channel_name);
 		}
+
 		if (opt_filter) {
-			ret = lttng_set_event_filter(handle, ev.name,
-				channel_name, opt_filter);
+			ret = lttng_enable_event_with_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("Error setting filter");
+					ERR("Setting filter for event %s: '%s'", ev.name,
+							opt_filter);
 					break;
 				}
-
-				ret = -1;
 				goto error;
+			} else {
+				MSG("Filter '%s' successfully set", opt_filter);
 			}
 		}