database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00
Code Activity

Use VVA_ONLY() instead of TESTONLY() in SEH macros so that the build

Browse Source 
works for coverage testing.

FossilOrigin-Name: 9e9d5b566da72adf780685ea27da7d76a7274e904a533438255af92875c94503
This commit is contained in:
drh
2021-08-20 18:18:12 +00:00
parent 5b6c3c8f7d
commit 67ae593ffe
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Add\smissing\sSEH_INJECT_FAULT\smacros. C Use\sVVA_ONLY()\sinstead\sof\sTESTONLY()\sin\sSEH\smacros\sso\sthat\sthe\sbuild\nworks\sfor\scoverage\stesting.
D 2021-08-20T17:23:19.198 D 2021-08-20T18:18:12.982
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
@@ -628,7 +628,7 @@ F src/vdbetrace.c 666c6fd9f1b62be6999e072a45b913e3c2c3518bc60dfd4d54fe304130acb7
F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
F src/vtab.c 88404ac1517903b3eb2abe256772ee95bb09f81ac0a17e13afe5d467df4de4ee F src/vtab.c 88404ac1517903b3eb2abe256772ee95bb09f81ac0a17e13afe5d467df4de4ee
F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
F src/wal.c 5f98987c924f3262e19bc1c124cc4e02553f768a86cfdfb4d193db04c4d0b3da F src/wal.c 2000742eae6204d2e6dff721eabf7905171af22bb99e3760670188f8a18d66f4
F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
F src/walker.c 7342becedf3f8a26f9817f08436bdf8b56ad69af83705f6b9320a0ad3092c2ac F src/walker.c 7342becedf3f8a26f9817f08436bdf8b56ad69af83705f6b9320a0ad3092c2ac
F src/where.c 99b6e13664a7bd9a553c554978d0e253066995dade621f44cffa8928c8b493b5 F src/where.c 99b6e13664a7bd9a553c554978d0e253066995dade621f44cffa8928c8b493b5
@@ -1921,7 +1921,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
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 bd9b373b177a71f5eaeb7ce8dd1dc755b34951ee1376c24652418bb329bfcb45 P 27e9bdb3a90a5826f45d32e0378e9afa90a16ac762a75236f38218f41bc45ded
R 18bce27bc9709a49e95cb84782c68c82 R 66057be76f6babcd4edb6b4970a8bed6
U dan U drh
Z 8c053f205f09cec18507fce552900c67 Z 72862037c4132917dc5cd800ca04f4aa

2
manifest.uuid
View File

@@ -1 +1 @@
27e9bdb3a90a5826f45d32e0378e9afa90a16ac762a75236f38218f41bc45ded 9e9d5b566da72adf780685ea27da7d76a7274e904a533438255af92875c94503

10
src/wal.c
View File

@@ -623,10 +623,10 @@ struct WalIterator {
# define SEH_TRY __try { \ # define SEH_TRY __try { \
assert( walAssertLockmask(pWal) && pWal->nSehTry==0 ); \ assert( walAssertLockmask(pWal) && pWal->nSehTry==0 ); \
TESTONLY(pWal->nSehTry++); VVA_ONLY(pWal->nSehTry++);
# define SEH_EXCEPT(X) \ # define SEH_EXCEPT(X) \
TESTONLY(pWal->nSehTry--); \ VVA_ONLY(pWal->nSehTry--); \
assert( pWal->nSehTry==0 ); \ assert( pWal->nSehTry==0 ); \
} __except( sehExceptionFilter(pWal, GetExceptionCode()) ){ X } } __except( sehExceptionFilter(pWal, GetExceptionCode()) ){ X }
@@ -639,7 +639,7 @@ struct WalIterator {
** file mapping. Or EXCEPTION_CONTINUE_SEARCH otherwise. ** file mapping. Or EXCEPTION_CONTINUE_SEARCH otherwise.
*/ */
static int sehExceptionFilter(Wal *pWal, int eCode){ static int sehExceptionFilter(Wal *pWal, int eCode){
TESTONLY(pWal->nSehTry--); VVA_ONLY(pWal->nSehTry--);
if( eCode==EXCEPTION_ACCESS_VIOLATION ){ if( eCode==EXCEPTION_ACCESS_VIOLATION ){
return EXCEPTION_EXECUTE_HANDLER; return EXCEPTION_EXECUTE_HANDLER;
} }
@@ -676,8 +676,8 @@ static void sehInjectFault(Wal *pWal){
assert( (X==0 || Y==0) && pWal->pFree==X ); pWal->pFree = Y assert( (X==0 || Y==0) && pWal->pFree==X ); pWal->pFree = Y
#else #else
# define SEH_TRY TESTONLY(pWal->nSehTry++); # define SEH_TRY VVA_ONLY(pWal->nSehTry++);
# define SEH_EXCEPT(X) TESTONLY(pWal->nSehTry--); assert( pWal->nSehTry==0 ); # define SEH_EXCEPT(X) VVA_ONLY(pWal->nSehTry--); assert( pWal->nSehTry==0 );
# define SEH_INJECT_FAULT assert( pWal->nSehTry>0 ); # define SEH_INJECT_FAULT assert( pWal->nSehTry>0 );
# define SEH_FREE_ON_ERROR(X,Y) # define SEH_FREE_ON_ERROR(X,Y)
#endif /* ifdef SQLITE_USE_SEH */ #endif /* ifdef SQLITE_USE_SEH */