---

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

Author: Elly Jones

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dedfef4c4c7a5e2d3f36d4301bfd9f7e1af21640
+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/rt/rust_kernel.cpp

@@ -150,11 +150,13 @@ rust_kernel::fail() {
 
 rust_task_id
 rust_kernel::create_task(rust_task *spawner, const char *name) {
-    scoped_lock with(_kernel_lock);
     rust_scheduler *thread = threads[isaac_rand(&rctx) % num_threads];
     rust_task *t = thread->create_task(spawner, name);
-    t->user.id = max_id++;
-    task_table.put(t->user.id, t);
+    {
+        scoped_lock with(_kernel_lock);
+        t->user.id = max_id++;
+        task_table.put(t->user.id, t);
+    }
     return t->user.id;
 }
 

trunk/src/rt/rust_task.cpp

@@ -397,6 +397,16 @@ 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) {

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);