Drop-OSS/dropbreak
1
0
Fork 0
mirror of https://github.com/Drop-OSS/dropbreak.git synced 2026-07-18 09:57:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #77 from TheNeikos/feature/dont_block_unecessarily

Browse Source 
Don't block readers if not needed
This commit is contained in:
Marcel Müller
2020-07-01 11:04:17 +00:00
committed by GitHub
parent 552874dc13 62b9ec0f7b
commit 456ab9041d
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib.rs
+7 -3
View File
@@ -509,7 +509,7 @@ impl<Data, Back, DeSer> Database<Data, Back, DeSer>
/// Flush the data structure to the backend
pub fn save(&self) -> error::Result<()> {
let mut backend = self.backend.lock().map_err(|_| error::RustbreakErrorKind::Poison)?;
let data = self.data.write().map_err(|_| error::RustbreakErrorKind::Poison)?;
let data = self.data.read().map_err(|_| error::RustbreakErrorKind::Poison)?;
let ser = self.deser.serialize(&*data)
.context(error::RustbreakErrorKind::Serialization)?;
@@ -523,12 +523,16 @@ impl<Data, Back, DeSer> Database<Data, Back, DeSer>
/// To make sure you have the latest data, call this method with `load` true
pub fn get_data(&self, load: bool) -> error::Result<Data> {
let mut backend = self.backend.lock().map_err(|_| error::RustbreakErrorKind::Poison)?;
let mut data = self.data.write().map_err(|_| error::RustbreakErrorKind::Poison)?;
if load {
let mut data = self.data.write().map_err(|_| error::RustbreakErrorKind::Poison)?;
*data = Self::inner_load(&mut backend, &self.deser).context(error::RustbreakErrorKind::Backend)?;
drop(backend);
return Ok(data.clone());
} else {
let data = self.data.read().map_err(|_| error::RustbreakErrorKind::Poison)?;
drop(backend);
return Ok(data.clone());
}
Ok(data.clone())
}
/// Puts the data as is into memory