From 8bc80862603bd5d1b0dcb7a0472935215f167f09 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Thu, 4 Apr 2019 15:16:11 -0700 Subject: 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 Reviewed-by: Chris Wilson --- tests/i915/gem_exec_reuse.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'tests/i915/gem_exec_reuse.c') diff --git a/tests/i915/gem_exec_reuse.c b/tests/i915/gem_exec_reuse.c index 55904718..9cba1354 100644 --- a/tests/i915/gem_exec_reuse.c +++ b/tests/i915/gem_exec_reuse.c @@ -56,29 +56,6 @@ static void noop(struct noop *n, gem_execbuf(n->fd, &execbuf); } -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); - fclose(file); - } - - if (getrlimit(RLIMIT_NOFILE, &rlim)) - return false; - - rlim.rlim_cur = rlim.rlim_max; - if (setrlimit(RLIMIT_NOFILE, &rlim)) - return false; - - rlim.rlim_cur = nofile_rlim; - rlim.rlim_max = nofile_rlim; - return setrlimit(RLIMIT_NOFILE, &rlim) == 0; -} - static uint64_t vfs_file_max(void) { long long unsigned max = 80000; @@ -126,7 +103,7 @@ igt_main uint32_t bbe = MI_BATCH_BUFFER_END; unsigned engine; - allow_unlimited_files(); + igt_allow_unlimited_files(); no.fd = drm_open_driver(DRIVER_INTEL); igt_require_gem(no.fd); -- cgit v1.2.3