MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-01-29 07:26:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

take FnMut closures by reference

Browse Source 
I mistakenly thought these had to be monomorphized. (The FnOnce still
does, until rust-lang/rfcs#1909 is implemented.) Turns out this way works
fine. It should result in less compile time / code size, though I didn't check
this.
This commit is contained in:
Scott Lamb 2018-02-23 09:19:42 -08:00
parent d9841fd634
commit 843e1b49c8
6 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
db/db.rs
View File

@ -999,9 +999,9 @@ impl LockedDatabase {
/// Lists the specified recordings in ascending order by start time, passing them to a supplied /// Lists the specified recordings in ascending order by start time, passing them to a supplied
/// function. Given that the function is called with the database lock held, it should be quick. /// function. Given that the function is called with the database lock held, it should be quick.
pub fn list_recordings_by_time<F>(&self, stream_id: i32, desired_time: Range<recording::Time>, pub fn list_recordings_by_time(
f: F) -> Result<(), Error> &self, stream_id: i32, desired_time: Range<recording::Time>,
where F: FnMut(ListRecordingsRow) -> Result<(), Error> { f: &mut FnMut(ListRecordingsRow) -> Result<(), Error>) -> Result<(), Error> {
let mut stmt = self.conn.prepare_cached(&self.list_recordings_by_time_sql)?; let mut stmt = self.conn.prepare_cached(&self.list_recordings_by_time_sql)?;
let rows = stmt.query_named(&[ let rows = stmt.query_named(&[
(":stream_id", &stream_id), (":stream_id", &stream_id),
@ -1011,9 +1011,9 @@ impl LockedDatabase {
} }
/// Lists the specified recordigs in ascending order by id. /// Lists the specified recordigs in ascending order by id.
pub fn list_recordings_by_id<F>(&self, stream_id: i32, desired_ids: Range<i32>, f: F) pub fn list_recordings_by_id(
-> Result<(), Error> &self, stream_id: i32, desired_ids: Range<i32>,
where F: FnMut(ListRecordingsRow) -> Result<(), Error> { f: &mut FnMut(ListRecordingsRow) -> Result<(), Error>) -> Result<(), Error> {
let mut stmt = self.conn.prepare_cached(LIST_RECORDINGS_BY_ID_SQL)?; let mut stmt = self.conn.prepare_cached(LIST_RECORDINGS_BY_ID_SQL)?;
let rows = stmt.query_named(&[ let rows = stmt.query_named(&[
(":start", &CompositeId::new(stream_id, desired_ids.start).0), (":start", &CompositeId::new(stream_id, desired_ids.start).0),
@ -1022,8 +1022,9 @@ impl LockedDatabase {
self.list_recordings_inner(rows, f) self.list_recordings_inner(rows, f)
} }
fn list_recordings_inner<F>(&self, mut rows: rusqlite::Rows, mut f: F) -> Result<(), Error> fn list_recordings_inner(
where F: FnMut(ListRecordingsRow) -> Result<(), Error> { &self, mut rows: rusqlite::Rows,
f: &mut FnMut(ListRecordingsRow) -> Result<(), Error>) -> Result<(), Error> {
while let Some(row) = rows.next() { while let Some(row) = rows.next() {
let row = row?; let row = row?;
let id = CompositeId(row.get_checked::<_, i64>(0)?); let id = CompositeId(row.get_checked::<_, i64>(0)?);
@ -1052,11 +1053,11 @@ impl LockedDatabase {
/// Calls `list_recordings_by_time` and aggregates consecutive recordings. /// Calls `list_recordings_by_time` and aggregates consecutive recordings.
/// Rows are given to the callback in arbitrary order. Callers which care about ordering /// Rows are given to the callback in arbitrary order. Callers which care about ordering
/// should do their own sorting. /// should do their own sorting.
pub fn list_aggregated_recordings<F>(&self, stream_id: i32, pub fn list_aggregated_recordings(
desired_time: Range<recording::Time>, &self, stream_id: i32, desired_time: Range<recording::Time>,
forced_split: recording::Duration, forced_split: recording::Duration,
mut f: F) -> Result<(), Error> f: &mut FnMut(&ListAggregatedRecordingsRow) -> Result<(), Error>)
where F: FnMut(&ListAggregatedRecordingsRow) -> Result<(), Error> { -> Result<(), Error> {
// Iterate, maintaining a map from a recording_id to the aggregated row for the latest // Iterate, maintaining a map from a recording_id to the aggregated row for the latest
// batch of recordings from the run starting at that id. Runs can be split into multiple // batch of recordings from the run starting at that id. Runs can be split into multiple
// batches for a few reasons: // batches for a few reasons:
@ -1071,7 +1072,7 @@ impl LockedDatabase {
// their timestamps overlap. Tracking all active runs prevents that interleaving from // their timestamps overlap. Tracking all active runs prevents that interleaving from
// causing problems.) // causing problems.)
let mut aggs: BTreeMap<i32, ListAggregatedRecordingsRow> = BTreeMap::new(); let mut aggs: BTreeMap<i32, ListAggregatedRecordingsRow> = BTreeMap::new();
self.list_recordings_by_time(stream_id, desired_time, |row| { self.list_recordings_by_time(stream_id, desired_time, &mut |row| {
let recording_id = row.id.recording(); let recording_id = row.id.recording();
let run_start_id = recording_id - row.run_offset; let run_start_id = recording_id - row.run_offset;
let needs_flush = if let Some(a) = aggs.get(&run_start_id) { let needs_flush = if let Some(a) = aggs.get(&run_start_id) {
@ -1146,8 +1147,9 @@ impl LockedDatabase {
/// Lists the oldest sample files (to delete to free room). /// Lists the oldest sample files (to delete to free room).
/// `f` should return true as long as further rows are desired. /// `f` should return true as long as further rows are desired.
pub(crate) fn list_oldest_sample_files<F>(&self, stream_id: i32, mut f: F) -> Result<(), Error> pub(crate) fn list_oldest_sample_files(
where F: FnMut(ListOldestSampleFilesRow) -> bool { &self, stream_id: i32, f: &mut FnMut(ListOldestSampleFilesRow) -> bool)
-> Result<(), Error> {
let s = match self.streams_by_id.get(&stream_id) { let s = match self.streams_by_id.get(&stream_id) {
None => bail!("no stream {}", stream_id), None => bail!("no stream {}", stream_id),
Some(s) => s, Some(s) => s,
@ -1805,7 +1807,7 @@ mod tests {
{ {
let db = db.lock(); let db = db.lock();
let all_time = recording::Time(i64::min_value()) .. recording::Time(i64::max_value()); let all_time = recording::Time(i64::min_value()) .. recording::Time(i64::max_value());
db.list_recordings_by_time(stream_id, all_time, |_row| { db.list_recordings_by_time(stream_id, all_time, &mut |_row| {
rows += 1; rows += 1;
Ok(()) Ok(())
}).unwrap(); }).unwrap();
@ -1830,7 +1832,7 @@ mod tests {
{ {
let db = db.lock(); let db = db.lock();
let all_time = recording::Time(i64::min_value()) .. recording::Time(i64::max_value()); let all_time = recording::Time(i64::min_value()) .. recording::Time(i64::max_value());
db.list_recordings_by_time(stream_id, all_time, |row| { db.list_recordings_by_time(stream_id, all_time, &mut |row| {
rows += 1; rows += 1;
recording_id = Some(row.id); recording_id = Some(row.id);
assert_eq!(r.time, assert_eq!(r.time,
@ -1845,7 +1847,7 @@ mod tests {
assert_eq!(1, rows); assert_eq!(1, rows);
rows = 0; rows = 0;
db.lock().list_oldest_sample_files(stream_id, |row| { db.lock().list_oldest_sample_files(stream_id, &mut |row| {
rows += 1; rows += 1;
assert_eq!(recording_id, Some(row.id)); assert_eq!(recording_id, Some(row.id));
assert_eq!(r.time, row.time); assert_eq!(r.time, row.time);
@ -2052,7 +2054,7 @@ mod tests {
{ {
let mut db = db.lock(); let mut db = db.lock();
let mut v = Vec::new(); let mut v = Vec::new();
db.list_oldest_sample_files(stream_id, |r| { v.push(r); true }).unwrap(); db.list_oldest_sample_files(stream_id, &mut |r| { v.push(r); true }).unwrap();
assert_eq!(1, v.len()); assert_eq!(1, v.len());
db.delete_recordings(&mut v); db.delete_recordings(&mut v);
db.flush("delete test").unwrap(); db.flush("delete test").unwrap();

2
db/dir.rs
View File

@ -383,7 +383,7 @@ fn get_rows_to_delete(db: &db::LockedDatabase, stream_id: i32,
return Ok(()); return Ok(());
} }
let mut n = 0; let mut n = 0;
db.list_oldest_sample_files(stream_id, |row| { db.list_oldest_sample_files(stream_id, &mut |row| {
bytes_to_delete += row.sample_file_bytes as i64; bytes_to_delete += row.sample_file_bytes as i64;
to_delete.push(row); to_delete.push(row);
n += 1; n += 1;

2
db/testutil.rs
View File

@ -149,7 +149,7 @@ impl TestDb {
db.flush("create_recording_from_encoder").unwrap(); db.flush("create_recording_from_encoder").unwrap();
let mut row = None; let mut row = None;
db.list_recordings_by_id(TEST_STREAM_ID, id.recording() .. id.recording()+1, db.list_recordings_by_id(TEST_STREAM_ID, id.recording() .. id.recording()+1,
|r| { row = Some(r); Ok(()) }).unwrap(); &mut |r| { row = Some(r); Ok(()) }).unwrap();
row.unwrap() row.unwrap()
} }
} }

4
src/mp4.rs
View File

@ -1788,7 +1788,7 @@ mod tests {
let all_time = recording::Time(i64::min_value()) .. recording::Time(i64::max_value()); let all_time = recording::Time(i64::min_value()) .. recording::Time(i64::max_value());
{ {
let db = tdb.db.lock(); let db = tdb.db.lock();
db.list_recordings_by_time(TEST_STREAM_ID, all_time, |r| { db.list_recordings_by_time(TEST_STREAM_ID, all_time, &mut |r| {
let d = r.duration_90k; let d = r.duration_90k;
assert!(skip_90k + shorten_90k < d); assert!(skip_90k + shorten_90k < d);
builder.append(&*db, r, skip_90k .. d - shorten_90k).unwrap(); builder.append(&*db, r, skip_90k .. d - shorten_90k).unwrap();
@ -2252,7 +2252,7 @@ mod bench {
let segment = { let segment = {
let all_time = recording::Time(i64::min_value()) .. recording::Time(i64::max_value()); let all_time = recording::Time(i64::min_value()) .. recording::Time(i64::max_value());
let mut row = None; let mut row = None;
db.list_recordings_by_time(testutil::TEST_STREAM_ID, all_time, |r| { db.list_recordings_by_time(testutil::TEST_STREAM_ID, all_time, &mut |r| {
row = Some(r); row = Some(r);
Ok(()) Ok(())
}).unwrap(); }).unwrap();

2
src/streamer.rs
View File

@ -385,7 +385,7 @@ mod tests {
Frame{start_90k: 90011, duration_90k: 0, is_key: false}, Frame{start_90k: 90011, duration_90k: 0, is_key: false},
]); ]);
let mut recordings = Vec::new(); let mut recordings = Vec::new();
db.list_recordings_by_id(testutil::TEST_STREAM_ID, 1..3, |r| { db.list_recordings_by_id(testutil::TEST_STREAM_ID, 1..3, &mut |r| {
recordings.push(r); recordings.push(r);
Ok(()) Ok(())
}).unwrap(); }).unwrap();

4
src/web.rs
View File

@ -257,7 +257,7 @@ impl ServiceInner {
.ok_or_else(|| format_err!("no such camera {}", uuid))?; .ok_or_else(|| format_err!("no such camera {}", uuid))?;
let stream_id = camera.streams[type_.index()] let stream_id = camera.streams[type_.index()]
.ok_or_else(|| format_err!("no such stream {}/{}", uuid, type_))?; .ok_or_else(|| format_err!("no such stream {}/{}", uuid, type_))?;
db.list_aggregated_recordings(stream_id, r, split, |row| { db.list_aggregated_recordings(stream_id, r, split, &mut |row| {
let end = row.ids.end - 1; // in api, ids are inclusive. let end = row.ids.end - 1; // in api, ids are inclusive.
out.recordings.push(json::Recording { out.recordings.push(json::Recording {
start_id: row.ids.start, start_id: row.ids.start,
@ -327,7 +327,7 @@ impl ServiceInner {
let db = self.db.lock(); let db = self.db.lock();
let mut prev = None; let mut prev = None;
let mut cur_off = 0; let mut cur_off = 0;
db.list_recordings_by_id(stream_id, s.ids.clone(), |r| { db.list_recordings_by_id(stream_id, s.ids.clone(), &mut |r| {
let recording_id = r.id.recording(); let recording_id = r.id.recording();
// Check for missing recordings. // Check for missing recordings.