[Python-modules-commits] [androguard] 01/03: upstream commit e1bd2a7 to fix compilation on non-x86 (Closes: #849647)

[Hans-Christoph Steiner]

This is an automated email from the git hooks/post-receive script.

eighthave pushed a commit to branch master
in repository androguard.

commit 67865eeef0706e98e3a05e5228cebe593e31038f
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Sat Mar 11 10:59:21 2017 +0100

    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"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/androguard.git