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
|
From 67865eeef0706e98e3a05e5228cebe593e31038f Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Sat, 11 Mar 2017 10:59:21 +0100
Subject: upstream commit e1bd2a7 to fix compilation on non-x86 (Closes:
#849647)
---
elsim/elsim/similarity/libsimilarity/similarity.c | 25 ++++++-----------------
elsim/elsim/similarity/libsimilarity/similarity.h | 1 +
2 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/elsim/elsim/similarity/libsimilarity/similarity.c b/elsim/elsim/similarity/libsimilarity/similarity.c
index 78468b7..a78c7b2 100644
--- a/elsim/elsim/similarity/libsimilarity/similarity.c
+++ b/elsim/elsim/similarity/libsimilarity/similarity.c
@@ -329,26 +329,13 @@ unsigned int kolmogorov(int level, void *orig, size_t size_orig)
/* Haypo */
+/* returns the number of seconds since some point; always increasing.
+ * Used only for timing operations.
+ */
double RDTSC(void) {
-#if defined linux || defined __APPLE__
- unsigned long long x;
- __asm__ volatile (".byte 0x0f, 0x31" : "=A"(x));
- return (double)x;
-#else
- unsigned long a, b;
- double x;
- asm
- {
- db 0x0F, 0x31
- mov [a], eax
- mov [b], eax
- }
-
- x = b;
- x *= 4294967296;
- x += a;
- return x;
-#endif
+ struct timespec time;
+ clock_gettime(CLOCK_MONOTONIC, &time);
+ return time.tv_sec + time.tv_nsec / 1e9;
}
double bennett(int level, void *orig, size_t size_orig)
diff --git a/elsim/elsim/similarity/libsimilarity/similarity.h b/elsim/elsim/similarity/libsimilarity/similarity.h
index d51fd7b..d632a9e 100644
--- a/elsim/elsim/similarity/libsimilarity/similarity.h
+++ b/elsim/elsim/similarity/libsimilarity/similarity.h
@@ -4,6 +4,7 @@
#include <stdio.h>
#include <string.h>
#include <math.h>
+#include <time.h>
#include "./z/z.h"
#include "./bz2/bz2.h"
|
