X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-events.c;h=92af4c900b278ba794d586520afbdcae78a44eeb;hb=6a35e5bd38fb1a47f57281d349218c7e4aae1da1;hp=7181f0fbaf6cb5d3461eb48af469cc1098402041;hpb=d26015f62c573e6d544f05caa25f0b0f645ef20c;p=lttng-modules.git

diff --git a/src/lttng-events.c b/src/lttng-events.c
index 7181f0fb..92af4c90 100644
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -981,7 +981,7 @@ struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct l
 				event_param->u.kprobe.symbol_name,
 				event_param->u.kprobe.offset,
 				event_param->u.kprobe.addr,
-				event_recorder);
+				&event_recorder->parent);
 		if (ret) {
 			ret = -EINVAL;
 			goto register_error;
@@ -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);
@@ -1257,11 +1257,11 @@ struct lttng_kernel_event_notifier *_lttng_event_notifier_create(
 		 * registration.
 		 */
 		smp_wmb();
-		ret = lttng_kprobes_register_event_notifier(
+		ret = lttng_kprobes_register_event(event_notifier_param->event.u.kprobe.symbol_name,
 				event_notifier_param->event.u.kprobe.symbol_name,
 				event_notifier_param->event.u.kprobe.offset,
 				event_notifier_param->event.u.kprobe.addr,
-				event_notifier);
+				&event_notifier->parent);
 		if (ret) {
 			ret = -EINVAL;
 			goto register_error;
@@ -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);
@@ -1499,7 +1498,7 @@ int _lttng_event_recorder_unregister(struct lttng_kernel_event_recorder *event_r
 		break;
 
 	case LTTNG_KERNEL_ABI_KPROBE:
-		lttng_kprobes_unregister_event(event_recorder);
+		lttng_kprobes_unregister_event(&event_recorder->parent);
 		ret = 0;
 		break;
 
@@ -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;
 
@@ -1591,12 +1590,12 @@ int _lttng_event_notifier_unregister(
 		break;
 
 	case LTTNG_KERNEL_ABI_KPROBE:
-		lttng_kprobes_unregister_event_notifier(event_notifier);
+		lttng_kprobes_unregister_event(&event_notifier->parent);
 		ret = 0;
 		break;
 
 	case LTTNG_KERNEL_ABI_UPROBE:
-		lttng_uprobes_unregister_event_notifier(event_notifier);
+		lttng_uprobes_unregister_event(&event_notifier->parent);
 		ret = 0;
 		break;
 
@@ -1646,7 +1645,7 @@ void _lttng_event_destroy(struct lttng_kernel_event_common *event)
 
 		case LTTNG_KERNEL_ABI_KPROBE:
 			module_put(event_priv->desc->owner);
-			lttng_kprobes_destroy_event_private(event_recorder);
+			lttng_kprobes_destroy_event_private(&event_recorder->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:
@@ -1686,7 +1685,7 @@ void _lttng_event_destroy(struct lttng_kernel_event_common *event)
 
 		case LTTNG_KERNEL_ABI_KPROBE:
 			module_put(event_notifier->priv->parent.desc->owner);
-			lttng_kprobes_destroy_event_notifier_private(event_notifier);
+			lttng_kprobes_destroy_event_private(&event_notifier->parent);
 			break;
 
 		case LTTNG_KERNEL_ABI_SYSCALL:
@@ -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: