summaryrefslogtreecommitdiffstats
path: root/lib/libsqlite3/src/wal.c
diff options
context:
space:
mode:
authorjturner <jturner@openbsd.org>2014-09-29 22:55:55 +0000
committerjturner <jturner@openbsd.org>2014-09-29 22:55:55 +0000
commita586bd9e68992abfe8e47f70f665db82fd484f8a (patch)
treee9468eb44816e86d3baf5af9c8b385ece347f254 /lib/libsqlite3/src/wal.c
parentlightly document mailq; ok gilles (diff)
downloadwireguard-openbsd-a586bd9e68992abfe8e47f70f665db82fd484f8a.tar.xz
wireguard-openbsd-a586bd9e68992abfe8e47f70f665db82fd484f8a.zip
Update sqlite3 to 3.8.6. A list of changes are available here:
http://sqlite.org/releaselog/3_8_6.html. Tested in a bulk and ok landry@
Diffstat (limited to 'lib/libsqlite3/src/wal.c')
-rw-r--r--lib/libsqlite3/src/wal.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libsqlite3/src/wal.c b/lib/libsqlite3/src/wal.c
index ad76065f504..70395f8bee4 100644
--- a/lib/libsqlite3/src/wal.c
+++ b/lib/libsqlite3/src/wal.c
@@ -2096,8 +2096,8 @@ static int walTryBeginRead(Wal *pWal, int *pChanged, int useWal, int cnt){
** calls to sqlite3OsSleep() have a delay of 1 microsecond. Really this
** is more of a scheduler yield than an actual delay. But on the 10th
** an subsequent retries, the delays start becoming longer and longer,
- ** so that on the 100th (and last) RETRY we delay for 21 milliseconds.
- ** The total delay time before giving up is less than 1 second.
+ ** so that on the 100th (and last) RETRY we delay for 323 milliseconds.
+ ** The total delay time before giving up is less than 10 seconds.
*/
if( cnt>5 ){
int nDelay = 1; /* Pause time in microseconds */
@@ -2105,7 +2105,7 @@ static int walTryBeginRead(Wal *pWal, int *pChanged, int useWal, int cnt){
VVA_ONLY( pWal->lockError = 1; )
return SQLITE_PROTOCOL;
}
- if( cnt>=10 ) nDelay = (cnt-9)*238; /* Max delay 21ms. Total delay 996ms */
+ if( cnt>=10 ) nDelay = (cnt-9)*(cnt-9)*39;
sqlite3OsSleep(pWal->pVfs, nDelay);
}