GRIN/grin-node
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

less txhashset locking (#2163)

Browse Source 
* less txhashset locking

* rework server stats a bit
This commit is contained in:
Antioch Peverell
2018-12-16 09:26:17 +00:00
committed by GitHub
parent 9a4895c86a
commit a50dcbfaa5
3 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
servers/src/common/adapters.rs
+8 -2
View File
@@ -260,6 +260,9 @@ impl p2p::ChainAdapter for NetToChainAdapter {
let max_height = self.chain().header_head().unwrap().height;
let txhashset = self.chain().txhashset();
let txhashset = txhashset.read();
// looks like we know one, getting as many following headers as allowed
let hh = header.height;
let mut headers = vec![];
@@ -268,7 +271,7 @@ impl p2p::ChainAdapter for NetToChainAdapter {
break;
}
if let Ok(header) = self.chain().get_header_by_height(h) {
if let Ok(header) = txhashset.get_header_by_height(h) {
headers.push(header);
} else {
error!("Failed to locate headers successfully.");
@@ -399,9 +402,12 @@ impl NetToChainAdapter {
// Find the first locator hash that refers to a known header on our main chain.
fn find_common_header(&self, locator: &[Hash]) -> Option<BlockHeader> {
let txhashset = self.chain().txhashset();
let txhashset = txhashset.read();
for hash in locator {
if let Ok(header) = self.chain().get_block_header(&hash) {
if let Ok(header_at_height) = self.chain().get_header_by_height(header.height) {
if let Ok(header_at_height) = txhashset.get_header_by_height(header.height) {
if header.hash() == header_at_height.hash() {
return Some(header);
}