Seperate probe modules from control modules

Move all control modules to the control list and make a seperate
probes list.

Signed-off-by: Jan Glauber <jan.glauber@gmail.com>
Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/src/bin/lttng-sessiond/modprobe.c b/src/bin/lttng-sessiond/modprobe.c
index c3629548cd7ba0ffa4c433c870c1457db2641cb3..d6efea8efbffa497f30241f274e3180a62919df7 100644 (file)
--- a/src/bin/lttng-sessiond/modprobe.c
+++ b/src/bin/lttng-sessiond/modprobe.c
@@ -25,16 +25,9 @@
 #include "modprobe.h"
 #include "kern-modules.h"
 
-/* MUST be loaded first */
+/* LTTng kernel tracer base modules list */
 const struct kern_modules_param kern_modules_control[] = {
-       { "lttng-tracer", 1 },
-};
-
-/* LTTng kernel tracer modules list */
-const struct kern_modules_param kern_modules_list[] = {
-       { "lttng-ftrace", 0 },
-       { "lttng-kprobes", 0 },
-       { "lttng-kretprobes", 0 },
+       { "lttng-tracer", 1 },  /* MUST be loaded first so keep at top */
        { "lttng-lib-ring-buffer", 1 },
        { "lttng-ring-buffer-client-discard", 1 },
        { "lttng-ring-buffer-client-overwrite", 1 },
@@ -43,6 +36,13 @@ const struct kern_modules_param kern_modules_list[] = {
        { "lttng-ring-buffer-client-mmap-overwrite", 1 },
        { "lttng-ring-buffer-metadata-mmap-client", 1 },
        { "lttng-types", 0 },
+       { "lttng-ftrace", 0 },
+       { "lttng-kprobes", 0 },
+       { "lttng-kretprobes", 0 },
+};
+
+/* LTTng kernel tracer probe modules list */
+const struct kern_modules_param kern_modules_probes[] = {
        { "lttng-probe-asoc", 0 },
        { "lttng-probe-block", 0 },
        { "lttng-probe-btrfs", 0 },
@@ -131,7 +131,7 @@ void modprobe_remove_lttng_control(void)
  */
 void modprobe_remove_lttng_data(void)
 {
-       return modprobe_remove_lttng(kern_modules_list,
+       return modprobe_remove_lttng(kern_modules_probes,
                                     ARRAY_SIZE(kern_modules_list));
 }
 
@@ -189,6 +189,6 @@ int modprobe_lttng_control(void)
  */
 int modprobe_lttng_data(void)
 {
-       return modprobe_lttng(kern_modules_list,
-                             ARRAY_SIZE(kern_modules_list));
+       return modprobe_lttng(kern_modules_probes,
+                             ARRAY_SIZE(kern_modules_probes));
 }