Fix simultaneous discovery subscription

This commit is contained in:
Andrew committed 2023-08-04 16:33:39 +07:00
1 parent 2484b8753b
commit 374b399631
3 files changed
+37 -23

No files matched your search

@@ -295,6 +295,7 @@ impl Poller {
if occ_entry.get().is_closed() {
occ_entry.insert(tx);
} else {
// log::error!("Failed to subscribe in bcconn to {:?} for {:?}", msg_num, msg_id);
let _ = tx
.send(Err(Error::SimultaneousSubscription { msg_num }))
.await;
@@ -78,12 +78,14 @@ lazy_static! {
}
type Subscriber = Arc<RwLock<BTreeMap<u32, Sender<Result<(UdpDiscovery, SocketAddr)>>>>>;
type Handlers = Arc<RwLock<Vec<Sender<Result<(UdpDiscovery, SocketAddr)>>>>>;
type ArcFramedSocket = UdpFramed<BcUdpCodex, Arc<UdpSocket>>;
pub(crate) struct Discoverer {
socket: Arc<UdpSocket>,
handle: RwLock<JoinSet<()>>,
writer: Sender<Result<(BcUdp, SocketAddr)>>,
subsribers: Subscriber,
handlers: Handlers,
local_addr: SocketAddr,
}
@@ -96,26 +98,27 @@ impl Discoverer {
let (mut writer, mut reader) = inner.split();
let mut set = JoinSet::new();
let subsribers: Subscriber = Default::default();
let handlers: Handlers = Default::default();
let thread_subscriber = subsribers.clone();
let thread_handlers = handlers.clone();
set.spawn(async move {
loop {
tokio::task::yield_now().await;
match reader.next().await {
Some(Ok((BcUdp::Discovery(bcudp), addr))) => {
let mut tid = bcudp.tid;
let tid = bcudp.tid;
let mut needs_removal = false;
if let Some(sender) = thread_subscriber.read().await.get(&tid) {
if let (Some(sender), true) =
(thread_subscriber.read().await.get(&tid), tid > 0)
{
if sender.send(Ok((bcudp, addr))).await.is_err() {
needs_removal = true;
}
} else if let Some(any_sender) = thread_subscriber.read().await.get(&0) {
if any_sender.send(Ok((bcudp, addr))).await.is_err() {
tid = 0; // To make is remove 0
needs_removal = true;
}
} else {
trace!("Udp Discovery got this unexpected BcUdp {:?}", bcudp);
for sender in thread_handlers.write().await.iter_mut() {
let _ = sender.send(Ok((bcudp.clone(), addr))).await;
}
}
if needs_removal {
thread_subscriber.write().await.remove(&tid);
@@ -148,6 +151,7 @@ impl Discoverer {
handle: RwLock::new(set),
writer: sinker,
subsribers,
handlers,
local_addr,
})
}
@@ -157,24 +161,33 @@ impl Discoverer {
}
async fn subscribe(&self, tid: u32) -> Result<Receiver<Result<(UdpDiscovery, SocketAddr)>>> {
let mut subs = self.subsribers.write().await;
match subs.entry(tid) {
Entry::Vacant(vacant) => {
let (tx, rx) = channel(10);
vacant.insert(tx);
Ok(rx)
}
Entry::Occupied(mut occ) => {
if occ.get().is_closed() {
if tid > 0 {
let mut subs = self.subsribers.write().await;
match subs.entry(tid) {
Entry::Vacant(vacant) => {
let (tx, rx) = channel(10);
occ.insert(tx);
vacant.insert(tx);
Ok(rx)
} else {
Err(Error::SimultaneousSubscription {
msg_num: Some(tid as u16),
})
}
Entry::Occupied(mut occ) => {
if occ.get().is_closed() {
let (tx, rx) = channel(10);
occ.insert(tx);
Ok(rx)
} else {
// log::error!("Failed to subscribe in discovery to {:?}", tid);
Err(Error::SimultaneousSubscription {
msg_num: Some(tid as u16),
})
}
}
}
} else {
// If tid is zero we listen to all!
let mut handlers = self.handlers.write().await;
let (tx, rx) = channel(10);
handlers.push(tx);
Ok(rx)
}
}
+1 -1
View File
@@ -52,7 +52,7 @@ fn bcudp_ack<'a, W: 'a + Write>(
le_u32(0),
le_u32(payload.group_id),
le_u32(payload.packet_id),
le_u32(0xd7160000),
le_u32(0),
le_u32(binary_payload.len() as u32),
slice(binary_payload),
))