Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add extra instrumentation to test_osinst.c. Also the --binarylog option to the test scripts. (CVS 5106) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
8a99efc07f93bc11d21aa501349c81f0 |
User & Date: | danielk1977 2008-05-08 15:58:06.000 |
Context
2008-05-08
| ||
16:51 | Fix recently introduced bug in tester.tcl. (CVS 5107) (check-in: 4b573d4e7d user: danielk1977 tags: trunk) | |
15:58 | Add extra instrumentation to test_osinst.c. Also the --binarylog option to the test scripts. (CVS 5106) (check-in: 8a99efc07f user: danielk1977 tags: trunk) | |
15:18 | Use a 6-byte rather than an 8-byte encoding for integers between 17592186044416 and 140737488355327. Ticket #3100. (CVS 5105) (check-in: 0a4d26dede user: drh tags: trunk) | |
Changes
Changes to src/test_osinst.c.
︙ | ︙ | |||
22 23 24 25 26 27 28 29 30 31 32 33 34 35 | ** sqlite3_instvfs_destroy() ** sqlite3_instvfs_configure() ** ** sqlite3_instvfs_reset() ** sqlite3_instvfs_get() ** ** sqlite3_instvfs_binarylog ** ** Tcl interface (omitted if SQLITE_TEST is not set): ** ** sqlite3_instvfs create NAME ?PARENT? ** ** Create and register new vfs called $NAME, which is a wrapper around ** the existing vfs $PARENT. If the PARENT argument is omitted, the | > | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | ** sqlite3_instvfs_destroy() ** sqlite3_instvfs_configure() ** ** sqlite3_instvfs_reset() ** sqlite3_instvfs_get() ** ** sqlite3_instvfs_binarylog ** sqlite3_instvfs_binarylog_marker ** ** Tcl interface (omitted if SQLITE_TEST is not set): ** ** sqlite3_instvfs create NAME ?PARENT? ** ** Create and register new vfs called $NAME, which is a wrapper around ** the existing vfs $PARENT. If the PARENT argument is omitted, the |
︙ | ︙ | |||
113 114 115 116 117 118 119 120 121 122 | #define OS_SYNC 17 #define OS_TRUNCATE 18 #define OS_UNLOCK 19 #define OS_WRITE 20 #define OS_NUMEVENTS 21 struct InstVfs { sqlite3_vfs base; sqlite3_vfs *pVfs; | > > > | | > > > | 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 | #define OS_SYNC 17 #define OS_TRUNCATE 18 #define OS_UNLOCK 19 #define OS_WRITE 20 #define OS_NUMEVENTS 21 #define BINARYLOG_STRING 30 #define BINARYLOG_MARKER 31 struct InstVfs { sqlite3_vfs base; sqlite3_vfs *pVfs; void *pClient; void (*xDel)(void *); void (*xCall)(void *, int, int, sqlite3_int64, int, const char *, int, int, sqlite3_int64); /* Counters */ sqlite3_int64 aTime[OS_NUMEVENTS]; int aCount[OS_NUMEVENTS]; int iNextFileId; }; typedef struct InstVfs InstVfs; #define REALVFS(p) (((InstVfs *)(p))->pVfs) typedef struct inst_file inst_file; struct inst_file { sqlite3_file base; sqlite3_file *pReal; InstVfs *pInstVfs; const char *zName; int iFileId; /* File id number */ int flags; }; /* ** Method declarations for inst_file. */ static int instClose(sqlite3_file*); |
︙ | ︙ | |||
169 170 171 172 173 174 175 176 177 178 179 180 181 182 | static void *instDlOpen(sqlite3_vfs*, const char *zFilename); static void instDlError(sqlite3_vfs*, int nByte, char *zErrMsg); static void *instDlSym(sqlite3_vfs*,void*, const char *zSymbol); static void instDlClose(sqlite3_vfs*, void*); static int instRandomness(sqlite3_vfs*, int nByte, char *zOut); static int instSleep(sqlite3_vfs*, int microseconds); static int instCurrentTime(sqlite3_vfs*, double*); static sqlite3_vfs inst_vfs = { 1, /* iVersion */ sizeof(inst_file), /* szOsFile */ INST_MAX_PATHNAME, /* mxPathname */ 0, /* pNext */ 0, /* zName */ | > > | 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 | static void *instDlOpen(sqlite3_vfs*, const char *zFilename); static void instDlError(sqlite3_vfs*, int nByte, char *zErrMsg); static void *instDlSym(sqlite3_vfs*,void*, const char *zSymbol); static void instDlClose(sqlite3_vfs*, void*); static int instRandomness(sqlite3_vfs*, int nByte, char *zOut); static int instSleep(sqlite3_vfs*, int microseconds); static int instCurrentTime(sqlite3_vfs*, double*); static void binarylog_blob(sqlite3_vfs *, const char *, int); static sqlite3_vfs inst_vfs = { 1, /* iVersion */ sizeof(inst_file), /* szOsFile */ INST_MAX_PATHNAME, /* mxPathname */ 0, /* pNext */ 0, /* zName */ |
︙ | ︙ | |||
234 235 236 237 238 239 240 | int rc; \ sqlite3_int64 t = osinst_hwtime(); \ rc = Call; \ t = osinst_hwtime() - t; \ pInstVfs->aTime[eEvent] += t; \ pInstVfs->aCount[eEvent] += 1; \ if( pInstVfs->xCall ){ \ | | > > | | 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 | int rc; \ sqlite3_int64 t = osinst_hwtime(); \ rc = Call; \ t = osinst_hwtime() - t; \ pInstVfs->aTime[eEvent] += t; \ pInstVfs->aCount[eEvent] += 1; \ if( pInstVfs->xCall ){ \ pInstVfs->xCall( \ pInstVfs->pClient,eEvent,p->iFileId,t,rc,p->zName,p->flags,A,B \ ); \ } \ return rc; \ } #define OS_TIME_VFS(eEvent, Z, flags, A, B, Call) { \ InstVfs *pInstVfs = (InstVfs *)pVfs; \ int rc; \ sqlite3_int64 t = osinst_hwtime(); \ rc = Call; \ t = osinst_hwtime() - t; \ pInstVfs->aTime[eEvent] += t; \ pInstVfs->aCount[eEvent] += 1; \ if( pInstVfs->xCall ){ \ pInstVfs->xCall(pInstVfs->pClient,eEvent,0, t, rc, Z, flags, A, B); \ } \ return rc; \ } /* ** Close an inst-file. */ |
︙ | ︙ | |||
302 303 304 305 306 307 308 | OS_TIME_IO(OS_SYNC, flags, 0, p->pReal->pMethods->xSync(p->pReal, flags)); } /* ** Return the current file-size of an inst-file. */ static int instFileSize(sqlite3_file *pFile, sqlite_int64 *pSize){ | > | > | 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 | OS_TIME_IO(OS_SYNC, flags, 0, p->pReal->pMethods->xSync(p->pReal, flags)); } /* ** Return the current file-size of an inst-file. */ static int instFileSize(sqlite3_file *pFile, sqlite_int64 *pSize){ OS_TIME_IO(OS_FILESIZE, (int)(*pSize), 0, p->pReal->pMethods->xFileSize(p->pReal, pSize) ); } /* ** Lock an inst-file. */ static int instLock(sqlite3_file *pFile, int eLock){ OS_TIME_IO(OS_LOCK, eLock, 0, p->pReal->pMethods->xLock(p->pReal, eLock)); |
︙ | ︙ | |||
363 364 365 366 367 368 369 370 | ){ inst_file *p = (inst_file *)pFile; pFile->pMethods = &inst_io_methods; p->pReal = (sqlite3_file *)&p[1]; p->pInstVfs = (InstVfs *)pVfs; p->zName = zName; p->flags = flags; | > > | > > | 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 | ){ inst_file *p = (inst_file *)pFile; pFile->pMethods = &inst_io_methods; p->pReal = (sqlite3_file *)&p[1]; p->pInstVfs = (InstVfs *)pVfs; p->zName = zName; p->flags = flags; p->iFileId = ++p->pInstVfs->iNextFileId; binarylog_blob(pVfs, zName, -1); OS_TIME_VFS(OS_OPEN, zName, flags, p->iFileId, 0, REALVFS(pVfs)->xOpen(REALVFS(pVfs), zName, p->pReal, flags, pOutFlags) ); } /* ** Delete the file located at zPath. If the dirSync argument is true, ** ensure the file-system modifications are synced to disk before ** returning. */ static int instDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){ binarylog_blob(pVfs, zPath, -1); OS_TIME_VFS(OS_DELETE, zPath, 0, dirSync, 0, REALVFS(pVfs)->xDelete(REALVFS(pVfs), zPath, dirSync) ); } /* ** Test for access permissions. Return true if the requested permission ** is available, or false otherwise. */ static int instAccess(sqlite3_vfs *pVfs, const char *zPath, int flags){ binarylog_blob(pVfs, zPath, -1); OS_TIME_VFS(OS_ACCESS, zPath, 0, flags, 0, REALVFS(pVfs)->xAccess(REALVFS(pVfs), zPath, flags) ); } /* ** Populate buffer zBufOut with a pathname suitable for use as a |
︙ | ︙ | |||
504 505 506 507 508 509 510 | } return (sqlite3_vfs *)p; } void sqlite3_instvfs_configure( sqlite3_vfs *pVfs, | | > > > > > > > > > > | 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 | } return (sqlite3_vfs *)p; } void sqlite3_instvfs_configure( sqlite3_vfs *pVfs, void (*xCall)( void*, int, /* File id */ int, /* Event code */ sqlite3_int64, int, /* Return code */ const char*, /* File name */ int, int, sqlite3_int64 ), void *pClient, void (*xDel)(void *) ){ InstVfs *p = (InstVfs *)pVfs; assert( pVfs->xOpen==instOpen ); if( p->xDel ){ p->xDel(p->pClient); |
︙ | ︙ | |||
604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 | p[2] = v>>8; p[3] = v; } static void binarylog_xcall( void *p, int eEvent, sqlite3_int64 nClick, const char *zName, int flags, int nByte, sqlite3_int64 iOffset ){ InstVfsBinaryLog *pLog = (InstVfsBinaryLog *)p; unsigned char *zRec; | > > | | | | | > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 | p[2] = v>>8; p[3] = v; } static void binarylog_xcall( void *p, int eEvent, int iFileId, sqlite3_int64 nClick, int return_code, const char *zName, int flags, int nByte, sqlite3_int64 iOffset ){ InstVfsBinaryLog *pLog = (InstVfsBinaryLog *)p; unsigned char *zRec; if( (28+pLog->nBuf)>BINARYLOG_BUFFERSIZE ){ sqlite3_file *pFile = pLog->pOut; pFile->pMethods->xWrite(pFile, pLog->zBuf, pLog->nBuf, pLog->iOffset); pLog->iOffset += pLog->nBuf; pLog->nBuf = 0; } zRec = (unsigned char *)&pLog->zBuf[pLog->nBuf]; put32bits(&zRec[0], eEvent); put32bits(&zRec[4], (int)iFileId); put32bits(&zRec[8], (int)nClick); put32bits(&zRec[12], return_code); put32bits(&zRec[16], flags); put32bits(&zRec[20], nByte); put32bits(&zRec[24], (int)iOffset); pLog->nBuf += 28; } static void binarylog_xdel(void *p){ /* Close the log file and free the memory allocated for the ** InstVfsBinaryLog structure. */ InstVfsBinaryLog *pLog = (InstVfsBinaryLog *)p; sqlite3_file *pFile = pLog->pOut; if( pLog->nBuf ){ pFile->pMethods->xWrite(pFile, pLog->zBuf, pLog->nBuf, pLog->iOffset); } pFile->pMethods->xClose(pFile); sqlite3_free(pLog->pOut); sqlite3_free(pLog->zBuf); sqlite3_free(pLog); } static void binarylog_blob( sqlite3_vfs *pVfs, const char *zBlob, int nBlob ){ unsigned char *zRec; int nWrite; InstVfs *pInstVfs = (InstVfs *)pVfs; InstVfsBinaryLog *pLog; if( pVfs->xOpen!=instOpen || pInstVfs->xCall!=binarylog_xcall ){ return; } pLog = (InstVfsBinaryLog *)pInstVfs->pClient; if( nBlob<0 ){ nBlob = strlen(zBlob); } nWrite = nBlob + 28; if( (nWrite+pLog->nBuf)>BINARYLOG_BUFFERSIZE ){ sqlite3_file *pFile = pLog->pOut; pFile->pMethods->xWrite(pFile, pLog->zBuf, pLog->nBuf, pLog->iOffset); pLog->iOffset += pLog->nBuf; pLog->nBuf = 0; } zRec = (unsigned char *)&pLog->zBuf[pLog->nBuf]; memset(zRec, 0, nWrite); put32bits(&zRec[0], BINARYLOG_STRING); put32bits(&zRec[4], (int)nBlob); memcpy(&zRec[28], zBlob, nBlob); pLog->nBuf += nWrite; } void sqlite3_instvfs_binarylog_marker( sqlite3_vfs *pVfs, const char *zMarker ){ InstVfs *pInstVfs = (InstVfs *)pVfs; InstVfsBinaryLog *pLog = (InstVfsBinaryLog *)pInstVfs->pClient; binarylog_blob(pVfs, zMarker, -1); binarylog_xcall(pLog, BINARYLOG_MARKER, 0, 0, 0, 0, 0, 0, 0); } sqlite3_vfs *sqlite3_instvfs_binarylog( const char *zVfs, const char *zParentVfs, const char *zLog ){ InstVfsBinaryLog *p; |
︙ | ︙ | |||
703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 | Tcl_Obj *pScript; }; typedef struct InstVfsCall InstVfsCall; static void test_instvfs_xcall( void *p, int eEvent, sqlite3_int64 nClick, const char *zName, int flags, int nByte, sqlite3_int64 iOffset ){ int rc; InstVfsCall *pCall = (InstVfsCall *)p; | > > | 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 | Tcl_Obj *pScript; }; typedef struct InstVfsCall InstVfsCall; static void test_instvfs_xcall( void *p, int eEvent, int iFileId, sqlite3_int64 nClick, int return_code, const char *zName, int flags, int nByte, sqlite3_int64 iOffset ){ int rc; InstVfsCall *pCall = (InstVfsCall *)p; |
︙ | ︙ | |||
741 742 743 744 745 746 747 | static int test_sqlite3_instvfs( void * clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[] ){ static const char *IV_strs[] = | | | | 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 | static int test_sqlite3_instvfs( void * clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[] ){ static const char *IV_strs[] = { "create", "destroy", "reset", "report", "configure", "binarylog", "marker", 0 }; enum IV_enum { IV_CREATE, IV_DESTROY, IV_RESET, IV_REPORT, IV_CONFIGURE, IV_BINARYLOG, IV_MARKER }; int iSub; if( objc<2 ){ Tcl_WrongNumArgs(interp, 1, objv, "SUB-COMMAND ..."); } if( Tcl_GetIndexFromObj(interp, objv[1], IV_strs, "sub-command", 0, &iSub) ){ return TCL_ERROR; |
︙ | ︙ | |||
803 804 805 806 807 808 809 810 811 812 813 814 815 816 | } if( isDefault ){ sqlite3_vfs_register(p, 1); } Tcl_SetObjResult(interp, objv[2]); break; } case IV_CONFIGURE: { InstVfsCall *pCall; sqlite3_vfs *p; if( objc!=4 ){ Tcl_WrongNumArgs(interp, 2, objv, "NAME SCRIPT"); | > > > > > > > > > > > > > > > > | 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 | } if( isDefault ){ sqlite3_vfs_register(p, 1); } Tcl_SetObjResult(interp, objv[2]); break; } case IV_MARKER: { sqlite3_vfs *p; if( objc!=4 ){ Tcl_WrongNumArgs(interp, 2, objv, "VFS MARKER"); return TCL_ERROR; } p = sqlite3_vfs_find(Tcl_GetString(objv[2])); if( !p || p->xOpen!=instOpen ){ Tcl_AppendResult(interp, "no such vfs: ", Tcl_GetString(objv[2]), 0); return TCL_ERROR; } sqlite3_instvfs_binarylog_marker(p, Tcl_GetString(objv[3])); Tcl_ResetResult(interp); break; } case IV_CONFIGURE: { InstVfsCall *pCall; sqlite3_vfs *p; if( objc!=4 ){ Tcl_WrongNumArgs(interp, 2, objv, "NAME SCRIPT"); |
︙ | ︙ |
Changes to test/tester.tcl.
1 2 3 4 5 6 7 8 9 10 11 12 13 | # 2001 September 15 # # The author disclaims copyright to this source code. In place of # a legal notice, here is a blessing: # # May you do good and not evil. # May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements some common TCL routines used for regression # testing the SQLite library # | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | # 2001 September 15 # # The author disclaims copyright to this source code. In place of # a legal notice, here is a blessing: # # May you do good and not evil. # May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements some common TCL routines used for regression # testing the SQLite library # # $Id: tester.tcl,v 1.120 2008/05/08 15:58:06 danielk1977 Exp $ # # What for user input before continuing. This gives an opportunity # to connect profiling tools to the process. # for {set i 0} {$i<[llength $argv]} {incr i} { if {[regexp {^-+pause$} [lindex $argv $i] all value]} { |
︙ | ︙ | |||
84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 | set ostrace_fd [open ostrace.sql w] puts $ostrace_fd "BEGIN;" if {[lindex $argv $i] eq "--ostrace"} { set s "CREATE TABLE ostrace" append s "(method TEXT, clicks INT, file TEXT, i32 INT, i64 INT);" puts $ostrace_fd $s sqlite3_instvfs configure ostrace ostrace_call } set argv [lreplace $argv $i $i] } } # # Check the command-line arguments to set the maximum number of # errors tolerated before halting. # | > > > > > > | 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 | set ostrace_fd [open ostrace.sql w] puts $ostrace_fd "BEGIN;" if {[lindex $argv $i] eq "--ostrace"} { set s "CREATE TABLE ostrace" append s "(method TEXT, clicks INT, file TEXT, i32 INT, i64 INT);" puts $ostrace_fd $s sqlite3_instvfs configure ostrace ostrace_call sqlite3_instvfs configure ostrace ostrace_call } set argv [lreplace $argv $i $i] } if {[lindex $argv $i] eq "--binarylog"} { set tester_do_binarylog 1 sqlite3_instvfs binarylog -default binarylog ostrace.bin set argv [lreplace $argv $i $i] } } # # Check the command-line arguments to set the maximum number of # errors tolerated before halting. # |
︙ | ︙ | |||
155 156 157 158 159 160 161 162 163 164 165 166 167 168 | } # Invoke the do_test procedure to run a single test # proc do_test {name cmd expected} { global argv nErr nTest skip_test maxErr sqlite3_memdebug_settitle $name if {$skip_test} { set skip_test 0 return } if {[llength $argv]==0} { set go 1 } else { | > > > | 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 | } # Invoke the do_test procedure to run a single test # proc do_test {name cmd expected} { global argv nErr nTest skip_test maxErr sqlite3_memdebug_settitle $name if {$::tester_do_binarylog} { sqlite3_instvfs marker binarylog "Start of $name" } if {$skip_test} { set skip_test 0 return } if {[llength $argv]==0} { set go 1 } else { |
︙ | ︙ | |||
188 189 190 191 192 193 194 195 196 197 198 199 200 201 | incr nErr lappend ::failList $name if {$nErr>=$maxErr} {puts "*** Giving up..."; finalize_testing} } else { puts " Ok" } flush stdout } # Run an SQL script. # Return the number of microseconds per statement. # proc speed_trial {name numstmt units sql} { puts -nonewline [format {%-21.21s } $name...] | > > > | 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 | incr nErr lappend ::failList $name if {$nErr>=$maxErr} {puts "*** Giving up..."; finalize_testing} } else { puts " Ok" } flush stdout if {$::tester_do_binarylog} { sqlite3_instvfs marker binarylog "End of $name" } } # Run an SQL script. # Return the number of microseconds per statement. # proc speed_trial {name numstmt units sql} { puts -nonewline [format {%-21.21s } $name...] |
︙ | ︙ | |||
278 279 280 281 282 283 284 285 286 287 288 289 290 291 | if {$nErr>0 && ![working_64bit_int]} { puts "******************************************************************" puts "N.B.: The version of TCL that you used to build this test harness" puts "is defective in that it does not support 64-bit integers. Some or" puts "all of the test failures above might be a result from this defect" puts "in your TCL build." puts "******************************************************************" } if {$sqlite_open_file_count} { puts "$sqlite_open_file_count files were left open" incr nErr } if {[info exists ::tester_do_ostrace]} { puts "Writing ostrace.sql..." | > > > | 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 | if {$nErr>0 && ![working_64bit_int]} { puts "******************************************************************" puts "N.B.: The version of TCL that you used to build this test harness" puts "is defective in that it does not support 64-bit integers. Some or" puts "all of the test failures above might be a result from this defect" puts "in your TCL build." puts "******************************************************************" } if {[info exists ::tester_do_binarylog]} { sqlite3_instvfs destroy binarylog } if {$sqlite_open_file_count} { puts "$sqlite_open_file_count files were left open" incr nErr } if {[info exists ::tester_do_ostrace]} { puts "Writing ostrace.sql..." |
︙ | ︙ |