diff --git a/core/io/darwin.rs b/core/io/darwin.rs index cd937e4bd..745f66b42 100644 --- a/core/io/darwin.rs +++ b/core/io/darwin.rs @@ -15,7 +15,7 @@ impl DarwinIO { impl IO for DarwinIO { fn open_file(&self, path: &str) -> Result> { - trace!("open_file: {}", path); + trace!("open_file(path = {})", path); let file = std::fs::File::open(path)?; Ok(Box::new(DarwinFile { file: RefCell::new(file), diff --git a/core/io/linux.rs b/core/io/linux.rs index f05a6167d..e745c82c1 100644 --- a/core/io/linux.rs +++ b/core/io/linux.rs @@ -4,6 +4,7 @@ use std::cell::RefCell; use std::os::unix::io::AsRawFd; use std::rc::Rc; use std::sync::Arc; +use log::trace; pub struct LinuxIO { ring: Rc>, @@ -20,6 +21,7 @@ impl LinuxIO { impl IO for LinuxIO { fn open_file(&self, path: &str) -> Result> { + trace!("open_file(path = {})", path); let file = std::fs::File::open(path)?; Ok(Box::new(LinuxFile { ring: self.ring.clone(), @@ -28,6 +30,7 @@ impl IO for LinuxIO { } fn run_once(&self) -> Result<()> { + trace!("run_once()"); let mut ring = self.ring.borrow_mut(); ring.submit_and_wait(1)?; let cqe = ring.completion().next().expect("completion queue is empty"); @@ -42,6 +45,7 @@ pub struct LinuxFile { impl File for LinuxFile { fn pread(&self, pos: usize, c: Arc) -> Result<()> { + trace!("pread(pos = {}, length = {})", pos, c.buf().len()); let fd = io_uring::types::Fd(self.file.as_raw_fd()); let read_e = { let mut buf = c.buf_mut(); diff --git a/core/pager.rs b/core/pager.rs index 8cec41e8e..124216754 100644 --- a/core/pager.rs +++ b/core/pager.rs @@ -87,7 +87,7 @@ impl Pager { } pub fn read_page(&self, page_idx: usize) -> anyhow::Result> { - trace!("read_page: {}", page_idx); + trace!("read_page(page_idx = {})", page_idx); let handle = self.page_cache.get_or_try_init(page_idx, 1, |_idx| { let page = Arc::new(Page::new()); page.set_locked(); diff --git a/core/sqlite3_ondisk.rs b/core/sqlite3_ondisk.rs index effd77d51..089a2cc59 100644 --- a/core/sqlite3_ondisk.rs +++ b/core/sqlite3_ondisk.rs @@ -142,7 +142,7 @@ pub fn begin_read_btree_page( page: Arc, page_idx: usize, ) -> Result<()> { - trace!("begin_read_btree_page: {}", page_idx); + trace!("begin_read_btree_page(page_idx = {})", page_idx); let buf = buffer_pool.get(); let drop_fn = Arc::new(move |buf| { let buffer_pool = buffer_pool.clone(); @@ -161,7 +161,7 @@ pub fn begin_read_btree_page( } fn finish_read_btree_page(page_idx: usize, buf: &Buffer, page: Arc) -> Result<()> { - trace!("finish_read_btree_page: {}", page_idx); + trace!("finish_read_btree_page(page_idx = {})", page_idx); let mut pos = if page_idx == 1 { DATABASE_HEADER_SIZE } else {