grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix deadlock.

Browse Source
This commit is contained in:
Gav Wood 2016-12-11 02:39:56 +01:00
parent 0a494962e4
commit 7a1539cfb5
No known key found for this signature in database
GPG Key ID: C49C1ACA1CC9B252
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
parity/updater.rs
View File

@ -95,7 +95,7 @@ pub struct Updater {
update_policy: UpdatePolicy, update_policy: UpdatePolicy,
weak_self: Mutex<Weak<Updater>>, weak_self: Mutex<Weak<Updater>>,
client: Weak<BlockChainClient>, client: Weak<BlockChainClient>,
fetcher: Option<fetch::Client>, fetcher: Mutex<Option<fetch::Client>>,
operations: Mutex<Option<Operations>>, operations: Mutex<Option<Operations>>,
exit_handler: Mutex<Option<Box<Fn() + 'static + Send>>>, exit_handler: Mutex<Option<Box<Fn() + 'static + Send>>>,
@ -129,7 +129,7 @@ impl Updater {
update_policy: update_policy, update_policy: update_policy,
weak_self: Mutex::new(Default::default()), weak_self: Mutex::new(Default::default()),
client: client.clone(), client: client.clone(),
fetcher: None, fetcher: Mutex::new(None),
operations: Mutex::new(None), operations: Mutex::new(None),
exit_handler: Mutex::new(None), exit_handler: Mutex::new(None),
this: VersionInfo::this(), this: VersionInfo::this(),
@ -141,8 +141,8 @@ impl Updater {
u.this.track = ReleaseTrack::Nightly; u.this.track = ReleaseTrack::Nightly;
} }
let mut r = Arc::new(u); let r = Arc::new(u);
Arc::get_mut(&mut r).expect("arc created on previous line; qed").fetcher = Some(fetch::Client::new(r.clone())); *r.fetcher.lock() = Some(fetch::Client::new(r.clone()));
*r.weak_self.lock() = Arc::downgrade(&r); *r.weak_self.lock() = Arc::downgrade(&r);
r r
} }
@ -328,7 +328,7 @@ impl Updater {
s.fetching = Some(latest.track.clone()); s.fetching = Some(latest.track.clone());
let weak_self = self.weak_self.lock().clone(); let weak_self = self.weak_self.lock().clone();
let f = move |r: Result<PathBuf, fetch::Error>| if let Some(this) = weak_self.upgrade() { this.fetch_done(r) }; let f = move |r: Result<PathBuf, fetch::Error>| if let Some(this) = weak_self.upgrade() { this.fetch_done(r) };
self.fetcher.as_ref().expect("Created on `new`; qed").fetch(b, Box::new(f)).ok(); self.fetcher.lock().as_ref().expect("Created on `new`; qed").fetch(b, Box::new(f)).ok();
} }
} }
} }