X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flttng-events.c;h=d5f8314c5fbbe59ea9834b37809de658971032c0;hb=17806c46f59eba37b32bde6543bd5017d154b42d;hp=6907b5a0f347d069ee8f5472b661b51eae0512f4;hpb=3c6beb8d0a658c617b2808abec04008edf9e3094;p=lttng-modules.git

diff --git a/src/lttng-events.c b/src/lttng-events.c
index 6907b5a0..d5f8314c 100644
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -1114,7 +1114,7 @@ struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct l
 
 		ret = lttng_uprobes_register_event(event_param->name,
 				event_param->u.uprobe.fd,
-				event_recorder);
+				&event_recorder->parent);
 		if (ret)
 			goto register_error;
 		ret = try_module_get(event_recorder->priv->parent.desc->owner);
@@ -1321,10 +1321,9 @@ struct lttng_kernel_event_notifier *_lttng_event_notifier_create(
 		 */
 		smp_wmb();
 
-		ret = lttng_uprobes_register_event_notifier(
-				event_notifier_param->event.name,
+		ret = lttng_uprobes_register_event(event_notifier_param->event.name,
 				event_notifier_param->event.u.uprobe.fd,
-				event_notifier);
+				&event_notifier->parent);
 		if (ret)
 			goto register_error;
 		ret = try_module_get(event_notifier->priv->parent.desc->owner);
@@ -1456,7 +1455,7 @@ void register_event_recorder(struct lttng_kernel_event_recorder *event_recorder)
 		break;
 
 	case LTTNG_KERNEL_ABI_SYSCALL:
-		ret = lttng_syscall_filter_enable_event_recorder(event_recorder);
+		ret = lttng_syscall_filter_enable_event(&event_recorder->parent);
 		break;
 
 	case LTTNG_KERNEL_ABI_KPROBE:
@@ -1509,7 +1508,7 @@ int _lttng_event_recorder_unregister(struct lttng_kernel_event_recorder *event_r
 		break;
 
 	case LTTNG_KERNEL_ABI_SYSCALL:
-		ret = lttng_syscall_filter_disable_event_recorder(event_recorder);
+		ret = lttng_syscall_filter_disable_event(&event_recorder->parent);
 		break;
 
 	case LTTNG_KERNEL_ABI_NOOP:
@@ -1517,7 +1516,7 @@ int _lttng_event_recorder_unregister(struct lttng_kernel_event_recorder *event_r
 		break;
 
 	case LTTNG_KERNEL_ABI_UPROBE:
-		lttng_uprobes_unregister_event(event_recorder);
+		lttng_uprobes_unregister_event(&event_recorder->parent);
 		ret = 0;
 		break;
 
@@ -1550,7 +1549,7 @@ void register_event_notifier(struct lttng_kernel_event_notifier *event_notifier)
 		break;
 
 	case LTTNG_KERNEL_ABI_SYSCALL:
-		ret = lttng_syscall_filter_enable_event_notifier(event_notifier);
+		ret = lttng_syscall_filter_enable_event(&event_notifier->parent);
 		break;
 
 	case LTTNG_KERNEL_ABI_KPROBE:
@@ -1596,12 +1595,12 @@ int _lttng_event_notifier_unregister(
 		break;
 
 	case LTTNG_KERNEL_ABI_UPROBE:
-		lttng_uprobes_unregister_event_notifier(event_notifier);
+		lttng_uprobes_unregister_event(&event_notifier->parent);
 		ret = 0;
 		break;
 
 	case LTTNG_KERNEL_ABI_SYSCALL:
-		ret = lttng_syscall_filter_disable_event_notifier(event_notifier);
+		ret = lttng_syscall_filter_disable_event(&event_notifier->parent);
 		break;
 
 	case LTTNG_KERNEL_ABI_KRETPROBE:
@@ -1659,7 +1658,7 @@ void _lttng_event_destroy(struct lttng_kernel_event_common *event)
 
 		case LTTNG_KERNEL_ABI_UPROBE:
 			module_put(event_priv->desc->owner);
-			lttng_uprobes_destroy_event_private(event_recorder);
+			lttng_uprobes_destroy_event_private(&event_recorder->parent);
 			break;
 
 		case LTTNG_KERNEL_ABI_FUNCTION:
@@ -1694,7 +1693,7 @@ void _lttng_event_destroy(struct lttng_kernel_event_common *event)
 
 		case LTTNG_KERNEL_ABI_UPROBE:
 			module_put(event_notifier->priv->parent.desc->owner);
-			lttng_uprobes_destroy_event_notifier_private(event_notifier);
+			lttng_uprobes_destroy_event_private(&event_notifier->parent);
 			break;
 
 		case LTTNG_KERNEL_ABI_KRETPROBE:
@@ -2243,7 +2242,7 @@ void lttng_create_syscall_event_if_missing(struct lttng_event_recorder_enabler *
 {
 	int ret;
 
-	ret = lttng_syscalls_register_event_recorder(event_enabler);
+	ret = lttng_syscalls_register_event(&event_enabler->parent);
 	WARN_ON_ONCE(ret);
 }
 
@@ -2252,7 +2251,7 @@ void lttng_create_syscall_event_notifier_if_missing(struct lttng_event_notifier_
 {
 	int ret;
 
-	ret = lttng_syscalls_register_event_notifier(event_notifier_enabler);
+	ret = lttng_syscalls_register_event(&event_notifier_enabler->parent);
 	WARN_ON_ONCE(ret);
 	ret = lttng_syscalls_create_matching_event_notifiers(event_notifier_enabler);
 	WARN_ON_ONCE(ret);