blob: da73d9ac3fe43edce80eb1491d2476f9dac9381a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
$NetBSD: patch-programs_fuzzer.c,v 1.2 2014/10/02 08:52:41 fhajny Exp $
Add portable code for ftime for NetBSD.
Based on https://code.google.com/p/lz4/source/detail?r=81.
--- programs/fuzzer.c.orig 2014-09-25 12:03:36.000000000 +0000
+++ programs/fuzzer.c
@@ -30,6 +30,7 @@
# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */
# pragma warning(disable : 4146) /* disable: C4146: minus unsigned expression */
# pragma warning(disable : 4310) /* disable: C4310: constant char value > 127 */
+# define BMK_LEGACY_TIMER 1
#endif
@@ -38,12 +39,17 @@
**************************************/
#include <stdlib.h>
#include <stdio.h> // fgets, sscanf
-#include <sys/timeb.h> // timeb
#include <string.h> // strcmp
#include "lz4.h"
#include "lz4hc.h"
#include "xxhash.h"
+// Use ftime() if gettimeofday() is not available on your target
+#if defined(BMK_LEGACY_TIMER)
+# include <sys/timeb.h> // timeb, ftime
+#else
+# include <sys/time.h> // gettimeofday
+#endif
/**************************************
Basic Types
@@ -104,8 +110,11 @@ static int displayLevel = 2;
/*********************************************************
Fuzzer functions
*********************************************************/
+#if defined(BMK_LEGACY_TIMER)
+
static int FUZ_GetMilliStart(void)
{
+ // Based on Legacy ftime()
struct timeb tb;
int nCount;
ftime( &tb );
@@ -113,6 +122,20 @@ static int FUZ_GetMilliStart(void)
return nCount;
}
+#else
+
+static int FUZ_GetMilliStart()
+{
+ // Based on newer gettimeofday()
+ // Use GetMilliSpan to correct for rollover
+ struct timeval tv;
+ int nCount;
+ gettimeofday(&tv, NULL);
+ nCount = (int) (tv.tv_usec/1000 + (tv.tv_sec & 0xfffff) * 1000);
+ return nCount;
+}
+
+#endif
static int FUZ_GetMilliSpan( int nTimeStart )
{
|
