mirror of
https://github.com/aramperes/onetun.git
synced 2025-09-09 11:38:32 -04:00
Remove unused dependency. Improve trace logging perf.
This commit is contained in:
parent
2e204d80fd
commit
2b18bd4ec3
3 changed files with 42 additions and 14 deletions
|
@ -1,3 +1,4 @@
|
|||
use std::fmt::{Display, Formatter};
|
||||
use std::sync::atomic::{AtomicU32, Ordering};
|
||||
use std::sync::Arc;
|
||||
|
||||
|
@ -26,6 +27,45 @@ pub enum Event {
|
|||
VirtualDeviceFed(PortProtocol),
|
||||
}
|
||||
|
||||
impl Display for Event {
|
||||
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
|
||||
match self {
|
||||
Event::Dumb => {
|
||||
write!(f, "Dumb{{}}")
|
||||
}
|
||||
Event::ClientConnectionInitiated(pf, vp) => {
|
||||
write!(f, "ClientConnectionInitiated{{ pf={} vp={} }}", pf, vp)
|
||||
}
|
||||
Event::ClientConnectionDropped(vp) => {
|
||||
write!(f, "ClientConnectionDropped{{ vp={} }}", vp)
|
||||
}
|
||||
Event::LocalData(pf, vp, data) => {
|
||||
let size = data.len();
|
||||
write!(f, "LocalData{{ pf={} vp={} size={} }}", pf, vp, size)
|
||||
}
|
||||
Event::RemoteData(vp, data) => {
|
||||
let size = data.len();
|
||||
write!(f, "RemoteData{{ vp={} size={} }}", vp, size)
|
||||
}
|
||||
Event::InboundInternetPacket(proto, data) => {
|
||||
let size = data.len();
|
||||
write!(
|
||||
f,
|
||||
"InboundInternetPacket{{ proto={} size={} }}",
|
||||
proto, size
|
||||
)
|
||||
}
|
||||
Event::OutboundInternetPacket(data) => {
|
||||
let size = data.len();
|
||||
write!(f, "OutboundInternetPacket{{ size={} }}", size)
|
||||
}
|
||||
Event::VirtualDeviceFed(proto) => {
|
||||
write!(f, "VirtualDeviceFed{{ proto={} }}", proto)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct Bus {
|
||||
counter: Arc<AtomicU32>,
|
||||
|
@ -84,7 +124,7 @@ impl BusEndpoint {
|
|||
// If the event was sent by this endpoint, it is skipped
|
||||
continue;
|
||||
} else {
|
||||
trace!("#{} <- {:?}", self.id, event);
|
||||
trace!("#{} <- {}", self.id, event);
|
||||
return event;
|
||||
}
|
||||
}
|
||||
|
@ -111,7 +151,7 @@ pub struct BusSender {
|
|||
impl BusSender {
|
||||
/// Sends the event on the bus. Note that the messages sent by this endpoint won't reach itself.
|
||||
pub fn send(&self, event: Event) {
|
||||
trace!("#{} -> {:?}", self.id, event);
|
||||
trace!("#{} -> {}", self.id, event);
|
||||
match self.tx.send((self.id, event)) {
|
||||
Ok(_) => {}
|
||||
Err(_) => error!("Failed to send event to bus from endpoint #{}", self.id),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue