Skip to content

Commit fa13fd9

Browse files
committed
rt: Remove set_min_stack
1 parent cad4918 commit fa13fd9

File tree

6 files changed

+1
-33
lines changed

6 files changed

+1
-33
lines changed

src/rt/rust_builtin.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -445,13 +445,6 @@ migrate_alloc(void *alloc, rust_task_id tid) {
445445
}
446446
}
447447

448-
// defined in rust_task.cpp
449-
extern size_t g_custom_min_stack_size;
450-
extern "C" CDECL void
451-
set_min_stack(uintptr_t stack_size) {
452-
g_custom_min_stack_size = stack_size;
453-
}
454-
455448
extern "C" CDECL int
456449
sched_threads() {
457450
rust_task *task = rust_scheduler::get_task();

src/rt/rust_task.cpp

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,6 @@ const uint8_t stack_canary[] = {0xAB, 0xCD, 0xAB, 0xCD,
6565
0xAB, 0xCD, 0xAB, 0xCD,
6666
0xAB, 0xCD, 0xAB, 0xCD};
6767

68-
// Stack size
69-
size_t g_custom_min_stack_size = 0;
70-
71-
static size_t
72-
get_min_stk_size(size_t default_size) {
73-
if (g_custom_min_stack_size != 0) {
74-
return g_custom_min_stack_size;
75-
} else {
76-
return default_size;
77-
}
78-
}
79-
8068
static size_t
8169
get_next_stk_size(rust_scheduler *sched, rust_task *task,
8270
size_t min, size_t current, size_t requested) {
@@ -157,7 +145,7 @@ new_stk(rust_scheduler *sched, rust_task *task, size_t requested_sz)
157145
}
158146

159147
// The minimum stack size, in bytes, of a Rust stack, excluding red zone
160-
size_t min_sz = get_min_stk_size(sched->min_stack_size);
148+
size_t min_sz = sched->min_stack_size;
161149

162150
// Try to reuse an existing stack segment
163151
if (task->stk != NULL && task->stk->prev != NULL) {

src/rt/rustrt.def.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ rust_getcwd
4949
rust_task_is_unwinding
5050
rust_task_sleep
5151
rust_get_task
52-
set_min_stack
5352
sched_threads
5453
shape_log_str
5554
squareroot

src/test/run-fail/morestack4.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44

55
use std;
66

7-
native mod rustrt {
8-
fn set_min_stack(size: uint);
9-
}
10-
117
fn getbig_and_fail(&&i: int) {
128
let r = and_then_get_big_again(@0);
139
if i != 0 {
@@ -21,7 +17,6 @@ resource and_then_get_big_again(_i: @int) {
2117
}
2218

2319
fn main() {
24-
rustrt::set_min_stack(256u);
2520
task::spawn {||
2621
getbig_and_fail(1);
2722
};

src/test/run-pass/morestack5.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
use std;
44
import task;
55

6-
native mod rustrt {
7-
fn set_min_stack(size: uint);
8-
}
9-
106
fn getbig(&&i: int) {
117
if i != 0 {
128
getbig(i - 1);
@@ -16,7 +12,6 @@ fn getbig(&&i: int) {
1612
fn main() {
1713
let sz = 400u;
1814
while sz < 500u {
19-
rustrt::set_min_stack(sz);
2015
task::join(task::spawn_joinable {|| getbig(200) });
2116
sz += 1u;
2217
}

src/test/run-pass/morestack6.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import task;
66
import std::rand;
77

88
native mod rustrt {
9-
fn set_min_stack(size: uint);
109
fn debug_get_stk_seg() -> *u8;
1110

1211
fn unsupervise();
@@ -71,7 +70,6 @@ fn main() {
7170
for f in fns {
7271
let sz = rng.next() % 256u32 + 256u32;
7372
let frame_backoff = rng.next() % 10u32 + 1u32;
74-
rustrt::set_min_stack(sz as uint);
7573
task::join(task::spawn_joinable {|| runtest(f, frame_backoff);});
7674
}
7775
}

0 commit comments

Comments
 (0)