aboutsummaryrefslogtreecommitdiff
path: root/src/wal.h
diff options
context:
space:
mode:
authordan <dan@noemail.net>2016-08-12 16:21:15 +0000
committerdan <dan@noemail.net>2016-08-12 16:21:15 +0000
commit7fb89906880271b5b548a2c3ba5cfba7602daf9d (patch)
tree2fcb270b7cc9e9f2df9d1cf670bb4cbaf60fb3be /src/wal.h
parent1bf4ca7c42ed8fdd484221a6d42c626cc9f361ef (diff)
downloadsqlite-7fb89906880271b5b548a2c3ba5cfba7602daf9d.tar.gz
sqlite-7fb89906880271b5b548a2c3ba5cfba7602daf9d.zip
Have wal file checkpoints exit early if the sqlite3_interrupt() API function is called.
FossilOrigin-Name: 8a5f41c7b1718507524adef1a2730e99cf53270a
Diffstat (limited to 'src/wal.h')
-rw-r--r--src/wal.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/wal.h b/src/wal.h
index 6048e7985..16d9d6e0d 100644
--- a/src/wal.h
+++ b/src/wal.h
@@ -28,7 +28,7 @@
#ifdef SQLITE_OMIT_WAL
# define sqlite3WalOpen(x,y,z) 0
# define sqlite3WalLimit(x,y)
-# define sqlite3WalClose(w,x,y,z) 0
+# define sqlite3WalClose(v,w,x,y,z) 0
# define sqlite3WalBeginReadTransaction(y,z) 0
# define sqlite3WalEndReadTransaction(z)
# define sqlite3WalDbsize(y) 0
@@ -38,7 +38,7 @@
# define sqlite3WalSavepoint(y,z)
# define sqlite3WalSavepointUndo(y,z) 0
# define sqlite3WalFrames(u,v,w,x,y,z) 0
-# define sqlite3WalCheckpoint(r,s,t,u,v,w,x,y,z) 0
+# define sqlite3WalCheckpoint(q,r,s,t,u,v,w,x,y,z) 0
# define sqlite3WalCallback(z) 0
# define sqlite3WalExclusiveMode(y,z) 0
# define sqlite3WalHeapMemory(z) 0
@@ -56,7 +56,7 @@ typedef struct Wal Wal;
/* Open and close a connection to a write-ahead log. */
int sqlite3WalOpen(sqlite3_vfs*, sqlite3_file*, const char *, int, i64, Wal**);
-int sqlite3WalClose(Wal *pWal, int sync_flags, int, u8 *);
+int sqlite3WalClose(Wal *pWal, sqlite3*, int sync_flags, int, u8 *);
/* Set the limiting size of a WAL file. */
void sqlite3WalLimit(Wal*, i64);
@@ -99,6 +99,7 @@ int sqlite3WalFrames(Wal *pWal, int, PgHdr *, Pgno, int, int);
/* Copy pages from the log to the database file */
int sqlite3WalCheckpoint(
Wal *pWal, /* Write-ahead log connection */
+ sqlite3 *db, /* Check this handle's interrupt flag */
int eMode, /* One of PASSIVE, FULL and RESTART */
int (*xBusy)(void*), /* Function to call when busy */
void *pBusyArg, /* Context argument for xBusyHandler */