diff options
| author | Brian Anderson <banderson@mozilla.com> | 2013-01-19 23:38:17 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2013-01-23 17:35:34 -0800 |
| commit | b9608fe4232c4014daa540849d471b1791b41fa6 (patch) | |
| tree | 10bd75fb21036ba97b406550c4c21ebe526ae2d5 /src/rt | |
| parent | fb9299346af9b951890db80e47eb65625997f160 (diff) | |
std: Convert uv_global_loop to use pipes
Diffstat (limited to 'src/rt')
| -rw-r--r-- | src/rt/rust_kernel.cpp | 1 | ||||
| -rw-r--r-- | src/rt/rust_kernel.h | 5 | ||||
| -rw-r--r-- | src/rt/rust_uv.cpp | 9 | ||||
| -rw-r--r-- | src/rt/rustrt.def.in | 1 |
4 files changed, 0 insertions, 16 deletions
diff --git a/src/rt/rust_kernel.cpp b/src/rt/rust_kernel.cpp index 7e342878841..8ca49ea6a57 100644 --- a/src/rt/rust_kernel.cpp +++ b/src/rt/rust_kernel.cpp @@ -34,7 +34,6 @@ rust_kernel::rust_kernel(rust_env *env) : sched_reaper(this), osmain_driver(NULL), non_weak_tasks(0), - global_loop_chan(0), at_exit_runner(NULL), at_exit_started(false), env(env), diff --git a/src/rt/rust_kernel.h b/src/rt/rust_kernel.h index 477e59d1b3e..8ba0405b86e 100644 --- a/src/rt/rust_kernel.h +++ b/src/rt/rust_kernel.h @@ -129,9 +129,6 @@ class rust_kernel { void end_weak_tasks(); void begin_shutdown(); - // Used to communicate with the process-side, global libuv loop - uintptr_t global_loop_chan; - lock_and_signal at_exit_lock; spawn_fn at_exit_runner; bool at_exit_started; @@ -190,8 +187,6 @@ public: bool send_to_port(rust_port_id chan, void *sptr); - uintptr_t* get_global_loop() { return &global_loop_chan; } - void register_exit_function(spawn_fn runner, fn_env_pair *f); }; diff --git a/src/rt/rust_uv.cpp b/src/rt/rust_uv.cpp index 53d8177bcf8..2dc70088628 100644 --- a/src/rt/rust_uv.cpp +++ b/src/rt/rust_uv.cpp @@ -513,15 +513,6 @@ rust_uv_ip6_port(struct sockaddr_in6* src) { return ntohs(src->sin6_port); } -extern "C" uintptr_t* -rust_uv_get_kernel_global_chan_ptr() { - uintptr_t* result = rust_get_current_task()->kernel->get_global_loop(); - rust_task* task = rust_get_current_task(); - LOG(task, stdlib, "global loop: %lu", (unsigned long int)result); - LOG(task, stdlib,"global loop val: %lu", (unsigned long int)*result); - return result; -} - extern "C" void* rust_uv_current_kernel_malloc(size_t size) { return current_kernel_malloc(size, "rust_uv_current_kernel_malloc"); diff --git a/src/rt/rustrt.def.in b/src/rt/rustrt.def.in index dd84e5ff6e7..8e8ce9ee509 100644 --- a/src/rt/rustrt.def.in +++ b/src/rt/rustrt.def.in @@ -158,7 +158,6 @@ rust_uv_get_data_for_req rust_uv_set_data_for_req rust_uv_get_base_from_buf rust_uv_get_len_from_buf -rust_uv_get_kernel_global_chan_ptr rust_uv_current_kernel_malloc rust_uv_current_kernel_free rust_uv_getaddrinfo |