From: William Lallemand <wlallemand@irq6.net>
Date: Sat, 9 Apr 2016 19:27:21 +0000 (+0200)
Subject: BUG/MEDIUM: trace.c: rdtsc() is defined in two files
X-Git-Tag: v1.7-dev3~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0567fa3af5037bc0f2695b802b72035ae2b2e431;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: trace.c: rdtsc() is defined in two files

The rdtsc() function provided in standard.h forbid trace.c to compile
because it's already defined there.
---

diff --git a/src/trace.c b/src/trace.c
index ab3827d31a..4bbbc302ab 100644
--- a/src/trace.c
+++ b/src/trace.c
@@ -162,22 +162,6 @@ static char *emit_hex(unsigned long h, char *out)
 	return out;
 }
 
-#if defined(__i386__) || defined(__x86_64__)
-static inline unsigned long long rdtsc()
-{
-     unsigned int a, d;
-     asm volatile("rdtsc" : "=a" (a), "=d" (d));
-     return a + ((unsigned long long)d << 32);
-}
-#else
-static inline unsigned long long rdtsc()
-{
-	struct timeval tv;
-	gettimeofday(&tv, NULL);
-	return tv.tv_sec * 1000000 + tv.tv_usec;
-}
-#endif
-
 static void make_line(void *from, void *to, int level, char dir)
 {
 	char *p = line;