---

yaml
---
r: 15574
b: refs/heads/try
c: 9a5d197
h: refs/heads/master
v: v3

Author: olsonjeffery

[refs]

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

branches/try/src/libstd/uv_hl.rs

@@ -17,7 +17,6 @@ native mod rustrt {
     fn rust_uv_get_kernel_global_chan_ptr() -> *libc::uintptr_t;
     fn rust_uv_get_kernel_global_async_handle() -> **libc::c_void;
     fn rust_uv_set_kernel_global_async_handle(handle: *ll::uv_async_t);
-    fn rust_uv_free_kernel_global_async_handle();
 }
 
 #[doc = "

branches/try/src/rt/rust_kernel.cpp

@@ -27,8 +27,9 @@ rust_kernel::rust_kernel(rust_env *env) :
     // set up storage of pointers needed to
     // access the global loop.
     global_loop_chan = 0;
-    global_async_handle = (void**)::malloc( // FIXME--can't use this->malloc()
-        sizeof(void*));                     // .. what do?
+    int foo = 0;
+    async_handle_stub = (void*)&foo;
+    global_async_handle = &async_handle_stub;
     *global_async_handle = (void*)0;
 
     // Create the single threaded scheduler that will run on the platform's

branches/try/src/rt/rust_kernel.h

@@ -75,6 +75,7 @@ class rust_kernel {
 
     // Used to communicate with the process-side, global libuv loop
     uintptr_t global_loop_chan;
+    void* async_handle_stub;
     void** global_async_handle;
 
 public:

branches/try/src/rt/rust_uv.cpp

@@ -454,7 +454,3 @@ extern "C" void
 rust_uv_set_kernel_global_async_handle(uv_async_t* handle) {
     rust_get_current_task()->kernel->set_global_async_handle((void*)handle);
 }
-extern "C" void
-rust_uv_free_kernel_global_async_handle() {
-    free((void*)rust_get_current_task()->kernel->get_global_async_handle());
-}