picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

journal-file: avoid joining offline thread

Browse source 
In journal_file_set_online() the offline thread doesn't need to be
joined if it's been canceled before actually reaching the phase of
writing the offline state.
This commit is contained in:
Vito Caputo 2018-05-28 15:09:55 -07:00 committed by Zbigniew Jędrzejewski-Szmek
parent 7ef7e15bd7
commit 83bf6b6741
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/journal/journal-file.c
View file

@ -262,7 +262,7 @@ int journal_file_set_offline(JournalFile *f, bool wait) {
}
static int journal_file_set_online(JournalFile *f) {
bool joined = false;
bool wait = true;
assert(f);
@ -272,23 +272,25 @@ static int journal_file_set_online(JournalFile *f) {
if (!(f->fd >= 0 && f->header))
return -EINVAL;
while (!joined) {
while (wait) {
switch (f->offline_state) {
case OFFLINE_JOINED:
/* No offline thread, no need to wait. */
joined = true;
wait = false;
break;
case OFFLINE_SYNCING:
if (!__sync_bool_compare_and_swap(&f->offline_state, OFFLINE_SYNCING, OFFLINE_CANCEL))
continue;
/* Canceled syncing prior to offlining, no need to wait. */
wait = false;
break;
case OFFLINE_AGAIN_FROM_SYNCING:
if (!__sync_bool_compare_and_swap(&f->offline_state, OFFLINE_AGAIN_FROM_SYNCING, OFFLINE_CANCEL))
continue;
/* Canceled restart from syncing, no need to wait. */
wait = false;
break;
case OFFLINE_AGAIN_FROM_OFFLINING:
@ -303,7 +305,7 @@ static int journal_file_set_online(JournalFile *f) {
if (r < 0)
return r;
joined = true;
wait = false;
break;
}
}