forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(client): fix up should_close sentinel value

Browse Source
This commit is contained in:
Sean McArthur
2018-01-30 17:09:16 -08:00
parent 84f3076438
commit b14de9eb34
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/client/mod.rs
View File

@@ -1,6 +1,6 @@
//! HTTP Client //! HTTP Client
use std::cell::RefCell; use std::cell::{Cell, RefCell};
use std::fmt; use std::fmt;
use std::io; use std::io;
use std::marker::PhantomData; use std::marker::PhantomData;
@@ -199,10 +199,11 @@ where C: Connect,
let pool_key = Rc::new(domain.to_string()); let pool_key = Rc::new(domain.to_string());
self.connector.connect(url) self.connector.connect(url)
.and_then(move |io| { .and_then(move |io| {
let (tx, rx) = mpsc::channel(0); // 1 extra slot for possible Close message
let (tx, rx) = mpsc::channel(1);
let tx = HyperClient { let tx = HyperClient {
tx: RefCell::new(tx), tx: RefCell::new(tx),
should_close: true, should_close: Cell::new(true),
}; };
let pooled = pool.pooled(pool_key, tx); let pooled = pool.pooled(pool_key, tx);
let conn = proto::Conn::<_, _, proto::ClientTransaction, _>::new(io, pooled.clone()); let conn = proto::Conn::<_, _, proto::ClientTransaction, _>::new(io, pooled.clone());
@@ -227,6 +228,7 @@ where C: Connect,
use proto::dispatch::ClientMsg; use proto::dispatch::ClientMsg;
let (callback, rx) = oneshot::channel(); let (callback, rx) = oneshot::channel();
client.should_close.set(false);
match client.tx.borrow_mut().start_send(ClientMsg::Request(head, body, callback)) { match client.tx.borrow_mut().start_send(ClientMsg::Request(head, body, callback)) {
Ok(_) => (), Ok(_) => (),
@@ -274,7 +276,12 @@ impl<C, B> fmt::Debug for Client<C, B> {
} }
struct HyperClient<B> { struct HyperClient<B> {
should_close: bool, // A sentinel that is usually always true. If this is dropped
// while true, this will try to shutdown the dispatcher task.
//
// This should be set to false whenever it is checked out of the
// pool and successfully used to send a request.
should_close: Cell<bool>,
tx: RefCell<::futures::sync::mpsc::Sender<proto::dispatch::ClientMsg<B>>>, tx: RefCell<::futures::sync::mpsc::Sender<proto::dispatch::ClientMsg<B>>>,
} }
@@ -282,7 +289,7 @@ impl<B> Clone for HyperClient<B> {
fn clone(&self) -> HyperClient<B> { fn clone(&self) -> HyperClient<B> {
HyperClient { HyperClient {
tx: self.tx.clone(), tx: self.tx.clone(),
should_close: self.should_close, should_close: self.should_close.clone(),
} }
} }
} }
@@ -298,8 +305,8 @@ impl<B> self::pool::Ready for HyperClient<B> {
impl<B> Drop for HyperClient<B> { impl<B> Drop for HyperClient<B> {
fn drop(&mut self) { fn drop(&mut self) {
if self.should_close { if self.should_close.get() {
self.should_close = false; self.should_close.set(false);
let _ = self.tx.borrow_mut().try_send(proto::dispatch::ClientMsg::Close); let _ = self.tx.borrow_mut().try_send(proto::dispatch::ClientMsg::Close);
} }
} }