Changeset 4122Tweet

Timestamp:

Dec 14, 2009, 4:33:53 AM (11 years ago)

Author:

Sam Hocevar

Message:

Fix a regression in the rlimit handling code caused by the myfork split.

Location:

zzuf/trunk/src

Files:

• myfork.c (modified) (2 diffs)
• zzuf.c (modified) (1 diff)

zzuf/trunk/src/myfork.c

@@ -38 +38 @@
 #include <string.h>
 #include <fcntl.h> /* for O_BINARY */
+#if defined HAVE_SYS_RESOURCE_H
+#   include <sys/resource.h> /* for RLIMIT_AS */
+#endif
 
 #include "common.h"
@@ -47 +50 @@
 #include "md5.h"
 #include "timer.h"
+
+#if defined RLIMIT_AS
+#   define ZZUF_RLIMIT_MEM RLIMIT_AS
+#elif defined RLIMIT_VMEM
+#   define ZZUF_RLIMIT_MEM RLIMIT_VMEM
+#elif defined RLIMIT_DATA
+#   define ZZUF_RLIMIT_MEM RLIMIT_DATA
+#else
+#   undef ZZUF_RLIMIT_MEM
+#endif
+
+#if defined RLIMIT_CPU
+#   define ZZUF_RLIMIT_CPU RLIMIT_CPU
+#else
+#   undef ZZUF_RLIMIT_CPU
+#endif
 
 static int run_process(struct opts *, int[][2]);

zzuf/trunk/src/zzuf.c

@@ -55 +55 @@
 #endif
 #if defined HAVE_SYS_RESOURCE_H
-#   include <sys/resource.h>
+#   include <sys/resource.h> /* for RLIMIT_AS */
 #endif