database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-05 15:55:57 +03:00
Code Activity

Add calls to the BenignMalloc() functions around the SQLITE_FCNTL_OVERWRITE call in backup.c.

Browse Source 
FossilOrigin-Name: 3e0833dbb736a1aca08d17941d6d33901b15a03b
This commit is contained in:
dan
2011-12-31 10:18:00 +00:00
parent b3ce3d6d92
commit 23a3de398e
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Add\scalls\sto\sthe\sBenignMalloc()\sfunctions\saround\sthe\sSQLITE_FCNTL_SIZE_HINT\scall\sin\spager.c. C Add\scalls\sto\sthe\sBenignMalloc()\sfunctions\saround\sthe\sSQLITE_FCNTL_OVERWRITE\scall\sin\sbackup.c.
D 2011-12-30T18:16:02.598 D 2011-12-31T10:18:00.048
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07 F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -122,7 +122,7 @@ F src/alter.c ac80a0f31189f8b4a524ebf661e47e84536ee7f5
F src/analyze.c f32ff304da413851eefa562b04e61ff6cb88248b F src/analyze.c f32ff304da413851eefa562b04e61ff6cb88248b
F src/attach.c 12c6957996908edc31c96d7c68d4942c2474405f F src/attach.c 12c6957996908edc31c96d7c68d4942c2474405f
F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
F src/backup.c 4368158da74d4711888e03264105c5c527d76caf F src/backup.c 80d713109d295cc3a674f55cfe6446afb9b024ad
F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
F src/btree.c 2fdde7d16c80bd4e8a0913038e766c4297818f6f F src/btree.c 2fdde7d16c80bd4e8a0913038e766c4297818f6f
@@ -986,7 +986,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
P 46e7903ab993b08251c87239bd4a7320e6781cee P c17a3f5e5d72187c06b598ef071d43ef89328e19
R f1370d9592311ee925b065af7c5e925d R 11347eca51418811296406b6ca6391d4
U dan U dan
Z 7b10c47157901b03eeddf5ba0f182b05 Z e290df4c733c56ee941822f3e8c85381

2
manifest.uuid
View File

@@ -1 +1 @@
c17a3f5e5d72187c06b598ef071d43ef89328e19 3e0833dbb736a1aca08d17941d6d33901b15a03b

2
src/backup.c
View File

@@ -678,7 +678,9 @@ int sqlite3BtreeCopyFile(Btree *pTo, Btree *pFrom){
pFd = sqlite3PagerFile(sqlite3BtreePager(pTo)); pFd = sqlite3PagerFile(sqlite3BtreePager(pTo));
if( pFd->pMethods ){ if( pFd->pMethods ){
i64 nByte = sqlite3BtreeGetPageSize(pFrom)*(i64)sqlite3BtreeLastPage(pFrom); i64 nByte = sqlite3BtreeGetPageSize(pFrom)*(i64)sqlite3BtreeLastPage(pFrom);
sqlite3BeginBenignMalloc();
sqlite3OsFileControl(pFd, SQLITE_FCNTL_OVERWRITE, &nByte); sqlite3OsFileControl(pFd, SQLITE_FCNTL_OVERWRITE, &nByte);
sqlite3EndBenignMalloc();
} }
/* Set up an sqlite3_backup object. sqlite3_backup.pDestDb must be set /* Set up an sqlite3_backup object. sqlite3_backup.pDestDb must be set