projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: create_channel_per_pid: remove channel on error
[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 df70f8fd57e49a19c382b21c69eaf56c1f68047c..3e06e93110801116d2441b59a0b1ddc13b3650ae 100644
(file)
--- a/
src/bin/lttng-sessiond/rotation-thread.c
+++ b/
src/bin/lttng-sessiond/rotation-thread.c
@@
-72,7
+72,6
@@
struct rotation_thread_timer_queue {
};
struct rotation_thread_handle {
};
struct rotation_thread_handle {
- int quit_pipe;
struct rotation_thread_timer_queue *rotation_timer_queue;
/* Access to the notification thread cmd_queue */
struct notification_thread_handle *notification_thread_handle;
struct rotation_thread_timer_queue *rotation_timer_queue;
/* Access to the notification thread cmd_queue */
struct notification_thread_handle *notification_thread_handle;
@@
-169,7
+168,6
@@
void rotation_thread_handle_destroy(
}
struct rotation_thread_handle *rotation_thread_handle_create(
}
struct rotation_thread_handle *rotation_thread_handle_create(
- int quit_pipe,
struct rotation_thread_timer_queue *rotation_timer_queue,
struct notification_thread_handle *notification_thread_handle,
sem_t *notification_thread_ready)
struct rotation_thread_timer_queue *rotation_timer_queue,
struct notification_thread_handle *notification_thread_handle,
sem_t *notification_thread_ready)
@@
-181,7
+179,6
@@
struct rotation_thread_handle *rotation_thread_handle_create(
goto end;
}
goto end;
}
- handle->quit_pipe = quit_pipe;
handle->rotation_timer_queue = rotation_timer_queue;
handle->notification_thread_handle = notification_thread_handle;
handle->notification_thread_ready = notification_thread_ready;
handle->rotation_timer_queue = rotation_timer_queue;
handle->notification_thread_handle = notification_thread_handle;
handle->notification_thread_ready = notification_thread_ready;
@@
-276,15
+273,8
@@
int init_poll_set(struct lttng_poll_event *poll_set,
* - quit pipe,
* - rotation thread timer queue pipe,
*/
* - quit pipe,
* - rotation thread timer queue pipe,
*/
- ret = lttng_poll_create(poll_set, 2, LTTNG_CLOEXEC);
- if (ret < 0) {
- goto end;
- }
-
- ret = lttng_poll_add(poll_set, handle->quit_pipe,
- LPOLLIN | LPOLLERR);
- if (ret < 0) {
- ERR("[rotation-thread] Failed to add quit_pipe fd to pollset");
+ ret = sessiond_set_thread_pollset(poll_set, 2);
+ if (ret) {
goto error;
}
ret = lttng_poll_add(poll_set,
goto error;
}
ret = lttng_poll_add(poll_set,
@@
-295,7
+285,6
@@
int init_poll_set(struct lttng_poll_event *poll_set,
goto error;
}
goto error;
}
-end:
return ret;
error:
lttng_poll_clean(poll_set);
return ret;
error:
lttng_poll_clean(poll_set);
@@
-442,7
+431,12
@@
end:
session->rotation_pending_local = false;
}
if (ret) {
session->rotation_pending_local = false;
}
if (ret) {
- session->rotation_state = LTTNG_ROTATION_STATE_ERROR;
+ ret = session_reset_rotation_state(session,
+ LTTNG_ROTATION_STATE_ERROR);
+ if (ret) {
+ ERR("Failed to reset rotation state of session \"%s\"",
+ session->name);
+ }
}
return 0;
}
}
return 0;
}
@@
-502,14
+496,19
@@
int check_session_rotation_pending_relay(struct ltt_session *session)
ERR("[rotation-thread] Encountered an error when checking if rotation of trace archive %" PRIu64 " of session \"%s\" is pending on the relay",
session->current_archive_id - 1,
session->name);
ERR("[rotation-thread] Encountered an error when checking if rotation of trace archive %" PRIu64 " of session \"%s\" is pending on the relay",
session->current_archive_id - 1,
session->name);
- session->rotation_state = LTTNG_ROTATION_STATE_ERROR;
+ ret = session_reset_rotation_state(session,
+ LTTNG_ROTATION_STATE_ERROR);
+ if (ret) {
+ ERR("Failed to reset rotation state of session \"%s\"",
+ session->name);
+ }
rotation_completed = false;
}
rcu_read_unlock();
if (rotation_completed) {
rotation_completed = false;
}
rcu_read_unlock();
if (rotation_completed) {
- DBG("[rotation-thread]
T
otation of trace archive %" PRIu64 " of session \"%s\" is complete on the relay",
+ DBG("[rotation-thread]
R
otation of trace archive %" PRIu64 " of session \"%s\" is complete on the relay",
session->current_archive_id - 1,
session->name);
session->rotation_pending_relay = false;
session->current_archive_id - 1,
session->name);
session->rotation_pending_relay = false;
@@
-566,7
+565,12
@@
int check_session_rotation_pending(struct ltt_session *session,
/* Rename the completed trace archive's location. */
now = time(NULL);
if (now == (time_t) -1) {
/* Rename the completed trace archive's location. */
now = time(NULL);
if (now == (time_t) -1) {
- session->rotation_state = LTTNG_ROTATION_STATE_ERROR;
+ ret = session_reset_rotation_state(session,
+ LTTNG_ROTATION_STATE_ERROR);
+ if (ret) {
+ ERR("Failed to reset rotation state of session \"%s\"",
+ session->name);
+ }
ret = LTTNG_ERR_UNK;
goto end;
}
ret = LTTNG_ERR_UNK;
goto end;
}
@@
-653,7
+657,7
@@
end:
return ret;
}
return ret;
}
-/* Call with the session
lock
held. */
+/* Call with the session
and session_list locks
held. */
static
int launch_session_rotation(struct ltt_session *session)
{
static
int launch_session_rotation(struct ltt_session *session)
{
@@
-747,10
+751,9
@@
int handle_job_queue(struct rotation_thread_handle *handle,
}
session_lock(session);
}
session_lock(session);
- session_unlock_list();
-
ret = run_job(job, session, handle->notification_thread_handle);
session_unlock(session);
ret = run_job(job, session, handle->notification_thread_handle);
session_unlock(session);
+ session_unlock_list();
free(job);
if (ret) {
goto end;
free(job);
if (ret) {
goto end;
@@
-960,7
+963,7
@@
void *thread_rotation(void *data)
goto error;
}
goto error;
}
- if (
fd == handle->quit_pipe
) {
+ if (
sessiond_check_thread_quit_pipe(fd, revents)
) {
DBG("[rotation-thread] Quit pipe activity");
/* TODO flush the queue. */
goto exit;
DBG("[rotation-thread] Quit pipe activity");
/* TODO flush the queue. */
goto exit;
This page took
0.035954 seconds
and
5
git commands to generate.