---

yaml
---
r: 14172
b: refs/heads/try
c: d493438
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: d90a9d3da0f8c77d98bd38148d78db95f7f8fc5a
+refs/heads/try: d493438c9805ff82b45aa5c40941c05311794130
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rt/rust_task.cpp

@@ -673,6 +673,17 @@ rust_task::record_stack_limit() {
     record_sp(stk->data + LIMIT_OFFSET + RED_ZONE_SIZE);
 }
 
+static bool
+sp_in_stk_seg(uintptr_t sp, stk_seg *stk) {
+    // Not positive these bounds for sp are correct.  I think that the first
+    // possible value for esp on a new stack is stk->end, which points to the
+    // address before the first value to be pushed onto a new stack. The last
+    // possible address we can push data to is stk->data.  Regardless, there's
+    // so much slop at either end that we should never hit one of these
+    // boundaries.
+    return (uintptr_t)stk->data <= sp && sp <= stk->end;
+}
+
 /*
 Called by landing pads during unwinding to figure out which
 stack segment we are currently running on, delete the others,
@@ -700,6 +711,25 @@ rust_task::config_notify(chan_handle chan) {
     notify_chan = chan;
 }
 
+/*
+Returns true if we're currently running on the Rust stack
+ */
+bool
+rust_task::on_rust_stack() {
+    uintptr_t sp = get_sp();
+    bool in_first_segment = sp_in_stk_seg(sp, stk);
+    if (in_first_segment) {
+        return true;
+    } else if (stk->next != NULL) {
+        // This happens only when calling the upcall to delete
+        // a stack segment
+        bool in_second_segment = sp_in_stk_seg(sp, stk->next);
+        return in_second_segment;
+    } else {
+        return false;
+    }
+}
+
 //
 // Local Variables:
 // mode: C++

branches/try/src/rt/rust_task.h

@@ -198,6 +198,8 @@ rust_task : public kernel_owned<rust_task>, rust_cond
     void call_on_rust_stack(void *args, void *fn_ptr);
 };
 
+// This stuff is on the stack-switching fast path
+
 // Get a rough approximation of the current stack pointer
 extern "C" uintptr_t get_sp();
 
@@ -226,7 +228,8 @@ sanitize_next_sp(uintptr_t next_sp) {
 
 inline void
 rust_task::call_on_c_stack(void *args, void *fn_ptr) {
-    I(thread, on_rust_stack());
+    // Too expensive to check
+    // I(thread, on_rust_stack());
 
     next_rust_sp = get_sp();
 
@@ -252,7 +255,8 @@ rust_task::call_on_c_stack(void *args, void *fn_ptr) {
 
 inline void
 rust_task::call_on_rust_stack(void *args, void *fn_ptr) {
-    I(thread, !on_rust_stack());
+    // Too expensive to check
+    // I(thread, !on_rust_stack());
     I(thread, next_rust_sp);
 
     next_c_sp = get_sp();
@@ -264,43 +268,14 @@ rust_task::call_on_rust_stack(void *args, void *fn_ptr) {
 
 inline void
 rust_task::return_c_stack() {
-    I(thread, on_rust_stack());
+    // Too expensive to check
+    // I(thread, on_rust_stack());
     I(thread, c_stack != NULL);
     thread->return_c_stack(c_stack);
     c_stack = NULL;
     next_c_sp = 0;
 }
 
-inline bool
-sp_in_stk_seg(uintptr_t sp, stk_seg *stk) {
-    // Not positive these bounds for sp are correct.  I think that the first
-    // possible value for esp on a new stack is stk->end, which points to the
-    // address before the first value to be pushed onto a new stack. The last
-    // possible address we can push data to is stk->data.  Regardless, there's
-    // so much slop at either end that we should never hit one of these
-    // boundaries.
-    return (uintptr_t)stk->data <= sp && sp <= stk->end;
-}
-
-/*
-Returns true if we're currently running on the Rust stack
- */
-inline bool
-rust_task::on_rust_stack() {
-    uintptr_t sp = get_sp();
-    bool in_first_segment = sp_in_stk_seg(sp, stk);
-    if (in_first_segment) {
-        return true;
-    } else if (stk->next != NULL) {
-        // This happens only when calling the upcall to delete
-        // a stack segment
-        bool in_second_segment = sp_in_stk_seg(sp, stk->next);
-        return in_second_segment;
-    } else {
-        return false;
-    }
-}
-
 //
 // Local Variables:
 // mode: C++

branches/try/src/rt/rust_task_thread.h

@@ -150,6 +150,8 @@ rust_task_thread::get_log() {
     return _log;
 }
 
+// This stuff is on the stack-switching fast path
+
 #ifndef __WIN32__
 
 inline rust_task *