Skip to content
Merged
Changes from all commits
Commits
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
34 changes: 17 additions & 17 deletions src/libstd/rt/sched.rs
Original file line number Diff line number Diff line change
Expand Up @@ -381,52 +381,44 @@ impl Scheduler {
match home {
&Some(Sched(ref home_handle))
if home_handle.sched_id != this.sched_id() => {
0
SendHome
}
&Some(AnySched) if this.run_anything => {
1
ResumeNow
}
&Some(AnySched) => {
2
Requeue
}
&Some(Sched(_)) => {
3
ResumeNow
}
&None => {
4
Homeless
}
}
};

match action_id {
0 => {
SendHome => {
rtdebug!("sending task home");
Scheduler::send_task_home(task);
Local::put(this);
return false;
}
1 => {
ResumeNow => {
rtdebug!("resuming now");
this.resume_task_immediately(task);
return true;
}
2 => {
Requeue => {
rtdebug!("re-queueing")
this.enqueue_task(task);
Local::put(this);
return false;
}
3 => {
rtdebug!("resuming now");
this.resume_task_immediately(task);
return true;
}
4 => {
Homeless => {
rtabort!("task home was None!");
}
_ => {
rtabort!("literally, you should not be here");
}
}
}

Expand Down Expand Up @@ -654,6 +646,14 @@ impl Scheduler {
}
}

// The cases for the below function.
enum ResumeAction {
SendHome,
Requeue,
ResumeNow,
Homeless
}

impl SchedHandle {
pub fn send(&mut self, msg: SchedMessage) {
self.queue.push(msg);
Expand Down