mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix dependencies in makefiles to include ext/misc/vfstrace.c as necessary.

Browse Source 
Improved xFileControl() output from vfstrace.c.

FossilOrigin-Name: e8f2d6313075c92fdeebcdfd8b50f43e9d45225890b2ef6b77148a766a42e940
This commit is contained in:
drh 2024-09-09 15:33:37 +00:00
parent a40f6eb80e
commit dbab768d07
6 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -1194,6 +1194,7 @@ SHELL_DEP = \
$(TOP)/ext/misc/shathree.c \ $(TOP)/ext/misc/shathree.c \
$(TOP)/ext/misc/sqlar.c \ $(TOP)/ext/misc/sqlar.c \
$(TOP)/ext/misc/uint.c \ $(TOP)/ext/misc/uint.c \
$(TOP)/ext/misc/vfstrace.c \
$(TOP)/ext/misc/zipfile.c \ $(TOP)/ext/misc/zipfile.c \
$(TOP)/ext/recover/dbdata.c \ $(TOP)/ext/recover/dbdata.c \
$(TOP)/ext/recover/sqlite3recover.c \ $(TOP)/ext/recover/sqlite3recover.c \

1
Makefile.msc
View File

@ -2320,6 +2320,7 @@ SHELL_DEP = \
$(TOP)\ext\misc\shathree.c \ $(TOP)\ext\misc\shathree.c \
$(TOP)\ext\misc\sqlar.c \ $(TOP)\ext\misc\sqlar.c \
$(TOP)\ext\misc\uint.c \ $(TOP)\ext\misc\uint.c \
$(TOP)\ext\misc\vfstrace.c \
$(TOP)\ext\misc\zipfile.c \ $(TOP)\ext\misc\zipfile.c \
$(TOP)\ext\recover\dbdata.c \ $(TOP)\ext\recover\dbdata.c \
$(TOP)\ext\recover\sqlite3recover.c \ $(TOP)\ext\recover\sqlite3recover.c \

13
ext/misc/vfstrace.c
View File

@ -511,7 +511,12 @@ static int vfstraceFileControl(sqlite3_file *pFile, int op, void *pArg){
} }
case SQLITE_FCNTL_BUSYHANDLER: zOp = "BUSYHANDLER"; break; case SQLITE_FCNTL_BUSYHANDLER: zOp = "BUSYHANDLER"; break;
case SQLITE_FCNTL_TEMPFILENAME: zOp = "TEMPFILENAME"; break; case SQLITE_FCNTL_TEMPFILENAME: zOp = "TEMPFILENAME"; break;
case SQLITE_FCNTL_MMAP_SIZE: zOp = "MMAP_SIZE"; break; case SQLITE_FCNTL_MMAP_SIZE: {
sqlite3_int64 iMMap = *(sqlite3_int64*)pArg;
sqlite3_snprintf(sizeof(zBuf), zBuf, "MMAP_SIZE,%lld",iMMap);
zOp = zBuf;
break;
}
case SQLITE_FCNTL_TRACE: zOp = "TRACE"; break; case SQLITE_FCNTL_TRACE: zOp = "TRACE"; break;
case SQLITE_FCNTL_HAS_MOVED: zOp = "HAS_MOVED"; break; case SQLITE_FCNTL_HAS_MOVED: zOp = "HAS_MOVED"; break;
case SQLITE_FCNTL_SYNC: zOp = "SYNC"; break; case SQLITE_FCNTL_SYNC: zOp = "SYNC"; break;
@ -561,6 +566,12 @@ static int vfstraceFileControl(sqlite3_file *pFile, int op, void *pArg){
zRVal = *(char**)pArg; zRVal = *(char**)pArg;
break; break;
} }
case SQLITE_FCNTL_MMAP_SIZE: {
sqlite3_snprintf(sizeof(zBuf2), zBuf2, "%lld", *(sqlite3_int64*)pArg);
zRVal = zBuf2;
break;
}
case SQLITE_FCNTL_HAS_MOVED:
case SQLITE_FCNTL_PERSIST_WAL: { case SQLITE_FCNTL_PERSIST_WAL: {
sqlite3_snprintf(sizeof(zBuf2), zBuf2, "%d", *(int*)pArg); sqlite3_snprintf(sizeof(zBuf2), zBuf2, "%d", *(int*)pArg);
zRVal = zBuf2; zRVal = zBuf2;

1
main.mk
View File

@ -771,6 +771,7 @@ SHELL_DEP = \
$(TOP)/ext/misc/shathree.c \ $(TOP)/ext/misc/shathree.c \
$(TOP)/ext/misc/sqlar.c \ $(TOP)/ext/misc/sqlar.c \
$(TOP)/ext/misc/uint.c \ $(TOP)/ext/misc/uint.c \
$(TOP)/ext/misc/vfstrace.c \
$(TOP)/ext/misc/zipfile.c \ $(TOP)/ext/misc/zipfile.c \
$(TOP)/ext/recover/dbdata.c \ $(TOP)/ext/recover/dbdata.c \
$(TOP)/ext/recover/sqlite3recover.c \ $(TOP)/ext/recover/sqlite3recover.c \

18
manifest
View File

@ -1,11 +1,11 @@
C Fix\sharmless\scompiler\swarnings\sin\sthe\svfstrace.c\sextension. C Fix\sdependencies\sin\smakefiles\sto\sinclude\sext/misc/vfstrace.c\sas\snecessary.\nImproved\sxFileControl()\soutput\sfrom\svfstrace.c.
D 2024-09-09T15:19:26.342 D 2024-09-09T15:33:37.183
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
F Makefile.in c41539ec7e8e69091e74c7d9e011115ae5e81d1f53829e640d299f3a754f94a4 F Makefile.in 7753650b4204e3ccd55a4e6a0d73a5a01f737dcefb099d901ce1de5df9d0b82c
F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
F Makefile.msc e72a4653ea8f48efd14c7dac1e7de308a1f3cc91f905f15cbcacc680301c8f03 F Makefile.msc 6e8925dca6dc8c3e9cce042bbf347d20164653e63aeafcf6f6a28e27cf976d8b
F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
F VERSION 0db40f92c04378404eb45bff93e9e42c148c7e54fd3da99469ed21e22411f5a6 F VERSION 0db40f92c04378404eb45bff93e9e42c148c7e54fd3da99469ed21e22411f5a6
F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@ -435,7 +435,7 @@ F ext/misc/urifuncs.c f71360d14fa9e7626b563f1f781c6148109462741c5235ac63ae0f8917
F ext/misc/uuid.c 5bb2264c1b64d163efa46509544fd7500cb8769cb7c16dd52052da8d961505cf F ext/misc/uuid.c 5bb2264c1b64d163efa46509544fd7500cb8769cb7c16dd52052da8d961505cf
F ext/misc/vfslog.c 3932ab932eeb2601dbc4447cb14d445aaa9fbe43b863ef5f014401c3420afd20 F ext/misc/vfslog.c 3932ab932eeb2601dbc4447cb14d445aaa9fbe43b863ef5f014401c3420afd20
F ext/misc/vfsstat.c a85df08654743922a19410d7b1e3111de41bb7cd07d20dd16eda4e2b808d269d F ext/misc/vfsstat.c a85df08654743922a19410d7b1e3111de41bb7cd07d20dd16eda4e2b808d269d
F ext/misc/vfstrace.c 9ff6f4352cdd3ed611e93239ad641c6e70dd48a50cae2d8c563dd1a4c549d5f9 F ext/misc/vfstrace.c 03f90dd465968e01f5d1d3e79c36cbc53a5bfe1bd55d239435ce94df19d5b0ac
F ext/misc/vtablog.c 1100250ce8782db37c833e3a9a5c9a3ecf1af5e15b8325572b82e6e0a138ffb5 F ext/misc/vtablog.c 1100250ce8782db37c833e3a9a5c9a3ecf1af5e15b8325572b82e6e0a138ffb5
F ext/misc/vtshim.c 1976e6dd68dd0d64508c91a6dfab8e75f8aaf6cd F ext/misc/vtshim.c 1976e6dd68dd0d64508c91a6dfab8e75f8aaf6cd
F ext/misc/wholenumber.c 0fa0c082676b7868bf2fa918e911133f2b349bcdceabd1198bba5f65b4fc0668 F ext/misc/wholenumber.c 0fa0c082676b7868bf2fa918e911133f2b349bcdceabd1198bba5f65b4fc0668
@ -687,7 +687,7 @@ F ext/wasm/wasmfs.make 8a4955882aaa0783b3f60a9484a1f0f3d8b6f775c0fcd17c082f31966
F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
F main.mk 5a2e7d4a852c058373efc78407816de41595d06975148c766092b3cf0fea4298 F main.mk 391342c3c0907f57bbb9ab60ce4b3cfe1ea61161996b449033984673d18980fd
F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@ -2212,8 +2212,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 055b97de8d2397987d72dbab1cde78ece2d1c066e95042b4ed6b7b36b2cf9006 P f23954e604bf4da45f07194b54a4fe1c83002ab65d6c6f0ac095e88baba18547
R 121ef6e86bed835ee78e7e9a5da1af0d R 7061e15741ec86af06f2beddce48e46a
U drh U drh
Z 339b357d35c1fb68817d90123ff83e8c Z 809fa2eaa1108af2a9ce0f3c9039775d
# Remove this line to create a well-formed Fossil manifest. # Remove this line to create a well-formed Fossil manifest.

2
manifest.uuid
View File

@ -1 +1 @@
f23954e604bf4da45f07194b54a4fe1c83002ab65d6c6f0ac095e88baba18547 e8f2d6313075c92fdeebcdfd8b50f43e9d45225890b2ef6b77148a766a42e940