From: dan <dan@noemail.net>
Date: Sat, 22 May 2010 08:22:39 +0000 (+0000)
Subject: Add a couple of missing methods to test_osinst.c..
X-Git-Tag: version-3.7.2~348
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c0928dcb673cc9ef51012fd62c1f85701c37b68;p=thirdparty%2Fsqlite.git

Add a couple of missing methods to test_osinst.c..

FossilOrigin-Name: 5c9e9c06ae350043e66f36087da4021a52e6ee17
---

diff --git a/manifest b/manifest
index 1baf9ed9da..dfba3352f8 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Add\sseveral\sEXPENSIVE_ASSERT\scode\sblocks\sto\svalidate\sthe\swal-index\shash\stable.\nFix\sthe\sbugs\sthat\sthese\scode\sblocks\sfine.\s\sRename\swalClearHash()\sto\s\nwalCleanupHash()\sand\ssimplify\sits\sinterface.
-D 2010-05-22T00:55:40
+C Add\sa\scouple\sof\smissing\smethods\sto\stest_osinst.c..
+D 2010-05-22T08:22:40
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -204,7 +201,7 @@ F src/test_loadext.c df586c27176e3c2cb2e099c78da67bf14379a56e
 F src/test_malloc.c 2842c922b8e8d992aba722214952204ca025b411
 F src/test_mutex.c ce06b59aca168cd8c520b77159a24352a7469bd3
 F src/test_onefile.c 4ce8c753c0240f010f0f2af89604875967d20945
-F src/test_osinst.c 9cac3f764c065a0ef9d341fffae0c29d6373dc82
+F src/test_osinst.c 77e9fc304bc9c825fb4b6c7e396d4d3f23c101b4
 F src/test_pcache.c 7bf828972ac0d2403f5cfa4cd14da41f8ebe73d8
 F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
 F src/test_server.c bbba05c144b5fc4b52ff650a4328027b3fa5fcc6
@@ -816,14 +813,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 40f80ffe70ca691dfa146f6d84956ed0784fc63d
-R 524fa1e4249768664dfa82575a2741a4
-U drh
-Z 028b5cd7fb9973ef295584c4a0b1ec8f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFL9yuPoxKgR168RlERAnVbAJ48JgsskKwH9nQ/ST9nadbql9iCqQCggJCz
-rLTdl7W6OQ9+Vg0rmcQfA+4=
-=Wnao
------END PGP SIGNATURE-----
+P 7aade899e55f4565f02d301e1e83fb0bac2ea500
+R cf1514dd18e6972433d06e5339115fa6
+U dan
+Z 8423981b7570a11d3c3148c90911df31
diff --git a/manifest.uuid b/manifest.uuid
index 90cdb13785..86a662fa26 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7aade899e55f4565f02d301e1e83fb0bac2ea500
\ No newline at end of file
+5c9e9c06ae350043e66f36087da4021a52e6ee17
\ No newline at end of file
diff --git a/src/test_osinst.c b/src/test_osinst.c
index f5e541c2d6..f55611d4f6 100644
--- a/src/test_osinst.c
+++ b/src/test_osinst.c
@@ -17,10 +17,15 @@
 
 /*
 ** 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.
+** 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.
+**
+** All calls on sqlite3_file objects except xFileControl() are logged.
+** Additionally, calls to the xAccess(), xOpen(), xDelete() and xRename() 
+** methods are logged. The other sqlite3_vfs object methods (xDlXXX,
+** xRandomness, xSleep, xCurrentTime, xGetLastError and xCurrentTimeInt64) 
+** are not logged.
 **
 ** The binary log files are read using a virtual table implementation
 ** also contained in this file. 
@@ -169,6 +174,10 @@ static int vfslogRandomness(sqlite3_vfs*, int nByte, char *zOut);
 static int vfslogSleep(sqlite3_vfs*, int microseconds);
 static int vfslogCurrentTime(sqlite3_vfs*, double*);
 
+static int vfslogGetLastError(sqlite3_vfs*, int, char *);
+static int vfslogRename(sqlite3_vfs*, const char *, const char *, int);
+static int vfslogCurrentTimeInt64(sqlite3_vfs*, sqlite3_int64*);
+
 static sqlite3_vfs vfslog_vfs = {
   1,                              /* iVersion */
   sizeof(VfslogFile),             /* szOsFile */
@@ -187,6 +196,9 @@ static sqlite3_vfs vfslog_vfs = {
   vfslogRandomness,               /* xRandomness */
   vfslogSleep,                    /* xSleep */
   vfslogCurrentTime,              /* xCurrentTime */
+  vfslogGetLastError,             /* xGetLastError */
+  vfslogRename,                   /* xRename */
+  vfslogCurrentTimeInt64          /* xCurrentTime */
 };
 
 static sqlite3_io_methods vfslog_io_methods = {
@@ -610,6 +622,16 @@ static int vfslogCurrentTime(sqlite3_vfs *pVfs, double *pTimeOut){
   return REALVFS(pVfs)->xCurrentTime(REALVFS(pVfs), pTimeOut);
 }
 
+static int vfslogGetLastError(sqlite3_vfs *pVfs, int a, char *b){
+  return REALVFS(pVfs)->xGetLastError(REALVFS(pVfs), a, b);
+}
+static int vfslogRename(sqlite3_vfs *pVfs, const char *a, const char *b, int c){
+  return REALVFS(pVfs)->xRename(REALVFS(pVfs), a, b, c);
+}
+static int vfslogCurrentTimeInt64(sqlite3_vfs *pVfs, sqlite3_int64 *p){
+  return REALVFS(pVfs)->xCurrentTimeInt64(REALVFS(pVfs), p);
+}
+
 static void vfslog_flush(VfslogVfs *p){
 #ifdef SQLITE_TEST
   extern int sqlite3_io_error_pending;