public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t] tests/gem_fd_exhaustion: Remove broken exit handler
@ 2019-04-09  6:46 Arkadiusz Hiler
  2019-04-09  7:34 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Arkadiusz Hiler @ 2019-04-09  6:46 UTC (permalink / raw)
  To: igt-dev; +Cc: Lucas De Marchi

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@intel.com>
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
---
 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

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-04-30 17:22 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-09  6:46 [igt-dev] [PATCH i-g-t] tests/gem_fd_exhaustion: Remove broken exit handler Arkadiusz Hiler
2019-04-09  7:34 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2019-04-09 11:38 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2019-04-30 17:22 ` [igt-dev] [PATCH i-g-t] " Lucas De Marchi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox