Changeset 4314 for zzuf/trunk/srcTweet

Timestamp:

Feb 6, 2010, 2:37:52 AM (11 years ago)

Author:

Sam Hocevar

Message:

On OS X, resident_size is actually in bytes, not pages. Fixing
memory check routine.

File:

• zzuf/trunk/src/libzzuf/lib-mem.c (modified) (3 diffs)

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

@@ -132 +132 @@
 /* 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. */
-#if defined HAVE_MACH_TASK_H
-vm_size_t mach_page_size;
-#endif
-
 static int memory_exceeded(void)
 {
@@ -144 +140 @@
     if (task_info(mach_task_self(), TASK_BASIC_INFO,
                   (task_info_t)&tbi, &mmtn) == KERN_SUCCESS
-         && (int64_t)tbi.resident_size * mach_page_size / 1048576
-                  > (int64_t)_zz_memory)
+         && (int64_t)tbi.resident_size / 1048576 > (int64_t)_zz_memory)
         return 1;
 #endif
@@ -157 +152 @@
     LOADSYM(malloc);
     LOADSYM(realloc);
-
-#if defined HAVE_MACH_TASK_H
-    host_page_size(mach_host_self(), &mach_page_size);
-#endif
 }