Changeset 4282

Timestamp:

01/19/10 13:44:23 (3 years ago)

Author:

sam

Message:

Fix memory limitation method on OS X (page size was ignored) and other
systems (was using MBs instead of MiBs?).

Location:

zzuf/trunk/src

Files:

• libzzuf/lib-mem.c (modified) (3 diffs)
• libzzuf/libzzuf.c (modified) (1 diff)
• myfork.c (modified) (1 diff)
• zzuf.c (modified) (2 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)
 {
@@ -140 +144 @@
     if (task_info(mach_task_self(), TASK_BASIC_INFO,
                   (task_info_t)&tbi, &mmtn) == KERN_SUCCESS
-         && tbi.resident_size > _zz_memory)
+         && (int64_t)tbi.resident_size * mach_page_size / 1048576
+                  > (int64_t)_zz_memory)
         return 1;
 #endif
@@ -152 +157 @@
     LOADSYM(malloc);
     LOADSYM(realloc);
+
+#if defined HAVE_MACH_TASK_H
+    host_page_size(mach_host_self(), &mach_page_size);
+#endif
 }
 

zzuf/trunk/src/libzzuf/libzzuf.c

@@ -177 +177 @@
     tmp = getenv("ZZUF_MEMORY");
     if(tmp)
-        _zz_memory = atoll(tmp);
+        _zz_memory = atoi(tmp);
 
     tmp = getenv("ZZUF_NETWORK");

zzuf/trunk/src/myfork.c

@@ -179 +179 @@
     {
         struct rlimit rlim;
-        rlim.rlim_cur = opts->maxmem * 1000000;
-        rlim.rlim_max = opts->maxmem * 1000000;
+        rlim.rlim_cur = opts->maxmem * 1048576;
+        rlim.rlim_max = opts->maxmem * 1048576;
         setrlimit(ZZUF_RLIMIT_MEM, &rlim);
     }

zzuf/trunk/src/zzuf.c

@@ -291 +291 @@
 #if defined HAVE_SETRLIMIT && defined ZZUF_RLIMIT_MEM
         case 'M': /* --max-memory */
-            setenv("ZZUF_MEMORY", "1", 1);
             if(myoptarg[0] == '=')
                 myoptarg++;
@@ -458 +457 @@
     if(opts->refuse)
         setenv("ZZUF_REFUSE", opts->refuse, 1);
+#if defined HAVE_SETRLIMIT && defined ZZUF_RLIMIT_MEM
+    if(opts->maxmem >= 0)
+    {
+        char buf[32];
+        snprintf(buf, 32, "%i", opts->maxmem);
+        setenv("ZZUF_MEMORY", buf, 1);
+    }
+#endif
 
     /* Allocate memory for children handling */