X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=threads2i.c;h=af913b4cf05b7e69553da0f76eb7df99f0b079f2;hb=d0d119d25d6be90d70146d863798c93fb07b115a;hp=c425d1813601f9c3c0f2eef029d67b93e9104ac4;hpb=0756819e460acb958eeb073f4d5ca9ddf66ec6c7;p=btree diff --git a/threads2i.c b/threads2i.c index c425d18..af913b4 100644 --- a/threads2i.c +++ b/threads2i.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 @@ -162,10 +162,9 @@ typedef struct BtPage_ { uint min; // next key offset unsigned char bits:7; // page size in bits unsigned char free:1; // page is on free chain - unsigned char lvl:5; // level of page + unsigned char lvl:6; // level of page unsigned char kill:1; // page is being deleted unsigned char dirty:1; // page has deleted keys - unsigned char posted:1; // page fence is posted unsigned char right[BtId]; // page number to right } *BtPage; @@ -366,10 +365,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 @@ -378,9 +377,9 @@ ushort prev; latch->share++; #ifdef unix - __sync_lock_release (&latch->mutex); + *latch->mutex = 0; #else - _InterlockedExchange8(&latch->mutex, 0); + _InterlockedExchange8(latch->mutex, 0); #endif if( prev ) @@ -401,10 +400,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) ) @@ -412,9 +411,9 @@ uint prev; else latch->pending = 1; #ifdef unix - __sync_lock_release (&latch->mutex); + *latch->mutex = 0; #else - _InterlockedExchange8(&latch->mutex, 0); + _InterlockedExchange8(latch->mutex, 0); #endif if( prev ) return; @@ -435,10 +434,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 @@ -447,9 +446,9 @@ uint prev; latch->exclusive = 1; #ifdef unix - __sync_lock_release (&latch->mutex); + *latch->mutex = 0; #else - _InterlockedExchange8(&latch->mutex, 0); + _InterlockedExchange8(latch->mutex, 0); #endif return prev; } @@ -459,17 +458,17 @@ uint prev; void bt_spinreleasewrite(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->exclusive = 0; #ifdef unix - __sync_lock_release (&latch->mutex); + *latch->mutex = 0; #else - _InterlockedExchange8(&latch->mutex, 0); + _InterlockedExchange8(latch->mutex, 0); #endif } @@ -478,17 +477,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); + *latch->mutex = 0; #else - _InterlockedExchange8(&latch->mutex, 0); + _InterlockedExchange8(latch->mutex, 0); #endif } @@ -697,14 +696,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 } @@ -2136,51 +2135,81 @@ uint bt_tod(BtDb *bt, uint slot) return slotptr(bt->cursor,slot)->tod; } - #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 +#include + +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; uid next, page_no; -BtLatchSet *latch; -BtPool *pool; -BtPage page; +BtPageSet set[1]; BtKey ptr; #ifdef unix for( idx = 1; idx < bt->mgr->latchmgr->latchdeployed; idx++ ) { - latch = bt->mgr->latchsets + idx; - if( *(ushort *)latch->readwr ) { - fprintf(stderr, "latchset %d r/w locked for page %.8x\n", idx, latch->page_no); - *(ushort *)latch->readwr = 0; - } - if( *(ushort *)latch->access ) { - fprintf(stderr, "latchset %d access locked for page %.8x\n", idx, latch->page_no); - *(ushort *)latch->access = 0; - } - if( *(ushort *)latch->parent ) { - fprintf(stderr, "latchset %d parent locked for page %.8x\n", idx, latch->page_no); - *(ushort *)latch->parent = 0; - } - if( *(ushort *)latch->busy ) { - fprintf(stderr, "latchset %d busy locked for page %.8x\n", idx, latch->page_no); - *(ushort *)latch->parent = 0; - } - if( latch->pin ) { - fprintf(stderr, "latchset %d pinned for page %.8x\n", idx, latch->page_no); - latch->pin = 0; + set->latch = bt->mgr->latchsets + idx; + if( set->latch->pin ) { + fprintf(stderr, "latchset %d pinned for page %.6x\n", idx, set->latch->page_no); + set->latch->pin = 0; } } for( hashidx = 0; hashidx < bt->mgr->latchmgr->latchhash; hashidx++ ) { if( idx = bt->mgr->latchmgr->table[hashidx].slot ) do { - latch = bt->mgr->latchsets + idx; - if( latch->hash != hashidx ) { + set->latch = bt->mgr->latchsets + idx; + if( set->latch->hash != hashidx ) fprintf(stderr, "latchset %d wrong hashidx\n", idx); - latch->hash = hashidx; - } - } while( idx = latch->next ); + if( set->latch->pin ) + fprintf(stderr, "latchset %d pinned for page %.8x\n", idx, set->latch->page_no); + } while( idx = set->latch->next ); } next = bt->mgr->latchmgr->nlatchpage + LATCH_page; @@ -2396,6 +2425,7 @@ HANDLE *threads; double real_time; ThreadArg *args; uint poolsize = 0; +float elapsed; int num = 0; char key[1]; BtMgr *mgr; @@ -2485,7 +2515,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); }