matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Performe cache flushing during aggregation

Browse source
This commit is contained in:
Matthias Beyer 2018-04-30 18:39:24 +02:00
parent 860e47a256
commit 004faaa905
2 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bin/core/imag-diagnostics/Cargo.toml
View file

@ -16,6 +16,7 @@ homepage = "http://imag-pim.org"
build = "../../../build.rs" build = "../../../build.rs"
[dependencies] [dependencies]
log = "0.4"
toml = "0.4" toml = "0.4"
toml-query = "0.6" toml-query = "0.6"

24
bin/core/imag-diagnostics/src/main.rs
View file

@ -35,6 +35,7 @@
extern crate clap; extern crate clap;
extern crate toml; extern crate toml;
extern crate toml_query; extern crate toml_query;
#[macro_use] extern crate log;
#[macro_use] extern crate libimagrt; #[macro_use] extern crate libimagrt;
extern crate libimagerror; extern crate libimagerror;
@ -59,6 +60,7 @@ use std::collections::BTreeMap;
mod ui; mod ui;
#[derive(Debug)]
struct Diagnostic { struct Diagnostic {
pub id: StoreId, pub id: StoreId,
pub entry_store_version: String, pub entry_store_version: String,
@ -71,7 +73,7 @@ struct Diagnostic {
impl Diagnostic { impl Diagnostic {
fn for_entry<'a>(entry: FileLockEntry<'a>) -> Result<Diagnostic, ::libimagstore::error::StoreError> { fn for_entry<'a>(entry: &FileLockEntry<'a>) -> Result<Diagnostic, ::libimagstore::error::StoreError> {
Ok(Diagnostic { Ok(Diagnostic {
id: entry.get_location().clone(), id: entry.get_location().clone(),
entry_store_version: entry entry_store_version: entry
@ -102,6 +104,7 @@ fn main() {
"Print diagnostics about imag and the imag store", "Print diagnostics about imag and the imag store",
ui::build_ui); ui::build_ui);
let mut entries_counter = 0;
let diags = rt.store() let diags = rt.store()
.entries() .entries()
.map_err_trace_exit_unwrap(1) .map_err_trace_exit_unwrap(1)
@ -111,7 +114,24 @@ fn main() {
.ok_or(Error::from("Unable to get entry".to_owned())) .ok_or(Error::from("Unable to get entry".to_owned()))
.map_err_trace_exit_unwrap(1) .map_err_trace_exit_unwrap(1)
}) })
.map(Diagnostic::for_entry) .map(|e| {
let diag = Diagnostic::for_entry(&e);
debug!("Diagnostic for '{:?}' = {:?}", e.get_location(), diag);
drop(e);
entries_counter += 1;
// because we're effectively reading _all_ store entries here.
//
// The store has an API for it, but the cache size calculation is O(n) and we can do
// better by simply flushing the cache each 100 entries
if entries_counter > 100 {
let _ = rt.store().flush_cache().map_err_trace_exit_unwrap(1);
entries_counter = 0;
}
diag
})
.collect::<Result<Vec<_>, _>>() .collect::<Result<Vec<_>, _>>()
.map_err_trace_exit_unwrap(1); .map_err_trace_exit_unwrap(1);