X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.c;h=51388298954768d35990b38e540617fc008e4020;hb=2f70b271351fe2b7befc4e327503f7c13a57dcd5;hp=a2c8a68b233e0ed7beeef1b893c7f453b874e08d;hpb=32a6298d8929c91842c9a5c09f1a3f4660c32eec;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index a2c8a68b2..513882989 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 {
@@ -369,7 +369,7 @@ static int enable_events(char *session_name)
 		ret = lttng_enable_event(handle, &ev, channel_name);
 		if (ret < 0) {
 			switch (-ret) {
-			case LTTCOMM_KERN_EVENT_EXIST:
+			case LTTNG_ERR_KERN_EVENT_EXIST:
 				WARN("Kernel events already enabled (channel %s, session %s)",
 						channel_name, session_name);
 				break;
@@ -380,25 +380,16 @@ static int enable_events(char *session_name)
 			}
 			goto end;
 		}
-		if (opt_filter) {
-			ret = lttng_set_event_filter(handle, ev.name, channel_name,
-						opt_filter);
-			if (ret < 0) {
-				ERR("Error setting filter");
-				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);
+						opt_kernel ? "kernel" : "UST", channel_name,
+						opt_loglevel);
 			} else {
 				MSG("All %s tracepoints are enabled in channel %s",
-					opt_kernel ? "kernel" : "UST", channel_name);
+						opt_kernel ? "kernel" : "UST", channel_name);
 
 			}
 			break;
@@ -411,11 +402,11 @@ static int enable_events(char *session_name)
 		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);
+						opt_kernel ? "kernel" : "UST", channel_name,
+						opt_loglevel);
 			} else {
 				MSG("All %s events are enabled in channel %s",
-					opt_kernel ? "kernel" : "UST", channel_name);
+						opt_kernel ? "kernel" : "UST", channel_name);
 			}
 			break;
 		default:
@@ -425,6 +416,41 @@ static int enable_events(char *session_name)
 			 */
 			goto error;
 		}
+		if (opt_filter) {
+			ret = lttng_set_event_filter(handle, ev.name, channel_name,
+						opt_filter);
+			if (ret < 0) {
+				switch (-ret) {
+				case LTTNG_ERR_FILTER_EXIST:
+					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);
+					/*
+					 * The event was successfully enabled before so when
+					 * failing to set a filter, disable the event. This has
+					 * been discussed in bug #343 on why we do that.
+					 */
+					err = lttng_disable_event(handle, ev.name, channel_name);
+					if (err < 0) {
+						ERR("Disabling all events after filter error: %s",
+								lttng_strerror(err));
+					} else {
+						WARN("All events of channel %s have been disabled due "
+								"to a filter error", channel_name);
+					}
+					break;
+				}
+				goto error;
+			} else {
+				MSG("Filter '%s' successfully set", opt_filter);
+			}
+		}
 		goto end;
 	}
 
@@ -520,7 +546,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 {
@@ -536,7 +562,7 @@ static int enable_events(char *session_name)
 		if (ret < 0) {
 			/* Turn ret to positive value to handle the positive error code */
 			switch (-ret) {
-			case LTTCOMM_KERN_EVENT_EXIST:
+			case LTTNG_ERR_KERN_EVENT_EXIST:
 				WARN("Kernel event %s already enabled (channel %s, session %s)",
 						event_name, channel_name, session_name);
 				break;
@@ -551,12 +577,39 @@ static int enable_events(char *session_name)
 					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_set_event_filter(handle, ev.name, channel_name,
+					opt_filter);
 			if (ret < 0) {
-				ERR("Error setting filter");
-				ret = -1;
+				switch (-ret) {
+				case LTTNG_ERR_FILTER_EXIST:
+					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);
+					/*
+					 * The event was successfully enabled before so when
+					 * failing to set a filter, disable the event. This has
+					 * been discussed in bug #343 on why we do that.
+					 */
+					err = lttng_disable_event(handle, ev.name, channel_name);
+					if (err < 0) {
+						ERR("Disabling event %s after filter error: %s",
+								ev.name, lttng_strerror(err));
+					} else {
+						WARN("Event %s of channel %s has been disabled due "
+								"to a filter error", ev.name, channel_name);
+					}
+					break;
+				}
 				goto error;
+			} else {
+				MSG("Filter '%s' successfully set", opt_filter);
 			}
 		}