From: drh Date: Wed, 14 Jul 2010 00:14:30 +0000 (+0000) Subject: Change the name of the xShmClose VFS method to xShmUnmap, everywhere. X-Git-Tag: version-3.7.2~138^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e11fedc589f95f1e39e9e7cf3e4a9957261ee1e9;p=thirdparty%2Fsqlite.git Change the name of the xShmClose VFS method to xShmUnmap, everywhere. FossilOrigin-Name: c2d27cf51d33e6f38bab37008d39074051f75274 --- diff --git a/manifest b/manifest index 68311200d7..606840e417 100644 --- a/manifest +++ b/manifest @@ -1,8 +1,8 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -C Tweaks\sto\sthe\snew\sshared-memory\sinterface\sdesign\s-\smostly\scomment\schanges. -D 2010-07-13T23:41:40 +C Change\sthe\sname\sof\sthe\sxShmClose\sVFS\smethod\sto\sxShmUnmap,\severywhere. +D 2010-07-14T00:14:31 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -153,12 +153,12 @@ F src/mutex_os2.c 6a62583e374ba3ac1a3fcc0da2bfdac7d3942689 F src/mutex_unix.c cf84466b4fdd2baa0d5a10bb19f08b2abc1ce42e F src/mutex_w32.c 1fe0e735897be20e09dd6f53c3fb516c6b48c0eb F src/notify.c cbfa66a836da3a51567209636e6a94059c137930 -F src/os.c a45484100b8e86718eb117d92feae082ac2530f8 -F src/os.h 93cb145b93bd971055cf4d55ac44eaaa51e148fc +F src/os.c a0ecbd198b92e60a3e3b8887a668df3f80b4f62f +F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9 F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f F src/os_os2.c 665876d5eec7585226b0a1cf5e18098de2b2da19 -F src/os_unix.c 53a84d8a2aeaf8fa721036f0336981f4ff5d8e82 -F src/os_win.c 3bb7e081045aa4c811197ead66febdf8d6209275 +F src/os_unix.c 7845a3c91b5e5e1ed3c5e7f5430ff8af7e9d6c02 +F src/os_win.c 61734aad7f50b28f3c76eb4b19b63472f6d825d9 F src/pager.c 78ca1e1f3315c8227431c403c04d791dccf242fb F src/pager.h 879fdde5a102d2f21a3135d6f647530b21c2796c F src/parse.y ace5c7a125d9f2a410e431ee3209034105045f7e @@ -185,7 +185,7 @@ F src/test2.c e3f564ab1e9fd0b47b0c9e23e7054e38bf0836cf F src/test3.c 4c21700c73a890a47fc685c1097bfb661346ac94 F src/test4.c ad03bb987ddedce928f4258c1e7fa4109a73497d F src/test5.c cc55900118fa4add8ec9cf69fc4225a4662f76b1 -F src/test6.c e328b5047ef9b7a8c2d64617625855ae38639708 +F src/test6.c c7256cc21d2409486d094277d5b017e8eced44ba F src/test7.c 3f2d63e4ccf97f8c2cf1a7fa0a3c8e2e2a354e6e F src/test8.c f959db9a22d882013b64c92753fa793b2ce3bdea F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60 @@ -195,7 +195,7 @@ F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2 F src/test_config.c 5a11c51af2156e2d07186930b36f2b8239a4393f F src/test_demovfs.c da81a5f7785bb352bda7911c332a983ec4f17f27 -F src/test_devsym.c 85286d641bda3f9ecd0e34fcc0b884de198a83b5 +F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc F src/test_func.c 13b582345fb1185a93e46c53310fae8547dcce20 F src/test_hexio.c 1237f000ec7a491009b1233f5c626ea71bce1ea2 F src/test_init.c 5d624ffd0409d424cf9adbfe1f056b200270077c @@ -205,7 +205,7 @@ F src/test_journal.c 424a334cdfdc8a6f975abe3641440147bded3185 F src/test_loadext.c df586c27176e3c2cb2e099c78da67bf14379a56e F src/test_malloc.c 4ab85f2b8ae3a237f4e6557b0a641181a19ffab1 F src/test_mutex.c ce06b59aca168cd8c520b77159a24352a7469bd3 -F src/test_onefile.c 01e7a0b0cf27cc974de3b2f825eca5a22185437a +F src/test_onefile.c 40cf9e212a377a6511469384a64b01e6e34b2eec F src/test_osinst.c f408c6a181f2fb04c56273afd5c3e1e82f60392c F src/test_pcache.c 7bf828972ac0d2403f5cfa4cd14da41f8ebe73d8 F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0 @@ -230,7 +230,7 @@ F src/vdbeblob.c 258a6010ba7a82b72b327fb24c55790655689256 F src/vdbemem.c 5e579abf6532001dfbee0e640dc34eae897a9807 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2 F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda -F src/wal.c 1a63156c661ff22c4c5fc2e6e3ee054017ea8493 +F src/wal.c 7dce9040d5ba6c575f337b298fce1a9c04eb2296 F src/wal.h 906c85760598b18584921fe08008435aa4eeeeb2 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f F src/where.c 926c83c6394e132a1c62b6b12ceeba7d55a34c19 @@ -837,14 +837,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 4a6c4b6605ddce59e586ab17024de5269191a823 -R 3ff2e4b2090261c584dc61be1d08bf07 +P 6336de7aa96a6e1e68cc123e5d5f485d790d95a2 +R ed9e8ba444308d86203809c921582295 U drh -Z 17027715e0d2ea3b3a9196f1e43adfc6 +Z ab55ba5726586911bf21a2d00d1bf9f3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFMPPm3oxKgR168RlERAnryAJ9sVObmWBMDEQUPVfV3402PMfePOgCeIeML -hGA0gHr75NFJ6p9J4Ro3ONY= -=Btgx +iD8DBQFMPQFqoxKgR168RlERAg+uAJ9DAAD3nEM/VCOWa4ZbILGJxqK4vgCeLpos +qbavHCgozBPyK/gW7mjQJ+c= +=fpWX -----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index 2722666b1d..87a7f0fa69 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6336de7aa96a6e1e68cc123e5d5f485d790d95a2 \ No newline at end of file +c2d27cf51d33e6f38bab37008d39074051f75274 \ No newline at end of file diff --git a/src/os.c b/src/os.c index 63b2b04d23..136e9eb55a 100644 --- a/src/os.c +++ b/src/os.c @@ -106,7 +106,7 @@ int sqlite3OsShmLock(sqlite3_file *id, int offset, int n, int flags){ void sqlite3OsShmBarrier(sqlite3_file *id){ id->pMethods->xShmBarrier(id); } -int sqlite3OsShmClose(sqlite3_file *id, int deleteFlag){ +int sqlite3OsShmUnmap(sqlite3_file *id, int deleteFlag){ return id->pMethods->xShmUnmap(id, deleteFlag); } int sqlite3OsShmMap( diff --git a/src/os.h b/src/os.h index d5ffa17745..7f17c203ef 100644 --- a/src/os.h +++ b/src/os.h @@ -250,7 +250,7 @@ int sqlite3OsDeviceCharacteristics(sqlite3_file *id); int sqlite3OsShmMap(sqlite3_file *,int,int,int,void volatile **); int sqlite3OsShmLock(sqlite3_file *id, int, int, int); void sqlite3OsShmBarrier(sqlite3_file *id); -int sqlite3OsShmClose(sqlite3_file *id, int); +int sqlite3OsShmUnmap(sqlite3_file *id, int); /* ** Functions for accessing sqlite3_vfs methods diff --git a/src/os_unix.c b/src/os_unix.c index 36fa3bb13c..ba614c5632 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -3607,6 +3607,9 @@ static void unixShmBarrier( /* ** Close a connection to shared-memory. Delete the underlying ** storage if deleteFlag is true. +** +** If there is no shared memory associated with the connection then this +** routine is a harmless no-op. */ static int unixShmUnmap( sqlite3_file *fd, /* The underlying database file */ diff --git a/src/os_win.c b/src/os_win.c index 9349c45883..b9de7924ef 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -1481,7 +1481,7 @@ shm_open_err: ** Close a connection to shared-memory. Delete the underlying ** storage if deleteFlag is true. */ -static int winShmClose( +static int winShmUnmap( sqlite3_file *fd, /* Database holding shared memory */ int deleteFlag /* Delete after closing if true */ ){ @@ -1763,7 +1763,7 @@ shmpage_out: # define winShmMap 0 # define winShmLock 0 # define winShmBarrier 0 -# define winShmClose 0 +# define winShmUnmap 0 #endif /* #ifndef SQLITE_OMIT_WAL */ /* @@ -1793,7 +1793,7 @@ static const sqlite3_io_methods winIoMethod = { winShmMap, /* xShmMap */ winShmLock, /* xShmLock */ winShmBarrier, /* xShmBarrier */ - winShmClose /* xShmClose */ + winShmUnmap /* xShmUnmap */ }; /**************************************************************************** diff --git a/src/test6.c b/src/test6.c index cb87cf23c9..c9c8a4d20f 100644 --- a/src/test6.c +++ b/src/test6.c @@ -529,8 +529,8 @@ static int cfShmLock(sqlite3_file *pFile, int ofst, int n, int flags){ static void cfShmBarrier(sqlite3_file *pFile){ sqlite3OsShmBarrier(((CrashFile*)pFile)->pRealFile); } -static int cfShmClose(sqlite3_file *pFile, int delFlag){ - return sqlite3OsShmClose(((CrashFile*)pFile)->pRealFile, delFlag); +static int cfShmUnmap(sqlite3_file *pFile, int delFlag){ + return sqlite3OsShmUnmap(((CrashFile*)pFile)->pRealFile, delFlag); } static int cfShmMap( sqlite3_file *pFile, /* Handle open on database file */ @@ -559,7 +559,7 @@ static const sqlite3_io_methods CrashFileVtab = { cfShmMap, /* xShmMap */ cfShmLock, /* xShmLock */ cfShmBarrier, /* xShmBarrier */ - cfShmClose /* xShmClose */ + cfShmUnmap /* xShmUnmap */ }; /* diff --git a/src/test_devsym.c b/src/test_devsym.c index b2ebd885aa..21f0f684d8 100644 --- a/src/test_devsym.c +++ b/src/test_devsym.c @@ -53,7 +53,7 @@ static int devsymDeviceCharacteristics(sqlite3_file*); static int devsymShmLock(sqlite3_file*,int,int,int); static int devsymShmMap(sqlite3_file*,int,int,int, void volatile **); static void devsymShmBarrier(sqlite3_file*); -static int devsymShmClose(sqlite3_file*,int); +static int devsymShmUnmap(sqlite3_file*,int); /* ** Method declarations for devsym_vfs. @@ -118,7 +118,7 @@ static sqlite3_io_methods devsym_io_methods = { devsymShmMap, /* xShmMap */ devsymShmLock, /* xShmLock */ devsymShmBarrier, /* xShmBarrier */ - devsymShmClose /* xShmClose */ + devsymShmUnmap /* xShmUnmap */ }; struct DevsymGlobal { @@ -253,9 +253,9 @@ static void devsymShmBarrier(sqlite3_file *pFile){ devsym_file *p = (devsym_file *)pFile; sqlite3OsShmBarrier(p->pReal); } -static int devsymShmClose(sqlite3_file *pFile, int delFlag){ +static int devsymShmUnmap(sqlite3_file *pFile, int delFlag){ devsym_file *p = (devsym_file *)pFile; - return sqlite3OsShmClose(p->pReal, delFlag); + return sqlite3OsShmUnmap(p->pReal, delFlag); } diff --git a/src/test_onefile.c b/src/test_onefile.c index 64d5a66a35..cd7db008cf 100644 --- a/src/test_onefile.c +++ b/src/test_onefile.c @@ -222,7 +222,7 @@ static sqlite3_io_methods fs_io_methods = { 0, /* xShmMap */ 0, /* xShmLock */ 0, /* xShmBarrier */ - 0 /* xShmClose */ + 0 /* xShmUnmap */ }; @@ -243,7 +243,7 @@ static sqlite3_io_methods tmp_io_methods = { 0, /* xShmMap */ 0, /* xShmLock */ 0, /* xShmBarrier */ - 0 /* xShmClose */ + 0 /* xShmUnmap */ }; /* Useful macros used in several places */ diff --git a/src/wal.c b/src/wal.c index a6bc7c121b..9a9b2dc0e8 100644 --- a/src/wal.c +++ b/src/wal.c @@ -1167,7 +1167,7 @@ recovery_error: ** Close an open wal-index. */ static void walIndexClose(Wal *pWal, int isDelete){ - sqlite3OsShmClose(pWal->pDbFd, isDelete); + sqlite3OsShmUnmap(pWal->pDbFd, isDelete); } /*