The optionnal control modules are loaded and unloaded through modules
dependencies by modprobe or libkmod. Trying to load them manually leads
to spurious log messages and slows down the sessiond startup.
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
/* LTTng kernel tracer mandatory core modules list */
struct kern_modules_param kern_modules_control_core[] = {
/* LTTng kernel tracer mandatory core modules list */
struct kern_modules_param kern_modules_control_core[] = {
- { "lttng-tracer" }, /* MUST be loaded first so keep at top */
- { "lttng-lib-ring-buffer" },
{ "lttng-ring-buffer-client-discard" },
{ "lttng-ring-buffer-client-overwrite" },
{ "lttng-ring-buffer-metadata-client" },
{ "lttng-ring-buffer-client-discard" },
{ "lttng-ring-buffer-client-overwrite" },
{ "lttng-ring-buffer-metadata-client" },
{ "lttng-ring-buffer-metadata-mmap-client" },
};
{ "lttng-ring-buffer-metadata-mmap-client" },
};
-/* LTTng kernel tracer optional base modules list */
-struct kern_modules_param kern_modules_control_opt[] = {
- { "lttng-types" },
- { "lttng-ftrace" },
- { "lttng-kprobes" },
- { "lttng-kretprobes" },
-};
-
/* LTTng kernel tracer probe modules list */
struct kern_modules_param kern_modules_probes_default[] = {
{ "lttng-probe-asoc" },
/* LTTng kernel tracer probe modules list */
struct kern_modules_param kern_modules_probes_default[] = {
{ "lttng-probe-asoc" },
*/
void modprobe_remove_lttng_control(void)
{
*/
void modprobe_remove_lttng_control(void)
{
- modprobe_remove_lttng(kern_modules_control_opt,
- ARRAY_SIZE(kern_modules_control_opt),
- LTTNG_MOD_OPTIONAL);
modprobe_remove_lttng(kern_modules_control_core,
ARRAY_SIZE(kern_modules_control_core),
LTTNG_MOD_REQUIRED);
modprobe_remove_lttng(kern_modules_control_core,
ARRAY_SIZE(kern_modules_control_core),
LTTNG_MOD_REQUIRED);
ret = modprobe_lttng(kern_modules_control_core,
ARRAY_SIZE(kern_modules_control_core),
LTTNG_MOD_REQUIRED);
ret = modprobe_lttng(kern_modules_control_core,
ARRAY_SIZE(kern_modules_control_core),
LTTNG_MOD_REQUIRED);
- if (ret != 0)
- return ret;
- ret = modprobe_lttng(kern_modules_control_opt,
- ARRAY_SIZE(kern_modules_control_opt),
- LTTNG_MOD_OPTIONAL);