Changeset 1660 for zzuf/trunk/src/zzuf.cTweet

Timestamp:

Jan 13, 2007, 11:50:38 AM (14 years ago)

Author:

Sam Hocevar

Message:

• Implemented -D/--delay to avoid fork bombs.

File:

• zzuf/trunk/src/zzuf.c (modified) (12 diffs)

zzuf/trunk/src/zzuf.c

@@ -88 +88 @@
 static int maxmem = -1;
 static int64_t maxtime = -1;
+static int64_t delay = 0;
 static int64_t lastlaunch = 0;
 
@@ -111 +112 @@
     for(;;)
     {
+#   define OPTSTR "B:cC:dD:E:F:iI:mM:nP:qr:R:s:ST:xhv"
 #   ifdef HAVE_GETOPT_LONG
 #       define MOREINFO "Try `%s --help' for more information.\n"
@@ -121 +123 @@
             { "max-crashes", 1, NULL, 'C' },
             { "debug",       0, NULL, 'd' },
+            { "delay",       1, NULL, 'D' },
             { "exclude",     1, NULL, 'E' },
             { "max-forks",   1, NULL, 'F' },
@@ -139 +142 @@
             { "version",     0, NULL, 'v' },
         };
-        int c = getopt_long(argc, argv, "B:cC:dE:F:iI:mM:nP:qr:R:s:ST:xhv",
-                            long_options, &option_index);
+        int c = getopt_long(argc, argv, OPTSTR, long_options, &option_index);
 #   else
 #       define MOREINFO "Try `%s -h' for more information.\n"
-        int c = getopt(argc, argv, "B:cC:dE:F:iI:mM:nP:qr:R:s:ST:xhv");
+        int c = getopt(argc, argv, OPTSTR);
 #   endif
         if(c == -1)
@@ -163 +165 @@
         case 'd': /* --debug */
             setenv("ZZUF_DEBUG", "1", 1);
+            break;
+        case 'D': /* --delay */
+            delay = (int64_t)(atof(optarg) * 1000000.0);
             break;
         case 'E': /* --exclude */
@@ -422 +427 @@
     char buf[BUFSIZ];
     int fd[3][2];
+    int64_t now = _zz_time();
     pid_t pid;
     int i, j;
@@ -433 +439 @@
     if(maxcrashes && crashes >= maxcrashes)
         return; /* all jobs crashed */
+
+    if(delay > 0 && lastlaunch + delay > now)
+        return; /* too early */
 
     /* Find the empty slot */
@@ -484 +493 @@
     }
 
-    lastlaunch = _zz_time();
-
     /* We’re the parent, acknowledge spawn */
-    child_list[i].date = lastlaunch;
+    child_list[i].date = now;
     child_list[i].pid = pid;
     for(j = 0; j < 3; j++)
@@ -500 +507 @@
         child_list[i].ctx = _zz_md5_init();
 
+    lastlaunch = now;
     child_count++;
     seed++;
@@ -712 +720 @@
 {
     printf("Usage: zzuf [-cdimnqSx] [-r ratio] [-s seed | -s start:stop]\n");
-    printf("                        [-F forks] [-C crashes] [-B bytes] [-T seconds]\n");
-    printf("                        [-M bytes] [-P protect] [-R refuse]\n");
+    printf("                        [-D delay] [-F forks] [-C crashes] [-B bytes]\n");
+    printf("                        [-T seconds] [-M bytes] [-P protect] [-R refuse]\n");
     printf("                        [-I include] [-E exclude] [PROGRAM [--] [ARGS]...]\n");
 #   ifdef HAVE_GETOPT_LONG
@@ -730 +738 @@
     printf("  -C, --max-crashes <n>    stop after <n> children have crashed (default 1)\n");
     printf("  -d, --debug              print debug messages\n");
+    printf("  -D, --delay              delay between forks\n");
     printf("  -E, --exclude <regex>    do not fuzz files matching <regex>\n");
     printf("  -F, --max-forks <n>      number of concurrent children (default 1)\n");
@@ -753 +762 @@
     printf("  -C <n>           stop after <n> children have crashed (default 1)\n");
     printf("  -d               print debug messages\n");
+    printf("  -D               delay between forks\n");
     printf("  -E <regex>       do not fuzz files matching <regex>\n");
     printf("  -F <n>           number of concurrent forks (default 1)\n");