X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=threads2h.c;h=1b5191420c7c0aa3b0aeb171f4e0c64915c05b5f;hb=fd91fad23459fa9c9f384b88fab0d24be4a9543c;hp=46742c487497d05185dd795028a54aadb46ff4db;hpb=471ecef14bab98d48dad385a2d9c3d4f361aa6c6;p=btree

diff --git a/threads2h.c b/threads2h.c
index 46742c4..1b51914 100644
--- 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
@@ -170,10 +170,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 list
-	unsigned char lvl:5;		// level of page
+	unsigned char lvl:6;		// level of page
 	unsigned char kill:1;		// page is being killed
 	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;
 
@@ -373,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
@@ -385,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 )
@@ -408,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) )
@@ -419,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;
@@ -442,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
@@ -454,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;
 }
@@ -467,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
 }
 
@@ -486,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
 }
 
@@ -784,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
 }
@@ -1964,10 +1963,10 @@ uid left;
 BTERR bt_splitpage (BtDb *bt, BtPageSet *set)
 {
 uint cnt = 0, idx = 0, max, nxt = bt->mgr->page_size;
-unsigned char fencekey[256];
+unsigned char fencekey[256], rightkey[256];
 uint lvl = set->page->lvl;
+BtPageSet right[1];
 uint prev;
-uid right;
 BtKey key;
 
 	//  split higher half of keys to bt->frame
@@ -1989,6 +1988,10 @@ BtKey key;
 		slotptr(bt->frame, idx)->off = nxt;
 	}
 
+	// remember existing fence key for new page to the right
+
+	memcpy (rightkey, key, key->len + 1);
+
 	bt->frame->bits = bt->mgr->page_bits;
 	bt->frame->min = nxt;
 	bt->frame->cnt = idx;
@@ -2001,7 +2004,7 @@ BtKey key;
 
 	//	get new free page and write higher keys to it.
 
-	if( !(right = bt_newpage(bt, bt->frame)) )
+	if( !(right->page_no = bt_newpage(bt, bt->frame)) )
 		return bt->err;
 
 	//	update lower keys to continue in old page
@@ -2009,7 +2012,6 @@ BtKey key;
 	memcpy (bt->frame, set->page, bt->mgr->page_size);
 	memset (set->page+1, 0, bt->mgr->page_size - sizeof(*set->page));
 	nxt = bt->mgr->page_size;
-	set->page->posted = 0;
 	set->page->dirty = 0;
 	set->page->act = 0;
 	cnt = 0;
@@ -2030,62 +2032,40 @@ BtKey key;
 	// remember fence key for smaller page
 
 	memcpy(fencekey, key, key->len + 1);
-	bt_putid(set->page->right, right);
+
+	bt_putid(set->page->right, right->page_no);
 	set->page->min = nxt;
 	set->page->cnt = idx;
 
 	// if current page is the root page, split it
 
 	if( set->page_no == ROOT_page )
-		return bt_splitroot (bt, set, fencekey, right);
-
-	right = 0;
+		return bt_splitroot (bt, set, fencekey, right->page_no);
 
 	// insert new fences in their parent pages
 
-	while( 1 ) {
-		bt_lockpage (BtLockParent, set->latch);
-
-		key = keyptr (set->page, set->page->cnt);
-		memcpy (fencekey, key, key->len + 1);
-		prev = set->page->posted;
-
-		if( right && prev ) {
-			bt_unlockpage (BtLockParent, set->latch);
-			bt_unlockpage (BtLockWrite, set->latch);
-			bt_unpinlatch (set->latch);
-			bt_unpinpool (set->pool);
-			return 0;
-		}
-
-		right = bt_getid (set->page->right);
-		set->page->posted = 1;
-
-		bt_unlockpage (BtLockWrite, set->latch);
+	right->latch = bt_pinlatch (bt, right->page_no);
+	bt_lockpage (BtLockParent, right->latch);
 
-		// insert new fence for reformulated left block of smaller keys
+	bt_lockpage (BtLockParent, set->latch);
+	bt_unlockpage (BtLockWrite, set->latch);
 
-		if( !prev )
-		  if( bt_insertkey (bt, fencekey+1, *fencekey, lvl+1, set->page_no, time(NULL)) )
-			return bt->err;
+	// insert new fence for reformulated left block of smaller keys
 
-		bt_unlockpage (BtLockParent, set->latch);
-		bt_unpinlatch (set->latch);
-		bt_unpinpool (set->pool);
-
-		if( !(set->page_no = right) )
-			break;
+	if( bt_insertkey (bt, fencekey+1, *fencekey, lvl+1, set->page_no, time(NULL)) )
+		return bt->err;
 
-		set->latch = bt_pinlatch (bt, right);
+	// switch fence for right block of larger keys to new right page
 
-		if( set->pool = bt_pinpool (bt, right) )
-			set->page = bt_page (bt, set->pool, right);
-		else
-			return bt->err;
+	if( bt_insertkey (bt, rightkey+1, *rightkey, lvl+1, right->page_no, time(NULL)) )
+		return bt->err;
 
-		bt_lockpage (BtLockWrite, set->latch);
-	}
+	bt_unlockpage (BtLockParent, set->latch);
+	bt_unpinlatch (set->latch);
+	bt_unpinpool (set->pool);
 
+	bt_unlockpage (BtLockParent, right->latch);
+	bt_unpinlatch (right->latch);
 	return 0;
 }
 
@@ -2245,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;
@@ -2484,6 +2513,7 @@ HANDLE *threads;
 double real_time;
 ThreadArg *args;
 uint poolsize = 0;
+float elapsed;
 int num = 0;
 char key[1];
 BtMgr *mgr;
@@ -2573,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);
 }