about summary refs log tree commit diff
path: root/src/rt
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2011-12-20 20:57:04 -0800
committerBrian Anderson <banderson@mozilla.com>2011-12-20 20:57:04 -0800
commitdedfef4c4c7a5e2d3f36d4301bfd9f7e1af21640 (patch)
tree01b407d906d741edb463522309b3fd2cb1363100 /src/rt
parent854daaec0c4cf0c236e46b45a1254c85a8b352db (diff)
downloadrust-dedfef4c4c7a5e2d3f36d4301bfd9f7e1af21640.tar.gz
rust-dedfef4c4c7a5e2d3f36d4301bfd9f7e1af21640.zip
Revert "wip"
This reverts commit aeadc6269ef76f4425a49d892ceac7ea311ef5c1.
Diffstat (limited to 'src/rt')
-rw-r--r--src/rt/circular_buffer.h2
-rw-r--r--src/rt/rust_task.cpp12
-rw-r--r--src/rt/rust_task.h1
3 files changed, 1 insertions, 14 deletions
diff --git a/src/rt/circular_buffer.h b/src/rt/circular_buffer.h
index ae08c0c6074..f06e700b2f8 100644
--- a/src/rt/circular_buffer.h
+++ b/src/rt/circular_buffer.h
@@ -7,7 +7,7 @@
 
 class
 circular_buffer : public kernel_owned<circular_buffer> {
-    static const size_t INITIAL_CIRCULAR_BUFFER_SIZE_IN_UNITS = 1;
+    static const size_t INITIAL_CIRCULAR_BUFFER_SIZE_IN_UNITS = 8;
     static const size_t MAX_CIRCULAR_BUFFER_SIZE = 1 << 24;
 
 public:
diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp
index 89570782942..2e6c41a8e79 100644
--- a/src/rt/rust_task.cpp
+++ b/src/rt/rust_task.cpp
@@ -404,9 +404,6 @@ rust_task::yield(size_t time_in_us, bool *killed) {
         *killed = true;
     }
 
-    // We're not going to need any extra stack for a while
-    clear_stack_cache();
-
     yield_timer.reset_us(time_in_us);
 
     // Return to the scheduler.
@@ -750,15 +747,6 @@ rust_task::del_stack() {
 }
 
 void
-rust_task::clear_stack_cache() {
-    A(sched, stk != NULL, "Expected to have a stack");
-    if (stk->prev != NULL) {
-        free_stk(this, stk->prev);
-        stk->prev = NULL;
-    }
-}
-
-void
 rust_task::record_stack_limit() {
     // The function prolog compares the amount of stack needed to the end of
     // the stack. As an optimization, when the frame size is less than 256
diff --git a/src/rt/rust_task.h b/src/rt/rust_task.h
index ba116c5a7bc..21d20691ac6 100644
--- a/src/rt/rust_task.h
+++ b/src/rt/rust_task.h
@@ -203,7 +203,6 @@ rust_task : public kernel_owned<rust_task>, rust_cond
     void reset_stack_limit();
     bool on_rust_stack();
     void check_stack_canary();
-    void clear_stack_cache();
 };
 
 //