X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-events.c;h=91a0810030047d59ea281a8dced6d91dc49f5aca;hb=cff6938b5405c9125a5149f03e504d7b1cc4b8a4;hp=379a7e7e1d4a39a3a574514cbd6c0b5881e88292;hpb=9de67196ec41ae39fd73e49259da50119c21bfcc;p=lttng-modules.git

diff --git a/src/lttng-events.c b/src/lttng-events.c
index 379a7e7e..91a08100 100644
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -280,7 +280,7 @@ void lttng_session_destroy(struct lttng_session *session)
 	mutex_lock(&sessions_mutex);
 	WRITE_ONCE(session->active, 0);
 	list_for_each_entry(chan, &session->chan, list) {
-		ret = lttng_syscalls_unregister(chan);
+		ret = lttng_syscalls_unregister_event(chan);
 		WARN_ON(ret);
 	}
 	list_for_each_entry(event, &session->events, list) {
@@ -289,7 +289,7 @@ void lttng_session_destroy(struct lttng_session *session)
 	}
 	synchronize_trace();	/* Wait for in-flight events to complete */
 	list_for_each_entry(chan, &session->chan, list) {
-		ret = lttng_syscalls_destroy(chan);
+		ret = lttng_syscalls_destroy_event(chan);
 		WARN_ON(ret);
 	}
 	list_for_each_entry_safe(event_enabler, tmp_event_enabler,
@@ -1179,7 +1179,7 @@ void register_event(struct lttng_event *event)
 						  event);
 		break;
 	case LTTNG_KERNEL_SYSCALL:
-		ret = lttng_syscall_filter_enable(event->chan, event);
+		ret = lttng_syscall_filter_enable_event(event->chan, event);
 		break;
 	case LTTNG_KERNEL_KPROBE:
 	case LTTNG_KERNEL_UPROBE:
@@ -1222,7 +1222,7 @@ int _lttng_event_unregister(struct lttng_event *event)
 		ret = 0;
 		break;
 	case LTTNG_KERNEL_SYSCALL:
-		ret = lttng_syscall_filter_disable(event->chan, event);
+		ret = lttng_syscall_filter_disable_event(event->chan, event);
 		break;
 	case LTTNG_KERNEL_NOOP:
 		ret = 0;
@@ -1713,7 +1713,7 @@ int lttng_desc_match_enabler(const struct lttng_event_desc *desc,
 			return -EINVAL;
 		}
 		switch (enabler->event_param.u.syscall.match) {
-		case LTTNG_SYSCALL_MATCH_NAME:
+		case LTTNG_KERNEL_SYSCALL_MATCH_NAME:
 			switch (enabler->format_type) {
 			case LTTNG_ENABLER_FORMAT_STAR_GLOB:
 				return lttng_match_enabler_star_glob(desc_name, enabler_name);
@@ -1723,7 +1723,7 @@ int lttng_desc_match_enabler(const struct lttng_event_desc *desc,
 				return -EINVAL;
 			}
 			break;
-		case LTTNG_SYSCALL_MATCH_NR:
+		case LTTNG_KERNEL_SYSCALL_MATCH_NR:
 			return -EINVAL;	/* Not implemented. */
 		default:
 			return -EINVAL;
@@ -1897,7 +1897,7 @@ void lttng_create_syscall_event_if_missing(struct lttng_event_enabler *event_ena
 {
 	int ret;
 
-	ret = lttng_syscalls_register(event_enabler->chan, NULL);
+	ret = lttng_syscalls_register_event(event_enabler->chan, NULL);
 	WARN_ON_ONCE(ret);
 }
 
@@ -1938,7 +1938,7 @@ int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler)
 	if (base_enabler->event_param.instrumentation == LTTNG_KERNEL_SYSCALL &&
 			base_enabler->event_param.u.syscall.entryexit == LTTNG_KERNEL_SYSCALL_ENTRYEXIT &&
 			base_enabler->event_param.u.syscall.abi == LTTNG_KERNEL_SYSCALL_ABI_ALL &&
-			base_enabler->event_param.u.syscall.match == LTTNG_SYSCALL_MATCH_NAME &&
+			base_enabler->event_param.u.syscall.match == LTTNG_KERNEL_SYSCALL_MATCH_NAME &&
 			!strcmp(base_enabler->event_param.name, "*")) {
 		if (base_enabler->enabled)
 			WRITE_ONCE(chan->syscall_all, 1);