projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bind newly registered triggers to session or channel objects
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
rotation-thread.c
diff --git
a/src/bin/lttng-sessiond/rotation-thread.c
b/src/bin/lttng-sessiond/rotation-thread.c
index d39aad80b413e888a9d6859a5be17473e7b11e0f..24ab0c8033fd715c829f036c67a2c3e891923c5d 100644
(file)
--- a/
src/bin/lttng-sessiond/rotation-thread.c
+++ b/
src/bin/lttng-sessiond/rotation-thread.c
@@
-261,8
+261,11
@@
error:
static
void fini_thread_state(struct rotation_thread_state *state)
{
static
void fini_thread_state(struct rotation_thread_state *state)
{
+ int ret;
+
lttng_poll_clean(&state->events);
lttng_poll_clean(&state->events);
- cds_lfht_destroy(channel_pending_rotate_ht, NULL);
+ ret = cds_lfht_destroy(channel_pending_rotate_ht, NULL);
+ assert(!ret);
if (rotate_notification_channel) {
lttng_notification_channel_destroy(rotate_notification_channel);
}
if (rotate_notification_channel) {
lttng_notification_channel_destroy(rotate_notification_channel);
}
@@
-433,7
+436,7
@@
int rotate_pending_relay_timer(struct ltt_session *session)
DBG("[rotation-thread] Check rotate pending on session %" PRIu64,
session->id);
DBG("[rotation-thread] Check rotate pending on session %" PRIu64,
session->id);
- ret = relay_rotate_pending(session, session->
rotate_count
- 1);
+ ret = relay_rotate_pending(session, session->
current_archive_id
- 1);
if (ret < 0) {
ERR("[rotation-thread] Check relay rotate pending");
goto end;
if (ret < 0) {
ERR("[rotation-thread] Check relay rotate pending");
goto end;
This page took
0.026505 seconds
and
4
git commands to generate.