initial state for indexed lookup

Sebastian Thiel committed 6 years ago

Commit acbcd791 parent 310a2f72 files · +14 −8Browse files

Unified · Split

2 files

@@ -36,12 +36,20 @@ impl index::File { · 35 unmodified lines
36	36	p.init(Some(self.num_objects()), Some("objects"));
37	37	p
38	38	});
	39	+
	40	+ let state_per_thread = \|index\| {
	41	+ (
	42	+ Vec::<u8>::with_capacity(2048), // decode buffer
	43	+ Vec::<u8>::with_capacity(2048), // re-encode buffer
	44	+ reduce_progress.lock().unwrap().add_child(format!("thread {}", index)), // per thread progress
	45	+ )
	46	+ };
39	47	in_parallel_if(
40	48	if_there_are_enough_objects,
41	49	tree.bases(),
42	50	thread_limit,
43		− \|_index\| (),
44		− \|_node: pack::graph::Node, _state: &mut ()\| Ok::<_, Error>(Vec::new()),
	51	+ state_per_thread,
	52	+ \|_node: pack::graph::Node, (_buf, _encode_buf, _progress)\| Ok::<_, Error>(Vec::new()),
45	53	index::verify::Reducer::from_progress(&reduce_progress, pack.data_len()),
46	54	)
47	55	}

@@ -35,9 +35,9 @@ impl index::File { · 34 unmodified lines
35	35	let state_per_thread = \|index\| {
36	36	(
37	37	make_cache(),
38		− Vec::with_capacity(2048),
39		− Vec::with_capacity(2048),
40		− reduce_progress.lock().unwrap().add_child(format!("thread {}", index)),
	38	+ Vec::with_capacity(2048), // decode buffer
	39	+ Vec::with_capacity(2048), // re-encode buffer
	40	+ reduce_progress.lock().unwrap().add_child(format!("thread {}", index)), // per thread progress
41	41	)
42	42	};
43	43
@@ -46,9 +46,7 @@ impl index::File { · 2 unmodified lines
46	46	input_chunks,
47	47	thread_limit,
48	48	state_per_thread,
49		− \|entries: &[index::Entry],
50		− (cache, buf, ref mut encode_buf, progress)\|
51		− -> Result<Vec<decode::Outcome>, Error> {
	49	+ \|entries: &[index::Entry], (cache, buf, encode_buf, progress)\| -> Result<Vec<decode::Outcome>, Error> {
52	50	progress.init(Some(entries.len() as u32), Some("entries"));
53	51	let mut stats = Vec::with_capacity(entries.len());
54	52	let mut header_buf = [0u8; 64];