database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-15 11:41:13 +03:00
Code Activity

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

Browse Source 
FossilOrigin-Name: 49d62933759d4e160ee3a4dd2aa316a2f5bbb4e6
This commit is contained in:
drh
2010-05-12 18:30:36 +00:00
parent 686138fe88
commit 365e2d255b
3 changed files with 52 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
manifest
View File

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

2
manifest.uuid
View File

@@ -1 +1 @@
c74458127468f30b16715594c8d68e9d3c05d292 49d62933759d4e160ee3a4dd2aa316a2f5bbb4e6

48
src/test_devsym.c
View File

@@ -50,6 +50,12 @@ static int devsymCheckReservedLock(sqlite3_file*, int *);
static int devsymFileControl(sqlite3_file*, int op, void *pArg); static int devsymFileControl(sqlite3_file*, int op, void *pArg);
static int devsymSectorSize(sqlite3_file*); static int devsymSectorSize(sqlite3_file*);
static int devsymDeviceCharacteristics(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. ** Method declarations for devsym_vfs.
@@ -112,12 +118,12 @@ static sqlite3_io_methods devsym_io_methods = {
devsymFileControl, /* xFileControl */ devsymFileControl, /* xFileControl */
devsymSectorSize, /* xSectorSize */ devsymSectorSize, /* xSectorSize */
devsymDeviceCharacteristics, /* xDeviceCharacteristics */ devsymDeviceCharacteristics, /* xDeviceCharacteristics */
0, /* xShmOpen */ devsymShmOpen, /* xShmOpen */
0, /* xShmSize */ devsymShmSize, /* xShmSize */
0, /* xShmGet */ devsymShmGet, /* xShmGet */
0, /* xShmRelease */ devsymShmRelease, /* xShmRelease */
0, /* xShmLock */ devsymShmLock, /* xShmLock */
0 /* xShmClose */ devsymShmClose /* xShmClose */
}; };
struct DevsymGlobal { struct DevsymGlobal {
@@ -231,6 +237,36 @@ static int devsymDeviceCharacteristics(sqlite3_file *pFile){
return g.iDeviceChar; 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. ** Open an devsym file handle.
*/ */