Introduce btree2t

[btree] / threads2h.c

diff --git a/threads2h.c b/threads2h.c
index 160308a9fcd1c8053e864b4a1ef7c7d1fa65aee4..7602b1179d54676363846162a930dcf1822fcc4a 100644 (file)
--- a/threads2h.c
+++ b/threads2h.c
@@ -612,6 +612,8 @@ ushort hashidx = page_no % bt->mgr->latchmgr->latchhash;
 ushort slot, avail = 0, victim, idx;
 BtLatchSet *set;
 
+  //  try to find existing latch table entry for this page
+
        //  obtain read lock on hash table entry
 
        bt_spinreadlock(bt->mgr->latchmgr->table[hashidx].latch);
@@ -790,7 +792,7 @@ uint slot;
        CloseHandle(mgr->idx);
        GlobalFree (mgr->pool);
        GlobalFree (mgr->hash);
-       GlobalFree (mgr->latch);
+       GlobalFree ((void *)mgr->latch);
        GlobalFree (mgr);
 #endif
 }
@@ -800,10 +802,10 @@ uint slot;
 void bt_close (BtDb *bt)
 {
 #ifdef unix
-       if ( bt->mem )
+       if( bt->mem )
                free (bt->mem);
 #else
-       if ( bt->mem)
+       if( bt->mem)
                VirtualFree (bt->mem, 0, MEM_RELEASE);
 #endif
        free (bt);
@@ -1226,7 +1228,7 @@ uint slot, idx, victim;
                return pool;
        }
 
-       //      upgrade to write lock
+       // upgrade to write lock
 
        bt_spinreleaseread (&bt->mgr->latch[idx]);
        bt_spinwritelock (&bt->mgr->latch[idx]);
@@ -1419,15 +1421,15 @@ int reuse;
                reuse = 0;
        }
 #ifdef unix
-       if ( pwrite(bt->mgr->idx, page, bt->mgr->page_size, new_page << bt->mgr->page_bits) < bt->mgr->page_size )
+       if( pwrite(bt->mgr->idx, page, bt->mgr->page_size, new_page << bt->mgr->page_bits) < bt->mgr->page_size )
                return bt->err = BTERR_wrt, 0;
 
        // if writing first page of pool block, zero last page in the block
 
-       if ( !reuse && bt->mgr->poolmask > 0 && (new_page & bt->mgr->poolmask) == 0 )
+       if( !reuse && bt->mgr->poolmask > 0 && (new_page & bt->mgr->poolmask) == 0 )
        {
                // use zero buffer to write zeros
-               if ( pwrite(bt->mgr->idx,bt->zero, bt->mgr->page_size, (new_page | bt->mgr->poolmask) << bt->mgr->page_bits) < bt->mgr->page_size )
+               if( pwrite(bt->mgr->idx,bt->zero, bt->mgr->page_size, (new_page | bt->mgr->poolmask) << bt->mgr->page_bits) < bt->mgr->page_size )
                        return bt->err = BTERR_wrt, 0;
        }
 #else
@@ -1535,7 +1537,7 @@ BtPool *prevpool;
        // re-read and re-lock root after determining actual level of root
 
        if( set->page->lvl != drill) {
-               if ( set->page_no != ROOT_page )
+               if( set->page_no != ROOT_page )
                        return bt->err = BTERR_struct, 0;
                        
                drill = set->page->lvl;
@@ -2082,7 +2084,7 @@ BtKey ptr;
                        ptr = keyptr(set->page, slot);
                else
                {
-                       if ( !bt->err )
+                       if( !bt->err )
                                bt->err = BTERR_ovflw;
                        return bt->err;
                }
@@ -2225,6 +2227,67 @@ 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 = 0;
+
+       memset (timeconv, 0, sizeof(SYSTEMTIME));
+
+       switch( type ) {
+       case 0:
+               GetSystemTimeAsFileTime (xittime);
+               FileTimeToSystemTime (xittime, timeconv);
+               ans = (double)timeconv->wDayOfWeek * 3600 * 24;
+               break;
+       case 1:
+               GetProcessTimes (GetCurrentProcess(), crtime, xittime, systime, usrtime);
+               FileTimeToSystemTime (usrtime, timeconv);
+               break;
+       case 2:
+               GetProcessTimes (GetCurrentProcess(), crtime, xittime, systime, usrtime);
+               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 <time.h>
+#include <sys/resource.h>
+
+double getCpuTime(int type)
+{
+struct rusage used[1];
+struct timeval tv[1];
+
+       switch( type ) {
+       case 0:
+               gettimeofday(tv, NULL);
+               return (double)tv->tv_sec + (double)tv->tv_usec / 1000000;
+
+       case 1:
+               getrusage(RUSAGE_SELF, used);
+               return (double)used->ru_utime.tv_sec + (double)used->ru_utime.tv_usec / 1000000;
+
+       case 2:
+               getrusage(RUSAGE_SELF, used);
+               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;
@@ -2454,16 +2517,15 @@ int main (int argc, char **argv)
 {
 int idx, cnt, len, slot, err;
 int segsize, bits = 16;
+double start, stop;
 #ifdef unix
 pthread_t *threads;
-timer start, stop;
 #else
-time_t start[1], stop[1];
 HANDLE *threads;
 #endif
-double real_time;
 ThreadArg *args;
 uint poolsize = 0;
+float elapsed;
 int num = 0;
 char key[1];
 BtMgr *mgr;
@@ -2480,11 +2542,7 @@ BtDb *bt;
                exit(0);
        }
 
-#ifdef unix
-       gettimeofday(&start, NULL);
-#else
-       time(start);
-#endif
+       start = getCpuTime(0);
 
        if( argc > 3 )
                bits = atoi(argv[3]);
@@ -2542,18 +2600,20 @@ BtDb *bt;
 #ifdef unix
        for( idx = 0; idx < cnt; idx++ )
                pthread_join (threads[idx], NULL);
-       gettimeofday(&stop, NULL);
-       real_time = 1000.0 * ( stop.tv_sec - start.tv_sec ) + 0.001 * (stop.tv_usec - start.tv_usec );
 #else
        WaitForMultipleObjects (cnt, threads, TRUE, INFINITE);
 
        for( idx = 0; idx < cnt; idx++ )
                CloseHandle(threads[idx]);
 
-       time (stop);
-       real_time = 1000 * (*stop - *start);
 #endif
-       fprintf(stderr, " Time to complete: %.2f seconds\n", real_time/1000);
+       elapsed = getCpuTime(0) - start;
+       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);
 }