summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rwxr-xr-xsrc/common/captureFile.cpp2
-rwxr-xr-xsrc/common/captureFile.h3
-rw-r--r--src/common/ef/efence.cpp9
3 files changed, 11 insertions, 3 deletions
diff --git a/src/common/captureFile.cpp b/src/common/captureFile.cpp
index b3035e8a..a25d1c42 100755
--- a/src/common/captureFile.cpp
+++ b/src/common/captureFile.cpp
@@ -135,7 +135,7 @@ bool CCapPktRaw::Compare(CCapPktRaw * obj,int dump,double dsec){
CPktNsecTimeStamp t2(obj->time_sec,obj->time_nsec);
if ( t1.diff(t2) > dsec ){
if ( dump ){
- printf(" ERROR: diff of 1 msec in time \n");
+ printf(" ERROR: diff of %lf seconds while only %lf allowed\n", t1.diff(t2), dsec);
}
return (false);
}
diff --git a/src/common/captureFile.h b/src/common/captureFile.h
index d87e57b6..a552d501 100755
--- a/src/common/captureFile.h
+++ b/src/common/captureFile.h
@@ -25,6 +25,7 @@ limitations under the License.
#include <stdlib.h>
#include <string>
#include <iostream>
+#include <cmath>
#ifdef WIN32
#pragma warning(disable:4786)
@@ -87,7 +88,7 @@ public:
}
double diff(const CPktNsecTimeStamp & obj){
- return (abs(getNsec() - obj.getNsec() ) );
+ return (std::abs(getNsec() - obj.getNsec() ) );
}
void Dump(FILE *fd);
diff --git a/src/common/ef/efence.cpp b/src/common/ef/efence.cpp
index 1340a12a..b74d3da5 100644
--- a/src/common/ef/efence.cpp
+++ b/src/common/ef/efence.cpp
@@ -821,7 +821,6 @@ ef_malloc(size_t size)
lock();
allocation=ef_memalign(EF_ALIGNMENT, size);
-
/* put 0xaa into the memset to find uninit issues */
memset(allocation,0xaa,size);
#if 0
@@ -897,6 +896,14 @@ calloc(size_t nelem, size_t elsize)
return (ef_calloc(nelem, elsize));
}
+extern C_LINKAGE int
+posix_memalign(void **memptr, size_t alignment, size_t size)
+{
+ *memptr=ef_malloc(size);
+ return(0);
+}
+
+
/*
* This will catch more bugs if you remove the page alignment, but it
* will break some software.