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

weak_counts has been stabilized (#11476)

Browse Source
This commit is contained in:
Artem Vorotnikov 2020-02-11 11:41:23 +03:00 committed by GitHub
parent c5123e1ecd
commit 1a8c0391c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
parity/run.rs
View File

@ -900,9 +900,7 @@ impl RunningClient {
trace!(target: "shutdown", "Informant dropped"); trace!(target: "shutdown", "Informant dropped");
drop(client); drop(client);
trace!(target: "shutdown", "Client dropped"); trace!(target: "shutdown", "Client dropped");
// This may help when debugging ref cycles. Requires nightly-only `#![feature(weak_counts)]` trace!(target: "shutdown", "Waiting for refs to Client to shutdown, strong_count={:?}, weak_count={:?}", weak_client.strong_count(), weak_client.weak_count());
// trace!(target: "shutdown", "Waiting for refs to Client to shutdown, strong_count={:?}, weak_count={:?}", weak_client.strong_count(), weak_client.weak_count());
trace!(target: "shutdown", "Waiting for refs to Client to shutdown");
wait_for_drop(weak_client); wait_for_drop(weak_client);
} }
} }
@ -960,11 +958,7 @@ fn wait_for_drop<T>(w: Weak<T>) {
thread::sleep(SLEEP_DURATION); thread::sleep(SLEEP_DURATION);
// When debugging shutdown issues on a nightly build it can help to enable this with the trace!(target: "shutdown", "Waiting for client to drop, strong_count={:?}, weak_count={:?}", w.strong_count(), w.weak_count());
// `#![feature(weak_counts)]` added to lib.rs (TODO: enable when
// https://github.com/rust-lang/rust/issues/57977 is stable)
// trace!(target: "shutdown", "Waiting for client to drop, strong_count={:?}, weak_count={:?}", w.strong_count(), w.weak_count());
trace!(target: "shutdown", "Waiting for client to drop");
} }
warn!("Shutdown timeout reached, exiting uncleanly."); warn!("Shutdown timeout reached, exiting uncleanly.");