Changeset 4258

Timestamp:

01/13/10 00:54:31 (3 years ago)

Author:

sam

Message:

Add a workaround for OS X ignoring RLIMIT_RSS / RLIMIT_AS and getrusage()
not filling in RSS information. After each memory allocation, we ask the
Mach for the RSS value.

Location:

zzuf/trunk

Files:

• configure.ac (modified) (1 diff)
• msvc/config.h (modified) (1 diff)
• src/libzzuf/lib-mem.c (modified) (7 diffs)
• src/libzzuf/libzzuf.c (modified) (2 diffs)
• src/libzzuf/libzzuf.h (modified) (1 diff)

zzuf/trunk/configure.ac

@@ -46 +46 @@
 AC_SUBST(DLL_LDFLAGS)
 
-AC_CHECK_HEADERS(windows.h winsock2.h io.h process.h unistd.h inttypes.h stdint.h getopt.h libc.h malloc.h dlfcn.h regex.h sys/cdefs.h sys/socket.h netinet/in.h arpa/inet.h sys/uio.h aio.h sys/mman.h sys/wait.h sys/resource.h sys/time.h endian.h)
+AC_CHECK_HEADERS(windows.h winsock2.h io.h process.h unistd.h inttypes.h stdint.h getopt.h libc.h malloc.h dlfcn.h regex.h sys/cdefs.h sys/socket.h netinet/in.h arpa/inet.h sys/uio.h aio.h sys/mman.h sys/wait.h sys/resource.h sys/time.h endian.h mach/task.h)
 
 AC_CHECK_FUNCS(setenv waitpid setrlimit gettimeofday fork kill pipe _pipe)

zzuf/trunk/msvc/config.h

@@ -60 +60 @@
 /* #undef HAVE_LIBC_H */
 /* #undef HAVE_LSEEK64 */
+/* #undef HAVE_MACH_TASK_H */
 #define HAVE_MALLOC_H 1
 /* #undef HAVE_MAP_FD */

zzuf/trunk/src/libzzuf/lib-mem.c

@@ -64 +64 @@
 #   include <libc.h>
 #endif
+#if defined HAVE_MACH_TASK_H
+#   include <mach/mach.h>
+#   include <mach/task.h>
+#endif
 
 #include "libzzuf.h"
@@ -126 +130 @@
 #define DUMMY_STOP ((uintptr_t)dummy_buffer + DUMMY_BYTES)
 
+/* setrlimit(RLIMIT_AS) is ignored on OS X, we need to check memory usage
+ * from inside the process. Oh, and getrusage() doesn't work either. */
+static int memory_exceeded(void)
+{
+#if defined HAVE_MACH_TASK_H
+    struct task_basic_info tbi;
+    mach_msg_type_number_t mmtn = TASK_BASIC_INFO_COUNT;
+
+    if (task_info(mach_task_self(), TASK_BASIC_INFO,
+                  (task_info_t)&tbi, &mmtn) == KERN_SUCCESS
+         && tbi.resident_size > _zz_memory)
+        return 1;
+#endif
+    return 0;
+}
+
 void _zz_mem_init(void)
 {
@@ -172 +192 @@
     }
     ret = ORIG(malloc)(size);
-    if(ret == NULL && _zz_memory && errno == ENOMEM)
+    if (_zz_memory && ((!ret && errno == ENOMEM)
+                        || (ret && memory_exceeded())))
         raise(SIGKILL);
     return ret;
@@ -217 +238 @@
     LOADSYM(realloc);
     ret = ORIG(realloc)(ptr, size);
-    if(ret == NULL && _zz_memory && errno == ENOMEM)
+    if (_zz_memory && ((!ret && errno == ENOMEM)
+                        || (ret && memory_exceeded())))
         raise(SIGKILL);
     return ret;
@@ -228 +250 @@
     LOADSYM(valloc);
     ret = ORIG(valloc)(size);
-    if(ret == NULL && _zz_memory && errno == ENOMEM)
+    if (_zz_memory && ((!ret && errno == ENOMEM)
+                        || (ret && memory_exceeded())))
         raise(SIGKILL);
     return ret;
@@ -240 +263 @@
     LOADSYM(memalign);
     ret = ORIG(memalign)(boundary, size);
-    if(ret == NULL && _zz_memory && errno == ENOMEM)
+    if (_zz_memory && ((!ret && errno == ENOMEM)
+                        || (ret && memory_exceeded())))
         raise(SIGKILL);
     return ret;
@@ -252 +276 @@
     LOADSYM(posix_memalign);
     ret = ORIG(posix_memalign)(memptr, alignment, size);
-    if(ret == ENOMEM && _zz_memory)
+    if (_zz_memory && ((!ret && errno == ENOMEM)
+                        || (ret && memory_exceeded())))
         raise(SIGKILL);
     return ret;

zzuf/trunk/src/libzzuf/libzzuf.c

@@ -84 +84 @@
  * variable.
  */
-int _zz_memory = 0;
+uint64_t _zz_memory = 0;
 
 /**
@@ -176 +176 @@
 
     tmp = getenv("ZZUF_MEMORY");
-    if(tmp && *tmp == '1')
-        _zz_memory = 1;
+    if(tmp)
+        _zz_memory = atoll(tmp);
 
     tmp = getenv("ZZUF_NETWORK");

zzuf/trunk/src/libzzuf/libzzuf.h

@@ -21 +21 @@
 extern int _zz_debugfd;
 extern int _zz_signal;
-extern int _zz_memory;
+extern uint64_t _zz_memory;
 extern int _zz_network;
 extern int _zz_autoinc;