#include "modprobe.h"
#include "kern-modules.h"
+#include "lttng-sessiond.h"
#define LTTNG_MOD_REQUIRED 1
#define LTTNG_MOD_OPTIONAL 0
{ "lttng-probe-napi" },
{ "lttng-probe-net" },
{ "lttng-probe-power" },
+ { "lttng-probe-preemptirq" },
{ "lttng-probe-printk" },
{ "lttng-probe-random" },
{ "lttng-probe-rcu" },
{
char *next;
int ret;
- char *tmp_list, *cur_list;
+ char *tmp_list, *cur_list, *saveptr;
assert(list);
size_t name_len;
struct kern_modules_param *cur_mod;
- next = strtok(cur_list, ",");
+ next = strtok_r(cur_list, ",", &saveptr);
if (!next) {
break;
}
* 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);
/*
* 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) {