Changeset 1801 for zzuf/trunkTweet

Timestamp:

Jul 10, 2007, 5:23:18 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Implemented -T / --max-cpu for max CPU time limits.

Location:

zzuf/trunk/src

Files:

• opts.c (modified) (1 diff)
• opts.h (modified) (1 diff)
• zzuf.c (modified) (7 diffs)

zzuf/trunk/src/opts.c

@@ -46 +46 @@
     opts->maxmem = -1;
     opts->maxtime = -1;
+    opts->maxcpu = -1;
     opts->delay = 0;
     opts->lastlaunch = 0;

zzuf/trunk/src/opts.h

@@ -28 +28 @@
     int quiet;
     int maxbytes;
+    int maxcpu;
     int md5;
     int checkexit;

zzuf/trunk/src/zzuf.c

@@ -163 +163 @@
 #   define OPTSTR_RLIMIT_MEM ""
 #endif
-#define OPTSTR OPTSTR_REGEX OPTSTR_RLIMIT_MEM \
-            "Ab:B:C:dD:f:F:imnp:P:qr:R:s:St:vxhV"
+#if defined HAVE_SETRLIMIT && defined ZZUF_RLIMIT_CPU
+#   define OPTSTR_RLIMIT_CPU "T:"
+#else
+#   define OPTSTR_RLIMIT_CPU ""
+#endif
+#define OPTSTR OPTSTR_REGEX OPTSTR_RLIMIT_MEM OPTSTR_RLIMIT_CPU \
+                "Ab:B:C:dD:f:F:imnp:P:qr:R:s:St:vxhV"
 #define MOREINFO "Try `%s --help' for more information.\n"
         int option_index = 0;
@@ -199 +204 @@
             { "signal",      0, NULL, 'S' },
             { "max-time",    1, NULL, 't' },
+            { "max-cpu",     1, NULL, 'T' },
             { "verbose",     0, NULL, 'v' },
             { "check-exit",  0, NULL, 'x' },
@@ -310 +316 @@
             opts->maxtime = (int64_t)(atof(myoptarg) * 1000000.0);
             break;
+#if defined HAVE_SETRLIMIT && defined ZZUF_RLIMIT_CPU
+        case 'T': /* --max-cpu */
+            opts->maxcpu = (int)(atof(myoptarg) + 0.5);
+            break;
+#endif
         case 'x': /* --check-exit */
             opts->checkexit = 1;
@@ -706 +717 @@
                        && opts->child[i].status == STATUS_SIGTERM))
         {
+            char const *message = "";
+
+            if(WTERMSIG(status) == SIGKILL && opts->maxmem >= 0)
+                message = " (memory exceeded?)";
+#   if defined SIGXCPU
+            else if(WTERMSIG(status) == SIGXCPU && opts->maxcpu >= 0)
+                message = " (CPU time exceeded?)";
+#   endif
+            else if(WTERMSIG(status) == SIGKILL && opts->maxcpu >= 0)
+                message = " (CPU time exceeded?)";
+
             finfo(stderr, opts, opts->child[i].seed);
             fprintf(stderr, "signal %i%s%s\n",
-                    WTERMSIG(status), sig2str(WTERMSIG(status)),
-                      (WTERMSIG(status) == SIGKILL && opts->maxmem >= 0) ?
-                      " (memory exceeded?)" : "");
+                    WTERMSIG(status), sig2str(WTERMSIG(status)), message);
             opts->crashes++;
         }
@@ -907 +927 @@
 #endif
 
+#if defined HAVE_SETRLIMIT && defined ZZUF_RLIMIT_CPU
+    if(opts->maxcpu >= 0)
+    {
+        struct rlimit rlim;
+        rlim.rlim_cur = opts->maxcpu;
+        rlim.rlim_max = opts->maxcpu + 5;
+        setrlimit(ZZUF_RLIMIT_CPU, &rlim);
+    }
+#endif
+
     /* Set environment variables */
     sprintf(buf, "%i", opts->seed);
@@ -1110 +1140 @@
 #endif
     printf("              [-f fuzzing] [-D delay] [-F forks] [-C crashes] [-B bytes]\n");
+    printf("              [-t seconds] ");
+#if defined HAVE_SETRLIMIT && defined ZZUF_RLIMIT_CPU
+    printf(                           "[-T seconds] ");
+#endif
 #if defined HAVE_SETRLIMIT && defined ZZUF_RLIMIT_MEM
-    printf("              [-t seconds] [-M bytes] [-b ranges] [-P protect] [-R refuse]\n");
-#else
-    printf("              [-t seconds] [-b ranges] [-P protect] [-R refuse]\n");
-#endif
-#if defined HAVE_REGEX_H
-    printf("              [-p descriptors] [-I include] [-E exclude]\n");
-    printf("              [PROGRAM [--] [ARGS]...]\n");
-#else
-    printf("              [-I include] [-E exclude] [PROGRAM [--] [ARGS]...]\n");
-#endif
+    printf(                                        "[-M bytes] ");
+#endif
+    printf(                                                   "[-b ranges] [-P protect]\n");
+    printf("              [-R refuse] [-p descriptors] ");
+#if defined HAVE_REGEX_H
+    printf(                                           "[-I include] [-E exclude]\n");
+    printf("              ");
+#endif
+    printf(              "[PROGRAM [--] [ARGS]...]\n");
     printf("       zzuf -h | --help\n");
     printf("       zzuf -V | --version\n");
@@ -1159 +1192 @@
     printf("  -S, --signal              prevent children from diverting crashing signals\n");
     printf("  -t, --max-time <n>        kill children that run for more than <n> seconds\n");
+    printf("  -T, --max-cpu <n>         kill children that use more than <n> CPU seconds\n");
     printf("  -v, --verbose             print information during the run\n");
     printf("  -x, --check-exit          report processes that exit with a non-zero status\n");