github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-12-18 17:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Enable Mercury to be shut down and all pending requests being cancelled.

Browse source
This commit is contained in:
Konstantin Seiler 2020-01-23 01:14:43 +11:00
parent b6c676ad60
commit 3fe3849588
2 changed files with 30 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
core/src/mercury/mod.rs
View file

@ -20,6 +20,7 @@ component! {
sequence: SeqGenerator<u64> = SeqGenerator::new(0), sequence: SeqGenerator<u64> = SeqGenerator::new(0),
pending: HashMap<Vec<u8>, MercuryPending> = HashMap::new(), pending: HashMap<Vec<u8>, MercuryPending> = HashMap::new(),
subscriptions: Vec<(String, mpsc::UnboundedSender<MercuryResponse>)> = Vec::new(), subscriptions: Vec<(String, mpsc::UnboundedSender<MercuryResponse>)> = Vec::new(),
is_shutdown: bool = false,
} }
} }
@ -61,7 +62,11 @@ impl MercuryManager {
}; };
let seq = self.next_seq(); let seq = self.next_seq();
self.lock(|inner| inner.pending.insert(seq.clone(), pending)); self.lock(|inner| {
if !inner.is_shutdown {
inner.pending.insert(seq.clone(), pending);
}
});
let cmd = req.method.command(); let cmd = req.method.command();
let data = req.encode(&seq); let data = req.encode(&seq);
@ -109,21 +114,23 @@ impl MercuryManager {
let (tx, rx) = mpsc::unbounded(); let (tx, rx) = mpsc::unbounded();
manager.lock(move |inner| { manager.lock(move |inner| {
debug!("subscribed uri={} count={}", uri, response.payload.len()); if !inner.is_shutdown {
if response.payload.len() > 0 { debug!("subscribed uri={} count={}", uri, response.payload.len());
// Old subscription protocol, watch the provided list of URIs if response.payload.len() > 0 {
for sub in response.payload { // Old subscription protocol, watch the provided list of URIs
let mut sub: protocol::pubsub::Subscription = for sub in response.payload {
protobuf::parse_from_bytes(&sub).unwrap(); let mut sub: protocol::pubsub::Subscription =
let sub_uri = sub.take_uri(); protobuf::parse_from_bytes(&sub).unwrap();
let sub_uri = sub.take_uri();
debug!("subscribed sub_uri={}", sub_uri); debug!("subscribed sub_uri={}", sub_uri);
inner.subscriptions.push((sub_uri, tx.clone())); inner.subscriptions.push((sub_uri, tx.clone()));
}
} else {
// New subscription protocol, watch the requested URI
inner.subscriptions.push((uri, tx));
} }
} else {
// New subscription protocol, watch the requested URI
inner.subscriptions.push((uri, tx));
} }
}); });
@ -222,4 +229,13 @@ impl MercuryManager {
} }
} }
} }
pub(crate) fn shutdown(&self) {
self.lock(|inner| {
inner.is_shutdown = true;
// destroy the sending halves of the channels to signal everyone who is waiting for something.
inner.pending.clear();
inner.subscriptions.clear();
});
}
} }

1
core/src/session.rs
View file

@ -237,6 +237,7 @@ impl Session {
pub fn shutdown(&self) { pub fn shutdown(&self) {
debug!("Invalidating session[{}]", self.0.session_id); debug!("Invalidating session[{}]", self.0.session_id);
self.0.data.write().unwrap().invalid = true; self.0.data.write().unwrap().invalid = true;
self.mercury().shutdown();
} }
pub fn is_invalid(&self) -> bool { pub fn is_invalid(&self) -> bool {