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

First pass at fix for ioprio not applying to process tree properly

Browse Source 
See https://github.com/FeralInteractive/gamemode/issues/140
This commit is contained in:
Marc Di Luzio 2019-05-12 19:53:16 +01:00
parent 6639b17500
commit bf2b057915
1 changed files with 46 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
daemon/gamemode-ioprio.c
View File

@ -36,7 +36,9 @@ POSSIBILITY OF SUCH DAMAGE.
#include "helpers.h" #include "helpers.h"
#include "logging.h" #include "logging.h"
#include <dirent.h>
#include <errno.h> #include <errno.h>
#include <stdio.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include <unistd.h> #include <unistd.h>
@ -135,28 +137,51 @@ void game_mode_apply_ioprio(const GameModeContext *self, const pid_t client, int
ioprio = IOPRIO_DEFAULT; ioprio = IOPRIO_DEFAULT;
} }
int current = game_mode_get_ioprio(client); /* Open the tasks dir for the client */
if (current == IOPRIO_DONT_SET) { char tasks[128];
/* Couldn't get the ioprio value, let's bail */ snprintf(tasks, sizeof(tasks), "/proc/%d/task", client);
DIR *client_task_dir = opendir(tasks);
if (client_task_dir == NULL) {
LOG_ERROR("Could not inspect tasks for client %d! Skipping ioprio optimisation.\n", client);
return; return;
} else if (current != expected) { }
/* Don't try and adjust the ioprio value if the value we got doesn't match default */
LOG_ERROR("Refused to set ioprio on client [%d]: prio was (%d) but we expected (%d)\n", /* Iterate for all tasks of client process */
client, struct dirent *tid_entry;
current, while ((tid_entry = readdir(client_task_dir)) != NULL) {
expected); /* Skip . and .. */
} else { if (tid_entry->d_name[0] == '.')
/* continue;
* For now we only support IOPRIO_CLASS_BE
* IOPRIO_CLASS_RT requires CAP_SYS_ADMIN but should be possible with a polkit process /* task name is the name of the file */
*/ int tid = atoi(tid_entry->d_name);
int p = ioprio;
ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, ioprio); int current = game_mode_get_ioprio(tid);
if (ioprio_set(IOPRIO_WHO_PROCESS, client, ioprio) != 0) { if (current == IOPRIO_DONT_SET) {
LOG_ERROR("Setting client [%d] IO priority to (%d) failed with error %d, ignoring\n", /* Couldn't get the ioprio value
client, * This could simply mean that the thread exited before fetching the ioprio
p, * So we should continue
errno); */
} else if (current != expected) {
/* Don't try and adjust the ioprio value if the value we got doesn't match default */
LOG_ERROR("Refused to set ioprio on client [%d]: prio was (%d) but we expected (%d)\n",
tid,
current,
expected);
} else {
/*
* For now we only support IOPRIO_CLASS_BE
* IOPRIO_CLASS_RT requires CAP_SYS_ADMIN but should be possible with a polkit process
*/
int p = ioprio;
ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, ioprio);
if (ioprio_set(IOPRIO_WHO_PROCESS, tid, ioprio) != 0) {
LOG_ERROR(
"Setting client [%d] IO priority to (%d) failed with error %d, ignoring\n",
tid,
p,
errno);
}
} }
} }
} }