From f23d1ad6c2f2fb9e4e6204936eb07e902320f03d Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 11 May 2004 14:39:17 +0200 Subject: [PATCH] lots of HAVE_ and some ndb_global fixes for ndb subtree ndb/include/portlib/NdbTCP.h: introduced ndb_net.h ndb/include/portlib/NdbThread.h: ndb_global ndb/src/common/portlib/unix/NdbCondition.c: Used HAVE_CLOCK_GETTIME ndb/src/common/portlib/unix/NdbMem.c: used HAVE_MLOCKALL ndb/src/common/portlib/unix/NdbSleep.c: ndb_global ndb/src/common/portlib/unix/NdbThread.c: . ndb/src/common/portlib/unix/NdbTick.c: HAVE_CLOCK_GETTIME ndb/src/kernel/vm/Emulator.cpp: ndb_global --- ndb/include/ndb_net.h | 7 ++++ ndb/include/portlib/NdbTCP.h | 12 +----- ndb/include/portlib/NdbThread.h | 3 +- ndb/src/common/portlib/unix/NdbCondition.c | 49 ++++------------------ ndb/src/common/portlib/unix/NdbMem.c | 8 ++-- ndb/src/common/portlib/unix/NdbSleep.c | 12 +----- ndb/src/common/portlib/unix/NdbThread.c | 5 +-- ndb/src/common/portlib/unix/NdbTick.c | 10 ++--- ndb/src/kernel/vm/Emulator.cpp | 6 --- 9 files changed, 29 insertions(+), 83 deletions(-) create mode 100644 ndb/include/ndb_net.h diff --git a/ndb/include/ndb_net.h b/ndb/include/ndb_net.h new file mode 100644 index 00000000000..279beb471a7 --- /dev/null +++ b/ndb/include/ndb_net.h @@ -0,0 +1,7 @@ + +#ifndef NDBNET_H +#define NDBNET_H + +#include + +#endif diff --git a/ndb/include/portlib/NdbTCP.h b/ndb/include/portlib/NdbTCP.h index e7538b1ed7f..04a52c7d033 100644 --- a/ndb/include/portlib/NdbTCP.h +++ b/ndb/include/portlib/NdbTCP.h @@ -18,6 +18,7 @@ #define NDB_TCP_H #include +#include #if defined NDB_OSE || defined NDB_SOFTOSE /** @@ -45,10 +46,6 @@ typedef int socklen_t; /** * Include files needed */ -#include -#include -#include - #include #define NDB_NONBLOCK O_NONBLOCK @@ -75,12 +72,7 @@ typedef int socklen_t; #endif -#ifndef NDB_MACOSX -#define NDB_SOCKLEN_T socklen_t -#else -#define NDB_SOCKLEN_T int -#endif - +#define NDB_SOCKLEN_T SOCKET_SIZE_TYPE #ifdef __cplusplus extern "C" { diff --git a/ndb/include/portlib/NdbThread.h b/ndb/include/portlib/NdbThread.h index 516022903e3..212f7de9384 100644 --- a/ndb/include/portlib/NdbThread.h +++ b/ndb/include/portlib/NdbThread.h @@ -17,8 +17,7 @@ #ifndef NDB_THREAD_H #define NDB_THREAD_H -#include - +#include #ifdef __cplusplus extern "C" { diff --git a/ndb/src/common/portlib/unix/NdbCondition.c b/ndb/src/common/portlib/unix/NdbCondition.c index 024c6b433f3..9615e107d0c 100644 --- a/ndb/src/common/portlib/unix/NdbCondition.c +++ b/ndb/src/common/portlib/unix/NdbCondition.c @@ -61,7 +61,6 @@ NdbCondition_Wait(struct NdbCondition* p_cond, return result; } -#if defined NDB_SOLARIS || defined NDB_HPUX #include int NdbCondition_WaitTimeout(struct NdbCondition* p_cond, @@ -74,7 +73,16 @@ NdbCondition_WaitTimeout(struct NdbCondition* p_cond, if (p_cond == NULL || p_mutex == NULL) return 1; +#ifdef HAVE_CLOCK_GETTIME clock_gettime(CLOCK_REALTIME, &abstime); +#else + { + struct timeval tick_time; + gettimeofday(&tick_time, 0); + abstime.tv_sec = tick_time.tv_sec; + abstime.tv_nsec = tick_time.tv_usec * 1000; + } +#endif if(msecs >= 1000){ secs = msecs / 1000; @@ -92,45 +100,6 @@ NdbCondition_WaitTimeout(struct NdbCondition* p_cond, return result; } -#endif - -#if defined NDB_LINUX || defined NDB_MACOSX -#include -#include - -int -NdbCondition_WaitTimeout(struct NdbCondition* p_cond, - NdbMutex* p_mutex, - int msecs){ - int result; - struct timespec abstime; - struct timeval tick_time; - int secs = 0; - - if (p_cond == NULL || p_mutex == NULL) - return 1; - - gettimeofday(&tick_time, 0); - - if(msecs >= 1000){ - secs = msecs / 1000; - msecs = msecs % 1000; - } - - - abstime.tv_sec = tick_time.tv_sec + secs; - abstime.tv_nsec = tick_time.tv_usec * 1000 + msecs * 1000000; - if (abstime.tv_nsec >= 1000000000) { - abstime.tv_sec += 1; - abstime.tv_nsec -= 1000000000; - } - - result = pthread_cond_timedwait(&p_cond->cond, p_mutex, &abstime); - - return result; -} -#endif - int NdbCondition_Signal(struct NdbCondition* p_cond){ diff --git a/ndb/src/common/portlib/unix/NdbMem.c b/ndb/src/common/portlib/unix/NdbMem.c index aa3663e064f..4ddb5b52ecd 100644 --- a/ndb/src/common/portlib/unix/NdbMem.c +++ b/ndb/src/common/portlib/unix/NdbMem.c @@ -54,16 +54,16 @@ void NdbMem_Free(void* ptr) int NdbMem_MemLockAll(){ -#if defined NDB_MACOSX - return 0; +#ifdef HAVE_MLOCKALL + return -1; #else return mlockall(MCL_CURRENT); #endif } int NdbMem_MemUnlockAll(){ -#if defined NDB_MACOSX - return 0; +#ifdef HAVE_MLOCKALL + return -1; #else return munlockall(); #endif diff --git a/ndb/src/common/portlib/unix/NdbSleep.c b/ndb/src/common/portlib/unix/NdbSleep.c index 35132d7f9c7..8702a25d1b1 100644 --- a/ndb/src/common/portlib/unix/NdbSleep.c +++ b/ndb/src/common/portlib/unix/NdbSleep.c @@ -15,19 +15,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include "NdbSleep.h" - -#ifdef NDB_SOLARIS -#include -#include -#endif - -#if defined NDB_LINUX || defined NDB_HPUX || defined NDB_MACOSX -#include -#include -#endif - int NdbSleep_MilliSleep(int milliseconds){ int result = 0; diff --git a/ndb/src/common/portlib/unix/NdbThread.c b/ndb/src/common/portlib/unix/NdbThread.c index dbb3da03eab..7f043bef56e 100644 --- a/ndb/src/common/portlib/unix/NdbThread.c +++ b/ndb/src/common/portlib/unix/NdbThread.c @@ -16,9 +16,8 @@ #include - -#include "NdbThread.h" -#include +#include +#include #define MAX_THREAD_NAME 16 diff --git a/ndb/src/common/portlib/unix/NdbTick.c b/ndb/src/common/portlib/unix/NdbTick.c index f4cda6449d6..d8f0b6ec27a 100644 --- a/ndb/src/common/portlib/unix/NdbTick.c +++ b/ndb/src/common/portlib/unix/NdbTick.c @@ -15,8 +15,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include "NdbTick.h" -#include #define NANOSEC_PER_SEC 1000000000 #define MICROSEC_PER_SEC 1000000 @@ -25,7 +25,7 @@ #define MILLISEC_PER_NANOSEC 1000000 -#if defined NDB_SOLARIS || NDB_HPUX +#ifdef HAVE_CLOCK_GETTIME NDB_TICKS NdbTick_CurrentMillisecond(void) { struct timespec tick_time; @@ -44,11 +44,7 @@ NdbTick_CurrentMicrosecond(NDB_TICKS * secs, Uint32 * micros){ * micros = t.tv_nsec / 1000; return res; } -#endif - -#if defined NDB_LINUX || NDB_MACOSX -#include -#include +#else NDB_TICKS NdbTick_CurrentMillisecond(void) { struct timeval tick_time; diff --git a/ndb/src/kernel/vm/Emulator.cpp b/ndb/src/kernel/vm/Emulator.cpp index 7eae1f519c0..0d6d3f55acb 100644 --- a/ndb/src/kernel/vm/Emulator.cpp +++ b/ndb/src/kernel/vm/Emulator.cpp @@ -39,12 +39,6 @@ extern "C" { extern void (* ndb_new_handler)(); } - -#if defined (NDB_LINUX) || defined (NDB_SOLARIS) -#include -#include -#endif - /** * Declare the global variables */