Skip to content

Commit 9b0ea6b

Browse files
committed
---
yaml --- r: 6897 b: refs/heads/master c: dedfef4 h: refs/heads/master i: 6895: 490000c v: v3
1 parent 44560bd commit 9b0ea6b

File tree

6 files changed

+2
-89
lines changed

6 files changed

+2
-89
lines changed

[refs]

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 854daaec0c4cf0c236e46b45a1254c85a8b352db
2+
refs/heads/master: dedfef4c4c7a5e2d3f36d4301bfd9f7e1af21640

trunk/src/libcore/core.rs

-14
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import option::{some, none};
77
import option = option::t;
88
export option, some, none;
9-
export repeat;
109

1110
// Export the log levels as global constants. Higher levels mean
1211
// more-verbosity. Error is the bottom level, default logging level is
@@ -16,16 +15,3 @@ const error : int = 0;
1615
const warn : int = 1;
1716
const info : int = 2;
1817
const debug : int = 3;
19-
20-
/*
21-
Function: repeat
22-
23-
Execute a function for a set number of times
24-
*/
25-
fn repeat(times: uint, f: block()) {
26-
let i = 0u;
27-
while i < times {
28-
f();
29-
i += 1u;
30-
}
31-
}

trunk/src/rt/circular_buffer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class
99
circular_buffer : public kernel_owned<circular_buffer> {
10-
static const size_t INITIAL_CIRCULAR_BUFFER_SIZE_IN_UNITS = 1;
10+
static const size_t INITIAL_CIRCULAR_BUFFER_SIZE_IN_UNITS = 8;
1111
static const size_t MAX_CIRCULAR_BUFFER_SIZE = 1 << 24;
1212

1313
public:

trunk/src/rt/rust_task.cpp

-12
Original file line numberDiff line numberDiff line change
@@ -404,9 +404,6 @@ rust_task::yield(size_t time_in_us, bool *killed) {
404404
*killed = true;
405405
}
406406

407-
// We're not going to need any extra stack for a while
408-
clear_stack_cache();
409-
410407
yield_timer.reset_us(time_in_us);
411408

412409
// Return to the scheduler.
@@ -749,15 +746,6 @@ rust_task::del_stack() {
749746
record_stack_limit();
750747
}
751748

752-
void
753-
rust_task::clear_stack_cache() {
754-
A(sched, stk != NULL, "Expected to have a stack");
755-
if (stk->prev != NULL) {
756-
free_stk(this, stk->prev);
757-
stk->prev = NULL;
758-
}
759-
}
760-
761749
void
762750
rust_task::record_stack_limit() {
763751
// The function prolog compares the amount of stack needed to the end of

trunk/src/rt/rust_task.h

-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ rust_task : public kernel_owned<rust_task>, rust_cond
203203
void reset_stack_limit();
204204
bool on_rust_stack();
205205
void check_stack_canary();
206-
void clear_stack_cache();
207206
};
208207

209208
//

trunk/src/test/bench/task-perf-one-million.rs

-60
This file was deleted.

0 commit comments

Comments
 (0)