X-Git-Url: http://git.liburcu.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Frotation-thread.c;h=659d8431dd39aec39dbcd7cba7eac3d4927b1ace;hp=fcbd83fb37b53e60c0bfe7fa47133b09b4f70d48;hb=2c0c9bbc39323735300b285d2c8a596eeaeb5c15;hpb=8c9211169fda5c183b0cf1f94c01721fdb5ccba5 diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c index fcbd83fb3..659d8431d 100644 --- a/src/bin/lttng-sessiond/rotation-thread.c +++ b/src/bin/lttng-sessiond/rotation-thread.c @@ -111,33 +111,6 @@ end: return queue; } -void log_job_destruction(const struct rotation_thread_job *job) -{ - enum lttng_error_level log_level; - const char *job_type_str = get_job_type_str(job->type); - - switch (job->type) { - case ROTATION_THREAD_JOB_TYPE_SCHEDULED_ROTATION: - /* - * Not a problem, the scheduled rotation is racing with the teardown - * of the daemon. In this case, the rotation will not happen, which - * is not a problem (or at least, not important enough to delay - * the shutdown of the session daemon). - */ - log_level = PRINT_DBG; - break; - case ROTATION_THREAD_JOB_TYPE_CHECK_PENDING_ROTATION: - /* This is not expected to happen; warn the user. */ - log_level = PRINT_WARN; - break; - default: - abort(); - } - - LOG(log_level, "Rotation thread timer queue still contains job of type %s targeting session \"%s\" on destruction", - job_type_str, job->session->name); -} - void rotation_thread_timer_queue_destroy( struct rotation_thread_timer_queue *queue) { @@ -796,6 +769,7 @@ end: return ret; } +static void *thread_rotation(void *data) { int ret;