X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=131e93d0f14646f6b6455816e44af613b26ca12c;hp=a2af8882f289397b55f889f6f6995566b02aa3f6;hb=13839b2759a1c2bc0e53224ddbfc35824cfbb62e;hpb=1136f41bfcb45da596fcb147b38b3181223f87e1

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index a2af8882f..131e93d0f 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -30,8 +30,8 @@
 #include <lttng/trigger/trigger-internal.h>
 #include <lttng/condition/condition.h>
 #include <lttng/condition/condition-internal.h>
-#include <lttng/condition/event-rule.h>
-#include <lttng/condition/event-rule-internal.h>
+#include <lttng/condition/on-event.h>
+#include <lttng/condition/on-event-internal.h>
 #include <lttng/event-rule/event-rule.h>
 #include <lttng/event-rule/event-rule-internal.h>
 #include <lttng/action/action.h>
@@ -359,7 +359,7 @@ static ssize_t list_lttng_channels(enum lttng_domain_type domain,
 			 * Map enum lttng_ust_output to enum lttng_event_output.
 			 */
 			switch (uchan->attr.output) {
-			case LTTNG_UST_MMAP:
+			case LTTNG_UST_ABI_MMAP:
 				channels[i].attr.output = LTTNG_EVENT_MMAP;
 				break;
 			default:
@@ -579,26 +579,26 @@ static int list_lttng_ust_global_events(char *channel_name,
 		event.enabled = uevent->enabled;
 
 		switch (uevent->attr.instrumentation) {
-		case LTTNG_UST_TRACEPOINT:
+		case LTTNG_UST_ABI_TRACEPOINT:
 			event.type = LTTNG_EVENT_TRACEPOINT;
 			break;
-		case LTTNG_UST_PROBE:
+		case LTTNG_UST_ABI_PROBE:
 			event.type = LTTNG_EVENT_PROBE;
 			break;
-		case LTTNG_UST_FUNCTION:
+		case LTTNG_UST_ABI_FUNCTION:
 			event.type = LTTNG_EVENT_FUNCTION;
 			break;
 		}
 
 		event.loglevel = uevent->attr.loglevel;
 		switch (uevent->attr.loglevel_type) {
-		case LTTNG_UST_LOGLEVEL_ALL:
+		case LTTNG_UST_ABI_LOGLEVEL_ALL:
 			event.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
 			break;
-		case LTTNG_UST_LOGLEVEL_RANGE:
+		case LTTNG_UST_ABI_LOGLEVEL_RANGE:
 			event.loglevel_type = LTTNG_EVENT_LOGLEVEL_RANGE;
 			break;
-		case LTTNG_UST_LOGLEVEL_SINGLE:
+		case LTTNG_UST_ABI_LOGLEVEL_SINGLE:
 			event.loglevel_type = LTTNG_EVENT_LOGLEVEL_SINGLE;
 			break;
 		}
@@ -4306,7 +4306,7 @@ static enum lttng_error_code trigger_modifies_event_notifier(
 	}
 
 	*adds_event_notifier = lttng_condition_get_type(condition) ==
-			LTTNG_CONDITION_TYPE_EVENT_RULE_HIT;
+			LTTNG_CONDITION_TYPE_ON_EVENT;
 end:
 	return ret_code;
 }
@@ -4521,6 +4521,7 @@ enum lttng_error_code cmd_unregister_trigger(const struct lttng_credentials *cmd
 	if (ret_code != LTTNG_OK) {
 		DBG("Failed to unregister trigger from notification thread: trigger name = '%s', trigger owner uid = %d, error code = %d",
 				trigger_name, (int) trigger_owner, ret_code);
+		goto end;
 	}
 
 	/*