From 558104de4de4acf8f419185131be5f514f866f8b Mon Sep 17 00:00:00 2001 From: gwenn Date: Sat, 28 Jul 2018 12:10:57 +0200 Subject: [PATCH 1/2] Add binding to sqlite3_busy_timeout and sqlite3_busy_handler. --- src/busy.rs | 160 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/lib.rs | 3 +- 2 files changed, 162 insertions(+), 1 deletion(-) create mode 100644 src/busy.rs diff --git a/src/busy.rs b/src/busy.rs new file mode 100644 index 0000000..f5ad1eb --- /dev/null +++ b/src/busy.rs @@ -0,0 +1,160 @@ +///! Busy handler (when the database is locked) +use std::time::Duration; +use std::mem; +use std::os::raw::{c_int, c_void}; +use std::ptr; + +use ffi; +use {Connection, InnerConnection, Result}; + +impl Connection { + /// Set a busy handler that sleeps for a specified amount of time when a table is locked. + /// The handler will sleep multiple times until at least "ms" milliseconds of sleeping have accumulated. + /// + /// Calling this routine with an argument equal to zero turns off all busy handlers. + // + /// There can only be a single busy handler for a particular database connection at any given moment. + /// If another busy handler was defined (using `busy_handler`) prior to calling this routine, that other busy handler is cleared. + pub fn busy_timeout(&self, timeout: Duration) -> Result<()> { + let ms = timeout + .as_secs() + .checked_mul(1000) + .and_then(|t| t.checked_add(timeout.subsec_millis().into())) + .expect("too big"); + self.db.borrow_mut().busy_timeout(ms as i32) + } + + /// Register a callback to handle `SQLITE_BUSY` errors. + /// + /// If the busy callback is `None`, then `SQLITE_BUSY is returned immediately upon encountering the lock.` + /// The argument to the busy handler callback is the number of times that the busy handler has been invoked previously for the same locking event. + /// If the busy callback returns `false`, then no additional attempts are made to access the database and `SQLITE_BUSY` is returned to the application. + /// If the callback returns `true`, then another attempt is made to access the database and the cycle repeats. + /// + /// There can only be a single busy handler defined for each database connection. + /// Setting a new busy handler clears any previously set handler. + /// Note that calling `busy_timeout()` or evaluating `PRAGMA busy_timeout=N` will change the busy handler and thus clear any previously set busy handler. + pub fn busy_handler(&self, callback: Option bool>) -> Result<()> { + unsafe extern "C" fn busy_handler_callback(p_arg: *mut c_void, count: c_int) -> c_int { + let handler_fn: fn(i32) -> bool = mem::transmute(p_arg); + if handler_fn(count) { + 1 + } else { + 0 + } + } + let mut c = self.db.borrow_mut(); + let r = match callback { + Some(f) => unsafe { + ffi::sqlite3_busy_handler(c.db(), Some(busy_handler_callback), mem::transmute(f)) + }, + None => unsafe { ffi::sqlite3_busy_handler(c.db(), None, ptr::null_mut()) }, + }; + c.decode_result(r) + } +} + +impl InnerConnection { + fn busy_timeout(&mut self, timeout: c_int) -> Result<()> { + let r = unsafe { ffi::sqlite3_busy_timeout(self.db, timeout) }; + self.decode_result(r) + } +} + +#[cfg(test)] +mod test { + extern crate tempdir; + use self::tempdir::TempDir; + use std::sync::atomic::{AtomicBool, Ordering}; + use std::sync::mpsc::sync_channel; + use std::time::Duration; + use std::thread; + + use {Connection, Error, ErrorCode, TransactionBehavior}; + + #[test] + fn test_default_busy() { + let temp_dir = TempDir::new("test_default_busy").unwrap(); + let path = temp_dir.path().join("test.db3"); + + let mut db1 = Connection::open(&path).unwrap(); + let tx1 = db1 + .transaction_with_behavior(TransactionBehavior::Exclusive) + .unwrap(); + let db2 = Connection::open(&path).unwrap(); + let r = db2.query_row("PRAGMA schema_version", &[], |_| unreachable!()); + match r.unwrap_err() { + Error::SqliteFailure(err, _) => { + assert_eq!(err.code, ErrorCode::DatabaseBusy); + } + err => panic!("Unexpected error {}", err), + } + tx1.rollback().unwrap(); + } + + #[test] + fn test_busy_timeout() { + let temp_dir = TempDir::new("test_busy_timeout").unwrap(); + let path = temp_dir.path().join("test.db3"); + + let db2 = Connection::open(&path).unwrap(); + db2.busy_timeout(Duration::from_secs(1)).unwrap(); + + let (rx, tx) = sync_channel(0); + let child = thread::spawn(move || { + let mut db1 = Connection::open(&path).unwrap(); + let tx1 = db1 + .transaction_with_behavior(TransactionBehavior::Exclusive) + .unwrap(); + rx.send(1).unwrap(); + thread::sleep(Duration::from_millis(100)); + tx1.rollback().unwrap(); + }); + + assert_eq!(tx.recv().unwrap(), 1); + let _ = + db2.query_row("PRAGMA schema_version", &[], |row| { + row.get_checked::<_, i32>(0) + }).expect("unexpected error"); + + child.join().unwrap(); + } + + #[test] + fn test_busy_handler() { + lazy_static! { + static ref CALLED: AtomicBool = AtomicBool::new(false); + } + fn busy_handler(_: i32) -> bool { + CALLED.store(true, Ordering::Relaxed); + thread::sleep(Duration::from_millis(100)); + true + } + + let temp_dir = TempDir::new("test_busy_handler").unwrap(); + let path = temp_dir.path().join("test.db3"); + + let db2 = Connection::open(&path).unwrap(); + db2.busy_handler(Some(busy_handler)).unwrap(); + + let (rx, tx) = sync_channel(0); + let child = thread::spawn(move || { + let mut db1 = Connection::open(&path).unwrap(); + let tx1 = db1 + .transaction_with_behavior(TransactionBehavior::Exclusive) + .unwrap(); + rx.send(1).unwrap(); + thread::sleep(Duration::from_millis(100)); + tx1.rollback().unwrap(); + }); + + assert_eq!(tx.recv().unwrap(), 1); + let _ = + db2.query_row("PRAGMA schema_version", &[], |row| { + row.get_checked::<_, i32>(0) + }).expect("unexpected error"); + assert_eq!(CALLED.load(Ordering::Relaxed), true); + + child.join().unwrap(); + } +} diff --git a/src/lib.rs b/src/lib.rs index d08e318..5ae6618 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -56,7 +56,7 @@ extern crate libsqlite3_sys as ffi; extern crate lru_cache; #[macro_use] extern crate bitflags; -#[cfg(all(test, feature = "trace"))] +#[cfg(test)] #[macro_use] extern crate lazy_static; @@ -126,6 +126,7 @@ mod hooks; #[cfg(feature = "hooks")] pub use hooks::*; mod unlock_notify; +mod busy; // Number of cached prepared statements we'll hold on to. const STATEMENT_CACHE_DEFAULT_CAPACITY: usize = 16; From e9b3fd61653f0b130ebcc36dbfad9958abf9229a Mon Sep 17 00:00:00 2001 From: gwenn Date: Sat, 28 Jul 2018 15:43:54 +0200 Subject: [PATCH 2/2] Upgrade to last stable version of Rust --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 3a7c0a7..7658d5e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,8 +1,8 @@ environment: matrix: - - TARGET: 1.25.0-x86_64-pc-windows-gnu + - TARGET: 1.27.2-x86_64-pc-windows-gnu MSYS2_BITS: 64 - - TARGET: 1.25.0-x86_64-pc-windows-msvc + - TARGET: 1.27.2-x86_64-pc-windows-msvc VCPKG_DEFAULT_TRIPLET: x64-windows VCPKGRS_DYNAMIC: 1 - TARGET: nightly-x86_64-pc-windows-msvc