X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fdatastore.rs;h=1a3d7c94024ce75dd1cd78dabe13dc29eadcf942;hb=af2cd26873a4ca90fd5c44a3b8d19ac6cfbbaf34;hp=26ed96bcb4feff30017a9942933d4c7c36485cee;hpb=b161100d1919c1d4c678d91a1f49ecca1747327e;p=dnsseed-rust diff --git a/src/datastore.rs b/src/datastore.rs index 26ed96b..1a3d7c9 100644 --- a/src/datastore.rs +++ b/src/datastore.rs @@ -108,14 +108,14 @@ struct Node { } struct Nodes { - good_node_services: HashMap>, + good_node_services: Vec>, nodes_to_state: HashMap, - state_next_scan: HashMap>, + state_next_scan: Vec>, } struct NodesMutRef<'a> { - good_node_services: &'a mut HashMap>, + good_node_services: &'a mut Vec>, nodes_to_state: &'a mut HashMap, - state_next_scan: &'a mut HashMap>, + state_next_scan: &'a mut Vec>, } impl Nodes { @@ -192,21 +192,13 @@ impl Store { macro_rules! nodes_uninitd { () => { { - let mut state_vecs = HashMap::with_capacity(11); - state_vecs.insert(AddressState::Untested, Vec::new()); - state_vecs.insert(AddressState::LowBlockCount, Vec::new()); - state_vecs.insert(AddressState::HighBlockCount, Vec::new()); - state_vecs.insert(AddressState::LowVersion, Vec::new()); - state_vecs.insert(AddressState::BadVersion, Vec::new()); - state_vecs.insert(AddressState::NotFullNode, Vec::new()); - state_vecs.insert(AddressState::ProtocolViolation, Vec::new()); - state_vecs.insert(AddressState::Timeout, Vec::new()); - state_vecs.insert(AddressState::TimeoutDuringRequest, Vec::new()); - state_vecs.insert(AddressState::Good, Vec::new()); - state_vecs.insert(AddressState::WasGood, Vec::new()); - let mut good_node_services = HashMap::with_capacity(64); - for i in 0..64 { - good_node_services.insert(i, HashSet::new()); + let mut state_vecs = Vec::with_capacity(AddressState::get_count() as usize); + for _ in 0..AddressState::get_count() { + state_vecs.push(Vec::new()); + } + let mut good_node_services = Vec::with_capacity(64); + for _ in 0..64 { + good_node_services.push(HashSet::new()); } Nodes { good_node_services, @@ -251,11 +243,11 @@ impl Store { if node.state == AddressState::Good { for i in 0..64 { if node.last_services & (1 << i) != 0 { - res.good_node_services.get_mut(&i).unwrap().insert(sockaddr); + res.good_node_services[i].insert(sockaddr); } } } - res.state_next_scan.get_mut(&node.state).unwrap().push((Instant::now(), sockaddr)); + res.state_next_scan[node.state.to_num() as usize].push((Instant::now(), sockaddr)); res.nodes_to_state.insert(sockaddr, node); } future::ok(res) @@ -281,7 +273,7 @@ impl Store { } pub fn get_node_count(&self, state: AddressState) -> usize { - self.nodes.read().unwrap().state_next_scan.get(&state).unwrap().len() + self.nodes.read().unwrap().state_next_scan[state.to_num() as usize].len() } pub fn get_regex(&self, _setting: RegexSetting) -> Arc { @@ -303,9 +295,9 @@ impl Store { state: AddressState::Untested, last_services: 0, last_update: cur_time, - last_good: Instant::now(), + last_good: cur_time, }); - nodes.state_next_scan.get_mut(&AddressState::Untested).unwrap().push((cur_time, addr)); + nodes.state_next_scan[AddressState::Untested.to_num() as usize].push((cur_time, addr)); res += 1; }, hash_map::Entry::Occupied(_) => {}, @@ -326,34 +318,40 @@ impl Store { pub fn set_node_state(&self, addr: SocketAddr, state: AddressState, services: u64) -> AddressState { let mut nodes_lock = self.nodes.write().unwrap(); let nodes = nodes_lock.borrow_mut(); - let state_ref = nodes.nodes_to_state.get_mut(&addr).unwrap(); - let ret = state_ref.state; let now = Instant::now(); + + let state_ref = nodes.nodes_to_state.entry(addr).or_insert(Node { + state: AddressState::Untested, + last_services: 0, + last_update: now, + last_good: now, + }); + let ret = state_ref.state; if (state_ref.state == AddressState::Good || state_ref.state == AddressState::WasGood) && state != AddressState::Good && state_ref.last_good >= now - Duration::from_secs(self.get_u64(U64Setting::WasGoodTimeout)) { state_ref.state = AddressState::WasGood; for i in 0..64 { if state_ref.last_services & (1 << i) != 0 { - nodes.good_node_services.get_mut(&i).unwrap().remove(&addr); + nodes.good_node_services[i].remove(&addr); } } state_ref.last_services = 0; - nodes.state_next_scan.get_mut(&AddressState::WasGood).unwrap().push((now, addr)); + nodes.state_next_scan[AddressState::WasGood.to_num() as usize].push((now, addr)); } else { state_ref.state = state; if state == AddressState::Good { for i in 0..64 { if services & (1 << i) != 0 && state_ref.last_services & (1 << i) == 0 { - nodes.good_node_services.get_mut(&i).unwrap().insert(addr); + nodes.good_node_services[i].insert(addr); } else if services & (1 << i) == 0 && state_ref.last_services & (1 << i) != 0 { - nodes.good_node_services.get_mut(&i).unwrap().remove(&addr); + nodes.good_node_services[i].remove(&addr); } } state_ref.last_services = services; state_ref.last_good = now; } - nodes.state_next_scan.get_mut(&state).unwrap().push((now, addr)); + nodes.state_next_scan[state.to_num() as usize].push((now, addr)); } state_ref.last_update = now; ret @@ -420,7 +418,7 @@ impl Store { if i.count_ones() == 1 { for j in 0..64 { if i & (1 << j) != 0 { - let set_ref = nodes.good_node_services.get(&j).unwrap(); + let set_ref = &nodes.good_node_services[j]; v4_set = set_ref.iter().filter(|e| e.is_ipv4() && e.port() == 8333) .choose_multiple(&mut rng, 21).iter().map(|e| e.ip()).collect(); v6_set = set_ref.iter().filter(|e| e.is_ipv6() && e.port() == 8333) @@ -434,17 +432,17 @@ impl Store { for j in 0..64 { if i & (1 << j) != 0 { if first_set == None { - first_set = Some(nodes.good_node_services.get(&j).unwrap()); + first_set = Some(&nodes.good_node_services[j]); } else { - second_set = Some(nodes.good_node_services.get(&j).unwrap()); + second_set = Some(&nodes.good_node_services[j]); break; } } } - v4_set = first_set.unwrap().intersection(second_set.unwrap()) + v4_set = first_set.unwrap().intersection(&second_set.unwrap()) .filter(|e| e.is_ipv4() && e.port() == 8333) .choose_multiple(&mut rng, 21).iter().map(|e| e.ip()).collect(); - v6_set = first_set.unwrap().intersection(second_set.unwrap()) + v6_set = first_set.unwrap().intersection(&second_set.unwrap()) .filter(|e| e.is_ipv6() && e.port() == 8333) .choose_multiple(&mut rng, 12).iter().map(|e| e.ip()).collect(); } else { @@ -454,10 +452,10 @@ impl Store { for j in 0..64 { if i & (1 << j) != 0 { if intersection_set_ref == None { - intersection_set_ref = Some(nodes.good_node_services.get(&j).unwrap()); + intersection_set_ref = Some(&nodes.good_node_services[j]); } else { let new_intersection = intersection_set_ref.unwrap() - .intersection(nodes.good_node_services.get(&j).unwrap()).map(|e| (*e).clone()).collect(); + .intersection(&nodes.good_node_services[j]).map(|e| (*e).clone()).collect(); intersection = Some(new_intersection); intersection_set_ref = Some(intersection.as_ref().unwrap()); } @@ -494,15 +492,17 @@ impl Store { let mut res = Vec::with_capacity(results); let cur_time = Instant::now(); - let mut nodes = self.nodes.write().unwrap(); - for (idx, (state, state_nodes)) in nodes.state_next_scan.iter_mut().enumerate() { - let cmp_time = cur_time - Duration::from_secs(self.get_u64(U64Setting::RescanInterval(*state))); - let split_point = cmp::min(cmp::min(results - res.len(), results - (per_bucket_results * (AddressState::get_count() as usize - idx))), - state_nodes.binary_search_by(|a| a.0.cmp(&cmp_time)).unwrap_or_else(|idx| idx)); - let mut new_nodes = state_nodes.split_off(split_point); - mem::swap(&mut new_nodes, state_nodes); - for (_, node) in new_nodes.drain(..) { - res.push(node); + { + let mut nodes = self.nodes.write().unwrap(); + for (idx, state_nodes) in nodes.state_next_scan.iter_mut().enumerate() { + let cmp_time = cur_time - Duration::from_secs(self.get_u64(U64Setting::RescanInterval(AddressState::from_num(idx as u8).unwrap()))); + let split_point = cmp::min(cmp::min(results - res.len(), (per_bucket_results * (idx + 1)) - res.len()), + state_nodes.binary_search_by(|a| a.0.cmp(&cmp_time)).unwrap_or_else(|idx| idx)); + let mut new_nodes = state_nodes.split_off(split_point); + mem::swap(&mut new_nodes, state_nodes); + for (_, node) in new_nodes.drain(..) { + res.push(node); + } } } res.shuffle(&mut thread_rng());