X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fdatastore.rs;h=57689354ada941b44686cf8cf030205e4eeb1ff3;hb=290b80cc5e710fff040962e5d17e5c8fef1ccb6d;hp=354a37d62aa5f63bd96bf5226bb814163d0da829;hpb=c579e91f083d369055230497b1c7bf4191a50880;p=dnsseed-rust diff --git a/src/datastore.rs b/src/datastore.rs index 354a37d..5768935 100644 --- a/src/datastore.rs +++ b/src/datastore.rs @@ -19,6 +19,7 @@ use regex::Regex; use crate::bgp_client::BGPClient; pub const SECS_PER_SCAN_RESULTS: u64 = 15; +const MAX_CONNS_PER_SEC_PER_STATUS: u64 = 30; #[derive(Clone, Copy, Hash, PartialEq, Eq)] pub enum AddressState { @@ -124,6 +125,7 @@ struct Node { last_good: Instant, // Ignored unless state is Good or WasGood last_services: u64, state: AddressState, + queued: bool, } /// Essentially SocketAddr but without a traffic class or scope @@ -170,14 +172,14 @@ impl SockAddr { } struct Nodes { - good_node_services: Vec>, + good_node_services: [HashSet; 64], nodes_to_state: HashMap, - state_next_scan: Vec>, + state_next_scan: Vec>, } struct NodesMutRef<'a> { - good_node_services: &'a mut Vec>, + good_node_services: &'a mut [HashSet; 64], nodes_to_state: &'a mut HashMap, - state_next_scan: &'a mut Vec>, + state_next_scan: &'a mut Vec>, } impl Nodes { @@ -264,10 +266,7 @@ impl Store { 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()); - } + let good_node_services = [HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new()]; Nodes { good_node_services, nodes_to_state: HashMap::new(), @@ -277,7 +276,6 @@ impl Store { } let nodes_future = File::open(store.clone() + "/nodes").and_then(|f| { - let start_time = Instant::now() - Duration::from_secs(60 * 60 * 24); let mut res = nodes_uninitd!(); let l = BufReader::new(f).lines(); for line_res in l { @@ -308,6 +306,7 @@ impl Store { last_services, last_update: Instant::now(), last_good: Instant::now(), + queued: true, }; if node.state == AddressState::Good { for i in 0..64 { @@ -316,7 +315,7 @@ impl Store { } } } - res.state_next_scan[node.state.to_num() as usize].push((start_time, sockaddr.into())); + res.state_next_scan[node.state.to_num() as usize].push(sockaddr.into()); res.nodes_to_state.insert(sockaddr.into(), node); } future::ok(res) @@ -365,8 +364,9 @@ impl Store { last_services: 0, last_update: cur_time, last_good: cur_time, + queued: true, }); - nodes.state_next_scan[AddressState::Untested.to_num() as usize].push((cur_time, addr.into())); + nodes.state_next_scan[AddressState::Untested.to_num() as usize].push(addr.into()); res += 1; }, hash_map::Entry::Occupied(_) => {}, @@ -396,6 +396,7 @@ impl Store { last_services: 0, last_update: now, last_good: now, + queued: false, }); let ret = state_ref.state; if (state_ref.state == AddressState::Good || state_ref.state == AddressState::WasGood) @@ -408,7 +409,10 @@ impl Store { } } state_ref.last_services = 0; - nodes.state_next_scan[AddressState::WasGood.to_num() as usize].push((now, addr)); + if !state_ref.queued { + nodes.state_next_scan[AddressState::WasGood.to_num() as usize].push(addr); + state_ref.queued = true; + } } else { state_ref.state = state; if state == AddressState::Good { @@ -422,7 +426,10 @@ impl Store { state_ref.last_services = services; state_ref.last_good = now; } - nodes.state_next_scan[state.to_num() as usize].push((now, addr)); + if !state_ref.queued { + nodes.state_next_scan[state.to_num() as usize].push(addr); + state_ref.queued = true; + } } state_ref.last_update = now; ret @@ -489,7 +496,28 @@ impl Store { let mut dns_buff = String::new(); { let mut rng = thread_rng(); - for i in &[1u64, 4, 5, 8, 9, 12, 13, 1024, 1025, 1028, 1029, 1032, 1033, 1036, 1037] { + for i in &[ 0b00000000001u64, + 0b00000000100, + 0b00000000101, + 0b00000001000, + 0b00000001001, + 0b00000001100, + 0b00000001101, + 0b00001001001, + 0b10000000000, + 0b10000000001, + 0b10000000100, + 0b10000000101, + 0b10000001000, + 0b10000001001, + 0b10000001100, + 0b10000001101, + 0b10001001000] { + // ^ NODE_NETWORK_LIIMTED + //COMPACT_FILTERS ^ ^ NODE_BLOOM + // NODE_WITNESS ^ ^ NODE_NETWORK + // We support all combos of NETWORK, NETWORK_LIMITED, BLOOM, and WITNESS + // We support COMPACT_FILTERS with WITNESS and NETWORK or NETWORK_LIIMTED. let mut tor_set: Vec = Vec::new(); let mut v6_set: Vec = Vec::new(); let mut v4_set: Vec = Vec::new(); @@ -574,18 +602,19 @@ impl Store { pub fn get_next_scan_nodes(&self) -> Vec { let mut res = Vec::with_capacity(128); - let cur_time = Instant::now(); { - let mut nodes = self.nodes.write().unwrap(); + let mut nodes_lock = self.nodes.write().unwrap(); + let nodes = nodes_lock.borrow_mut(); for (idx, state_nodes) in nodes.state_next_scan.iter_mut().enumerate() { let rescan_interval = cmp::max(self.get_u64(U64Setting::RescanInterval(AddressState::from_num(idx as u8).unwrap())), 1); - let cmp_time = cur_time - Duration::from_secs(rescan_interval); - let split_point = cmp::min(SECS_PER_SCAN_RESULTS * state_nodes.len() as u64 / rescan_interval, - state_nodes.binary_search_by(|a| a.0.cmp(&cmp_time)).unwrap_or_else(|idx| idx) as u64); + let split_point = cmp::min(cmp::min(SECS_PER_SCAN_RESULTS * state_nodes.len() as u64 / rescan_interval, + SECS_PER_SCAN_RESULTS * MAX_CONNS_PER_SEC_PER_STATUS), + state_nodes.len() as u64); let mut new_nodes = state_nodes.split_off(split_point as usize); mem::swap(&mut new_nodes, state_nodes); - for (_, node) in new_nodes.drain(..) { + for node in new_nodes.drain(..) { + nodes.nodes_to_state.get_mut(&node).unwrap().queued = false; res.push((&node).into()); } }