marcel/gamemode
1
0
Fork 0
mirror of https://github.com/FeralInteractive/gamemode.git synced 2025-08-05 20:58:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor to store the initial governor state when gamemode is entered

Browse Source 
Rather than when gamemoded is started. As see in Issue #52.

	A small refactor here to ensure things stay consistent, especially
	to stop storing a pointer from get_gov_state that might have had
	it's memory changed at some point, confusingly.
This commit is contained in:
Marc Di Luzio
2018-05-15 16:28:33 +01:00
parent 6d181f86bd
commit 39ad076fa9
5 changed files with 31 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
daemon/gamemode.c
View File

@@ -33,6 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include "gamemode.h"
#include "daemon_config.h"
#include "governors-query.h"
#include "governors.h"
#include "logging.h"
@@ -60,7 +61,7 @@ struct GameModeContext {
GameModeConfig *config; /**<Pointer to config object */
bool performance_mode; /**<Only updates when we can */
char initial_cpu_mode[64]; /**<Only updates when we can */
/* Reaper control */
struct {
@@ -99,14 +100,13 @@ void game_mode_context_init(GameModeContext *self)
had_context_init = true;
self->refcount = ATOMIC_VAR_INIT(0);
/* clear the initial string */
memset(self->initial_cpu_mode, 0, sizeof(self->initial_cpu_mode));
/* Initialise the config */
self->config = config_create();
config_init(self->config);
/* Read current governer state before setting up any message handling */
update_initial_gov_state();
LOG_MSG("governor is set to [%s]\n", get_initial_governor());
pthread_rwlock_init(&self->rwlock, NULL);
pthread_mutex_init(&self->reaper.mutex, NULL);
pthread_cond_init(&self->reaper.condition, NULL);
@@ -176,8 +176,20 @@ static void game_mode_context_enter(GameModeContext *self)
i++;
}
if (!self->performance_mode && set_governors("performance")) {
self->performance_mode = true;
/* Read the initial governor state so we can revert it correctly */
const char *initial_state = get_gov_state();
if (initial_state) {
/* store the initial cpu governor mode */
strncpy(self->initial_cpu_mode, initial_state, sizeof(self->initial_cpu_mode) - 1);
self->initial_cpu_mode[sizeof(self->initial_cpu_mode) - 1] = '\0';
LOG_MSG("governor was initially set to [%s]\n", initial_state);
/* set the governor to performance */
if (!set_governors("performance")) {
/* if the set fails, clear the initial mode so we don't try and reset it back and fail
* again, presumably */
memset(self->initial_cpu_mode, 0, sizeof(self->initial_cpu_mode));
}
}
}
@@ -192,8 +204,10 @@ static void game_mode_context_leave(GameModeContext *self)
LOG_MSG("Leaving Game Mode...\n");
sd_notifyf(0, "STATUS=%sGameMode is currently deactivated.%s\n", "\x1B[1;36m", "\x1B[0m");
if (self->performance_mode && set_governors(NULL)) {
self->performance_mode = false;
/* Reset the governer state back to initial */
if (self->initial_cpu_mode[0] != '\0') {
set_governors(self->initial_cpu_mode);
memset(self->initial_cpu_mode, 0, sizeof(self->initial_cpu_mode));
}
char scripts[CONFIG_LIST_MAX][CONFIG_VALUE_MAX];