X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.c;h=90172e50a58d554c95b4cf502132584e2d59097f;hb=7671f53cf3b6029a3bf00e502a0a58ac7a82e378;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..90172e50a 100644
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -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;
@@ -384,7 +384,17 @@ static int enable_events(char *session_name)
 			ret = lttng_set_event_filter(handle, ev.name, channel_name,
 						opt_filter);
 			if (ret < 0) {
-				ERR("Error setting filter");
+				switch (-ret) {
+				case LTTNG_ERR_FILTER_EXIST:
+					ERR("Filter on events is already enabled"
+							" (channel %s, session %s)",
+						channel_name, session_name);
+					break;
+				default:
+					ERR("Error setting filter");
+					break;
+				}
+
 				ret = -1;
 				goto error;
 			}
@@ -536,7 +546,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;
@@ -554,7 +564,17 @@ static int enable_events(char *session_name)
 			ret = lttng_set_event_filter(handle, ev.name,
 				channel_name, opt_filter);
 			if (ret < 0) {
-				ERR("Error setting filter");
+				switch (-ret) {
+				case LTTNG_ERR_FILTER_EXIST:
+					ERR("Filter on event %s is already enabled"
+							" (channel %s, session %s)",
+						event_name, channel_name, session_name);
+					break;
+				default:
+					ERR("Error setting filter");
+					break;
+				}
+
 				ret = -1;
 				goto error;
 			}