X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fdatastore.rs;h=4f59305b30f5cf17e634b493f8742700b75a411f;hb=82ab324e5e800a6dc8b952c3b776ce2f8f827f2f;hp=1013a9e3139c985e5378f2fc5917cbe380660118;hpb=1e90008ac857dbf642addc27cf92ef4d7c76b51d;p=dnsseed-rust diff --git a/src/datastore.rs b/src/datastore.rs index 1013a9e..4f59305 100644 --- a/src/datastore.rs +++ b/src/datastore.rs @@ -1,13 +1,20 @@ use std::{cmp, mem}; -use std::collections::{HashMap, hash_map}; -use std::sync::RwLock; +use std::collections::{HashSet, HashMap, hash_map}; +use std::sync::{Arc, RwLock}; use std::net::SocketAddr; use std::time::{Duration, Instant}; +use std::io::{BufRead, BufReader}; use bitcoin::network::address::Address; use rand::thread_rng; -use rand::seq::SliceRandom; +use rand::seq::{SliceRandom, IteratorRandom}; + +use tokio::prelude::*; +use tokio::fs::File; +use tokio::io::write_all; + +use regex::Regex; #[derive(Clone, Copy, Hash, PartialEq, Eq)] pub enum AddressState { @@ -20,10 +27,77 @@ pub enum AddressState { ProtocolViolation, Timeout, TimeoutDuringRequest, + TimeoutAwaitingPong, + TimeoutAwaitingAddr, + TimeoutAwaitingBlock, Good, WasGood, } +impl AddressState { + pub fn from_num(num: u8) -> Option { + match num { + 0x0 => Some(AddressState::Untested), + 0x1 => Some(AddressState::LowBlockCount), + 0x2 => Some(AddressState::HighBlockCount), + 0x3 => Some(AddressState::LowVersion), + 0x4 => Some(AddressState::BadVersion), + 0x5 => Some(AddressState::NotFullNode), + 0x6 => Some(AddressState::ProtocolViolation), + 0x7 => Some(AddressState::Timeout), + 0x8 => Some(AddressState::TimeoutDuringRequest), + 0x9 => Some(AddressState::TimeoutAwaitingPong), + 0xa => Some(AddressState::TimeoutAwaitingAddr), + 0xb => Some(AddressState::TimeoutAwaitingBlock), + 0xc => Some(AddressState::Good), + 0xd => Some(AddressState::WasGood), + _ => None, + } + } + + pub fn to_num(&self) -> u8 { + match *self { + AddressState::Untested => 0, + AddressState::LowBlockCount => 1, + AddressState::HighBlockCount => 2, + AddressState::LowVersion => 3, + AddressState::BadVersion => 4, + AddressState::NotFullNode => 5, + AddressState::ProtocolViolation => 6, + AddressState::Timeout => 7, + AddressState::TimeoutDuringRequest => 8, + AddressState::TimeoutAwaitingPong => 9, + AddressState::TimeoutAwaitingAddr => 10, + AddressState::TimeoutAwaitingBlock => 11, + AddressState::Good => 12, + AddressState::WasGood => 13, + } + } + + pub fn to_str(&self) -> &'static str { + match *self { + AddressState::Untested => "Untested", + AddressState::LowBlockCount => "Low Block Count", + AddressState::HighBlockCount => "High Block Count", + AddressState::LowVersion => "Low Version", + AddressState::BadVersion => "Bad Version", + AddressState::NotFullNode => "Not Full Node", + AddressState::ProtocolViolation => "Protocol Violation", + AddressState::Timeout => "Timeout", + AddressState::TimeoutDuringRequest => "Timeout During Request", + AddressState::TimeoutAwaitingPong => "Timeout Awaiting Pong", + AddressState::TimeoutAwaitingAddr => "Timeout Awaiting Addr", + AddressState::TimeoutAwaitingBlock => "Timeout Awaiting Block", + AddressState::Good => "Good", + AddressState::WasGood => "Was Good", + } + } + + pub const fn get_count() -> u8 { + 14 + } +} + #[derive(Hash, PartialEq, Eq)] pub enum U64Setting { ConnsPerSec, @@ -34,124 +108,422 @@ pub enum U64Setting { } #[derive(Hash, PartialEq, Eq)] -pub enum StringSetting { +pub enum RegexSetting { SubverRegex, } +struct Node { + last_update: Instant, + last_good: Instant, // Ignored unless state is Good or WasGood + last_services: u64, + state: AddressState, +} + struct Nodes { - good_node_services: HashMap>, - nodes_to_state: HashMap, - state_next_scan: HashMap>, + good_node_services: Vec>, + nodes_to_state: HashMap, + state_next_scan: Vec>, +} +struct NodesMutRef<'a> { + good_node_services: &'a mut Vec>, + nodes_to_state: &'a mut HashMap, + state_next_scan: &'a mut Vec>, + +} +impl Nodes { + fn borrow_mut<'a>(&'a mut self) -> NodesMutRef<'a> { + NodesMutRef { + good_node_services: &mut self.good_node_services, + nodes_to_state: &mut self.nodes_to_state, + state_next_scan: &mut self.state_next_scan, + } + } } pub struct Store { u64_settings: RwLock>, - subver_regex: RwLock, + subver_regex: RwLock>, nodes: RwLock, + store: String, } impl Store { - pub fn new() -> Store { - let mut u64s = HashMap::with_capacity(15); - u64s.insert(U64Setting::ConnsPerSec, 50); - u64s.insert(U64Setting::RunTimeout, 120); - u64s.insert(U64Setting::WasGoodTimeout, 21600); - u64s.insert(U64Setting::RescanInterval(AddressState::Untested), 0); - u64s.insert(U64Setting::RescanInterval(AddressState::LowBlockCount), 3600); - u64s.insert(U64Setting::RescanInterval(AddressState::HighBlockCount), 7200); - u64s.insert(U64Setting::RescanInterval(AddressState::LowVersion), 21600); - u64s.insert(U64Setting::RescanInterval(AddressState::BadVersion), 21600); - u64s.insert(U64Setting::RescanInterval(AddressState::NotFullNode), 86400); - u64s.insert(U64Setting::RescanInterval(AddressState::ProtocolViolation), 86400); - u64s.insert(U64Setting::RescanInterval(AddressState::Timeout), 86400); - u64s.insert(U64Setting::RescanInterval(AddressState::TimeoutDuringRequest), 21600); - u64s.insert(U64Setting::RescanInterval(AddressState::Good), 1800); - u64s.insert(U64Setting::RescanInterval(AddressState::WasGood), 1800); - u64s.insert(U64Setting::MinProtocolVersion, 10000); //XXX - 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, Vec::new()); - } - Store { - u64_settings: RwLock::new(u64s), - subver_regex: RwLock::new(".*".to_string()), - nodes: RwLock::new(Nodes { - good_node_services, - nodes_to_state: HashMap::new(), - state_next_scan: state_vecs, - }), + pub fn new(store: String) -> impl Future { + let settings_future = File::open(store.clone() + "/settings").and_then(|f| { + let mut l = BufReader::new(f).lines(); + macro_rules! try_read { + ($lines: expr, $ty: ty) => { { + match $lines.next() { + Some(line) => match line { + Ok(line) => match line.parse::<$ty>() { + Ok(res) => res, + Err(e) => return future::err(std::io::Error::new(std::io::ErrorKind::InvalidData, e)), + }, + Err(e) => return future::err(e), + }, + None => return future::err(std::io::Error::new(std::io::ErrorKind::UnexpectedEof, "")), + } + } } + } + let mut u64s = HashMap::with_capacity(AddressState::get_count() as usize + 4); + u64s.insert(U64Setting::ConnsPerSec, try_read!(l, u64)); + u64s.insert(U64Setting::RunTimeout, try_read!(l, u64)); + u64s.insert(U64Setting::WasGoodTimeout, try_read!(l, u64)); + u64s.insert(U64Setting::MinProtocolVersion, try_read!(l, u64)); + u64s.insert(U64Setting::RescanInterval(AddressState::Untested), try_read!(l, u64)); + u64s.insert(U64Setting::RescanInterval(AddressState::LowBlockCount), try_read!(l, u64)); + u64s.insert(U64Setting::RescanInterval(AddressState::HighBlockCount), try_read!(l, u64)); + u64s.insert(U64Setting::RescanInterval(AddressState::LowVersion), try_read!(l, u64)); + u64s.insert(U64Setting::RescanInterval(AddressState::BadVersion), try_read!(l, u64)); + u64s.insert(U64Setting::RescanInterval(AddressState::NotFullNode), try_read!(l, u64)); + u64s.insert(U64Setting::RescanInterval(AddressState::ProtocolViolation), try_read!(l, u64)); + u64s.insert(U64Setting::RescanInterval(AddressState::Timeout), try_read!(l, u64)); + u64s.insert(U64Setting::RescanInterval(AddressState::TimeoutDuringRequest), try_read!(l, u64)); + u64s.insert(U64Setting::RescanInterval(AddressState::TimeoutAwaitingPong), try_read!(l, u64)); + u64s.insert(U64Setting::RescanInterval(AddressState::TimeoutAwaitingAddr), try_read!(l, u64)); + u64s.insert(U64Setting::RescanInterval(AddressState::TimeoutAwaitingBlock), try_read!(l, u64)); + u64s.insert(U64Setting::RescanInterval(AddressState::Good), try_read!(l, u64)); + u64s.insert(U64Setting::RescanInterval(AddressState::WasGood), try_read!(l, u64)); + future::ok((u64s, try_read!(l, Regex))) + }).or_else(|_| -> future::FutureResult<(HashMap, Regex), ()> { + let mut u64s = HashMap::with_capacity(15); + u64s.insert(U64Setting::ConnsPerSec, 10); + u64s.insert(U64Setting::RunTimeout, 120); + u64s.insert(U64Setting::WasGoodTimeout, 21600); + u64s.insert(U64Setting::RescanInterval(AddressState::Untested), 0); + u64s.insert(U64Setting::RescanInterval(AddressState::LowBlockCount), 3600); + u64s.insert(U64Setting::RescanInterval(AddressState::HighBlockCount), 7200); + u64s.insert(U64Setting::RescanInterval(AddressState::LowVersion), 21600); + u64s.insert(U64Setting::RescanInterval(AddressState::BadVersion), 21600); + u64s.insert(U64Setting::RescanInterval(AddressState::NotFullNode), 86400); + u64s.insert(U64Setting::RescanInterval(AddressState::ProtocolViolation), 86400); + u64s.insert(U64Setting::RescanInterval(AddressState::Timeout), 86400); + u64s.insert(U64Setting::RescanInterval(AddressState::TimeoutDuringRequest), 21600); + u64s.insert(U64Setting::RescanInterval(AddressState::TimeoutAwaitingPong), 3600); + u64s.insert(U64Setting::RescanInterval(AddressState::TimeoutAwaitingAddr), 1800); + u64s.insert(U64Setting::RescanInterval(AddressState::TimeoutAwaitingBlock), 3600); + u64s.insert(U64Setting::RescanInterval(AddressState::Good), 1800); + u64s.insert(U64Setting::RescanInterval(AddressState::WasGood), 1800); + u64s.insert(U64Setting::MinProtocolVersion, 70002); + future::ok((u64s, Regex::new(".*").unwrap())) + }); + + macro_rules! nodes_uninitd { + () => { { + 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, + nodes_to_state: HashMap::new(), + state_next_scan: state_vecs, + } + } } } + + let nodes_future = File::open(store.clone() + "/nodes").and_then(|f| { + let mut res = nodes_uninitd!(); + let l = BufReader::new(f).lines(); + for line_res in l { + let line = match line_res { + Ok(l) => l, + Err(_) => return future::ok(res), + }; + let mut line_iter = line.split(','); + macro_rules! try_read { + ($lines: expr, $ty: ty) => { { + match $lines.next() { + Some(line) => match line.parse::<$ty>() { + Ok(res) => res, + Err(_) => return future::ok(res), + }, + None => return future::ok(res), + } + } } + } + let sockaddr = try_read!(line_iter, SocketAddr); + let state = try_read!(line_iter, u8); + let last_services = try_read!(line_iter, u64); + let node = Node { + state: match AddressState::from_num(state) { + Some(v) => v, + None => return future::ok(res), + }, + last_services, + last_update: Instant::now(), + last_good: Instant::now(), + }; + if node.state == AddressState::Good { + for i in 0..64 { + if node.last_services & (1 << i) != 0 { + res.good_node_services[i].insert(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) + }).or_else(|_| -> future::FutureResult { + future::ok(nodes_uninitd!()) + }); + settings_future.join(nodes_future).and_then(move |((u64_settings, regex), nodes)| { + future::ok(Store { + u64_settings: RwLock::new(u64_settings), + subver_regex: RwLock::new(Arc::new(regex)), + nodes: RwLock::new(nodes), + store, + }) + }) } pub fn get_u64(&self, setting: U64Setting) -> u64 { *self.u64_settings.read().unwrap().get(&setting).unwrap() } + pub fn set_u64(&self, setting: U64Setting, value: u64) { + *self.u64_settings.write().unwrap().get_mut(&setting).unwrap() = value; + } + 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_string(&self, _setting: StringSetting) -> String { - self.subver_regex.read().unwrap().clone() + pub fn get_regex(&self, _setting: RegexSetting) -> Arc { + Arc::clone(&*self.subver_regex.read().unwrap()) } - pub fn add_fresh_nodes(&self, addresses: &Vec<(u32, Address)>) { + pub fn set_regex(&self, _setting: RegexSetting, value: Regex) { + *self.subver_regex.write().unwrap() = Arc::new(value); + } + + pub fn add_fresh_addrs>(&self, addresses: I) -> u64 { + let mut res = 0; let mut nodes = self.nodes.write().unwrap(); let cur_time = Instant::now(); - for &(_, ref addr) in addresses { - if let Ok(socketaddr) = addr.socket_addr() { - match nodes.nodes_to_state.entry(socketaddr.clone()) { - hash_map::Entry::Vacant(e) => { - e.insert(AddressState::Untested); - nodes.state_next_scan.get_mut(&AddressState::Untested).unwrap().push((cur_time, socketaddr)); - }, - hash_map::Entry::Occupied(_) => {}, - } - } else { - //TODO: Handle onions + for addr in addresses { + match nodes.nodes_to_state.entry(addr.clone()) { + hash_map::Entry::Vacant(e) => { + e.insert(Node { + state: AddressState::Untested, + last_services: 0, + last_update: cur_time, + last_good: cur_time, + }); + nodes.state_next_scan[AddressState::Untested.to_num() as usize].push((cur_time, addr)); + res += 1; + }, + hash_map::Entry::Occupied(_) => {}, } } + res } - pub fn set_node_state(&self, addr: SocketAddr, state: AddressState, services: u64) { - let mut nodes = self.nodes.write().unwrap(); - let state_ref = nodes.nodes_to_state.get_mut(&addr).unwrap(); - if *state_ref == AddressState::Good && state != AddressState::Good { - *state_ref = AddressState::WasGood; - nodes.state_next_scan.get_mut(&AddressState::WasGood).unwrap().push((Instant::now(), addr)); + pub fn add_fresh_nodes(&self, addresses: &Vec<(u32, Address)>) { + self.add_fresh_addrs(addresses.iter().filter_map(|(_, addr)| { + match addr.socket_addr() { + Ok(socketaddr) => Some(socketaddr), + Err(_) => None, // TODO: Handle onions + } + })); + } + + 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 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[i].remove(&addr); + } + } + state_ref.last_services = 0; + nodes.state_next_scan[AddressState::WasGood.to_num() as usize].push((now, addr)); } else { - *state_ref = state; - nodes.state_next_scan.get_mut(&state).unwrap().push((Instant::now(), addr)); + 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[i].insert(addr); + } else if services & (1 << i) == 0 && state_ref.last_services & (1 << i) != 0 { + nodes.good_node_services[i].remove(&addr); + } + } + state_ref.last_services = services; + state_ref.last_good = now; + } + nodes.state_next_scan[state.to_num() as usize].push((now, addr)); } - if state == AddressState::Good { + state_ref.last_update = now; + ret + } - } + pub fn save_data(&'static self) -> impl Future { + let settings_file = self.store.clone() + "/settings"; + let settings_future = File::create(settings_file.clone() + ".tmp").and_then(move |f| { + let settings_string = format!("{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}", + self.get_u64(U64Setting::ConnsPerSec), + self.get_u64(U64Setting::RunTimeout), + self.get_u64(U64Setting::WasGoodTimeout), + self.get_u64(U64Setting::MinProtocolVersion), + self.get_u64(U64Setting::RescanInterval(AddressState::Untested)), + self.get_u64(U64Setting::RescanInterval(AddressState::LowBlockCount)), + self.get_u64(U64Setting::RescanInterval(AddressState::HighBlockCount)), + self.get_u64(U64Setting::RescanInterval(AddressState::LowVersion)), + self.get_u64(U64Setting::RescanInterval(AddressState::BadVersion)), + self.get_u64(U64Setting::RescanInterval(AddressState::NotFullNode)), + self.get_u64(U64Setting::RescanInterval(AddressState::ProtocolViolation)), + self.get_u64(U64Setting::RescanInterval(AddressState::Timeout)), + self.get_u64(U64Setting::RescanInterval(AddressState::TimeoutDuringRequest)), + self.get_u64(U64Setting::RescanInterval(AddressState::TimeoutAwaitingPong)), + self.get_u64(U64Setting::RescanInterval(AddressState::TimeoutAwaitingAddr)), + self.get_u64(U64Setting::RescanInterval(AddressState::TimeoutAwaitingBlock)), + self.get_u64(U64Setting::RescanInterval(AddressState::Good)), + self.get_u64(U64Setting::RescanInterval(AddressState::WasGood)), + self.get_regex(RegexSetting::SubverRegex).as_str()); + write_all(f, settings_string).and_then(|(mut f, _)| { + f.poll_sync_all() + }).and_then(|_| { + tokio::fs::rename(settings_file.clone() + ".tmp", settings_file) + }) + }); + + let nodes_file = self.store.clone() + "/nodes"; + let nodes_future = File::create(nodes_file.clone() + ".tmp").and_then(move |f| { + let mut nodes_buff = String::new(); + { + let nodes = self.nodes.read().unwrap(); + nodes_buff.reserve(nodes.nodes_to_state.len() * 20); + for (ref sockaddr, ref node) in nodes.nodes_to_state.iter() { + nodes_buff += &sockaddr.to_string(); + nodes_buff += ","; + nodes_buff += &node.state.to_num().to_string(); + nodes_buff += ","; + nodes_buff += &node.last_services.to_string(); + nodes_buff += "\n"; + } + } + write_all(f, nodes_buff) + }).and_then(|(mut f, _)| { + f.poll_sync_all() + }).and_then(|_| { + tokio::fs::rename(nodes_file.clone() + ".tmp", nodes_file) + }); + + let dns_file = self.store.clone() + "/nodes.dump"; + let dns_future = File::create(dns_file.clone() + ".tmp").and_then(move |f| { + let mut dns_buff = String::new(); + { + let nodes = self.nodes.read().unwrap(); + let mut rng = thread_rng(); + for i in &[1u64, 4, 5, 8, 9, 12, 13, 1024, 1025, 1028, 1029, 1032, 1033, 1036, 1037] { + let mut v6_set = Vec::new(); + let mut v4_set = Vec::new(); + if i.count_ones() == 1 { + for j in 0..64 { + if i & (1 << j) != 0 { + 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) + .choose_multiple(&mut rng, 12).iter().map(|e| e.ip()).collect(); + break; + } + } + } else if i.count_ones() == 2 { + let mut first_set = None; + let mut second_set = None; + for j in 0..64 { + if i & (1 << j) != 0 { + if first_set == None { + first_set = Some(&nodes.good_node_services[j]); + } else { + second_set = Some(&nodes.good_node_services[j]); + break; + } + } + } + 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()) + .filter(|e| e.is_ipv6() && e.port() == 8333) + .choose_multiple(&mut rng, 12).iter().map(|e| e.ip()).collect(); + } else { + //TODO: Could optimize this one a bit + let mut intersection; + let mut intersection_set_ref = None; + for j in 0..64 { + if i & (1 << j) != 0 { + if intersection_set_ref == None { + intersection_set_ref = Some(&nodes.good_node_services[j]); + } else { + let new_intersection = intersection_set_ref.unwrap() + .intersection(&nodes.good_node_services[j]).map(|e| (*e).clone()).collect(); + intersection = Some(new_intersection); + intersection_set_ref = Some(intersection.as_ref().unwrap()); + } + } + } + v4_set = intersection_set_ref.unwrap().iter() + .filter(|e| e.is_ipv4() && e.port() == 8333) + .choose_multiple(&mut rng, 21).iter().map(|e| e.ip()).collect(); + v6_set = intersection_set_ref.unwrap().iter() + .filter(|e| e.is_ipv6() && e.port() == 8333) + .choose_multiple(&mut rng, 12).iter().map(|e| e.ip()).collect(); + } + for a in v4_set { + dns_buff += &format!("x{:x}.dnsseed\tIN\tA\t{}\n", i, a); + } + for a in v6_set { + dns_buff += &format!("x{:x}.dnsseed\tIN\tAAAA\t{}\n", i, a); + } + } + } + write_all(f, dns_buff) + }).and_then(|(mut f, _)| { + f.poll_sync_all() + }).and_then(|_| { + tokio::fs::rename(dns_file.clone() + ".tmp", dns_file) + }); + + settings_future.join3(nodes_future, dns_future).then(|_| { future::ok(()) }) } pub fn get_next_scan_nodes(&self) -> Vec { - let mut res = Vec::with_capacity(600); + let results = 30 * self.get_u64(U64Setting::ConnsPerSec) as usize; + let per_bucket_results = results / (AddressState::get_count() as usize); + let mut res = Vec::with_capacity(results); let cur_time = Instant::now(); - let mut nodes = self.nodes.write().unwrap(); - for (state, state_nodes) in nodes.state_next_scan.iter_mut() { - let cmp_time = cur_time - Duration::from_secs(self.get_u64(U64Setting::RescanInterval(*state))); - let split_point = cmp::min(cmp::min(600 - res.len(), 60), - 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());