projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: kernel session closes fd 0 after create
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
trace-ust.c
diff --git
a/src/bin/lttng-sessiond/trace-ust.c
b/src/bin/lttng-sessiond/trace-ust.c
index 7f422a99e2e24658f1ea1c1d9a27c1e26463723e..9c7cfb690221f11778196bb83fa98209162c4091 100644
(file)
--- a/
src/bin/lttng-sessiond/trace-ust.c
+++ b/
src/bin/lttng-sessiond/trace-ust.c
@@
-139,7
+139,7
@@
struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan,
luc = zmalloc(sizeof(struct ltt_ust_channel));
if (luc == NULL) {
luc = zmalloc(sizeof(struct ltt_ust_channel));
if (luc == NULL) {
-
perror
("ltt_ust_channel zmalloc");
+
PERROR
("ltt_ust_channel zmalloc");
goto error;
}
goto error;
}
@@
-171,7
+171,7
@@
struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan,
/* Set trace output path */
ret = snprintf(luc->pathname, PATH_MAX, "%s", path);
if (ret < 0) {
/* Set trace output path */
ret = snprintf(luc->pathname, PATH_MAX, "%s", path);
if (ret < 0) {
-
perror
("asprintf ust create channel");
+
PERROR
("asprintf ust create channel");
goto error_free_channel;
}
goto error_free_channel;
}
@@
-225,27
+225,30
@@
struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
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:
break;
default:
- ERR("Unknown ust loglevel type (%d)", ev->type);
+ ERR("Unknown ust loglevel type (%d)", ev->
loglevel_
type);
goto error_free_event;
}
goto error_free_event;
}
- /* Copy loglevel */
- lue->attr.loglevel = ev->loglevel;
/* Init node */
lttng_ht_node_init_str(&lue->node, lue->attr.name);
/* Alloc context hash tables */
lue->ctx = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
/* Init node */
lttng_ht_node_init_str(&lue->node, lue->attr.name);
/* Alloc context hash tables */
lue->ctx = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
- DBG2("Trace UST event %s created", lue->attr.name);
+ DBG2("Trace UST event %s, loglevel (%d,%d) created",
+ lue->attr.name, lue->attr.loglevel_type,
+ lue->attr.loglevel);
return lue;
return lue;
@@
-267,7
+270,7
@@
struct ltt_ust_metadata *trace_ust_create_metadata(char *path)
lum = zmalloc(sizeof(struct ltt_ust_metadata));
if (lum == NULL) {
lum = zmalloc(sizeof(struct ltt_ust_metadata));
if (lum == NULL) {
-
perror
("ust metadata zmalloc");
+
PERROR
("ust metadata zmalloc");
goto error;
}
goto error;
}
@@
-283,7
+286,7
@@
struct ltt_ust_metadata *trace_ust_create_metadata(char *path)
/* Set metadata trace path */
ret = snprintf(lum->pathname, PATH_MAX, "%s/metadata", path);
if (ret < 0) {
/* Set metadata trace path */
ret = snprintf(lum->pathname, PATH_MAX, "%s/metadata", path);
if (ret < 0) {
-
perror
("asprintf ust metadata");
+
PERROR
("asprintf ust metadata");
goto error_free_metadata;
}
goto error_free_metadata;
}
This page took
0.026898 seconds
and
4
git commands to generate.