mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
refactor wait timer for net pump
This commit is contained in:
parent
9354932483
commit
709c087337
1 changed files with 22 additions and 22 deletions
|
|
@ -18,7 +18,7 @@ use num_traits::*;
|
||||||
mod connection_manager;
|
mod connection_manager;
|
||||||
mod device;
|
mod device;
|
||||||
|
|
||||||
use std::collections::{BTreeMap, HashMap};
|
use std::collections::{BTreeMap, HashMap, BTreeSet};
|
||||||
use std::convert::TryInto;
|
use std::convert::TryInto;
|
||||||
use xous::{msg_blocking_scalar_unpack, msg_scalar_unpack, send_message, Message, CID, SID};
|
use xous::{msg_blocking_scalar_unpack, msg_scalar_unpack, send_message, Message, CID, SID};
|
||||||
use xous_ipc::Buffer;
|
use xous_ipc::Buffer;
|
||||||
|
|
@ -36,7 +36,7 @@ use smoltcp::socket::{
|
||||||
SocketHandle, TcpSocket, TcpSocketBuffer, UdpPacketMetadata, UdpSocket, UdpSocketBuffer,
|
SocketHandle, TcpSocket, TcpSocketBuffer, UdpPacketMetadata, UdpSocket, UdpSocketBuffer,
|
||||||
};
|
};
|
||||||
use smoltcp::time::{Duration, Instant};
|
use smoltcp::time::{Duration, Instant};
|
||||||
use std::sync::Arc;
|
use std::sync::{Arc, Mutex};
|
||||||
use std::thread;
|
use std::thread;
|
||||||
|
|
||||||
const PING_DEFAULT_TIMEOUT_MS: u32 = 10_000;
|
const PING_DEFAULT_TIMEOUT_MS: u32 = 10_000;
|
||||||
|
|
@ -245,6 +245,9 @@ fn xmain() -> ! {
|
||||||
let mut dns_ipv6_hook = XousScalarEndpoint::new();
|
let mut dns_ipv6_hook = XousScalarEndpoint::new();
|
||||||
let mut dns_allclear_hook = XousScalarEndpoint::new();
|
let mut dns_allclear_hook = XousScalarEndpoint::new();
|
||||||
|
|
||||||
|
// wakeup polling management
|
||||||
|
let wakeup_time: Arc::<Mutex::<BTreeSet<u64>>> = Arc::new(Mutex::new(BTreeSet::new()));
|
||||||
|
|
||||||
log::trace!("ready to accept requests");
|
log::trace!("ready to accept requests");
|
||||||
// register a suspend/resume listener
|
// register a suspend/resume listener
|
||||||
let sr_cid = xous::connect(net_sid).expect("couldn't create suspend callback connection");
|
let sr_cid = xous::connect(net_sid).expect("couldn't create suspend callback connection");
|
||||||
|
|
@ -1581,28 +1584,32 @@ fn xmain() -> ! {
|
||||||
|
|
||||||
// establish our next check-up interval
|
// establish our next check-up interval
|
||||||
if delay_threads.load(Ordering::SeqCst) < MAX_DELAY_THREADS {
|
if delay_threads.load(Ordering::SeqCst) < MAX_DELAY_THREADS {
|
||||||
let timestamp = Instant::from_millis(timer.elapsed_ms() as i64);
|
let now = timer.elapsed_ms();
|
||||||
|
let timestamp = Instant::from_millis(now as i64);
|
||||||
if let Some(delay) = iface.poll_delay(&sockets, timestamp) {
|
if let Some(delay) = iface.poll_delay(&sockets, timestamp) {
|
||||||
let delay_ms = delay.total_millis();
|
const RANGE_MS: u64 = 5;
|
||||||
if delay_ms < 2 {
|
let wakeup = now + delay.total_millis();
|
||||||
xous::try_send_message(
|
let no_wakeup_scheduled = wakeup_time.lock().unwrap().range(wakeup - RANGE_MS..wakeup + RANGE_MS).count() == 0;
|
||||||
net_conn,
|
if no_wakeup_scheduled {
|
||||||
Message::new_scalar(Opcode::NetPump.to_usize().unwrap(), 0, 0, 0, 0),
|
wakeup_time.lock().unwrap().insert(wakeup);
|
||||||
)
|
|
||||||
.ok();
|
|
||||||
} else {
|
|
||||||
let prev_count = delay_threads.fetch_add(1, Ordering::SeqCst);
|
let prev_count = delay_threads.fetch_add(1, Ordering::SeqCst);
|
||||||
log::trace!(
|
log::trace!(
|
||||||
"spawning checkup thread for {}ms. New total threads: {}",
|
"spawning wakeup at {}ms. New total threads: {}",
|
||||||
delay_ms,
|
wakeup,
|
||||||
prev_count + 1
|
prev_count + 1
|
||||||
);
|
);
|
||||||
thread::spawn({
|
thread::spawn({
|
||||||
let parent_conn = net_conn.clone();
|
let parent_conn = net_conn.clone();
|
||||||
let delay_threads = delay_threads.clone();
|
let delay_threads = delay_threads.clone();
|
||||||
|
let wakeup = wakeup.clone();
|
||||||
|
let now = now.clone();
|
||||||
|
let wakeup_time = wakeup_time.clone();
|
||||||
move || {
|
move || {
|
||||||
let tt = ticktimer_server::Ticktimer::new().unwrap();
|
let tt = ticktimer_server::Ticktimer::new().unwrap();
|
||||||
tt.sleep_ms(delay_ms as usize).unwrap();
|
tt.sleep_ms((wakeup - now) as usize).unwrap();
|
||||||
|
if !wakeup_time.lock().unwrap().remove(&wakeup) {
|
||||||
|
log::warn!("time {} was not in wakeup queue!", wakeup);
|
||||||
|
}
|
||||||
xous::try_send_message(
|
xous::try_send_message(
|
||||||
parent_conn,
|
parent_conn,
|
||||||
Message::new_scalar(
|
Message::new_scalar(
|
||||||
|
|
@ -1624,14 +1631,7 @@ fn xmain() -> ! {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
log::warn!("Thread pool exhausted; deferring creation of new poll helpers");
|
log::info!("Thread pool exhausted; deferring creation of new poll helpers");
|
||||||
// fire off another pump message. This will cause the network server to effectively
|
|
||||||
// busy-wait until the thread pool starts to clear out.
|
|
||||||
xous::try_send_message(
|
|
||||||
net_conn,
|
|
||||||
Message::new_scalar(Opcode::NetPump.to_usize().unwrap(), 0, 0, 0, 0),
|
|
||||||
)
|
|
||||||
.ok();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Some(Opcode::GetIpv4Config) => {
|
Some(Opcode::GetIpv4Config) => {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue