unify trait bounds for parallel code: prefer Clone over Sync (#259)

Sebastian Thiel committed 4 years ago

Commit c805d0b1 parent 3c790e06 files · +24 −24Browse files

Unified · Split

6 files

DEVELOPMENT.md +6 −0
git-features/src/parallel/in_parallel.rs +4 −4
git-features/src/parallel/mod.rs +2 −2
git-features/src/parallel/reduce.rs +7 −13
git-pack/src/data/output/count/objects/mod.rs +2 −2
git-pack/src/data/output/entry/iter_from_counts.rs +3 −3

@@ -683,3 +683,9 @@ Please note that these are based on the following value system: · 682 unmodified lines
683	683	a single-threaded version).
684	684	- Maybe… after some benchmarks, we can entirely drop the single-threaded version if it's not significantly faster on a single thread (without thread primiives) than the
685	685	same with multi-threading (but a single-thread).
	686	+ - Servers would be split into readers and writers, where…
	687	+ - …readers share a common pool and thus all maps, with lazy loading and refresh (but their pack-ids change due to that, and packs might disappear)
	688	+ - …writers when…
	689	+ - …cloning use an eagerly loaded Repository just for that particular clone for stable pack ids
	690	+ - …fetches use a lazy-loaded Repository with refresh disabled, and full retries if the pack they were referring to goes away. Maybe there can be a policy for that to keep
	691	+ pack ids stable despite refresh, which would also solve clones which could then lazy-load.

git-features/src/parallel/in_parallel.rs+4−4

@@ -22,8 +22,8 @@ pub fn join<O1: Send, O2: Send>(left: impl FnOnce() -> O1 + Send, right: impl Fn · 21 unmodified lines
22	22	pub fn in_parallel<I, S, O, R>(
23	23	input: impl Iterator<Item = I> + Send,
24	24	thread_limit: Option<usize>,
25		− new_thread_state: impl Fn(usize) -> S + Send + Sync,
26		− consume: impl Fn(I, &mut S) -> O + Send + Sync,
	25	+ new_thread_state: impl Fn(usize) -> S + Send + Clone,
	26	+ consume: impl Fn(I, &mut S) -> O + Send + Clone,
27	27	mut reducer: R,
28	28	) -> Result<<R as Reduce>::Output, <R as Reduce>::Error>
29	29	where
@@ -32,8 +32,6 @@ where · 2 unmodified lines
32	32	O: Send,
33	33	{
34	34	let num_threads = num_threads(thread_limit);
35		− let new_thread_state = &new_thread_state;
36		− let consume = &consume;
37	35	crossbeam_utils::thread::scope(move \|s\| {
38	36	let receive_result = {
39	37	let (send_input, receive_input) = crossbeam_channel::bounded::<I>(num_threads);
@@ -42,6 +40,8 @@ where · 2 unmodified lines
42	40	s.spawn({
43	41	let send_result = send_result.clone();
44	42	let receive_input = receive_input.clone();
	43	+ let new_thread_state = new_thread_state.clone();
	44	+ let consume = consume.clone();
45	45	move \|_\| {
46	46	let mut state = new_thread_state(thread_id);
47	47	for item in receive_input {

git-features/src/parallel/mod.rs+2−2

@@ -133,8 +133,8 @@ pub fn in_parallel_if<I, S, O, R>( · 132 unmodified lines
133	133	condition: impl FnOnce() -> bool,
134	134	input: impl Iterator<Item = I> + Send,
135	135	thread_limit: Option<usize>,
136		− new_thread_state: impl Fn(usize) -> S + Send + Sync,
137		− consume: impl Fn(I, &mut S) -> O + Send + Sync,
	136	+ new_thread_state: impl Fn(usize) -> S + Send + Clone,
	137	+ consume: impl Fn(I, &mut S) -> O + Send + Clone,
138	138	reducer: R,
139	139	) -> Result<<R as Reduce>::Output, <R as Reduce>::Error>
140	140	where

git-features/src/parallel/reduce.rs+7−13

@@ -138,11 +138,9 @@ mod stepped { · 137 unmodified lines
138	138
139	139	impl<InputIter, ConsumeFn, Reduce, I, O, S> Stepwise<InputIter, ConsumeFn, S, Reduce>
140	140	where
141		− InputIter: Iterator<Item = I> + Send,
142		− ConsumeFn: Fn(I, &mut S) -> O + Send + Sync,
	141	+ InputIter: Iterator<Item = I>,
	142	+ ConsumeFn: Fn(I, &mut S) -> O,
143	143	Reduce: super::Reduce<Input = O>,
144		− I: Send,
145		− O: Send,
146	144	{
147	145	/// Instantiate a new iterator.
148	146	/// For a description of parameters, see [`in_parallel()`][crate::parallel::in_parallel()].
@@ -154,7 +152,7 @@ mod stepped { · 5 unmodified lines
154	152	reducer: Reduce,
155	153	) -> Self
156	154	where
157		− ThreadStateFn: Fn(usize) -> S + Send + Sync,
	155	+ ThreadStateFn: Fn(usize) -> S,
158	156	{
159	157	Stepwise {
160	158	input,
@@ -175,11 +173,9 @@ mod stepped { · 14 unmodified lines
175	173
176	174	impl<InputIter, ConsumeFn, ThreadState, Reduce, I, O> Iterator for Stepwise<InputIter, ConsumeFn, ThreadState, Reduce>
177	175	where
178		− InputIter: Iterator<Item = I> + Send,
179		− ConsumeFn: Fn(I, &mut ThreadState) -> O + Send + Sync,
	176	+ InputIter: Iterator<Item = I>,
	177	+ ConsumeFn: Fn(I, &mut ThreadState) -> O,
180	178	Reduce: super::Reduce<Input = O>,
181		− I: Send,
182		− O: Send,
183	179	{
184	180	type Item = Result<Reduce::FeedProduce, Reduce::Error>;
185	181
@@ -192,11 +188,9 @@ mod stepped { · 6 unmodified lines
192	188
193	189	impl<InputIter, ConsumeFn, R, I, O, S> super::Finalize for Stepwise<InputIter, ConsumeFn, S, R>
194	190	where
195		− InputIter: Iterator<Item = I> + Send,
196		− ConsumeFn: Fn(I, &mut S) -> O + Send + Sync,
	191	+ InputIter: Iterator<Item = I>,
	192	+ ConsumeFn: Fn(I, &mut S) -> O,
197	193	R: super::Reduce<Input = O>,
198		− I: Send,
199		− O: Send,
200	194	{
201	195	type Reduce = R;
202	196

git-pack/src/data/output/count/objects/mod.rs+2−2

@@ -39,7 +39,7 @@ pub type Result<E1, E2> = std::result::Result<(Vec<output::Count>, Outcome), Err · 38 unmodified lines
39	39	/// * more configuration
40	40	pub fn objects<Find, Iter, IterErr, Oid, PackCache, ObjectCache>(
41	41	db: Find,
42		− make_caches: impl Fn() -> (PackCache, ObjectCache) + Send + Sync,
	42	+ make_caches: impl Fn() -> (PackCache, ObjectCache) + Send + Clone,
43	43	objects_ids: Iter,
44	44	progress: impl Progress,
45	45	should_interrupt: &AtomicBool,
@@ -50,7 +50,7 @@ pub fn objects<Find, Iter, IterErr, Oid, PackCache, ObjectCache>( · 4 unmodified lines
50	50	}: Options,
51	51	) -> Result<find::existing::Error<Find::Error>, IterErr>
52	52	where
53		− Find: crate::Find + Send + Sync,
	53	+ Find: crate::Find + Send + Clone,
54	54	<Find as crate::Find>::Error: Send,
55	55	Iter: Iterator<Item = std::result::Result<Oid, IterErr>> + Send,
56	56	Oid: Into<ObjectId> + Send,

git-pack/src/data/output/entry/iter_from_counts.rs+3−3

@@ -42,7 +42,7 @@ use crate::data::{output, output::ChunkId}; · 41 unmodified lines
42	42	pub fn iter_from_counts<Find, Cache>(
43	43	mut counts: Vec<output::Count>,
44	44	db: Find,
45		− make_cache: impl Fn() -> Cache + Send + Sync + 'static,
	45	+ make_cache: impl Fn() -> Cache + Send + Clone + Sync + 'static,
46	46	mut progress: impl Progress,
47	47	Options {
48	48	version,
@@ -54,7 +54,7 @@ pub fn iter_from_counts<Find, Cache>( · 5 unmodified lines
54	54	) -> impl Iterator<Item = Result<(ChunkId, Vec<output::Entry>), Error<Find::Error>>>
55	55	+ parallel::reduce::Finalize<Reduce = reduce::Statistics<Error<Find::Error>>>
56	56	where
57		− Find: crate::Find + Send + Sync + 'static,
	57	+ Find: crate::Find + Send + Clone + 'static,
58	58	<Find as crate::Find>::Error: Send,
59	59	Cache: crate::cache::DecodeEntry,
60	60	{
@@ -78,7 +78,7 @@ where · 17 unmodified lines
78	78	{
79	79	let progress = Arc::clone(&progress);
80	80	let counts = &counts;
81		− let db = &db;
	81	+ let db = db.clone();
82	82	move \|chunk_range, buf\| {
83	83	let chunk = {
84	84	let c = &counts[chunk_range];

unify trait bounds for parallel code: prefer Clone over Sync (#259)

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code