projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
centralize sessiond config option handling
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
modprobe.c
diff --git
a/src/bin/lttng-sessiond/modprobe.c
b/src/bin/lttng-sessiond/modprobe.c
index 05027404e42587cc9abbe34c57c4f8722a68a127..75d6387c6fbe6b6c887d2117ee8c62ac6a242199 100644
(file)
--- a/
src/bin/lttng-sessiond/modprobe.c
+++ b/
src/bin/lttng-sessiond/modprobe.c
@@
-34,6
+34,7
@@
#include "modprobe.h"
#include "kern-modules.h"
#include "modprobe.h"
#include "kern-modules.h"
+#include "lttng-sessiond.h"
#define LTTNG_MOD_REQUIRED 1
#define LTTNG_MOD_OPTIONAL 0
#define LTTNG_MOD_REQUIRED 1
#define LTTNG_MOD_OPTIONAL 0
@@
-343,7
+344,7
@@
static int modprobe_lttng(struct kern_modules_param *modules,
}
} else {
DBG("Modprobe successfully %s", modules[i].name);
}
} else {
DBG("Modprobe successfully %s", modules[i].name);
- modules[i].loaded;
+ modules[i].loaded
= true
;
}
}
}
}
@@
-568,12
+569,7
@@
int modprobe_lttng_data(void)
* Base probes: either from command line option, environment
* variable or default list.
*/
* Base probes: either from command line option, environment
* variable or default list.
*/
- if (kmod_probes_list) {
- list = kmod_probes_list;
- } else {
- list = utils_get_kmod_probes_list();
- }
-
+ list = config.kmod_probes_list.value;
if (list) {
/* User-specified probes. */
ret = append_list_to_probes(list);
if (list) {
/* User-specified probes. */
ret = append_list_to_probes(list);
@@
-608,12
+604,7
@@
int modprobe_lttng_data(void)
/*
* Extra modules? Append them to current probes list.
*/
/*
* Extra modules? Append them to current probes list.
*/
- if (kmod_extra_probes_list) {
- list = kmod_extra_probes_list;
- } else {
- list = utils_get_extra_kmod_probes_list();
- }
-
+ list = config.kmod_extra_probes_list.value;
if (list) {
ret = append_list_to_probes(list);
if (ret) {
if (list) {
ret = append_list_to_probes(list);
if (ret) {
This page took
0.025014 seconds
and
4
git commands to generate.