summaryrefslogtreecommitdiff
path: root/tests/i915/gem_concurrent_all.c
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@intel.com>2019-04-04 15:16:11 -0700
committerLucas De Marchi <lucas.demarchi@intel.com>2019-04-05 10:00:45 -0700
commit8bc80862603bd5d1b0dcb7a0472935215f167f09 (patch)
treef095731ce601ac3492add9a876cb5d108b22135e /tests/i915/gem_concurrent_all.c
parent019f892e5d1a0a9643cb726c47ce2d99c14b444f (diff)
lib: add igt_allow_unlimited_files()
Share the implementation to tweak the maximum number of open files. The version in tests/i915/gem_exec_reuse.c was a little bit different, but I don't think it needs to be because it would still return a failure if any of the calls to setrlimit() fail. So I'm using the other one. Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'tests/i915/gem_concurrent_all.c')
-rw-r--r--tests/i915/gem_concurrent_all.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/tests/i915/gem_concurrent_all.c b/tests/i915/gem_concurrent_all.c
index 6049372d..3ddaab82 100644
--- a/tests/i915/gem_concurrent_all.c
+++ b/tests/i915/gem_concurrent_all.c
@@ -1678,26 +1678,6 @@ num_buffers(uint64_t max,
return n;
}
-static bool allow_unlimited_files(void)
-{
- struct rlimit rlim;
- unsigned nofile_rlim = 1024*1024;
-
- FILE *file = fopen("/proc/sys/fs/file-max", "r");
- if (file) {
- igt_assert(fscanf(file, "%u", &nofile_rlim) == 1);
- igt_info("System limit for open files is %u\n", nofile_rlim);
- fclose(file);
- }
-
- if (getrlimit(RLIMIT_NOFILE, &rlim))
- return false;
-
- rlim.rlim_cur = nofile_rlim;
- rlim.rlim_max = nofile_rlim;
- return setrlimit(RLIMIT_NOFILE, &rlim) == 0;
-}
-
igt_main
{
const struct access_mode modes[] = {
@@ -1821,7 +1801,7 @@ igt_main
all = true;
igt_fixture {
- allow_unlimited_files();
+ igt_allow_unlimited_files();
fd = drm_open_driver(DRIVER_INTEL);
igt_require_gem(fd);