X-Git-Url: https://pd.if.org/git/?p=btree;a=blobdiff_plain;f=threads2j.c;h=ddaf07dbd8cc2bcf234db132081aa8704823600f;hp=27212ef96602fb8a18bbd29d04117f34d209a106;hb=d3d8184d50ec57dc1c0f0e19505ea026c1a1fbab;hpb=1a0821acfbaaf782e68983c15ac7adfc811d81bb

diff --git a/threads2j.c b/threads2j.c
index 27212ef..ddaf07d 100644
--- a/threads2j.c
+++ b/threads2j.c
@@ -741,14 +741,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
 }
@@ -2183,51 +2183,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 <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;
 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( *(uint *)latch->readwr ) {
-			fprintf(stderr, "latchset %d r/w locked for page %.8x\n", idx, latch->page_no);
-			*(uint *)latch->readwr = 0;
-		}
-		if( *(uint *)latch->access ) {
-			fprintf(stderr, "latchset %d access locked for page %.8x\n", idx, latch->page_no);
-			*(uint *)latch->access = 0;
-		}
-		if( *(uint *)latch->parent ) {
-			fprintf(stderr, "latchset %d parent locked for page %.8x\n", idx, latch->page_no);
-			*(uint *)latch->parent = 0;
-		}
-		if( *(uint *)latch->busy ) {
-			fprintf(stderr, "latchset %d busy locked for page %.8x\n", idx, latch->page_no);
-			*(uint *)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;
@@ -2393,7 +2423,20 @@ FILE *in;
 		page_no = LEAF_page;
 
 		while( page_no < bt_getid(bt->mgr->latchmgr->alloc->right) ) {
-			pread (bt->mgr->idx, bt->frame, bt->mgr->page_size, page_no << bt->mgr->page_bits);
+		uid off = page_no << bt->mgr->page_bits;
+#ifdef unix
+		  pread (bt->mgr->idx, bt->frame, bt->mgr->page_size, off);
+#else
+		DWORD amt[1];
+
+		  SetFilePointer (bt->mgr->idx, (long)off, (long*)(&off)+1, FILE_BEGIN);
+
+		  if( !ReadFile(bt->mgr->idx, bt->frame, bt->mgr->page_size, amt, NULL))
+			return bt->err = BTERR_map;
+
+		  if( *amt <  bt->mgr->page_size )
+			return bt->err = BTERR_map;
+#endif
 			if( !bt->frame->free && !bt->frame->lvl )
 				cnt += bt->frame->act;
 			if( page_no > LEAF_page )
@@ -2430,6 +2473,7 @@ HANDLE *threads;
 double real_time;
 ThreadArg *args;
 uint poolsize = 0;
+float elapsed;
 int num = 0;
 char key[1];
 BtMgr *mgr;
@@ -2519,7 +2563,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);
 }