Fix for the test_devsym.c test module for the VFS-SHM refactoring.

FossilOrigin-Name: 49d62933759d4e160ee3a4dd2aa316a2f5bbb4e6

diff --git a/manifest b/manifest
index 455726248b41eed40778943bf97ca349824e5def..360b1740a68347c844815f8589cd430b4a01a1a4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C A\scouple\ssimple\sfixes\sto\sget\swal.test\smostly\sworking.
-D 2010-05-12T18:10:52
+C Fix\sfor\sthe\stest_devsym.c\stest\smodule\sfor\sthe\sVFS-SHM\srefactoring.
+D 2010-05-12T18:30:36
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -193,7 +193,7 @@ F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de
 F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2
 F src/test_config.c 6210f501d358bde619ae761f06f123529c6ba24f
 F src/test_demovfs.c da81a5f7785bb352bda7911c332a983ec4f17f27
-F src/test_devsym.c c910ea795b7cd9dc1bb8e90776816ef5ed8833ea
+F src/test_devsym.c 136869028132c3dc34fe920a9fda716f391227f4
 F src/test_func.c 13b582345fb1185a93e46c53310fae8547dcce20
 F src/test_hexio.c 1237f000ec7a491009b1233f5c626ea71bce1ea2
 F src/test_init.c 5d624ffd0409d424cf9adbfe1f056b200270077c
@@ -817,14 +817,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 2b00152c1ac0b3735aa6cfab61259ff04d81c701
-R b7946fb277db4dbc4bc013e5e5fa093c
+P c74458127468f30b16715594c8d68e9d3c05d292
+R 5a9efacb9856d7f4bdde2f4883d79672
 U drh
-Z 62e42baf1876f9498d88e14692278875
+Z 630d17e21b3111ffa913dd47b8968c39
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFL6u8uoxKgR168RlERAoSbAJ9jNFTVpnB+tvn+mLuDe10PoEq3+ACeI55J
-3VWwGaEkCHFZz1L5A8JAA68=
-=qjYf
+iD8DBQFL6vPPoxKgR168RlERAj53AJkBapvtr+dRsf/F1XjNxRi5BCrThQCdFxa3
+EJzQfQYaZjLG21xvWiHqkgU=
+=76NU
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 62c6d71cbfe71ce81ff3d7fda01710e53129efa6..0fda76004a4a46a9d71024094a5cd0b122994c0c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c74458127468f30b16715594c8d68e9d3c05d292
\ No newline at end of file
+49d62933759d4e160ee3a4dd2aa316a2f5bbb4e6
\ No newline at end of file

diff --git a/src/test_devsym.c b/src/test_devsym.c
index ed7078d7a1bfc35196875b943ccb4b07df9deaa4..0a60b3c94d3107bf67d9adf79d4963510305c32e 100644 (file)
--- a/src/test_devsym.c
+++ b/src/test_devsym.c
@@ -50,6 +50,12 @@ static int devsymCheckReservedLock(sqlite3_file*, int *);
 static int devsymFileControl(sqlite3_file*, int op, void *pArg);
 static int devsymSectorSize(sqlite3_file*);
 static int devsymDeviceCharacteristics(sqlite3_file*);
+static int devsymShmOpen(sqlite3_file*);
+static int devsymShmSize(sqlite3_file*,int,int*);
+static int devsymShmGet(sqlite3_file*,int,int*,void**);
+static int devsymShmRelease(sqlite3_file*);
+static int devsymShmLock(sqlite3_file*,int,int*);
+static int devsymShmClose(sqlite3_file*,int);
 
 /*
 ** Method declarations for devsym_vfs.
@@ -112,12 +118,12 @@ static sqlite3_io_methods devsym_io_methods = {
   devsymFileControl,                /* xFileControl */
   devsymSectorSize,                 /* xSectorSize */
   devsymDeviceCharacteristics,      /* xDeviceCharacteristics */
-  0,                                /* xShmOpen */
-  0,                                /* xShmSize */
-  0,                                /* xShmGet */
-  0,                                /* xShmRelease */
-  0,                                /* xShmLock */
-  0                                 /* xShmClose */
+  devsymShmOpen,                    /* xShmOpen */
+  devsymShmSize,                    /* xShmSize */
+  devsymShmGet,                     /* xShmGet */
+  devsymShmRelease,                 /* xShmRelease */
+  devsymShmLock,                    /* xShmLock */
+  devsymShmClose                    /* xShmClose */
 };
 
 struct DevsymGlobal {
@@ -231,6 +237,36 @@ static int devsymDeviceCharacteristics(sqlite3_file *pFile){
   return g.iDeviceChar;
 }
 
+/*
+** Shared-memory methods are all pass-thrus.
+*/
+static int devsymShmOpen(sqlite3_file *pFile){
+  devsym_file *p = (devsym_file *)pFile;
+  return sqlite3OsShmOpen(p->pReal);
+}
+static int devsymShmSize(sqlite3_file *pFile, int reqSize, int *pSize){
+  devsym_file *p = (devsym_file *)pFile;
+  return sqlite3OsShmSize(p->pReal, reqSize, pSize);
+}
+static int devsymShmGet(sqlite3_file *pFile, int reqSz, int *pSize, void **pp){
+  devsym_file *p = (devsym_file *)pFile;
+  return sqlite3OsShmGet(p->pReal, reqSz, pSize, pp);
+}
+static int devsymShmRelease(sqlite3_file *pFile){
+  devsym_file *p = (devsym_file *)pFile;
+  return sqlite3OsShmRelease(p->pReal);
+}
+static int devsymShmLock(sqlite3_file *pFile, int desired, int *pGot){
+  devsym_file *p = (devsym_file *)pFile;
+  return sqlite3OsShmLock(p->pReal, desired, pGot);
+}
+static int devsymShmClose(sqlite3_file *pFile, int delFlag){
+  devsym_file *p = (devsym_file *)pFile;
+  return sqlite3OsShmClose(p->pReal, delFlag);
+}
+
+
+
 /*
 ** Open an devsym file handle.
 */