X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-events.c;h=701cff8ca8ff8663f82c0148bfb4ac15448bf81c;hb=453b249526809a70e95057a9f594c4d2be19b97f;hp=f47e9dcfcebbf9f62c488eac3b339e0d497c1499;hpb=a26a7e4f2376619bb63519d089caeaf59af4a6b2;p=lttng-modules.git

diff --git a/lttng-events.c b/lttng-events.c
index f47e9dcf..701cff8c 100644
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -400,7 +400,7 @@ struct lttng_event *lttng_event_create(struct lttng_channel *chan,
 			ret = -ENOENT;
 			goto register_error;
 		}
-		ret = kabi_2635_tracepoint_probe_register(event->desc->kname,
+		ret = lttng_wrapper_tracepoint_probe_register(event->desc->kname,
 				event->desc->probe_callback,
 				event);
 		if (ret) {
@@ -519,7 +519,7 @@ int _lttng_event_unregister(struct lttng_event *event)
 
 	switch (event->instrumentation) {
 	case LTTNG_KERNEL_TRACEPOINT:
-		ret = kabi_2635_tracepoint_probe_unregister(event->desc->name,
+		ret = lttng_wrapper_tracepoint_probe_unregister(event->desc->kname,
 						  event->desc->probe_callback,
 						  event);
 		if (ret)
@@ -1255,15 +1255,32 @@ static int __init lttng_events_init(void)
 {
 	int ret;
 
+	ret = wrapper_lttng_fixup_sig(THIS_MODULE);
+	if (ret)
+		return ret;
+
+	ret = lttng_tracepoint_init();
+	if (ret)
+		return ret;
 	event_cache = KMEM_CACHE(lttng_event, 0);
-	if (!event_cache)
-		return -ENOMEM;
+	if (!event_cache) {
+		ret = -ENOMEM;
+		goto error_kmem;
+	}
 	ret = lttng_abi_init();
 	if (ret)
 		goto error_abi;
+	ret = lttng_logger_init();
+	if (ret)
+		goto error_logger;
 	return 0;
+
+error_logger:
+	lttng_abi_exit();
 error_abi:
 	kmem_cache_destroy(event_cache);
+error_kmem:
+	lttng_tracepoint_exit();
 	return ret;
 }
 
@@ -1273,10 +1290,12 @@ static void __exit lttng_events_exit(void)
 {
 	struct lttng_session *session, *tmpsession;
 
+	lttng_logger_exit();
 	lttng_abi_exit();
 	list_for_each_entry_safe(session, tmpsession, &sessions, list)
 		lttng_session_destroy(session);
 	kmem_cache_destroy(event_cache);
+	lttng_tracepoint_exit();
 }
 
 module_exit(lttng_events_exit);
@@ -1286,4 +1305,5 @@ MODULE_AUTHOR("Mathieu Desnoyers <mathieu.desnoyers@efficios.com>");
 MODULE_DESCRIPTION("LTTng Events");
 MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
 	__stringify(LTTNG_MODULES_MINOR_VERSION) "."
-	__stringify(LTTNG_MODULES_PATCHLEVEL_VERSION));
+	__stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
+	LTTNG_MODULES_EXTRAVERSION);