projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
port: run namespace tests only on Linux
[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 f07672c220158d285325db3c57207edfed525f08..5fc02969383c3820e239600a1966da92ba80fcd0 100644
(file)
--- a/
src/bin/lttng-sessiond/rotation-thread.c
+++ b/
src/bin/lttng-sessiond/rotation-thread.c
@@
-16,7
+16,6
@@
#include <common/align.h>
#include <common/time.h>
#include <common/hashtable/utils.h>
#include <common/align.h>
#include <common/time.h>
#include <common/hashtable/utils.h>
-#include <sys/eventfd.h>
#include <sys/stat.h>
#include <time.h>
#include <signal.h>
#include <sys/stat.h>
#include <time.h>
#include <signal.h>
@@
-352,13
+351,13
@@
void check_session_rotation_pending_on_consumers(struct ltt_session *session,
goto end;
}
goto end;
}
-
if (exists_status != CONSUMER_TRACE_CHUNK_EXISTS_STATUS_UNKNOWN_CHUNK) {
+ if (exists_status != CONSUMER_TRACE_CHUNK_EXISTS_STATUS_UNKNOWN_CHUNK) {
pthread_mutex_unlock(socket->lock);
chunk_exists_on_peer = true;
goto end;
pthread_mutex_unlock(socket->lock);
chunk_exists_on_peer = true;
goto end;
-
}
+ }
pthread_mutex_unlock(socket->lock);
pthread_mutex_unlock(socket->lock);
-
}
+ }
skip_ust:
if (!session->kernel_session) {
skip_ust:
if (!session->kernel_session) {
@@
-381,11
+380,11
@@
skip_ust:
goto end;
}
goto end;
}
-
if (exists_status != CONSUMER_TRACE_CHUNK_EXISTS_STATUS_UNKNOWN_CHUNK) {
+ if (exists_status != CONSUMER_TRACE_CHUNK_EXISTS_STATUS_UNKNOWN_CHUNK) {
pthread_mutex_unlock(socket->lock);
chunk_exists_on_peer = true;
goto end;
pthread_mutex_unlock(socket->lock);
chunk_exists_on_peer = true;
goto end;
-
}
+ }
pthread_mutex_unlock(socket->lock);
}
skip_kernel:
pthread_mutex_unlock(socket->lock);
}
skip_kernel:
@@
-548,7
+547,7
@@
int run_job(struct rotation_thread_job *job, struct ltt_session *session,
switch (job->type) {
case ROTATION_THREAD_JOB_TYPE_SCHEDULED_ROTATION:
switch (job->type) {
case ROTATION_THREAD_JOB_TYPE_SCHEDULED_ROTATION:
- ret = launch_session_rotation(session);
+ ret = launch_session_rotation(session);
break;
case ROTATION_THREAD_JOB_TYPE_CHECK_PENDING_ROTATION:
ret = check_session_rotation_pending(session,
break;
case ROTATION_THREAD_JOB_TYPE_CHECK_PENDING_ROTATION:
ret = check_session_rotation_pending(session,
@@
-604,7
+603,7
@@
int handle_job_queue(struct rotation_thread_handle *handle,
}
session_lock(session);
}
session_lock(session);
- ret = run_job(job, session, handle->notification_thread_handle);
+ ret = run_job(job, session, handle->notification_thread_handle);
session_unlock(session);
/* Release reference held by the job. */
session_put(session);
session_unlock(session);
/* Release reference held by the job. */
session_put(session);
This page took
0.024637 seconds
and
4
git commands to generate.