diff options
author | Determinant <[email protected]> | 2020-06-17 23:06:09 -0400 |
---|---|---|
committer | Determinant <[email protected]> | 2020-06-17 23:06:09 -0400 |
commit | 33070682dcf1ec0bf9b22cd2ea38cf983a628f7d (patch) | |
tree | 954a4bfb2c00927b1c65ace3dfdddb22b6cda06e /src | |
parent | ac755fb17ec1a72361fa734dc453fa336e9f818f (diff) |
bump the version of libaio-futuresv0.1.3
Diffstat (limited to 'src')
-rw-r--r-- | src/lib.rs | 15 | ||||
-rw-r--r-- | src/wal.rs | 10 |
2 files changed, 15 insertions, 10 deletions
@@ -50,7 +50,7 @@ pub mod wal; use async_trait::async_trait; use futures::executor::block_on; -use libaiofut::{new_batch_scheduler, AIOBatchSchedulerIn, AIOManager}; +use libaiofut::{AIOBuilder, AIOManager}; use libc::off_t; use nix::fcntl::{fallocate, open, openat, FallocateFlags, OFlag}; use nix::sys::stat::Mode; @@ -62,14 +62,14 @@ use wal::{WALBytes, WALFile, WALPos, WALRingId, WALStore}; pub struct WALFileAIO { fd: RawFd, - aiomgr: Rc<AIOManager<AIOBatchSchedulerIn>>, + aiomgr: Rc<AIOManager>, } impl WALFileAIO { pub fn new( rootfd: RawFd, filename: &str, - aiomgr: Rc<AIOManager<AIOBatchSchedulerIn>>, + aiomgr: Rc<AIOManager>, ) -> Result<Self, ()> { openat( rootfd, @@ -137,7 +137,7 @@ pub struct WALStoreAIO<F: FnMut(WALBytes, WALRingId) -> Result<(), ()>> { rootfd: RawFd, rootpath: String, recover_func: RefCell<F>, - aiomgr: Rc<AIOManager<AIOBatchSchedulerIn>>, + aiomgr: Rc<AIOManager>, } impl<F: FnMut(WALBytes, WALRingId) -> Result<(), ()>> WALStoreAIO<F> { @@ -145,14 +145,13 @@ impl<F: FnMut(WALBytes, WALRingId) -> Result<(), ()>> WALStoreAIO<F> { wal_dir: &str, truncate: bool, recover_func: F, - aiomgr: Option<AIOManager<AIOBatchSchedulerIn>>, + aiomgr: Option<AIOManager>, ) -> Result<Self, ()> { let recover_func = RefCell::new(recover_func); let rootpath = wal_dir.to_string(); let aiomgr = Rc::new(aiomgr.ok_or(Err(())).or_else( - |_: Result<AIOManager<AIOBatchSchedulerIn>, ()>| { - AIOManager::new(new_batch_scheduler(None), 128, None, None) - .or(Err(())) + |_: Result<AIOManager, ()>| { + AIOBuilder::default().build().or(Err(())) }, )?); @@ -574,8 +574,8 @@ pub struct WALLoader { recover_policy: RecoverPolicy, } -impl WALLoader { - pub fn new() -> Self { +impl Default for WALLoader { + fn default() -> Self { WALLoader { file_nbit: 22, // 4MB block_nbit: 15, // 32KB, @@ -583,6 +583,12 @@ impl WALLoader { recover_policy: RecoverPolicy::Strict } } +} + +impl WALLoader { + pub fn new() -> Self { + Default::default() + } pub fn file_nbit(&mut self, v: u8) -> &mut Self { self.file_nbit = v; |