// btree version 2s
-// 18 FEB 2014
+// with reworked bt_deletekey code
+// 25 FEB 2014
// author: karl malbrain, malbrain@cal.berkeley.edu
do munmap (hash->page, (bt->hashmask+1) << bt->page_bits);
while(hash = hash->lrunext);
- if ( bt->mem )
+ if( bt->mem )
free (bt->mem);
close (bt->idx);
free (bt->cache);
CloseHandle(hash->hmap);
} while(hash = hash->lrunext);
- if ( bt->mem)
+ if( bt->mem)
VirtualFree (bt->mem, 0, MEM_RELEASE);
FlushFileBuffers(bt->idx);
CloseHandle(bt->idx);
else if( bits < BT_minbits )
bits = BT_minbits;
- if ( bt_lockpage(bt, ALLOC_page, lockmode) )
+ if( bt_lockpage(bt, ALLOC_page, lockmode) )
return bt_close (bt), NULL;
#ifdef unix
bt->zero = (BtPage)(bt->mem + 5 * bt->page_size);
if( size || *amt ) {
- if ( bt_unlockpage(bt, ALLOC_page, lockmode) )
+ if( bt_unlockpage(bt, ALLOC_page, lockmode) )
return bt_close (bt), NULL;
return bt;
off64_t off = page_no << bt->page_bits;
#ifdef unix
- if ( !bt->mapped_io )
- if ( pwrite(bt->idx, page, bt->page_size, off) != bt->page_size )
+ if( !bt->mapped_io )
+ if( pwrite(bt->idx, page, bt->page_size, off) != bt->page_size )
return bt->err = BTERR_wrt;
#else
uint amt[1];
- if ( !bt->mapped_io )
+ if( !bt->mapped_io )
{
SetFilePointer (bt->idx, (long)off, (long*)(&off)+1, FILE_BEGIN);
if( !WriteFile (bt->idx, (char *)page, bt->page_size, amt, NULL) )
if( *amt < bt->page_size )
return GetLastError(), bt->err = BTERR_wrt;
}
- else if ( bt->mode == BT_fl ) {
+ else if( bt->mode == BT_fl ) {
FlushViewOfFile(page, bt->page_size);
FlushFileBuffers(bt->idx);
}
return bt->err;
}
#ifdef unix
- if ( pread(bt->idx, *page, bt->page_size, off) < bt->page_size )
+ if( pread(bt->idx, *page, bt->page_size, off) < bt->page_size )
return bt->err = BTERR_map;
#else
SetFilePointer (bt->idx, (long)off, (long*)(&off)+1, FILE_BEGIN);
// lock allocation page
- if ( bt_lockpage(bt, ALLOC_page, BtLockWrite) )
+ if( bt_lockpage(bt, ALLOC_page, BtLockWrite) )
return bt->err;
if( bt_mappage (bt, &bt->alloc, ALLOC_page) )
// lock page zero
- if ( bt_lockpage(bt, ALLOC_page, BtLockWrite) )
+ if( bt_lockpage(bt, ALLOC_page, BtLockWrite) )
return 0;
if( bt_mappage (bt, &bt->alloc, ALLOC_page) )
// unlock page zero
- if ( bt_unlockpage(bt, ALLOC_page, BtLockWrite) )
+ if( bt_unlockpage(bt, ALLOC_page, BtLockWrite) )
return 0;
return new_page;
}
#ifdef unix
- if ( pwrite(bt->idx, page, bt->page_size, new_page << bt->page_bits) < bt->page_size )
+ if( pwrite(bt->idx, page, bt->page_size, new_page << bt->page_bits) < bt->page_size )
return bt->err = BTERR_wrt, 0;
// if writing first page of hash block, zero last page in the block
- if ( !reuse && bt->hashmask > 0 && (new_page & bt->hashmask) == 0 )
+ if( !reuse && bt->hashmask > 0 && (new_page & bt->hashmask) == 0 )
{
// use temp buffer to write zeros
memset(bt->zero, 0, bt->page_size);
- if ( pwrite(bt->idx,bt->zero, bt->page_size, (new_page | bt->hashmask) << bt->page_bits) < bt->page_size )
+ if( pwrite(bt->idx,bt->zero, bt->page_size, (new_page | bt->hashmask) << bt->page_bits) < bt->page_size )
return bt->err = BTERR_wrt, 0;
}
#else
// unlock page zero
- if ( bt_unlockpage(bt, ALLOC_page, BtLockWrite) )
+ if( bt_unlockpage(bt, ALLOC_page, BtLockWrite) )
return 0;
return new_page;
// re-read and re-lock root after determining actual level of root
if( bt->page->lvl != drill) {
- if ( bt->page_no != ROOT_page )
+ if( bt->page_no != ROOT_page )
return bt->err = BTERR_struct, 0;
drill = bt->page->lvl;
// obtain lock on right page
- if ( bt_lockpage(bt, right, BtLockWrite) )
+ if( bt_lockpage(bt, right, BtLockWrite) )
return bt->err;
if( bt_mappage (bt, &bt->temp, right) )
else
id = 0;
- if ( bt_unlockpage(bt, bt->page_no, BtLockRead) )
+ if( bt_unlockpage(bt, bt->page_no, BtLockRead) )
return 0;
return id;
ptr = keyptr(bt->page, slot);
else
{
- if ( !bt->err )
+ if( !bt->err )
bt->err = BTERR_ovflw;
return bt->err;
}
slotptr(page, slot)->dead = 0;
slotptr(page, slot)->tod = tod;
bt_putid(slotptr(page,slot)->id, id);
- if ( bt_update(bt, bt->page, bt->page_no) )
+ if( bt_update(bt, bt->page, bt->page_no) )
return bt->err;
return bt_unlockpage(bt, bt->page_no, BtLockWrite);
}
bt->cursor_page = bt->page_no;
- if ( bt_unlockpage(bt, bt->page_no, BtLockRead) )
+ if( bt_unlockpage(bt, bt->page_no, BtLockRead) )
return 0;
return slot;
memcpy (bt->cursor, bt->page, bt->page_size);
- if ( bt_unlockpage(bt, right, BtLockRead) )
+ if( bt_unlockpage(bt, right, BtLockRead) )
return 0;
slot = 0;
#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
+
// standalone program to index file of keys
// then list them onto std-out
uint slot, line = 0, off = 0, found = 0;
int dead, ch, cnt = 0, bits = 12;
unsigned char key[256];
-clock_t done, start;
+double done, start;
uint pgblk = 0;
+float elapsed;
time_t tod[1];
uint scan = 0;
uint len = 0;
uint map = 0;
+uid page_no;
BtKey ptr;
BtDb *bt;
FILE *in;
exit(0);
}
- start = clock();
+ start = getCpuTime(0);
time(tod);
if( argc > 4 )
}
else if( len < 245 )
key[len++] = ch;
- fprintf(stderr, "finished adding keys, %d \n", line);
+ fprintf(stderr, "finished adding keys for %s, %d \n", argv[2], line);
break;
case 'd':
}
else if( len < 245 )
key[len++] = ch;
- fprintf(stderr, "finished deleting keys, %d \n", line);
+ fprintf(stderr, "finished deleting keys for %s, %d \n", argv[2], line);
break;
case 'f':
}
else if( len < 245 )
key[len++] = ch;
- fprintf(stderr, "finished search of %d keys, found %d\n", line, found);
+ fprintf(stderr, "finished search of %d keys for %s, found %d\n", line, argv[2], found);
break;
case 's':
- scan++;
- break;
+ cnt = len = key[0] = 0;
- }
+ if( slot = bt_startkey (bt, key, len) )
+ slot--;
+ else
+ fprintf(stderr, "Error %d in StartKey. Syserror: %d\n", bt->err, errno), exit(0);
- done = clock();
- fprintf(stderr, " Time to complete: %.2f seconds\n", (float)(done - start) / CLOCKS_PER_SEC);
+ while( slot = bt_nextkey (bt, slot) ) {
+ ptr = bt_key(bt, slot);
+ fwrite (ptr->key, ptr->len, 1, stdout);
+ fputc ('\n', stdout);
+ cnt++;
+ }
- dead = cnt = 0;
- len = key[0] = 0;
+ fprintf(stderr, " Total keys read %d\n", cnt - 1);
+ break;
- fprintf(stderr, "started reading\n");
+ case 'c':
+ fprintf(stderr, "started counting\n");
+ cnt = 0;
- if( slot = bt_startkey (bt, key, len) )
- slot--;
- else
- fprintf(stderr, "Error %d in StartKey. Syserror: %d\n", bt->err, errno), exit(0);
+ page_no = LEAF_page;
+ cnt = 0;
- while( slot = bt_nextkey (bt, slot) )
- if( cnt++, scan ) {
- ptr = bt_key(bt, slot);
- fwrite (ptr->key, ptr->len, 1, stdout);
- fputc ('\n', stdout);
+ while( 1 ) {
+ uid off = page_no << bt->page_bits;
+#ifdef unix
+ if( !pread (bt->idx, bt->frame, bt->page_size, off) )
+ break;
+#else
+ DWORD amt[1];
+
+ SetFilePointer (bt->idx, (long)off, (long*)(&off)+1, FILE_BEGIN);
+
+ if( !ReadFile(bt->idx, bt->frame, bt->page_size, amt, NULL))
+ break;
+
+ if( *amt < bt->page_size )
+ fprintf (stderr, "unable to read page %.8x", page_no);
+#endif
+ if( !bt->frame->free && !bt->frame->lvl )
+ cnt += bt->frame->act;
+
+ page_no++;
}
+
+ cnt--; // remove stopper key
+ fprintf(stderr, " Total keys read %d\n", cnt);
+ break;
+ }
+
+ done = getCpuTime(0);
+ elapsed = (float)(done - 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);
- fprintf(stderr, " Total keys read %d\n", cnt);
return 0;
}