Fix: unload all kernel modules on sessiond exit

Stopping a root lttng-sessiond that has loaded kernel modules currently
leaves some modules loaded, add them in the correct order to allow
unloading them all.

Change-Id: I71f25c798f8c42737d295f32a5e3708287168bc6
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/bin/lttng-sessiond/modprobe.cpp b/src/bin/lttng-sessiond/modprobe.cpp
index e2050e7febefa809227f38c1b48c3d0a9b252603..d14dd7dfc754f64eb1e9bfbdcab1b666c69981b1 100644 (file)
--- a/src/bin/lttng-sessiond/modprobe.cpp
+++ b/src/bin/lttng-sessiond/modprobe.cpp
@@ -27,6 +27,26 @@
 
 /* LTTng kernel tracer mandatory core modules list */
 struct kern_modules_param kern_modules_control_core[] = {
+       {
+               .name = (char *) "lttng-wrapper",
+               .load_policy = KERNEL_MODULE_PROPERTY_LOAD_POLICY_REQUIRED,
+               .loaded = false,
+       },
+       {
+               .name = (char *) "lttng-statedump",
+               .load_policy = KERNEL_MODULE_PROPERTY_LOAD_POLICY_REQUIRED,
+               .loaded = false,
+       },
+       {
+               .name = (char *) "lttng-clock",
+               .load_policy = KERNEL_MODULE_PROPERTY_LOAD_POLICY_REQUIRED,
+               .loaded = false,
+       },
+       {
+               .name = (char *) "lttng-lib-ring-buffer",
+               .load_policy = KERNEL_MODULE_PROPERTY_LOAD_POLICY_REQUIRED,
+               .loaded = false,
+       },
        {
                .name = (char *) "lttng-ring-buffer-client-discard",
                .load_policy = KERNEL_MODULE_PROPERTY_LOAD_POLICY_REQUIRED,