tokio-rs/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2026-09-07 00:00:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

threadpool: rename inner to something more descriptive (#768)

Browse Source 
`inner` is a fitting name for variables of type named `Inner`, but in other cases I find them confusing - sometimes `inner` refers to a `Pool`, sometimes to a `Sender`. I renamed a bunch of variables named `inner` to be more descriptive.

This PR is the first step in an effort of splitting https://github.com/tokio-rs/tokio/pull/722#issuecomment-439552671 into multiple PRs.
This commit is contained in:
Stjepan Glavina
2018-11-20 20:05:14 +01:00
committed by GitHub
parent 3658e10045
commit 9c037044c4
9 changed files with 100 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tokio-threadpool/src/sender.rs
+7 -7
View File
@@ -23,7 +23,7 @@ use futures::{future, Future};
/// [`ThreadPool::sender`]: struct.ThreadPool.html#method.sender
#[derive(Debug)]
pub struct Sender {
pub(crate) inner: Arc<Pool>,
pub(crate) pool: Arc<Pool>,
}
impl Sender {
@@ -85,7 +85,7 @@ impl Sender {
/// Logic to prepare for spawning
fn prepare_for_spawn(&self) -> Result<(), SpawnError> {
let mut state: pool::State = self.inner.state.load(Acquire).into();
let mut state: pool::State = self.pool.state.load(Acquire).into();
// Increment the number of futures spawned on the pool as well as
// validate that the pool is still running/
@@ -104,7 +104,7 @@ impl Sender {
next.inc_num_futures();
let actual = self.inner.state.compare_and_swap(
let actual = self.pool.state.compare_and_swap(
state.into(), next.into(), AcqRel).into();
if actual == state {
@@ -135,7 +135,7 @@ impl tokio_executor::Executor for Sender {
impl<'a> tokio_executor::Executor for &'a Sender {
fn status(&self) -> Result<(), tokio_executor::SpawnError> {
let state: pool::State = self.inner.state.load(Acquire).into();
let state: pool::State = self.pool.state.load(Acquire).into();
if state.num_futures() == MAX_FUTURES {
// No capacity
@@ -161,7 +161,7 @@ impl<'a> tokio_executor::Executor for &'a Sender {
// Create a new task for the future
let task = Arc::new(Task::new(future));
self.inner.submit_to_random(task, &self.inner);
self.pool.submit_to_random(task, &self.pool);
Ok(())
}
@@ -189,7 +189,7 @@ where T: Future<Item = (), Error = ()> + Send + 'static,
impl Clone for Sender {
#[inline]
fn clone(&self) -> Sender {
let inner = self.inner.clone();
Sender { inner }
let pool = self.pool.clone();
Sender { pool }
}
}