X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmodprobe.c;h=2c527dced1eac9c66c52cf436294c6fa20d91573;hp=d730a1dae972fb6f76a3907c8e1ad95ed2be61e1;hb=0c82ac624169ec9ec062f395e55abfe992d0fd91;hpb=9ae17e21d5de3a709182f11eaba3ba175ee0c432 diff --git a/src/bin/lttng-sessiond/modprobe.c b/src/bin/lttng-sessiond/modprobe.c index d730a1dae..2c527dced 100644 --- a/src/bin/lttng-sessiond/modprobe.c +++ b/src/bin/lttng-sessiond/modprobe.c @@ -16,7 +16,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _GNU_SOURCE #define _LGPL_SOURCE #include #include @@ -92,6 +91,8 @@ struct kern_modules_param kern_modules_probes_default[] = { { "lttng-probe-v4l2" }, { "lttng-probe-workqueue" }, { "lttng-probe-writeback" }, + { "lttng-probe-x86-irq-vectors" }, + { "lttng-probe-x86-exceptions" }, }; /* dynamic probe modules list */ @@ -359,12 +360,12 @@ static int grow_probes(void) static int append_list_to_probes(const char *list) { char *next; - int index = nr_probes, ret; - char *tmp_list; + int ret; + char *tmp_list, *cur_list; assert(list); - tmp_list = strdup(list); + cur_list = tmp_list = strdup(list); if (!tmp_list) { PERROR("strdup temp list"); return -ENOMEM; @@ -374,11 +375,11 @@ static int append_list_to_probes(const char *list) size_t name_len; struct kern_modules_param *cur_mod; - next = strtok(tmp_list, ","); + next = strtok(cur_list, ","); if (!next) { break; } - tmp_list = NULL; + cur_list = NULL; /* filter leading spaces */ while (*next == ' ') { @@ -395,7 +396,7 @@ static int append_list_to_probes(const char *list) /* Length 13 is "lttng-probe-" + \0 */ name_len = strlen(next) + 13; - cur_mod = &probes[index++]; + cur_mod = &probes[nr_probes]; cur_mod->name = zmalloc(name_len); if (!cur_mod->name) { PERROR("malloc probe list"); @@ -410,7 +411,6 @@ static int append_list_to_probes(const char *list) goto error; } - cur_mod++; nr_probes++; }