about summary refs log tree commit diff
path: root/src/rt/rust_scheduler.cpp
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2011-11-16 18:49:19 -0800
committerBrian Anderson <banderson@mozilla.com>2011-11-16 18:49:19 -0800
commit02cebbb9f1d30fbad2b82ac1599c593b5af95019 (patch)
tree160396218b7d7b7502fb7e8b36eeaef52a037a22 /src/rt/rust_scheduler.cpp
parent5559e149e492efadd803eb65f34c259a90c595e7 (diff)
downloadrust-02cebbb9f1d30fbad2b82ac1599c593b5af95019.tar.gz
rust-02cebbb9f1d30fbad2b82ac1599c593b5af95019.zip
Revert "rt: More work on morestack"
This reverts commit 68aff2ad6d55a051e9347aa38f945d114f282691.
Diffstat (limited to 'src/rt/rust_scheduler.cpp')
-rw-r--r--src/rt/rust_scheduler.cpp10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/rt/rust_scheduler.cpp b/src/rt/rust_scheduler.cpp
index b17565dda46..6a88c2f2417 100644
--- a/src/rt/rust_scheduler.cpp
+++ b/src/rt/rust_scheduler.cpp
@@ -1,7 +1,6 @@
 
 #include <stdarg.h>
 #include <cassert>
-#include <pthread.h>
 #include "rust_internal.h"
 #include "globals.h"
 
@@ -13,9 +12,6 @@ DWORD rust_scheduler::task_key;
 
 bool rust_scheduler::tls_initialized = false;
 
-// Defined in arch/*/record_sp.S.
-extern "C" void rust_record_sp(uintptr_t sp);
-
 rust_scheduler::rust_scheduler(rust_kernel *kernel,
                                rust_srv *srv,
                                int id) :
@@ -289,8 +285,6 @@ rust_scheduler::start_main_loop() {
              scheduled_task->state->name);
 
         place_task_in_tls(scheduled_task);
-        rust_record_sp(scheduled_task->stk->limit);
-        //pthread_setspecific(89, (void *)scheduled_task->stk->limit);
 
         interrupt_flag = 0;
 
@@ -380,8 +374,6 @@ rust_scheduler::place_task_in_tls(rust_task *task) {
 
 rust_task *
 rust_scheduler::get_task() {
-    if (!tls_initialized)
-        return NULL;
     rust_task *task = reinterpret_cast<rust_task *>
         (pthread_getspecific(task_key));
     assert(task && "Couldn't get the task from TLS!");
@@ -403,8 +395,6 @@ rust_scheduler::place_task_in_tls(rust_task *task) {
 
 rust_task *
 rust_scheduler::get_task() {
-    if (!tls_initialized)
-        return NULL;
     rust_task *task = reinterpret_cast<rust_task *>(TlsGetValue(task_key));
     assert(task && "Couldn't get the task from TLS!");
     return task;