// btree version 2s
-// 18 FEB 2014
+// with reworked bt_deletekey code
+// 25 FEB 2014
// author: karl malbrain, malbrain@cal.berkeley.edu
FILETIME systime[1];
FILETIME usrtime[1];
SYSTEMTIME timeconv[1];
-double ans;
+double ans = 0;
- GetProcessTimes (GetCurrentProcess(), crtime, xittime, systime, usrtime);
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->wHour * 3600;
ans += (double)timeconv->wMinute * 60;
ans += (double)timeconv->wSecond;
ans += (double)timeconv->wMilliseconds / 1000;
return ans;
}
#else
-#include <sys/time.h>
+#include <time.h>
#include <sys/resource.h>
double getCpuTime(int type)
{
struct rusage used[1];
+struct timeval tv[1];
- getrusage(RUSAGE_SELF, used);
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;
}
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);
+
+ while( slot = bt_nextkey (bt, slot) ) {
+ ptr = bt_key(bt, slot);
+ fwrite (ptr->key, ptr->len, 1, stdout);
+ fputc ('\n', stdout);
+ cnt++;
+ }
+
+ fprintf(stderr, " Total keys read %d\n", cnt - 1);
+ break;
+
+ case 'c':
+ fprintf(stderr, "started counting\n");
+ cnt = 0;
+
+ page_no = LEAF_page;
+ cnt = 0;
+
+ 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 = clock();
- elapsed = (float)(done - start)/CLOCKS_PER_SEC;
+ 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);
- dead = cnt = 0;
- len = key[0] = 0;
-
- fprintf(stderr, "started reading\n");
-
- if( slot = bt_startkey (bt, key, len) )
- slot--;
- else
- fprintf(stderr, "Error %d in StartKey. Syserror: %d\n", bt->err, errno), exit(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);
- }
-
- fprintf(stderr, " Total keys read %d\n", cnt);
return 0;
}