marcel/gamemode
1
0
Fork 0
mirror of https://github.com/FeralInteractive/gamemode.git synced 2025-06-06 23:57:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Extend the context rwlock around where we apply optimisations

Browse Source 
This prevents a potential race condition for when the reaper thread reloads the config
This commit is contained in:
Marc Di Luzio 2019-05-24 08:45:14 +01:00
parent 89904602e9
commit a9e3f866a0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
daemon/gamemode.c
View File

@ -431,7 +431,6 @@ int game_mode_context_register(GameModeContext *self, pid_t client, pid_t reques
/* Update the list */ /* Update the list */
cl->next = self->client; cl->next = self->client;
self->client = cl; self->client = cl;
pthread_rwlock_unlock(&self->rwlock);
/* First add, init */ /* First add, init */
if (atomic_fetch_add_explicit(&self->refcount, 1, memory_order_seq_cst) == 0) { if (atomic_fetch_add_explicit(&self->refcount, 1, memory_order_seq_cst) == 0) {
@ -439,6 +438,7 @@ int game_mode_context_register(GameModeContext *self, pid_t client, pid_t reques
} }
game_mode_apply_client_optimisations(self, client); game_mode_apply_client_optimisations(self, client);
pthread_rwlock_unlock(&self->rwlock);
game_mode_client_count_changed(); game_mode_client_count_changed();
@ -517,7 +517,6 @@ int game_mode_context_unregister(GameModeContext *self, pid_t client, pid_t requ
} }
/* Unlock here, potentially yielding */ /* Unlock here, potentially yielding */
pthread_rwlock_unlock(&self->rwlock);
if (!found) { if (!found) {
LOG_HINTED( LOG_HINTED(
@ -528,6 +527,7 @@ int game_mode_context_unregister(GameModeContext *self, pid_t client, pid_t requ
" -- with a nearby 'Removing expired game' which means we cleaned up properly\n" " -- with a nearby 'Removing expired game' which means we cleaned up properly\n"
" -- (we will log this event). This hint will be displayed only once.\n", " -- (we will log this event). This hint will be displayed only once.\n",
client); client);
pthread_rwlock_unlock(&self->rwlock);
return -1; return -1;
} }
@ -536,10 +536,12 @@ int game_mode_context_unregister(GameModeContext *self, pid_t client, pid_t requ
game_mode_context_leave(self); game_mode_context_leave(self);
} }
game_mode_client_count_changed();
game_mode_remove_client_optimisations(self, client); game_mode_remove_client_optimisations(self, client);
pthread_rwlock_unlock(&self->rwlock);
game_mode_client_count_changed();
return 0; return 0;
} }