Remove -lrt dependency on linux link

[btree] / threads2h.c

diff --git a/threads2h.c b/threads2h.c
index 4a28044811ef815c490558f5cf66af89d13c29aa..1b5191420c7c0aa3b0aeb171f4e0c64915c05b5f 100644 (file)
--- a/threads2h.c
+++ b/threads2h.c
@@ -93,11 +93,11 @@ typedef enum{
 // share is count of read accessors
 // grant write lock when share == 0
 
-typedef struct {
-       volatile unsigned char mutex;
-       volatile unsigned char exclusive:1;
-       volatile unsigned char pending:1;
-       volatile ushort share;
+volatile typedef struct {
+       unsigned char mutex[1];
+       unsigned char exclusive:1;
+       unsigned char pending:1;
+       ushort share;
 } BtSpinLatch;
 
 //  hash table entries
@@ -372,10 +372,10 @@ ushort prev;
   do {
        //      obtain latch mutex
 #ifdef unix
-       if( __sync_lock_test_and_set(&latch->mutex, 1) )
+       if( __sync_lock_test_and_set(latch->mutex, 1) )
                continue;
 #else
-       if( _InterlockedExchange8(&latch->mutex, 1) )
+       if( _InterlockedExchange8(latch->mutex, 1) )
                continue;
 #endif
        //  see if exclusive request is granted or pending
@@ -384,9 +384,9 @@ ushort prev;
                latch->share++;
 
 #ifdef unix
-       __sync_lock_release (&latch->mutex);
+       __sync_lock_release (latch->mutex);
 #else
-       _InterlockedExchange8(&latch->mutex, 0);
+       _InterlockedExchange8(latch->mutex, 0);
 #endif
 
        if( prev )
@@ -407,10 +407,10 @@ uint prev;
 
   do {
 #ifdef  unix
-       if( __sync_lock_test_and_set(&latch->mutex, 1) )
+       if( __sync_lock_test_and_set(latch->mutex, 1) )
                continue;
 #else
-       if( _InterlockedExchange8(&latch->mutex, 1) )
+       if( _InterlockedExchange8(latch->mutex, 1) )
                continue;
 #endif
        if( prev = !(latch->share | latch->exclusive) )
@@ -418,9 +418,9 @@ uint prev;
        else
                latch->pending = 1;
 #ifdef unix
-       __sync_lock_release (&latch->mutex);
+       __sync_lock_release (latch->mutex);
 #else
-       _InterlockedExchange8(&latch->mutex, 0);
+       _InterlockedExchange8(latch->mutex, 0);
 #endif
        if( prev )
                return;
@@ -441,10 +441,10 @@ int bt_spinwritetry(BtSpinLatch *latch)
 uint prev;
 
 #ifdef unix
-       if( __sync_lock_test_and_set(&latch->mutex, 1) )
+       if( __sync_lock_test_and_set(latch->mutex, 1) )
                return 0;
 #else
-       if( _InterlockedExchange8(&latch->mutex, 1) )
+       if( _InterlockedExchange8(latch->mutex, 1) )
                return 0;
 #endif
        //      take write access if all bits are clear
@@ -453,9 +453,9 @@ uint prev;
                latch->exclusive = 1;
 
 #ifdef unix
-       __sync_lock_release (&latch->mutex);
+       __sync_lock_release (latch->mutex);
 #else
-       _InterlockedExchange8(&latch->mutex, 0);
+       _InterlockedExchange8(latch->mutex, 0);
 #endif
        return prev;
 }
@@ -466,17 +466,17 @@ void bt_spinreleasewrite(BtSpinLatch *latch)
 {
        //      obtain latch mutex
 #ifdef unix
-       while( __sync_lock_test_and_set(&latch->mutex, 1) )
+       while( __sync_lock_test_and_set(latch->mutex, 1) )
                sched_yield();
 #else
-       while( _InterlockedExchange8(&latch->mutex, 1) )
+       while( _InterlockedExchange8(latch->mutex, 1) )
                SwitchToThread();
 #endif
        latch->exclusive = 0;
 #ifdef unix
-       __sync_lock_release (&latch->mutex);
+       __sync_lock_release (latch->mutex);
 #else
-       _InterlockedExchange8(&latch->mutex, 0);
+       _InterlockedExchange8(latch->mutex, 0);
 #endif
 }
 
@@ -485,17 +485,17 @@ void bt_spinreleasewrite(BtSpinLatch *latch)
 void bt_spinreleaseread(BtSpinLatch *latch)
 {
 #ifdef unix
-       while( __sync_lock_test_and_set(&latch->mutex, 1) )
+       while( __sync_lock_test_and_set(latch->mutex, 1) )
                sched_yield();
 #else
-       while( _InterlockedExchange8(&latch->mutex, 1) )
+       while( _InterlockedExchange8(latch->mutex, 1) )
                SwitchToThread();
 #endif
        latch->share--;
 #ifdef unix
-       __sync_lock_release (&latch->mutex);
+       __sync_lock_release (latch->mutex);
 #else
-       _InterlockedExchange8(&latch->mutex, 0);
+       _InterlockedExchange8(latch->mutex, 0);
 #endif
 }
 
@@ -783,14 +783,14 @@ uint slot;
        close (mgr->idx);
        free (mgr->pool);
        free (mgr->hash);
-       free (mgr->latch);
+       free ((void *)mgr->latch);
        free (mgr);
 #else
        FlushFileBuffers(mgr->idx);
        CloseHandle(mgr->idx);
        GlobalFree (mgr->pool);
        GlobalFree (mgr->hash);
-       GlobalFree (mgr->latch);
+       GlobalFree ((void *)mgr->latch);
        GlobalFree (mgr);
 #endif
 }
@@ -2225,6 +2225,55 @@ uint bt_tod(BtDb *bt, uint slot)
 
 #ifdef STANDALONE
 
+#ifndef unix
+double getCpuTime(int type)
+{
+FILETIME crtime[1];
+FILETIME xittime[1];
+FILETIME systime[1];
+FILETIME usrtime[1];
+SYSTEMTIME timeconv[1];
+double ans;
+
+       GetProcessTimes (GetCurrentProcess(), crtime, xittime, systime, usrtime);
+       memset (timeconv, 0, sizeof(SYSTEMTIME));
+
+       switch( type ) {
+       case 1:
+               FileTimeToSystemTime (usrtime, timeconv);
+               break;
+       case 2:
+               FileTimeToSystemTime (systime, timeconv);
+               break;
+       }
+
+       ans = (double)timeconv->wHour * 3600;
+       ans += (double)timeconv->wMinute * 60;
+       ans += (double)timeconv->wSecond;
+       ans += (double)timeconv->wMilliseconds / 1000;
+       return ans;
+}
+#else
+#include <sys/time.h>
+#include <sys/resource.h>
+
+double getCpuTime(int type)
+{
+struct rusage used[1];
+
+       getrusage(RUSAGE_SELF, used);
+       switch( type ) {
+       case 1:
+               return (double)used->ru_utime.tv_sec + (double)used->ru_utime.tv_usec / 1000000;
+
+       case 2:
+               return (double)used->ru_stime.tv_sec + (double)used->ru_stime.tv_usec / 1000000;
+       }
+
+       return 0;
+}
+#endif
+
 void bt_latchaudit (BtDb *bt)
 {
 ushort idx, hashidx;
@@ -2464,6 +2513,7 @@ HANDLE *threads;
 double real_time;
 ThreadArg *args;
 uint poolsize = 0;
+float elapsed;
 int num = 0;
 char key[1];
 BtMgr *mgr;
@@ -2553,7 +2603,13 @@ BtDb *bt;
        time (stop);
        real_time = 1000 * (*stop - *start);
 #endif
-       fprintf(stderr, " Time to complete: %.2f seconds\n", real_time/1000);
+       elapsed = real_time / 1000;
+       fprintf(stderr, " real %dm%.3fs\n", (int)(elapsed/60), elapsed - (int)(elapsed/60)*60);
+       elapsed = getCpuTime(1);
+       fprintf(stderr, " user %dm%.3fs\n", (int)(elapsed/60), elapsed - (int)(elapsed/60)*60);
+       elapsed = getCpuTime(2);
+       fprintf(stderr, " sys  %dm%.3fs\n", (int)(elapsed/60), elapsed - (int)(elapsed/60)*60);
+
        bt_mgrclose (mgr);
 }