From 618e41874a1ef47a6629524016bd8d9ffce617bc Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Thu, 2 Oct 2014 05:05:12 -0400 Subject: [PATCH] remove the uv_support code --- mk/rt.mk | 3 +- src/rt/rust_uv.c | 169 ----------------------------------------------- 2 files changed, 1 insertion(+), 171 deletions(-) delete mode 100644 src/rt/rust_uv.c diff --git a/mk/rt.mk b/mk/rt.mk index 6dcac0b95e8..de06d4917ee 100644 --- a/mk/rt.mk +++ b/mk/rt.mk @@ -35,7 +35,7 @@ # that's per-target so you're allowed to conditionally add files based on the # target. ################################################################################ -NATIVE_LIBS := rust_builtin hoedown uv_support morestack miniz context_switch \ +NATIVE_LIBS := rust_builtin hoedown morestack miniz context_switch \ rustrt_native rust_test_helpers # $(1) is the target triple @@ -50,7 +50,6 @@ NATIVE_DEPS_hoedown_$(1) := hoedown/src/autolink.c \ hoedown/src/html_smartypants.c \ hoedown/src/stack.c \ hoedown/src/version.c -NATIVE_DEPS_uv_support_$(1) := rust_uv.c NATIVE_DEPS_miniz_$(1) = miniz.c NATIVE_DEPS_rust_builtin_$(1) := rust_builtin.c \ rust_android_dummy.c diff --git a/src/rt/rust_uv.c b/src/rt/rust_uv.c deleted file mode 100644 index 0739e8b5e11..00000000000 --- a/src/rt/rust_uv.c +++ /dev/null @@ -1,169 +0,0 @@ -// Copyright 2012 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -#include -#include - -#ifdef __WIN32__ -// For alloca -#include -#endif - -#ifndef __WIN32__ -// for signal -#include -#endif - -#include "uv.h" - -void* -rust_uv_loop_new() { -// FIXME libuv doesn't always ignore SIGPIPE even though we don't need it. -#ifndef __WIN32__ - signal(SIGPIPE, SIG_IGN); -#endif - return (void*)uv_loop_new(); -} - -void -rust_uv_loop_set_data(uv_loop_t* loop, void* data) { - loop->data = data; -} - -uv_udp_t* -rust_uv_get_udp_handle_from_send_req(uv_udp_send_t* send_req) { - return send_req->handle; -} - -uv_stream_t* -rust_uv_get_stream_handle_from_connect_req(uv_connect_t* connect) { - return connect->handle; -} -uv_stream_t* -rust_uv_get_stream_handle_from_write_req(uv_write_t* write_req) { - return write_req->handle; -} - -uv_loop_t* -rust_uv_get_loop_for_uv_handle(uv_handle_t* handle) { - return handle->loop; -} - -void* -rust_uv_get_data_for_uv_loop(uv_loop_t* loop) { - return loop->data; -} - -void -rust_uv_set_data_for_uv_loop(uv_loop_t* loop, - void* data) { - loop->data = data; -} - -void* -rust_uv_get_data_for_uv_handle(uv_handle_t* handle) { - return handle->data; -} - -void -rust_uv_set_data_for_uv_handle(uv_handle_t* handle, void* data) { - handle->data = data; -} - -void* -rust_uv_get_data_for_req(uv_req_t* req) { - return req->data; -} - -void -rust_uv_set_data_for_req(uv_req_t* req, void* data) { - req->data = data; -} - -uintptr_t -rust_uv_handle_type_max() { - return UV_HANDLE_TYPE_MAX; -} - -uintptr_t -rust_uv_req_type_max() { - return UV_REQ_TYPE_MAX; -} - -ssize_t -rust_uv_get_result_from_fs_req(uv_fs_t* req) { - return req->result; -} -const char* -rust_uv_get_path_from_fs_req(uv_fs_t* req) { - return req->path; -} -void* -rust_uv_get_ptr_from_fs_req(uv_fs_t* req) { - return req->ptr; -} -uv_loop_t* -rust_uv_get_loop_from_fs_req(uv_fs_t* req) { - return req->loop; -} - -uv_loop_t* -rust_uv_get_loop_from_getaddrinfo_req(uv_getaddrinfo_t* req) { - return req->loop; -} - -void -rust_uv_populate_uv_stat(uv_fs_t* req_in, uv_stat_t* stat_out) { - stat_out->st_dev = req_in->statbuf.st_dev; - stat_out->st_mode = req_in->statbuf.st_mode; - stat_out->st_nlink = req_in->statbuf.st_nlink; - stat_out->st_uid = req_in->statbuf.st_uid; - stat_out->st_gid = req_in->statbuf.st_gid; - stat_out->st_rdev = req_in->statbuf.st_rdev; - stat_out->st_ino = req_in->statbuf.st_ino; - stat_out->st_size = req_in->statbuf.st_size; - stat_out->st_blksize = req_in->statbuf.st_blksize; - stat_out->st_blocks = req_in->statbuf.st_blocks; - stat_out->st_flags = req_in->statbuf.st_flags; - stat_out->st_gen = req_in->statbuf.st_gen; - stat_out->st_atim.tv_sec = req_in->statbuf.st_atim.tv_sec; - stat_out->st_atim.tv_nsec = req_in->statbuf.st_atim.tv_nsec; - stat_out->st_mtim.tv_sec = req_in->statbuf.st_mtim.tv_sec; - stat_out->st_mtim.tv_nsec = req_in->statbuf.st_mtim.tv_nsec; - stat_out->st_ctim.tv_sec = req_in->statbuf.st_ctim.tv_sec; - stat_out->st_ctim.tv_nsec = req_in->statbuf.st_ctim.tv_nsec; - stat_out->st_birthtim.tv_sec = req_in->statbuf.st_birthtim.tv_sec; - stat_out->st_birthtim.tv_nsec = req_in->statbuf.st_birthtim.tv_nsec; -} - -void -rust_set_stdio_container_flags(uv_stdio_container_t *c, int flags) { - c->flags = (uv_stdio_flags) flags; -} - -void -rust_set_stdio_container_fd(uv_stdio_container_t *c, int fd) { - c->data.fd = fd; -} - -void -rust_set_stdio_container_stream(uv_stdio_container_t *c, uv_stream_t *stream) { - c->data.stream = stream; -} - -int -rust_uv_process_pid(uv_process_t* p) { - return p->pid; -} - -int -rust_uv_guess_handle(int fd) { - return uv_guess_handle(fd); -}