[igt-dev] [PATCH i-g-t] tests/gem_fd_exhaustion: Remove broken exit handler

[Lucas De Marchi]

On Tue, Apr 09, 2019 at 09:46:58AM +0300, Arkadiusz Hiler wrote:
>With the introduction of igt_allow_unlimited_files() the way the
>original implementation that set RLIMIT_NOFILE and then restored it got
>half-removed.
>
>The new way of setting was used, but the old exit handler was still in place,
>resetting the value to uninitialized variable.
>
>Since we seem to not care about restoring the original limit in multiple
>other places let's not do that here and instead ponder on doing that
>elsewhere.
>
>Fixes: 8bc80862603b ("lib: add igt_allow_unlimited_files()")
>Cc: Lucas De Marchi <lucas.demarchi at intel.com>
>Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler at intel.com>


Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>

thanks
Lucas De Marchi

>---
> tests/i915/gem_fd_exhaustion.c | 35 ----------------------------------
> 1 file changed, 35 deletions(-)
>
>diff --git a/tests/i915/gem_fd_exhaustion.c b/tests/i915/gem_fd_exhaustion.c
>index 9704fa02..23602b98 100644
>--- a/tests/i915/gem_fd_exhaustion.c
>+++ b/tests/i915/gem_fd_exhaustion.c
>@@ -33,39 +33,6 @@
> #include <fcntl.h>
> #include <limits.h>
>
>-unsigned int original_nr_open;
>-
>-static int read_sysctl(const char *path)
>-{
>-	unsigned int val;
>-	FILE *f = fopen(path, "r");
>-
>-	if (f) {
>-		igt_assert(fscanf(f, "%u", &val) == 1);
>-		fclose(f);
>-		return val;
>-	}
>-	return -errno;
>-}
>-
>-static int write_sysctl(const char *path, unsigned int val)
>-{
>-	FILE *f = fopen(path, "w");
>-
>-	if (f) {
>-		igt_assert(fprintf(f, "%u", val));
>-		fclose(f);
>-		return 0;
>-	}
>-	return -errno;
>-}
>-
>-static void restore_original_sysctl(int sig)
>-{
>-	if (original_nr_open > 0)
>-		write_sysctl("/proc/sys/fs/nr_open", original_nr_open);
>-}
>-
> igt_simple_main
> {
> 	int fd;
>@@ -74,8 +41,6 @@ igt_simple_main
>
> 	fd = drm_open_driver(DRIVER_INTEL);
>
>-	igt_install_exit_handler(restore_original_sysctl);
>-
> 	igt_fork(n, 1) {
> 		igt_drop_root();
>
>-- 
>2.20.1
>