Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | (Moved to the mistake branch due to compile errors in test_osinst.c.) Change the vfs instrumentation code in test_osinst.c to make it easier to deploy. Add a vtab implementation for reading the binary log file format. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | mistake |
Files: | files | file ages | folders |
SHA1: |
ee13c8849d234931bb3be36e42383d22 |
User & Date: | dan 2010-05-12 19:02:36.000 |
Original Comment: | Change the vfs instrumentation code in test_osinst.c to make it easier to deploy. Add a vtab implementation for reading the binary log file format. |
Context
2010-05-13
| ||
09:32 | Fix mistake in test_osinst.c. (Closed-Leaf check-in: 4c3e137803 user: dan tags: mistake) | |
2010-05-12
| ||
19:02 | (Moved to the mistake branch due to compile errors in test_osinst.c.) Change the vfs instrumentation code in test_osinst.c to make it easier to deploy. Add a vtab implementation for reading the binary log file format. (check-in: ee13c8849d user: dan tags: mistake) | |
13:50 | Remove the OP_Variable optimization of check-in [48b77b04935d894] since it can lead to malfunctions as described in ticket [26ff0c82d1e90]. (check-in: 7838163d08 user: drh tags: trunk) | |
Changes
Changes to src/test_osinst.c.
︙ | ︙ | |||
11 12 13 14 15 16 17 | ****************************************************************************** ** ** This file contains the implementation of an SQLite vfs wrapper that ** adds instrumentation to all vfs and file methods. C and Tcl interfaces ** are provided to control the instrumentation. */ | > > > > | < < < < | | | | | < < > | | < | < < < | < | | < < < | < < < | | < < | < < < < > > < < | | < < | | | | > > | > > | < < < < | > > > > > > > | < < | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | ****************************************************************************** ** ** This file contains the implementation of an SQLite vfs wrapper that ** adds instrumentation to all vfs and file methods. C and Tcl interfaces ** are provided to control the instrumentation. */ /* Public API: */ int sqlite3_vfslog_new(const char *, const char *, const char *); int sqlite3_vfslog_finalize(const char *); int sqlite3_vfslog_register(sqlite3 *) /* ** This module contains code for a wrapper VFS that causes a log of ** all (well, technically "most") VFS calls to be written into a nominated ** file on disk. The log is stored in a compressed binary format to ** reduce the amount of IO overhead introduced into the application ** by logging. ** ** The binary log files are read using a virtual table implementation ** also contained in this file. ** ** CREATING LOG FILES: ** ** int sqlite3_vfslog_new( ** const char *zVfs, // Name of new VFS ** const char *zParentVfs, // Name of parent VFS (or NULL) ** const char *zLog // Name of log file to write to ** ); ** ** int sqlite3_vfslog_finalize(const char *zVfs); ** ** READING LOG FILES: ** ** Log files are read using the "vfslog" virtual table implementation ** in this file. To register the virtual table with SQLite, use: ** ** int sqlite3_vfslog_register(sqlite3 *db); ** ** Then, if the log file is named "vfs.log", the following SQL command: ** ** CREATE VIRTUAL TABLE v USING vfslog('vfs.log'); ** ** creates a virtual table with 6 columns, as follows: ** ** CREATE TABLE v( ** event TEXT, // "xOpen", "xRead" etc. ** file TEXT, // Name of file this call applies to ** clicks INTEGER, // Time spent in call ** rc INTEGER, // Return value ** size INTEGER, // Bytes read or written ** offset INTEGER // File offset read or written ** ); ** */ #include "sqlite3.h" #include <string.h> #include <assert.h> /* ** hwtime.h contains inline assembler code for implementing ** high-performance timing routines. */ #include "hwtime.h" /* ** Maximum pathname length supported by the vfslog backend. */ #define INST_MAX_PATHNAME 512 #define OS_ACCESS 1 #define OS_CHECKRESERVEDLOCK 2 #define OS_CLOSE 3 #define OS_CURRENTTIME 4 #define OS_DELETE 5 #define OS_DEVCHAR 6 #define OS_FILECONTROL 7 |
︙ | ︙ | |||
121 122 123 124 125 126 127 | #define BINARYLOG_STRING 30 #define BINARYLOG_MARKER 31 #define BINARYLOG_PREPARE_V2 64 #define BINARYLOG_STEP 65 #define BINARYLOG_FINALIZE 66 | | | < > | < < | | < | | > > > > < < < < | | | | < | < > > > > | | | | | | | | | | | | | | | | | | | | | | | | | < < | | | | | | | | | | | | | | | | | | | | | | | | | | < < < < < | < < < < | < < < < < < < < < < < < < | < | < < < < < < | < | | > > > | > > | < | > > > | > | | > > | < > | < > > > | | > > | | < | < > > > | | | > > > | < > > > | | > > > > | < > > > | > | | | > > > | < > > > | | > > > > | > > > | | > > > > | > > > | | < > > > > | < > > > | | > | | | > > > > | > > > | | > > > > | > > > | | > > > > | | < | < | | < | > | > > > | > > | < | > > | > | > > | < | > > | > | < | < | | | | | < | < | < | < | < | < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < > | | | > < < < < < < < < < < < < | < < < < | < < < | | < | < < < < < < < < < | < < < < < < | | > | > | > < | > > > | < > > > > | > > > | | < > > | | > > | > > | < > | | | | > > | > | > | | > | < < < < | > > | > > < | < < < | > > < < | < < < < < < < < < < < < < < < < < < < < < < < < > > | > | | | > | > > | > | > | > | | | > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > | > > > > > > > > > > | > > > > > > > | > > > > > > > > > > > > > > > > > > > > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < < < | < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < | | > > > > > | < | > | | | > | < < | < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < | < | | | < < < < | | < < < < < < < < < < < | < < | < < | | | | | < | < < < | < < < < < < < < < < < < | < < < | | < < < < < | | < < | < < | < < < | | < < < < | | < < < < > | < | | < | | | < | > | < < | < < < < < < < | > > | < < < < | < | > | 106 107 108 109 110 111 112 113 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 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 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 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 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 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 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 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 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 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 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 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 | #define BINARYLOG_STRING 30 #define BINARYLOG_MARKER 31 #define BINARYLOG_PREPARE_V2 64 #define BINARYLOG_STEP 65 #define BINARYLOG_FINALIZE 66 #define VFSLOG_BUFFERSIZE 8192 typedef struct VfslogVfs VfslogVfs; typedef struct VfslogFile VfslogFile; struct VfslogVfs { sqlite3_vfs base; /* VFS methods */ sqlite3_vfs *pVfs; /* Parent VFS */ int iNextFileId; /* Next file id */ sqlite3_file *pLog; /* Log file handle */ sqlite3_int64 iOffset; /* Log file offset of start of write buffer */ int nBuf; /* Number of valid bytes in aBuf[] */ char aBuf[VFSLOG_BUFFERSIZE]; /* Write buffer */ }; struct VfslogFile { sqlite3_file base; /* IO methods */ sqlite3_file *pReal; /* Underlying file handle */ sqlite3_vfs *pVfslog; /* Associated VsflogVfs object */ int iFileId; /* File id number */ }; #define REALVFS(p) (((VfslogVfs *)(p))->pVfs) /* ** Method declarations for vfslog_file. */ static int vfslogClose(sqlite3_file*); static int vfslogRead(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst); static int vfslogWrite(sqlite3_file*,const void*,int iAmt, sqlite3_int64 iOfst); static int vfslogTruncate(sqlite3_file*, sqlite3_int64 size); static int vfslogSync(sqlite3_file*, int flags); static int vfslogFileSize(sqlite3_file*, sqlite3_int64 *pSize); static int vfslogLock(sqlite3_file*, int); static int vfslogUnlock(sqlite3_file*, int); static int vfslogCheckReservedLock(sqlite3_file*, int *pResOut); static int vfslogFileControl(sqlite3_file*, int op, void *pArg); static int vfslogSectorSize(sqlite3_file*); static int vfslogDeviceCharacteristics(sqlite3_file*); /* ** Method declarations for vfslog_vfs. */ static int vfslogOpen(sqlite3_vfs*, const char *, sqlite3_file*, int , int *); static int vfslogDelete(sqlite3_vfs*, const char *zName, int syncDir); static int vfslogAccess(sqlite3_vfs*, const char *zName, int flags, int *); static int vfslogFullPathname(sqlite3_vfs*, const char *zName, int, char *zOut); static void *vfslogDlOpen(sqlite3_vfs*, const char *zFilename); static void vfslogDlError(sqlite3_vfs*, int nByte, char *zErrMsg); static void (*vfslogDlSym(sqlite3_vfs *pVfs, void *p, const char*zSym))(void); static void vfslogDlClose(sqlite3_vfs*, void*); static int vfslogRandomness(sqlite3_vfs*, int nByte, char *zOut); static int vfslogSleep(sqlite3_vfs*, int microseconds); static int vfslogCurrentTime(sqlite3_vfs*, double*); static sqlite3_vfs vfslog_vfs = { 1, /* iVersion */ sizeof(VfslogFile), /* szOsFile */ INST_MAX_PATHNAME, /* mxPathname */ 0, /* pNext */ 0, /* zName */ 0, /* pAppData */ vfslogOpen, /* xOpen */ vfslogDelete, /* xDelete */ vfslogAccess, /* xAccess */ vfslogFullPathname, /* xFullPathname */ vfslogDlOpen, /* xDlOpen */ vfslogDlError, /* xDlError */ vfslogDlSym, /* xDlSym */ vfslogDlClose, /* xDlClose */ vfslogRandomness, /* xRandomness */ vfslogSleep, /* xSleep */ vfslogCurrentTime, /* xCurrentTime */ }; static sqlite3_io_methods vfslog_io_methods = { 1, /* iVersion */ vfslogClose, /* xClose */ vfslogRead, /* xRead */ vfslogWrite, /* xWrite */ vfslogTruncate, /* xTruncate */ vfslogSync, /* xSync */ vfslogFileSize, /* xFileSize */ vfslogLock, /* xLock */ vfslogUnlock, /* xUnlock */ vfslogCheckReservedLock, /* xCheckReservedLock */ vfslogFileControl, /* xFileControl */ vfslogSectorSize, /* xSectorSize */ vfslogDeviceCharacteristics /* xDeviceCharacteristics */ }; static sqlite3_uint64 vfslog_time(){ return sqlite3Hwtime(); } static void vfslog_call(sqlite3_vfs *, int, int, int, int, int, int); static void vfslog_string(sqlite3_vfs *, const char *); /* ** Close an vfslog-file. */ static int vfslogClose(sqlite3_file *pFile){ sqlite3_uint64 t; int rc = SQLITE_OK; VfslogFile *p = (VfslogFile *)pFile; t = vfslog_time(); if( p->pReal->pMethods ){ rc = p->pReal->pMethods->xClose(p->pReal); } t = vfslog_time() - t; vfslog_call(p->pVfslog, OS_CLOSE, p->iFileId, t, rc, 0, 0); return rc; } /* ** Read data from an vfslog-file. */ static int vfslogRead( sqlite3_file *pFile, void *zBuf, int iAmt, sqlite_int64 iOfst ){ int rc; sqlite3_uint64 t; VfslogFile *p = (VfslogFile *)pFile; t = vfslog_time(); rc = p->pReal->pMethods->xRead(p->pReal, zBuf, iAmt, iOfst); t = vfslog_time() - t; vfslog_call(p->pVfslog, OS_READ, p->iFileId, t, rc, iAmt, (int)iOfst); return rc; } /* ** Write data to an vfslog-file. */ static int vfslogWrite( sqlite3_file *pFile, const void *z, int iAmt, sqlite_int64 iOfst ){ int rc; sqlite3_uint64 t; VfslogFile *p = (VfslogFile *)pFile; t = vfslog_time(); rc = p->pReal->pMethods->xWrite(p->pReal, z, iAmt, iOfst); t = vfslog_time() - t; vfslog_call(p->pVfslog, OS_WRITE, p->iFileId, t, rc, iAmt, (int)iOfst); return rc; } /* ** Truncate an vfslog-file. */ static int vfslogTruncate(sqlite3_file *pFile, sqlite_int64 size){ int rc; sqlite3_uint64 t; VfslogFile *p = (VfslogFile *)pFile; t = vfslog_time(); rc = p->pReal->pMethods->xTruncate(p->pReal, size); t = vfslog_time() - t; vfslog_call(p->pVfslog, OS_TRUNCATE, p->iFileId, t, rc, 0, (int)size); return rc; } /* ** Sync an vfslog-file. */ static int vfslogSync(sqlite3_file *pFile, int flags){ int rc; sqlite3_uint64 t; VfslogFile *p = (VfslogFile *)pFile; t = vfslog_time(); rc = p->pReal->pMethods->xSync(p->pReal, flags); t = vfslog_time() - t; vfslog_call(p->pVfslog, OS_SYNC, p->iFileId, t, rc, flags, 0); return rc; } /* ** Return the current file-size of an vfslog-file. */ static int vfslogFileSize(sqlite3_file *pFile, sqlite_int64 *pSize){ int rc; sqlite3_uint64 t; VfslogFile *p = (VfslogFile *)pFile; t = vfslog_time(); rc = p->pReal->pMethods->xFileSize(p->pReal, pSize); t = vfslog_time() - t; vfslog_call(p->pVfslog, OS_FILESIZE, p->iFileId, t, rc, 0, (int)*pSize); return rc; } /* ** Lock an vfslog-file. */ static int vfslogLock(sqlite3_file *pFile, int eLock){ int rc; sqlite3_uint64 t; VfslogFile *p = (VfslogFile *)pFile; t = vfslog_time(); rc = p->pReal->pMethods->xLock(p->pReal, eLock); t = vfslog_time() - t; vfslog_call(p->pVfslog, OS_LOCK, p->iFileId, t, rc, eLock, 0); return rc; } /* ** Unlock an vfslog-file. */ static int vfslogUnlock(sqlite3_file *pFile, int eLock){ int rc; sqlite3_uint64 t; VfslogFile *p = (VfslogFile *)pFile; t = vfslog_time(); rc = p->pReal->pMethods->xUnlock(p->pReal, eLock); t = vfslog_time() - t; vfslog_call(p->pVfslog, OS_UNLOCK, p->iFileId, t, rc, eLock, 0); return rc; } /* ** Check if another file-handle holds a RESERVED lock on an vfslog-file. */ static int vfslogCheckReservedLock(sqlite3_file *pFile, int *pResOut){ int rc; sqlite3_uint64 t; VfslogFile *p = (VfslogFile *)pFile; t = vfslog_time(); rc = p->pReal->pMethods->xCheckReservedLock(p->pReal, pResOut); t = vfslog_time() - t; vfslog_call(p->pVfslog, OS_CHECKRESERVEDLOCK, p->iFileId, t, rc, *pResOut, 0); return rc; } /* ** File control method. For custom operations on an vfslog-file. */ static int vfslogFileControl(sqlite3_file *pFile, int op, void *pArg){ VfslogFile *p = (VfslogFile *)pFile; return p->pReal->pMethods->xFileControl(p->pReal, op, pArg); } /* ** Return the sector-size in bytes for an vfslog-file. */ static int vfslogSectorSize(sqlite3_file *pFile){ int rc; sqlite3_uint64 t; VfslogFile *p = (VfslogFile *)pFile; t = vfslog_time(); rc = p->pReal->pMethods->xSectorSize(p->pReal); t = vfslog_time() - t; vfslog_call(p->pVfslog, OS_SECTORSIZE, p->iFileId, t, rc, 0, 0); return rc; } /* ** Return the device characteristic flags supported by an vfslog-file. */ static int vfslogDeviceCharacteristics(sqlite3_file *pFile){ int rc; sqlite3_uint64 t; VfslogFile *p = (VfslogFile *)pFile; t = vfslog_time(); rc = p->pReal->pMethods->xDeviceCharacteristics(p->pReal); t = vfslog_time() - t; vfslog_call(p->pVfslog, OS_DEVCHAR, p->iFileId, t, rc, 0, 0); return rc; } /* ** Open an vfslog file handle. */ static int vfslogOpen( sqlite3_vfs *pVfs, const char *zName, sqlite3_file *pFile, int flags, int *pOutFlags ){ int rc; sqlite3_uint64 t; VfslogFile *p = (VfslogFile *)pFile; VfslogVfs *pLog = (VfslogVfs *)pVfs; pFile->pMethods = &vfslog_io_methods; p->pReal = (sqlite3_file *)&p[1]; p->pVfslog = pVfs; p->iFileId = ++pLog->iNextFileId; t = vfslog_time(); rc = REALVFS(pVfs)->xOpen(REALVFS(pVfs), zName, p->pReal, flags, pOutFlags); t = vfslog_time() - t; vfslog_call(pVfs, OS_OPEN, p->iFileId, t, rc, 0, 0); vfslog_string(pVfs, zName); return rc; } /* ** 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 vfslogDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){ int rc; sqlite3_uint64 t; t = vfslog_time(); rc = REALVFS(pVfs)->xDelete(REALVFS(pVfs), zPath, dirSync); t = vfslog_time() - t; vfslog_call(pVfs, OS_DELETE, 0, t, rc, dirSync, 0); vfslog_string(pVfs, zPath); return rc; } /* ** Test for access permissions. Return true if the requested permission ** is available, or false otherwise. */ static int vfslogAccess( sqlite3_vfs *pVfs, const char *zPath, int flags, int *pResOut ){ int rc; sqlite3_uint64 t; t = vfslog_time(); rc = REALVFS(pVfs)->xAccess(REALVFS(pVfs), zPath, flags, pResOut); t = vfslog_time() - t; vfslog_call(pVfs, OS_ACCESS, 0, t, rc, flags, *pResOut); vfslog_string(pVfs, zPath); return rc; } /* ** Populate buffer zOut with the full canonical pathname corresponding ** to the pathname in zPath. zOut is guaranteed to point to a buffer ** of at least (INST_MAX_PATHNAME+1) bytes. */ static int vfslogFullPathname( sqlite3_vfs *pVfs, const char *zPath, int nOut, char *zOut ){ return REALVFS(pVfs)->xFullPathname(REALVFS(pVfs), zPath, nOut, zOut); } /* ** Open the dynamic library located at zPath and return a handle. */ static void *vfslogDlOpen(sqlite3_vfs *pVfs, const char *zPath){ return REALVFS(pVfs)->xDlOpen(REALVFS(pVfs), zPath); } /* ** Populate the buffer zErrMsg (size nByte bytes) with a human readable ** utf-8 string describing the most recent error encountered associated ** with dynamic libraries. */ static void vfslogDlError(sqlite3_vfs *pVfs, int nByte, char *zErrMsg){ REALVFS(pVfs)->xDlError(REALVFS(pVfs), nByte, zErrMsg); } /* ** Return a pointer to the symbol zSymbol in the dynamic library pHandle. */ static void (*vfslogDlSym(sqlite3_vfs *pVfs, void *p, const char *zSym))(void){ return REALVFS(pVfs)->xDlSym(REALVFS(pVfs), p, zSym); } /* ** Close the dynamic library handle pHandle. */ static void vfslogDlClose(sqlite3_vfs *pVfs, void *pHandle){ REALVFS(pVfs)->xDlClose(REALVFS(pVfs), pHandle); } /* ** Populate the buffer pointed to by zBufOut with nByte bytes of ** random data. */ static int vfslogRandomness(sqlite3_vfs *pVfs, int nByte, char *zBufOut){ return REALVFS(pVfs)->xRandomness(REALVFS(pVfs), nByte, zBufOut); } /* ** Sleep for nMicro microseconds. Return the number of microseconds ** actually slept. */ static int vfslogSleep(sqlite3_vfs *pVfs, int nMicro){ return REALVFS(pVfs)->xSleep(REALVFS(pVfs), nMicro); } /* ** Return the current time as a Julian Day number in *pTimeOut. */ static int vfslogCurrentTime(sqlite3_vfs *pVfs, double *pTimeOut){ return REALVFS(pVfs)->xCurrentTime(REALVFS(pVfs), pTimeOut); } static void vfslog_flush(VfslogVfs *p){ #ifdef SQLITE_TEST extern int sqlite3_io_error_pending; extern int sqlite3_io_error_persist; extern int sqlite3_diskfull_pending; int pending = sqlite3_io_error_pending; int persist = sqlite3_io_error_persist; int diskfull = sqlite3_diskfull_pending; sqlite3_io_error_pending = 0; sqlite3_io_error_persist = 0; sqlite3_diskfull_pending = 0; #endif if( p->nBuf ){ p->pLog->pMethods->xWrite(p->pLog, p->aBuf, p->nBuf, p->iOffset); p->iOffset += p->nBuf; p->nBuf = 0; } #ifdef SQLITE_TEST sqlite3_io_error_pending = pending; sqlite3_io_error_persist = persist; sqlite3_diskfull_pending = diskfull; #endif } static void put32bits(unsigned char *p, unsigned int v){ p[0] = v>>24; p[1] = v>>16; p[2] = v>>8; p[3] = v; } static void vfslog_call( sqlite3_vfs *pVfs, int eEvent, int iFileid, int nClick, int return_code, int size, int offset ){ VfslogVfs *p = (VfslogVfs *)pVfs; unsigned char *zRec; if( (24+p->nBuf)>sizeof(p->aBuf) ){ vfslog_flush(p); } zRec = (unsigned char *)&p->aBuf[p->nBuf]; put32bits(&zRec[0], eEvent); put32bits(&zRec[4], iFileid); put32bits(&zRec[8], nClick); put32bits(&zRec[12], return_code); put32bits(&zRec[16], size); put32bits(&zRec[20], offset); p->nBuf += 24; } static void vfslog_string(sqlite3_vfs *pVfs, const char *zStr){ VfslogVfs *p = (VfslogVfs *)pVfs; unsigned char *zRec; int nStr = zStr ? strlen(zStr) : 0; if( (4+nStr+p->nBuf)>sizeof(p->aBuf) ){ vfslog_flush(p); } zRec = (unsigned char *)&p->aBuf[p->nBuf]; put32bits(&zRec[0], nStr); if( zStr ){ memcpy(&zRec[4], zStr, nStr); } p->nBuf += (4 + nStr); } static void vfslog_finalize(VfslogVfs *p){ if( p->pLog->pMethods ){ vfslog_flush(p); p->pLog->pMethods->xClose(p->pLog); } sqlite3_free(p); } int sqlite3_vfslog_finalize(const char *zVfs){ sqlite3_vfs *pVfs; pVfs = sqlite3_vfs_find(zVfs); if( !pVfs || pVfs->xOpen!=vfslogOpen ){ return SQLITE_ERROR; } vfslog_finalize((VfslogVfs *)pVfs); return SQLITE_OK; } int sqlite3_vfslog_new( const char *zVfs, /* New VFS name */ const char *zParentVfs, /* Parent VFS name (or NULL) */ const char *zLog /* Log file name */ ){ VfslogVfs *p; sqlite3_vfs *pParent; int nByte; int flags; int rc; char *zFile; int nVfs; pParent = sqlite3_vfs_find(zParentVfs); if( !pParent ){ return SQLITE_ERROR; } nVfs = strlen(zVfs); nByte = sizeof(VfslogVfs) + pParent->szOsFile + nVfs+1+pParent->mxPathname+1; p = (VfslogVfs *)sqlite3_malloc(nByte); memset(p, 0, nByte); p->pVfs = pParent; p->pLog = (sqlite3_file *)&p[1]; memcpy(&p->base, &vfslog_vfs, sizeof(sqlite3_vfs)); p->base.zName = &((char *)p->pLog)[pParent->szOsFile]; p->base.szOsFile += pParent->szOsFile; memcpy((char *)p->base.zName, zVfs, nVfs); zFile = (char *)&p->base.zName[nVfs+1]; pParent->xFullPathname(pParent, zLog, pParent->mxPathname, zFile); flags = SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE|SQLITE_OPEN_MASTER_JOURNAL; pParent->xDelete(pParent, zFile, 0); rc = pParent->xOpen(pParent, zFile, p->pLog, flags, &flags); if( rc==SQLITE_OK ){ memcpy(p->aBuf, "sqlite_ostrace1.....", 20); p->iOffset = 0; p->nBuf = 20; rc = sqlite3_vfs_register((sqlite3_vfs *)p, 1); } if( rc ){ vfslog_finalize(p); } return rc; } static const char *vfslog_eventname(int eEvent){ const char *zEvent = 0; switch( eEvent ){ case OS_CLOSE: zEvent = "xClose"; break; case OS_READ: zEvent = "xRead"; break; case OS_WRITE: zEvent = "xWrite"; break; case OS_TRUNCATE: zEvent = "xTruncate"; break; case OS_SYNC: zEvent = "xSync"; break; case OS_FILESIZE: zEvent = "xFilesize"; break; case OS_LOCK: zEvent = "xLock"; break; case OS_UNLOCK: zEvent = "xUnlock"; break; case OS_CHECKRESERVEDLOCK: zEvent = "xCheckResLock"; break; case OS_FILECONTROL: zEvent = "xFileControl"; break; case OS_SECTORSIZE: zEvent = "xSectorSize"; break; case OS_DEVCHAR: zEvent = "xDeviceChar"; break; case OS_OPEN: zEvent = "xOpen"; break; case OS_DELETE: zEvent = "xDelete"; break; case OS_ACCESS: zEvent = "xAccess"; break; case OS_FULLPATHNAME: zEvent = "xFullPathname"; break; case OS_RANDOMNESS: zEvent = "xRandomness"; break; case OS_SLEEP: zEvent = "xSleep"; break; case OS_CURRENTTIME: zEvent = "xCurrentTime"; break; } return zEvent; } typedef struct VfslogVtab VfslogVtab; typedef struct VfslogCsr VfslogCsr; /* ** Virtual table type for the vfslog reader module. */ struct VfslogVtab { sqlite3_vtab base; /* Base class */ sqlite3_file *pFd; /* File descriptor open on vfslog file */ sqlite3_int64 nByte; /* Size of file in bytes */ char *zFile; /* File name for pFd */ }; /* ** Virtual table cursor type for the vfslog reader module. */ struct VfslogCsr { sqlite3_vtab_cursor base; /* Base class */ sqlite3_int64 iRowid; /* Current rowid. */ sqlite3_int64 iOffset; /* Offset of next record in file */ char *zTransient; /* Transient 'file' string */ int nFile; /* Size of array azFile[] */ char **azFile; /* File strings */ unsigned char aBuf[1024]; /* Current vfs log entry (read from file) */ }; static unsigned int get32bits(unsigned char *p){ return (p[0]<<24) + (p[1]<<16) + (p[2]<<8) + p[3]; } /* ** The argument must point to a buffer containing a nul-terminated string. ** If the string begins with an SQL quote character it is overwritten by ** the dequoted version. Otherwise the buffer is left unmodified. */ static void dequote(char *z){ char quote; /* Quote character (if any ) */ quote = z[0]; if( quote=='[' || quote=='\'' || quote=='"' || quote=='`' ){ int iIn = 1; /* Index of next byte to read from input */ int iOut = 0; /* Index of next byte to write to output */ if( quote=='[' ) quote = ']'; while( z[iIn] ){ if( z[iIn]==quote ){ if( z[iIn+1]!=quote ) break; z[iOut++] = quote; iIn += 2; }else{ z[iOut++] = z[iIn++]; } } z[iOut] = '\0'; } } /* ** Connect to or create a vfslog virtual table. */ static int vlogConnect( sqlite3 *db, void *pAux, int argc, const char *const*argv, sqlite3_vtab **ppVtab, char **pzErr ){ sqlite3_vfs *pVfs; /* VFS used to read log file */ int flags; /* flags passed to pVfs->xOpen() */ VfslogVtab *p; int rc; int nByte; char *zFile; *ppVtab = 0; pVfs = sqlite3_vfs_find(0); nByte = sizeof(VfslogVtab) + pVfs->szOsFile + pVfs->mxPathname; p = sqlite3_malloc(nByte); if( p==0 ) return SQLITE_NOMEM; memset(p, 0, nByte); p->pFd = (sqlite3_file *)&p[1]; p->zFile = &((char *)p->pFd)[pVfs->szOsFile]; zFile = sqlite3_mprintf("%s", argv[3]); if( !zFile ){ sqlite3_free(p); return SQLITE_NOMEM; } dequote(zFile); pVfs->xFullPathname(pVfs, zFile, pVfs->mxPathname, p->zFile); sqlite3_free(zFile); flags = SQLITE_OPEN_READWRITE|SQLITE_OPEN_MASTER_JOURNAL; rc = pVfs->xOpen(pVfs, p->zFile, p->pFd, flags, &flags); if( rc==SQLITE_OK ){ p->pFd->pMethods->xFileSize(p->pFd, &p->nByte); sqlite3_declare_vtab(db, "CREATE TABLE xxx(event, file, click, rc, size, offset)" ); *ppVtab = &p->base; }else{ sqlite3_free(p); } return rc; } /* ** There is no "best-index". This virtual table always does a linear ** scan of the binary VFS log file. */ static int vlogBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){ pIdxInfo->estimatedCost = 10.0; return SQLITE_OK; } /* ** Disconnect from or destroy a vfslog virtual table. */ static int vlogDisconnect(sqlite3_vtab *pVtab){ VfslogVtab *p = (VfslogVtab *)pVtab; if( p->pFd->pMethods ){ p->pFd->pMethods->xClose(p->pFd); p->pFd->pMethods = 0; } sqlite3_free(p); return SQLITE_OK; } /* ** Open a new vfslog cursor. */ static int vlogOpen(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCursor){ VfslogCsr *pCsr; /* Newly allocated cursor object */ pCsr = sqlite3_malloc(sizeof(VfslogCsr)); if( !pCsr ) return SQLITE_NOMEM; memset(pCsr, 0, sizeof(VfslogCsr)); *ppCursor = &pCsr->base; return SQLITE_OK; } /* ** Close a vfslog cursor. */ static int vlogClose(sqlite3_vtab_cursor *pCursor){ VfslogCsr *p = (VfslogCsr *)pCursor; int i; for(i=0; i<p->nFile; i++){ sqlite3_free(p->azFile[i]); } sqlite3_free(p->azFile); sqlite3_free(p->zTransient); sqlite3_free(p); return SQLITE_OK; } /* ** Move a vfslog cursor to the next entry in the file. */ static int vlogNext(sqlite3_vtab_cursor *pCursor){ VfslogCsr *pCsr = (VfslogCsr *)pCursor; VfslogVtab *p = (VfslogVtab *)pCursor->pVtab; int rc = SQLITE_OK; int nRead; sqlite3_free(pCsr->zTransient); pCsr->zTransient = 0; nRead = 24; if( pCsr->iOffset+nRead<=p->nByte ){ int eEvent; rc = p->pFd->pMethods->xRead(p->pFd, pCsr->aBuf, nRead, pCsr->iOffset); eEvent = get32bits(pCsr->aBuf); if( (rc==SQLITE_OK) && (eEvent==OS_OPEN || eEvent==OS_DELETE || eEvent==OS_ACCESS) ){ char buf[4]; rc = p->pFd->pMethods->xRead(p->pFd, buf, 4, pCsr->iOffset+nRead); nRead += 4; if( rc==SQLITE_OK ){ int nStr = get32bits((unsigned char *)buf); char *zStr = sqlite3_malloc(nStr+1); rc = p->pFd->pMethods->xRead(p->pFd, zStr, nStr, pCsr->iOffset+nRead); zStr[nStr] = '\0'; nRead += nStr; if( eEvent==OS_OPEN ){ int iFileid = get32bits(&pCsr->aBuf[4]); if( iFileid>=pCsr->nFile ){ int nNew = sizeof(pCsr->azFile[0])*(iFileid+1); pCsr->azFile = (char **)sqlite3_realloc(pCsr->azFile, nNew); nNew -= sizeof(pCsr->azFile[0])*pCsr->nFile; memset(&pCsr->azFile[pCsr->nFile], 0, nNew); pCsr->nFile = iFileid+1; } sqlite3_free(pCsr->azFile[iFileid]); pCsr->azFile[iFileid] = zStr; }else{ pCsr->zTransient = zStr; } } } } pCsr->iRowid += 1; pCsr->iOffset += nRead; return rc; } static int vlogEof(sqlite3_vtab_cursor *pCursor){ VfslogCsr *pCsr = (VfslogCsr *)pCursor; VfslogVtab *p = (VfslogVtab *)pCursor->pVtab; return (pCsr->iOffset>=p->nByte); } static int vlogFilter( sqlite3_vtab_cursor *pCursor, int idxNum, const char *idxStr, int argc, sqlite3_value **argv ){ VfslogCsr *pCsr = (VfslogCsr *)pCursor; pCsr->iRowid = 0; pCsr->iOffset = 20; return vlogNext(pCursor); } static int vlogColumn( sqlite3_vtab_cursor *pCursor, sqlite3_context *ctx, int i ){ unsigned int val; VfslogCsr *pCsr = (VfslogCsr *)pCursor; assert( i<7 ); val = get32bits(&pCsr->aBuf[4*i]); switch( i ){ case 0: { sqlite3_result_text(ctx, vfslog_eventname(val), -1, SQLITE_STATIC); break; } case 1: { char *zStr = pCsr->zTransient; if( val!=0 && val<pCsr->nFile ){ zStr = pCsr->azFile[val]; } sqlite3_result_text(ctx, zStr, -1, SQLITE_TRANSIENT); break; } default: sqlite3_result_int(ctx, val); break; } return SQLITE_OK; } static int vlogRowid(sqlite3_vtab_cursor *pCursor, sqlite_int64 *pRowid){ VfslogCsr *pCsr = (VfslogCsr *)pCursor; *pRowid = pCsr->iRowid; return SQLITE_OK; } int sqlite3_vfslog_register(sqlite3 *db){ static sqlite3_module vfslog_module = { 0, /* iVersion */ vlogConnect, /* xCreate */ vlogConnect, /* xConnect */ vlogBestIndex, /* xBestIndex */ vlogDisconnect, /* xDisconnect */ vlogDisconnect, /* xDestroy */ vlogOpen, /* xOpen - open a cursor */ vlogClose, /* xClose - close a cursor */ vlogFilter, /* xFilter - configure scan constraints */ vlogNext, /* xNext - advance a cursor */ vlogEof, /* xEof - check for end of scan */ vlogColumn, /* xColumn - read data */ vlogRowid, /* xRowid - read data */ 0, /* xUpdate */ 0, /* xBegin */ 0, /* xSync */ 0, /* xCommit */ 0, /* xRollback */ 0, /* xFindMethod */ 0, /* xRename */ }; sqlite3_create_module(db, "vfslog", &vfslog_module, 0); return SQLITE_OK; } /************************************************************************** *************************************************************************** ** Tcl interface starts here. */ #ifdef SQLITE_TEST #include <tcl.h> static int test_vfslog( void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[] ){ struct SqliteDb { sqlite3 *db; }; sqlite3 *db; Tcl_CmdInfo cmdInfo; int rc = SQLITE_ERROR; static const char *strs[] = { "finalize", "new", "register", 0 }; enum VL_enum { VL_FINALIZE, VL_NEW, VL_REGISTER }; int iSub; if( objc<2 ){ Tcl_WrongNumArgs(interp, 1, objv, "SUB-COMMAND ..."); return TCL_ERROR; } if( Tcl_GetIndexFromObj(interp, objv[1], strs, "sub-command", 0, &iSub) ){ return TCL_ERROR; } switch( (enum VL_enum)iSub ){ case VL_FINALIZE: { int rc; char *zVfs; if( objc!=3 ){ Tcl_WrongNumArgs(interp, 2, objv, "VFS"); return TCL_ERROR; } zVfs = Tcl_GetString(objv[2]); rc = sqlite3_vfslog_finalize(zVfs); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, "failed", 0); return TCL_ERROR; } break; }; case VL_NEW: { int rc; char *zVfs; char *zParent; char *zLog; if( objc!=5 ){ Tcl_WrongNumArgs(interp, 2, objv, "VFS PARENT LOGFILE"); return TCL_ERROR; } zVfs = Tcl_GetString(objv[2]); zParent = Tcl_GetString(objv[3]); zLog = Tcl_GetString(objv[4]); if( *zParent=='\0' ) zParent = 0; rc = sqlite3_vfslog_new(zVfs, zParent, zLog); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, "failed", 0); return TCL_ERROR; } break; }; case VL_REGISTER: { char *zDb; if( objc!=3 ){ Tcl_WrongNumArgs(interp, 2, objv, "DB"); return TCL_ERROR; } zDb = Tcl_GetString(objv[2]); if( Tcl_GetCommandInfo(interp, zDb, &cmdInfo) ){ db = ((struct SqliteDb*)cmdInfo.objClientData)->db; rc = sqlite3_vfslog_register(db); } if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, "Bad sqlite3 handle: ", zDb, 0); return TCL_ERROR; } break; }; } return TCL_OK; } int SqlitetestOsinst_Init(Tcl_Interp *interp){ Tcl_CreateObjCommand(interp, "vfslog", test_vfslog, 0, 0); return TCL_OK; } #endif /* SQLITE_TEST */ |
Changes to test/tester.tcl.
︙ | ︙ | |||
74 75 76 77 78 79 80 | proc ostrace_call {zCall nClick zFile i32 i64} { set s "INSERT INTO ostrace VALUES('$zCall', $nClick, '$zFile', $i32, $i64);" puts $::ostrace_fd $s } for {set i 0} {$i<[llength $argv]} {incr i} { | < < < < < < < < < < < < < < | 74 75 76 77 78 79 80 81 82 83 84 85 86 87 | proc ostrace_call {zCall nClick zFile i32 i64} { set s "INSERT INTO ostrace VALUES('$zCall', $nClick, '$zFile', $i32, $i64);" puts $::ostrace_fd $s } for {set i 0} {$i<[llength $argv]} {incr i} { if {[lindex $argv $i] eq "--binarylog"} { set tester_do_binarylog 1 set argv [lreplace $argv $i $i] } } # |
︙ | ︙ | |||
130 131 132 133 134 135 136 | # if {![info exists nTest]} { sqlite3_shutdown install_malloc_faultsim 1 sqlite3_initialize autoinstall_test_functions if {[info exists tester_do_binarylog]} { | | | | 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 | # if {![info exists nTest]} { sqlite3_shutdown install_malloc_faultsim 1 sqlite3_initialize autoinstall_test_functions if {[info exists tester_do_binarylog]} { vfslog new binarylog {} vfslog.bin #sqlite3_instvfs marker binarylog "$argv0 $argv" } } proc reset_db {} { catch {db close} file delete -force test.db file delete -force test.db-journal |
︙ | ︙ | |||
176 177 178 179 180 181 182 | # 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 {[info exists ::tester_do_binarylog]} { | | | 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 | # 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 {[info exists ::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 |
︙ | ︙ | |||
212 213 214 215 216 217 218 | lappend ::failList $name if {$nErr>=$maxErr} {puts "*** Giving up..."; finalize_testing} } else { puts " Ok" } flush stdout if {[info exists ::tester_do_binarylog]} { | | | 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 | lappend ::failList $name if {$nErr>=$maxErr} {puts "*** Giving up..."; finalize_testing} } else { puts " Ok" } flush stdout if {[info exists ::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} { |
︙ | ︙ | |||
307 308 309 310 311 312 313 | 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]} { | | < < < < < < < < < < < < < < | 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 | 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]} { vfslog finalize binarylog } if {$sqlite_open_file_count} { puts "$sqlite_open_file_count files were left open" incr nErr } if {[sqlite3_memory_used]>0} { puts "Unfreed memory: [sqlite3_memory_used] bytes" incr nErr ifcapable memdebug||mem5||(mem3&&debug) { puts "Writing unfreed memory log to \"./memleak.txt\"" sqlite3_memdebug_dump ./memleak.txt } |
︙ | ︙ |