diff options
| author | Tim Gore <tim.gore@intel.com> | 2015-04-27 16:17:50 +0100 |
|---|---|---|
| committer | Thomas Wood <thomas.wood@intel.com> | 2015-05-01 17:13:56 +0100 |
| commit | 48a27bcaf6a284235c41ce196b4969a472f264e6 (patch) | |
| tree | 5fc96bb8fbe42908411189bcb60631aee56325e6 /lib/igt_core.c | |
| parent | 637f0455da91c91eedae1245464b45f0c3f7310e (diff) | |
lib/igt_core.c : only disable low mem killer once
The call to low_mem_killer_disable(true) was being done
from within function oom_adjust_for_doom. However,
oom_adjust_for_doom gets called from 3 places. We only
want the call to low_mem_killer_disable(true) to happen
during common_init, so call it from here instead of from
oom_adjust_for_doom.
v2:Thomas Wood pointed out that the initial call to disable
the low_mem_killer does not get made when we are just
listing subtests; so I have qualified the call from the
exit handler, which re-enables the low_mem_killer, with
if (!igt_only_list_subtests()).
For belt and braces I have also made low_mem_killer_disable
idempotent, so multiple calls to disable or re-enable are
safe.
Signed-off-by: Tim Gore <tim.gore@intel.com>
[Thomas: small coding style fix]
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
Diffstat (limited to 'lib/igt_core.c')
| -rw-r--r-- | lib/igt_core.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/igt_core.c b/lib/igt_core.c index 7d04f2c4..e746832e 100644 --- a/lib/igt_core.c +++ b/lib/igt_core.c @@ -396,6 +396,7 @@ static void low_mem_killer_disable(bool disable) /* The following must persist across invocations */ static char prev_adj_scores[256]; static int adj_scores_len = 0; + static bool is_disabled = false; /* capture the permissions bits for the lowmemkiller adj pseudo-file. * Bail out if the stat fails; it probably means that there is no @@ -408,7 +409,7 @@ static void low_mem_killer_disable(bool disable) /* make sure the file can be read/written - by default it is write-only */ chmod(adj_fname, S_IRUSR | S_IWUSR); - if (disable) { + if (disable && !is_disabled) { /* read the current oom adj parameters for lowmemorykiller */ fd = open(adj_fname, O_RDWR); igt_assert(fd != -1); @@ -421,13 +422,15 @@ static void low_mem_killer_disable(bool disable) igt_assert_eq(write(fd, no_lowmem_killer, sizeof(no_lowmem_killer)), sizeof(no_lowmem_killer)); close(fd); - } else { + is_disabled = true; + } else if (is_disabled) { /* just re-enstate the original settings */ fd = open(adj_fname, O_WRONLY); igt_assert(fd != -1); igt_assert_eq(write(fd, prev_adj_scores, adj_scores_len), adj_scores_len); close(fd); + is_disabled = false; } /* re-enstate the file permissions */ @@ -437,7 +440,9 @@ static void low_mem_killer_disable(bool disable) bool igt_exit_called; static void common_exit_handler(int sig) { - low_mem_killer_disable(false); + if (!igt_only_list_subtests()) { + low_mem_killer_disable(false); + } /* When not killed by a signal check that igt_exit() has been properly * called. */ @@ -490,7 +495,6 @@ static void oom_adjust_for_doom(void) igt_assert(write(fd, always_kill, sizeof(always_kill)) == sizeof(always_kill)); close(fd); - low_mem_killer_disable(true); } static int common_init(int *argc, char **argv, @@ -653,6 +657,7 @@ out: print_version(); oom_adjust_for_doom(); + low_mem_killer_disable(true); } /* install exit handler, to ensure we clean up */ |