From 577b888e4b87437a37903abb5b70b113a9df059d Mon Sep 17 00:00:00 2001 From: Jeff Olson Date: Fri, 27 Apr 2012 21:39:45 -0700 Subject: [PATCH] rt: remove unneccesary c++ functions and rust_kernel data, re: global loop --- src/rt/rust_kernel.cpp | 3 --- src/rt/rust_kernel.h | 3 --- src/rt/rust_uv.cpp | 10 ---------- src/rt/rustrt.def.in | 2 -- 4 files changed, 18 deletions(-) diff --git a/src/rt/rust_kernel.cpp b/src/rt/rust_kernel.cpp index 9afb010a3db8..e041256eaaa8 100644 --- a/src/rt/rust_kernel.cpp +++ b/src/rt/rust_kernel.cpp @@ -27,9 +27,6 @@ rust_kernel::rust_kernel(rust_env *env) : // set up storage of pointers needed to // access the global loop. global_loop_chan = 0; - async_handle_inner = (uintptr_t)0; - global_async_handle = &async_handle_inner; - *global_async_handle = (uintptr_t)0; // Create the single threaded scheduler that will run on the platform's // main thread diff --git a/src/rt/rust_kernel.h b/src/rt/rust_kernel.h index 58739b2ada0d..3f313f614a65 100644 --- a/src/rt/rust_kernel.h +++ b/src/rt/rust_kernel.h @@ -75,8 +75,6 @@ class rust_kernel { // Used to communicate with the process-side, global libuv loop uintptr_t global_loop_chan; - uintptr_t async_handle_inner; - uintptr_t* global_async_handle; public: struct rust_env *env; @@ -124,7 +122,6 @@ public: bool send_to_port(rust_port_id chan, void *sptr); uintptr_t* get_global_loop() { return &global_loop_chan; } - uintptr_t* get_global_async_handle() { return global_async_handle; } }; template struct kernel_owned { diff --git a/src/rt/rust_uv.cpp b/src/rt/rust_uv.cpp index 84cf14f47ed8..12e7c174b453 100644 --- a/src/rt/rust_uv.cpp +++ b/src/rt/rust_uv.cpp @@ -450,13 +450,3 @@ rust_uv_get_kernel_global_chan_ptr() { LOG(task, stdlib,"global loop val: %lu", (unsigned long int)*result); return result; } - -extern "C" uintptr_t* -rust_uv_get_kernel_monitor_global_chan_ptr() { - return rust_uv_get_kernel_global_chan_ptr(); -} - -extern "C" uintptr_t* -rust_uv_get_kernel_global_async_handle() { - return rust_get_current_task()->kernel->get_global_async_handle(); -} diff --git a/src/rt/rustrt.def.in b/src/rt/rustrt.def.in index 49d632027415..3ad2f98f025c 100644 --- a/src/rt/rustrt.def.in +++ b/src/rt/rustrt.def.in @@ -139,8 +139,6 @@ 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_get_kernel_monitor_global_chan_ptr -rust_uv_get_kernel_global_async_handle rust_dbg_lock_create rust_dbg_lock_destroy rust_dbg_lock_lock