Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rt: remove unnecessary enum in basic_scheduler #4462

Merged
merged 2 commits into from
Feb 3, 2022
Merged

rt: remove unnecessary enum in basic_scheduler #4462

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6e1f28
rt: remove unnecessary enum in basic_scheduler
carllerche Feb 2, 2022
231acc7
fmt
carllerche Feb 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 13 additions & 39 deletions tokio/src/runtime/basic_scheduler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,23 +64,10 @@ pub(crate) struct Spawner {
shared: Arc<Shared>,
}

/// A remote scheduler entry.
///
/// These are filled in by remote threads sending instructions to the scheduler.
enum RemoteMsg {
/// A remote thread wants to spawn a task.
Schedule(task::Notified<Arc<Shared>>),
}

// Safety: Used correctly, the task header is "thread safe". Ultimately the task
// is owned by the current thread executor, for which this instruction is being
// sent.
unsafe impl Send for RemoteMsg {}

/// Scheduler state shared between threads.
struct Shared {
/// Remote run queue. None if the `Runtime` has been dropped.
queue: Mutex<Option<VecDeque<RemoteMsg>>>,
queue: Mutex<Option<VecDeque<task::Notified<Arc<Shared>>>>>,

/// Collection of all active tasks spawned onto this executor.
owned: OwnedTasks<Arc<Shared>>,
Expand Down Expand Up @@ -251,12 +238,8 @@ impl Drop for BasicScheduler {
// Using `Option::take` to replace the shared queue with `None`.
// We already shut down every task, so we just need to drop the task.
if let Some(remote_queue) = remote_queue {
for entry in remote_queue {
match entry {
RemoteMsg::Schedule(task) => {
drop(task);
}
}
for task in remote_queue {
drop(task);
}
}

Expand Down Expand Up @@ -396,7 +379,7 @@ impl Spawner {
handle
}

fn pop(&self) -> Option<RemoteMsg> {
fn pop(&self) -> Option<task::Notified<Arc<Shared>>> {
match self.shared.queue.lock().as_mut() {
Some(queue) => queue.pop_front(),
None => None,
Expand Down Expand Up @@ -470,7 +453,7 @@ impl Schedule for Arc<Shared> {
// don't need to do anything with the notification in that case.
let mut guard = self.queue.lock();
if let Some(queue) = guard.as_mut() {
queue.push_back(RemoteMsg::Schedule(task));
queue.push_back(task);
drop(guard);
self.unpark.unpark();
}
Expand Down Expand Up @@ -528,17 +511,12 @@ impl CoreGuard<'_> {
core.tick = core.tick.wrapping_add(1);

let entry = if tick % REMOTE_FIRST_INTERVAL == 0 {
core.spawner
.pop()
.or_else(|| core.tasks.pop_front().map(RemoteMsg::Schedule))
core.spawner.pop().or_else(|| core.tasks.pop_front())
} else {
core.tasks
.pop_front()
.map(RemoteMsg::Schedule)
.or_else(|| core.spawner.pop())
core.tasks.pop_front().or_else(|| core.spawner.pop())
};

let entry = match entry {
let task = match entry {
Some(entry) => entry,
None => {
core = context.park(core);
Expand All @@ -548,17 +526,13 @@ impl CoreGuard<'_> {
}
};

match entry {
RemoteMsg::Schedule(task) => {
let task = context.spawner.shared.owned.assert_owner(task);
let task = context.spawner.shared.owned.assert_owner(task);

let (c, _) = context.run_task(core, || {
task.run();
});
let (c, _) = context.run_task(core, || {
task.run();
});

core = c;
}
}
core = c;
}

// Yield to the driver, this drives the timer and pulls any
Expand Down