---

yaml
---
r: 6394
b: refs/heads/master
c: 0dfa141
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63d40b8ab661ae1921bac26e0e4c72fb0ce57586
+refs/heads/master: 0dfa1410d3bbe6eb30e2e97b8eeb2b403ac25660

trunk/src/rt/rust_scheduler.cpp

@@ -343,7 +343,6 @@ rust_scheduler::create_task(rust_task *spawner, const char *name) {
                         task, spawner ? spawner->name : "null", name);
     if(spawner) {
         task->pin(spawner->pinned_on);
-        task->on_wakeup(spawner->_on_wakeup);
     }
 
     {

trunk/src/rt/rust_task.cpp

@@ -115,7 +115,6 @@ rust_task::rust_task(rust_scheduler *sched, rust_task_list *state,
     running_on(-1),
     pinned_on(-1),
     local_region(&sched->srv->local_region),
-    _on_wakeup(NULL),
     failed(false),
     killed(false),
     propagate_failure(true),
@@ -456,10 +455,6 @@ rust_task::wakeup(rust_cond *from) {
     cond = NULL;
     cond_name = "none";
 
-    if(_on_wakeup) {
-        _on_wakeup->on_wakeup();
-    }
-
     sched->lock.signal();
 }
 
@@ -523,10 +518,6 @@ void rust_task::unpin() {
     pinned_on = -1;
 }
 
-void rust_task::on_wakeup(rust_task::wakeup_callback *callback) {
-    _on_wakeup = callback;
-}
-
 rust_port_id rust_task::register_port(rust_port *port) {
     I(sched, !lock.lock_held_by_current_thread());
     scoped_lock with(lock);

trunk/src/rt/rust_task.h

@@ -106,13 +106,6 @@ rust_task : public kernel_owned<rust_task>, rust_cond
 
     memory_region local_region;
 
-    class wakeup_callback {
-    public:
-        virtual void on_wakeup() = 0;
-    };
-
-    wakeup_callback *_on_wakeup;
-
     // Indicates that the task ended in failure
     bool failed;
     // Indicates that the task was killed and needs to unwind
@@ -189,8 +182,6 @@ rust_task : public kernel_owned<rust_task>, rust_cond
     void pin(int id);
     void unpin();
 
-    void on_wakeup(wakeup_callback *callback);
-
     rust_port_id register_port(rust_port *port);
     void release_port(rust_port_id id);
     rust_port *get_port_by_id(rust_port_id id);