---

yaml
---
r: 6896
b: refs/heads/master
c: bbc534b
h: refs/heads/master
v: v3

Author: Elly Jones

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aeadc6269ef76f4425a49d892ceac7ea311ef5c1
+refs/heads/master: bbc534bcccfc1904104a1fa275a6a873a7675cd1

trunk/src/cargo/cargo.rs

@@ -31,6 +31,7 @@ type package = {
     uuid: str,
     url: str,
     method: str,
+    ref: option::t<str>,
     tags: [str]
 };
 
@@ -242,6 +243,11 @@ fn load_one_source_package(&src: source, p: map::hashmap<str, json::json>) {
         }
     };
 
+    let ref = alt p.find("ref") {
+        some(json::string(_n)) { some(_n) }
+        _ { none }
+    };
+
     let tags = [];
     alt p.find("tags") {
         some(json::list(js)) {
@@ -260,6 +266,7 @@ fn load_one_source_package(&src: source, p: map::hashmap<str, json::json>) {
         uuid: uuid,
         url: url,
         method: method,
+        ref: ref,
         tags: tags
     });
     log "  Loaded package: " + src.name + "/" + name;
@@ -398,8 +405,14 @@ fn install_source(c: cargo, path: str) {
     }
 }
 
-fn install_git(c: cargo, wd: str, url: str) {
+fn install_git(c: cargo, wd: str, url: str, ref: option::t<str>) {
     run::run_program("git", ["clone", url, wd]);
+    if option::is_some::<str>(ref) {
+        let r = option::get::<str>(ref);
+        fs::change_dir(wd);
+        run::run_program("git", ["checkout", r]);
+    }
+
     install_source(c, wd);
 }
 
@@ -424,7 +437,7 @@ fn install_file(c: cargo, wd: str, path: str) {
 fn install_package(c: cargo, wd: str, pkg: package) {
     info("Installing with " + pkg.method + " from " + pkg.url + "...");
     if pkg.method == "git" {
-        install_git(c, wd, pkg.url);
+        install_git(c, wd, pkg.url, pkg.ref);
     } else if pkg.method == "http" {
         install_curl(c, wd, pkg.url);
     } else if pkg.method == "file" {

trunk/src/cargo/sources.json

@@ -3,7 +3,7 @@
 		"url": "https://raw.github.com/graydon/cargo-central/master/packages.json"
 	},
 	"elly": {
-		"url": "https://raw.github.com/elly/rust-packages/master/packages.json",
+		"url": "https://raw.github.com/elly/rust-packages/master/packages.json"
 		"sig": "https://raw.github.com/elly/rust-packages/master/packages.json.sig",
 		"key": "https://raw.github.com/elly/rust-packages/master/signing-key.gpg",
 		"keyfp": "4107 21C0 FF32 858F 61FF  33F6 E595 8E36 FDC8 EA00"

trunk/src/libcore/core.rs

@@ -6,7 +6,6 @@
 import option::{some,  none};
 import option = option::t;
 export option, some, none;
-export repeat;
 
 // Export the log levels as global constants. Higher levels mean
 // more-verbosity. Error is the bottom level, default logging level is
@@ -16,16 +15,3 @@ const error : int = 0;
 const warn : int = 1;
 const info : int = 2;
 const debug : int = 3;
-
-/*
-Function: repeat
-
-Execute a function for a set number of times
-*/
-fn repeat(times: uint, f: block()) {
-    let i = 0u;
-    while i < times {
-        f();
-        i += 1u;
-    }
-}

trunk/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:

trunk/src/rt/rust_task.cpp

@@ -397,16 +397,23 @@ void rust_task::start()
     sched->lock.signal();
 }
 
+void
+rust_task::grow(size_t n_frame_bytes)
+{
+    // FIXME (issue #151): Just fail rather than almost certainly crashing
+    // mysteriously later. The commented-out logic below won't work at all in
+    // the presence of non-word-aligned pointers.
+    abort();
+
+}
+
 // Only run this on the rust stack
 void
 rust_task::yield(size_t time_in_us, bool *killed) {
     if (this->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.
@@ -749,15 +756,6 @@ rust_task::del_stack() {
     record_stack_limit();
 }
 
-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

trunk/src/rt/rust_task.h

@@ -138,6 +138,7 @@ rust_task : public kernel_owned<rust_task>, rust_cond
     void start(uintptr_t spawnee_fn,
                uintptr_t args);
     void start();
+    void grow(size_t n_frame_bytes);
     bool running();
     bool blocked();
     bool blocked_on(rust_cond *cond);
@@ -203,7 +204,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();
 };
 
 //