From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 2 Jul 2012 15:40:44 +0000 (-0400)
Subject: Revert "trace event: introduce TP_MODULE_NOAUTOLOAD and TP_MODULE_NOINIT"
X-Git-Tag: v2.0.5~4
X-Git-Url: http://git.liburcu.org/?a=commitdiff_plain;ds=sidebyside;h=d44a585f45b414de16c348b81ebdb98ded789831;p=lttng-modules.git

Revert "trace event: introduce TP_MODULE_NOAUTOLOAD and TP_MODULE_NOINIT"

This reverts commit e4bd62774b66eea5fd4221f2c006586e911a8de4.

This commit belongs to master, not stable-2.0.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/lttng-syscalls.c b/lttng-syscalls.c
index a1bc9d42..37feffbe 100644
--- a/lttng-syscalls.c
+++ b/lttng-syscalls.c
@@ -49,7 +49,7 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id);
  */
 #define LTTNG_PACKAGE_BUILD
 #define CREATE_TRACE_POINTS
-#define TP_MODULE_NOINIT
+#define TP_MODULE_OVERRIDE
 #define TRACE_INCLUDE_PATH ../instrumentation/syscalls/headers
 
 #define PARAMS(args...)	args
@@ -107,7 +107,7 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id);
 #undef SC_DEFINE_EVENT_NOARGS
 #undef TP_PROBE_CB
 
-#undef TP_MODULE_NOINIT
+#undef TP_MODULE_OVERRIDE
 #undef LTTNG_PACKAGE_BUILD
 #undef CREATE_TRACE_POINTS
 
diff --git a/probes/lttng-events.h b/probes/lttng-events.h
index aba48218..05e17b9b 100644
--- a/probes/lttng-events.h
+++ b/probes/lttng-events.h
@@ -705,25 +705,23 @@ static void __event_probe__##_name(void *__data)			      \
 #define module_exit_eval1(_token, _system)	module_exit(_token##_system)
 #define module_exit_eval(_token, _system)	module_exit_eval1(_token, _system)
 
-#ifndef TP_MODULE_NOINIT
+#ifndef TP_MODULE_OVERRIDE
 static int TP_ID(__lttng_events_init__, TRACE_SYSTEM)(void)
 {
 	wrapper_vmalloc_sync_all();
 	return lttng_probe_register(&TP_ID(__probe_desc___, TRACE_SYSTEM));
 }
 
+module_init_eval(__lttng_events_init__, TRACE_SYSTEM);
+
 static void TP_ID(__lttng_events_exit__, TRACE_SYSTEM)(void)
 {
 	lttng_probe_unregister(&TP_ID(__probe_desc___, TRACE_SYSTEM));
 }
 
-#ifndef TP_MODULE_NOAUTOLOAD
-module_init_eval(__lttng_events_init__, TRACE_SYSTEM);
 module_exit_eval(__lttng_events_exit__, TRACE_SYSTEM);
 #endif
 
-#endif
-
 #undef module_init_eval
 #undef module_exit_eval
 #undef TP_ID1