Changeset 1657Tweet

Timestamp:

Jan 12, 2007, 4:47:48 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Change timing functions to gettimeofday() instead of time() for more precision.

Location:

zzuf/trunk

Files:

• Makefile.am (modified) (1 diff, 1 prop)
• src/Makefile.am (modified) (1 diff, 1 prop)
• src/timer.c (added)
• src/timer.h (added)
• src/zzuf.c (modified) (9 diffs)

zzuf/trunk/Makefile.am

@@ +1 @@
+# $Id$
 
 SUBDIRS = src test doc

zzuf/trunk/src/Makefile.am

@@ +1 @@
+# $Id$
+
 COMMON = random.c random.h fd.c fd.h fuzz.c fuzz.h
 
 bin_PROGRAMS = zzuf
-zzuf_SOURCES = zzuf.c $(COMMON) md5.c md5.h
+zzuf_SOURCES = zzuf.c $(COMMON) md5.c md5.h timer.c timer.h
 zzuf_CFLAGS = -DLIBDIR=\"$(libdir)/zzuf\"
 

zzuf/trunk/src/zzuf.c

@@ -34 +34 @@
 #include <errno.h>
 #include <signal.h>
-#include <sys/time.h>
-#include <time.h>
 #include <sys/wait.h>
 #include <sys/time.h>
@@ -45 +43 @@
 #include "fuzz.h"
 #include "md5.h"
+#include "timer.h"
 
 static void spawn_child(char **);
@@ -72 +71 @@
     int fd[3]; /* 0 is debug, 1 is stderr, 2 is stdout */
     int bytes, seed;
-    time_t date;
+    int64_t date;
     struct md5 *ctx;
 } *child_list;
@@ -84 +83 @@
 static int checkexit = 0;
 static int maxmem = -1;
-static double maxtime = -1.0;
+static int64_t maxtime = -1;
 
 #define ZZUF_FD_SET(fd, p_fdset, maxfd) \
@@ -215 +214 @@
             break;
         case 'T': /* --max-time */
-            maxtime = atof(optarg);
+            maxtime = (int64_t)(atof(optarg) * 1000000.0);
             break;
         case 'x': /* --check-exit */
@@ -469 +468 @@
 
     /* We’re the parent, acknowledge spawn */
-    child_list[i].date = time(NULL);
+    child_list[i].date = _zz_time();
     child_list[i].pid = pid;
     for(j = 0; j < 3; j++)
@@ -487 +486 @@
 static void clean_children(void)
 {
-    time_t now = time(NULL);
+    int64_t now = _zz_time();
     int i, j;
 
@@ -504 +503 @@
 
         if(child_list[i].status == STATUS_RUNNING
-            && maxtime >= 0.0
-            && difftime(now, child_list[i].date) > maxtime)
+            && maxtime >= 0
+            && now > child_list[i].date + maxtime)
         {
             fprintf(stdout, "zzuf[seed=%i]: time exceeded, sending SIGTERM\n",
@@ -515 +514 @@
     }
 
-    /* Kill children if necessary */
+    /* Kill children if necessary (still there after 2 seconds) */
     for(i = 0; i < maxforks; i++)
     {
         if(child_list[i].status == STATUS_SIGTERM
-            && difftime(now, child_list[i].date) > 2.0)
+            && now > child_list[i].date + 2000000)
         {
             fprintf(stdout, "zzuf[seed=%i]: not responding, sending SIGKILL\n",