summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
b903e1f)
- fix event list bug due to loglevel error,
- enforce "-1" loglevel value in the sessiond when ALL loglevels are
selected.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
tmp[i].loglevel = uevent->attr.loglevel;
switch (uevent->attr.loglevel_type) {
case LTTNG_UST_LOGLEVEL_ALL:
tmp[i].loglevel = uevent->attr.loglevel;
switch (uevent->attr.loglevel_type) {
case LTTNG_UST_LOGLEVEL_ALL:
- tmp[i].type = LTTNG_EVENT_LOGLEVEL_ALL;
+ tmp[i].loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
break;
case LTTNG_UST_LOGLEVEL_RANGE:
break;
case LTTNG_UST_LOGLEVEL_RANGE:
- tmp[i].type = LTTNG_EVENT_LOGLEVEL_RANGE;
+ tmp[i].loglevel_type = LTTNG_EVENT_LOGLEVEL_RANGE;
break;
case LTTNG_UST_LOGLEVEL_SINGLE:
break;
case LTTNG_UST_LOGLEVEL_SINGLE:
- tmp[i].type = LTTNG_EVENT_LOGLEVEL_SINGLE;
+ tmp[i].loglevel_type = LTTNG_EVENT_LOGLEVEL_SINGLE;
switch (ev->loglevel_type) {
case LTTNG_EVENT_LOGLEVEL_ALL:
lue->attr.loglevel_type = LTTNG_UST_LOGLEVEL_ALL;
switch (ev->loglevel_type) {
case LTTNG_EVENT_LOGLEVEL_ALL:
lue->attr.loglevel_type = LTTNG_UST_LOGLEVEL_ALL;
+ lue->attr.loglevel = -1; /* Force to -1 */
break;
case LTTNG_EVENT_LOGLEVEL_RANGE:
lue->attr.loglevel_type = LTTNG_UST_LOGLEVEL_RANGE;
break;
case LTTNG_EVENT_LOGLEVEL_RANGE:
lue->attr.loglevel_type = LTTNG_UST_LOGLEVEL_RANGE;
+ lue->attr.loglevel = ev->loglevel;
break;
case LTTNG_EVENT_LOGLEVEL_SINGLE:
lue->attr.loglevel_type = LTTNG_UST_LOGLEVEL_SINGLE;
break;
case LTTNG_EVENT_LOGLEVEL_SINGLE:
lue->attr.loglevel_type = LTTNG_UST_LOGLEVEL_SINGLE;
+ lue->attr.loglevel = ev->loglevel;
break;
default:
ERR("Unknown ust loglevel type (%d)", ev->type);
goto error_free_event;
}
break;
default:
ERR("Unknown ust loglevel type (%d)", ev->type);
goto error_free_event;
}
- /* Copy loglevel */
- lue->attr.loglevel = ev->loglevel;
/* Init node */
lttng_ht_node_init_str(&lue->node, lue->attr.name);
/* Init node */
lttng_ht_node_init_str(&lue->node, lue->attr.name);
+ } else {
+ ev.loglevel = -1;
+ } else {
+ ev.loglevel = -1;
}
} else {
ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
}
} else {
ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");