projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: sessiond: cmd_enable_channel: negative error code used
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
cmd.c
diff --git
a/src/bin/lttng-sessiond/cmd.c
b/src/bin/lttng-sessiond/cmd.c
index 51b73bc4e6d02f22d60163b430f9a16f20fea8fa..829e59dd4b67aad2e9003e3b33a16310a09c6645 100644
(file)
--- a/
src/bin/lttng-sessiond/cmd.c
+++ b/
src/bin/lttng-sessiond/cmd.c
@@
-1305,7
+1305,7
@@
static int cmd_enable_channel_internal(struct ltt_session *session,
attr = lttng_channel_copy(_attr);
if (!attr) {
attr = lttng_channel_copy(_attr);
if (!attr) {
- ret =
-
LTTNG_ERR_NOMEM;
+ ret = LTTNG_ERR_NOMEM;
goto end;
}
goto end;
}
@@
-2866,7
+2866,7
@@
int cmd_start_trace(struct ltt_session *session)
*/
session->rotated_after_last_stop = false;
*/
session->rotated_after_last_stop = false;
- if (session->rotate_timer_period) {
+ if (session->rotate_timer_period
&& !session->rotation_schedule_timer_enabled
) {
int int_ret = timer_session_rotation_schedule_timer_start(
session, session->rotate_timer_period);
int int_ret = timer_session_rotation_schedule_timer_start(
session, session->rotate_timer_period);
@@
-3805,6
+3805,7
@@
enum lttng_error_code cmd_list_channels(enum lttng_domain_type domain,
extended->lost_packets = lost_packets;
ret = lttng_channel_serialize(channel, buffer);
extended->lost_packets = lost_packets;
ret = lttng_channel_serialize(channel, buffer);
+ lttng_channel_destroy(channel);
if (ret) {
ret = -1;
break;
if (ret) {
ret = -1;
break;
This page took
0.025351 seconds
and
4
git commands to generate.