asyncengine 0.0.1.testing1 → 0.0.2.alpha1

metadata

@@ -1,58 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: asyncengine
-version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 0
-  - 0
-  - 1
-  - testing1
-  version: 0.0.1.testing1
+version: !ruby/object:Gem::Version
+  version: 0.0.2.alpha1
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Inaki Baz Castillo
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-02 00:00:00 +02:00
-default_executable: 
+date: 2012-06-27 00:00:00.000000000 Z
 dependencies: []
-
-description: Ruby asynchronous event driven library based on libuv
+description: Ruby asynchronous event driven framework on top of libuv
 email: ibc@aliax.net
 executables: []
-
-extensions: 
+extensions:
 - ext/asyncengine/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - asyncengine.gemspec
+- Rakefile
 - README.markdown
-- lib/asyncengine/errors.rb
+- lib/asyncengine/utils.rb
+- lib/asyncengine/debug.rb
+- lib/asyncengine/uv_error.rb
 - lib/asyncengine/timer.rb
 - lib/asyncengine/udp.rb
-- lib/asyncengine/next_tick.rb
+- lib/asyncengine/tcp.rb
+- lib/asyncengine/handle.rb
 - lib/asyncengine/version.rb
 - lib/asyncengine/asyncengine_ext.so
 - lib/asyncengine.rb
+- ext/asyncengine/rb_utilities.c
 - ext/asyncengine/ae_udp.c
 - ext/asyncengine/asyncengine_ruby.c
 - ext/asyncengine/ae_next_tick.c
 - ext/asyncengine/ae_handle_common.c
+- ext/asyncengine/ae_resolver.c
+- ext/asyncengine/ae_tcp.c
+- ext/asyncengine/ae_utils.c
+- ext/asyncengine/ip_parser.c
+- ext/asyncengine/ae_call_from_other_thread.c
+- ext/asyncengine/ae_ip_utils.c
 - ext/asyncengine/ae_timer.c
+- ext/asyncengine/ae_resolver.h
 - ext/asyncengine/ae_handle_common.h
+- ext/asyncengine/ae_utils.h
 - ext/asyncengine/ae_timer.h
+- ext/asyncengine/ip_parser.h
+- ext/asyncengine/ae_tcp.h
 - ext/asyncengine/asyncengine_ruby.h
+- ext/asyncengine/ae_call_from_other_thread.h
+- ext/asyncengine/rb_utilities.h
+- ext/asyncengine/ae_ip_utils.h
 - ext/asyncengine/ae_next_tick.h
+- ext/asyncengine/debug.h
 - ext/asyncengine/ae_udp.h
 - ext/asyncengine/extconf.rb
 - ext/asyncengine/libuv/README.md
 - ext/asyncengine/libuv/gyp_uv
 - ext/asyncengine/libuv/config-unix.mk
 - ext/asyncengine/libuv/common.gypi
+- ext/asyncengine/libuv/ibc_tests/uv_shutdown_write_issue.c
+- ext/asyncengine/libuv/ibc_tests/exec_test.sh
+- ext/asyncengine/libuv/ibc_tests/uv_tcp_close_while_connecting.c
 - ext/asyncengine/libuv/test/test-list.h
+- ext/asyncengine/libuv/test/benchmark-loop-count.c
 - ext/asyncengine/libuv/test/test-fs-event.c
 - ext/asyncengine/libuv/test/test-getsockname.c
 - ext/asyncengine/libuv/test/benchmark-spawn.c
@@ -66,6 +79,7 @@ files:
 - ext/asyncengine/libuv/test/test-fail-always.c
 - ext/asyncengine/libuv/test/test-ref.c
 - ext/asyncengine/libuv/test/task.h
+- ext/asyncengine/libuv/test/test-tcp-connect-error-after-write.c
 - ext/asyncengine/libuv/test/test-thread.c
 - ext/asyncengine/libuv/test/test-ipc-send-recv.c
 - ext/asyncengine/libuv/test/test-udp-dgram-too-big.c
@@ -74,6 +88,7 @@ files:
 - ext/asyncengine/libuv/test/test-callback-stack.c
 - ext/asyncengine/libuv/test/benchmark-pump.c
 - ext/asyncengine/libuv/test/test-udp-multicast-join.c
+- ext/asyncengine/libuv/test/test-callback-order.c
 - ext/asyncengine/libuv/test/test-tcp-flags.c
 - ext/asyncengine/libuv/test/test-mutexes.c
 - ext/asyncengine/libuv/test/test-tcp-writealot.c
@@ -86,9 +101,11 @@ files:
 - ext/asyncengine/libuv/test/test-platform-output.c
 - ext/asyncengine/libuv/test/test-getaddrinfo.c
 - ext/asyncengine/libuv/test/runner-win.c
+- ext/asyncengine/libuv/test/test-tcp-close-while-connecting.c
 - ext/asyncengine/libuv/test/test-timer.c
 - ext/asyncengine/libuv/test/test-cwd-and-chdir.c
 - ext/asyncengine/libuv/test/test-ipc.c
+- ext/asyncengine/libuv/test/test-tcp-connect-timeout.c
 - ext/asyncengine/libuv/test/test-tcp-bind-error.c
 - ext/asyncengine/libuv/test/benchmark-list.h
 - ext/asyncengine/libuv/test/test-udp-ipv6.c
@@ -97,8 +114,10 @@ files:
 - ext/asyncengine/libuv/test/benchmark-tcp-write-batch.c
 - ext/asyncengine/libuv/test/test-hrtime.c
 - ext/asyncengine/libuv/test/test-tcp-bind6-error.c
+- ext/asyncengine/libuv/test/test-fs-poll.c
 - ext/asyncengine/libuv/test/echo-server.c
 - ext/asyncengine/libuv/test/test-spawn.c
+- ext/asyncengine/libuv/test/test-tcp-shutdown-after-write.c
 - ext/asyncengine/libuv/test/blackhole-server.c
 - ext/asyncengine/libuv/test/test-connection-fail.c
 - ext/asyncengine/libuv/test/benchmark-pound.c
@@ -111,6 +130,7 @@ files:
 - ext/asyncengine/libuv/test/test-ping-pong.c
 - ext/asyncengine/libuv/test/test-udp-multicast-ttl.c
 - ext/asyncengine/libuv/test/test-fs.c
+- ext/asyncengine/libuv/test/benchmark-million-timers.c
 - ext/asyncengine/libuv/test/test-shutdown-eof.c
 - ext/asyncengine/libuv/test/benchmark-ares.c
 - ext/asyncengine/libuv/test/runner.c
@@ -121,19 +141,23 @@ files:
 - ext/asyncengine/libuv/test/benchmark-getaddrinfo.c
 - ext/asyncengine/libuv/test/test-timer-again.c
 - ext/asyncengine/libuv/test/run-benchmarks.c
+- ext/asyncengine/libuv/test/test-semaphore.c
 - ext/asyncengine/libuv/test/fixtures/load_error.node
 - ext/asyncengine/libuv/test/fixtures/empty_file
 - ext/asyncengine/libuv/test/test-dlerror.c
 - ext/asyncengine/libuv/test/test-get-currentexe.c
 - ext/asyncengine/libuv/test/test-counters-init.c
+- ext/asyncengine/libuv/test/test-walk-handles.c
 - ext/asyncengine/libuv/test/benchmark-ping-pongs.c
 - ext/asyncengine/libuv/test/test-run-once.c
 - ext/asyncengine/libuv/test/runner-unix.c
+- ext/asyncengine/libuv/test/test-poll-close.c
 - ext/asyncengine/libuv/test/test-util.c
 - ext/asyncengine/libuv/test/test-udp-options.c
 - ext/asyncengine/libuv/test/runner-win.h
+- ext/asyncengine/libuv/test/benchmark-fs-stat.c
+- ext/asyncengine/libuv/test/test-poll.c
 - ext/asyncengine/libuv/test/test-pass-always.c
-- ext/asyncengine/libuv/test/test-eio-overflow.c
 - ext/asyncengine/libuv/test/dns-server.c
 - ext/asyncengine/libuv/test/test-idle.c
 - ext/asyncengine/libuv/AUTHORS
@@ -151,27 +175,27 @@ files:
 - ext/asyncengine/libuv/src/unix/cygwin.c
 - ext/asyncengine/libuv/src/unix/timer.c
 - ext/asyncengine/libuv/src/unix/tty.c
-- ext/asyncengine/libuv/src/unix/check.c
 - ext/asyncengine/libuv/src/unix/udp.c
 - ext/asyncengine/libuv/src/unix/stream.c
 - ext/asyncengine/libuv/src/unix/core.o
+- ext/asyncengine/libuv/src/unix/poll.o
+- ext/asyncengine/libuv/src/unix/loop-watcher.o
 - ext/asyncengine/libuv/src/unix/thread.c
 - ext/asyncengine/libuv/src/unix/core.c
 - ext/asyncengine/libuv/src/unix/uv-eio.c
-- ext/asyncengine/libuv/src/unix/idle.c
 - ext/asyncengine/libuv/src/unix/tty.o
 - ext/asyncengine/libuv/src/unix/netbsd.c
 - ext/asyncengine/libuv/src/unix/async.c
 - ext/asyncengine/libuv/src/unix/openbsd.c
 - ext/asyncengine/libuv/src/unix/error.o
 - ext/asyncengine/libuv/src/unix/process.c
-- ext/asyncengine/libuv/src/unix/prepare.c
 - ext/asyncengine/libuv/src/unix/sunos.c
 - ext/asyncengine/libuv/src/unix/dl.c
 - ext/asyncengine/libuv/src/unix/error.c
 - ext/asyncengine/libuv/src/unix/timer.o
 - ext/asyncengine/libuv/src/unix/internal.h
 - ext/asyncengine/libuv/src/unix/uv-eio.o
+- ext/asyncengine/libuv/src/unix/poll.c
 - ext/asyncengine/libuv/src/unix/ev/libev.m4
 - ext/asyncengine/libuv/src/unix/ev/event.c
 - ext/asyncengine/libuv/src/unix/ev/ev_win32.c
@@ -212,24 +236,22 @@ files:
 - ext/asyncengine/libuv/src/unix/ev/missing
 - ext/asyncengine/libuv/src/unix/ev/config.guess
 - ext/asyncengine/libuv/src/unix/ev/depcomp
-- ext/asyncengine/libuv/src/unix/cares.o
 - ext/asyncengine/libuv/src/unix/fs.o
 - ext/asyncengine/libuv/src/unix/udp.o
+- ext/asyncengine/libuv/src/unix/loop-watcher.c
 - ext/asyncengine/libuv/src/unix/linux/core.o
 - ext/asyncengine/libuv/src/unix/linux/inotify.c
-- ext/asyncengine/libuv/src/unix/linux/core.c
 - ext/asyncengine/libuv/src/unix/linux/syscalls.c
+- ext/asyncengine/libuv/src/unix/linux/linux-core.c
 - ext/asyncengine/libuv/src/unix/linux/syscalls.h
 - ext/asyncengine/libuv/src/unix/linux/syscalls.o
+- ext/asyncengine/libuv/src/unix/linux/linux-core.o
 - ext/asyncengine/libuv/src/unix/linux/inotify.o
-- ext/asyncengine/libuv/src/unix/idle.o
 - ext/asyncengine/libuv/src/unix/process.o
 - ext/asyncengine/libuv/src/unix/pipe.o
-- ext/asyncengine/libuv/src/unix/cares.c
 - ext/asyncengine/libuv/src/unix/thread.o
 - ext/asyncengine/libuv/src/unix/pipe.c
 - ext/asyncengine/libuv/src/unix/darwin.c
-- ext/asyncengine/libuv/src/unix/check.o
 - ext/asyncengine/libuv/src/unix/kqueue.c
 - ext/asyncengine/libuv/src/unix/fs.c
 - ext/asyncengine/libuv/src/unix/uv-eio.h
@@ -257,13 +279,13 @@ files:
 - ext/asyncengine/libuv/src/unix/eio/config_cygwin.h
 - ext/asyncengine/libuv/src/unix/eio/LICENSE
 - ext/asyncengine/libuv/src/unix/freebsd.c
-- ext/asyncengine/libuv/src/unix/prepare.o
 - ext/asyncengine/libuv/src/unix/tcp.o
 - ext/asyncengine/libuv/src/unix/dl.o
 - ext/asyncengine/libuv/src/unix/loop.c
 - ext/asyncengine/libuv/src/unix/async.o
 - ext/asyncengine/libuv/src/unix/loop.o
 - ext/asyncengine/libuv/src/unix/tcp.c
+- ext/asyncengine/libuv/src/fs-poll.o
 - ext/asyncengine/libuv/src/uv-common.h
 - ext/asyncengine/libuv/src/win/winapi.h
 - ext/asyncengine/libuv/src/win/timer.c
@@ -273,10 +295,12 @@ files:
 - ext/asyncengine/libuv/src/win/req.c
 - ext/asyncengine/libuv/src/win/thread.c
 - ext/asyncengine/libuv/src/win/winsock.c
+- ext/asyncengine/libuv/src/win/req-inl.h
 - ext/asyncengine/libuv/src/win/util.c
 - ext/asyncengine/libuv/src/win/core.c
 - ext/asyncengine/libuv/src/win/winapi.c
 - ext/asyncengine/libuv/src/win/fs-event.c
+- ext/asyncengine/libuv/src/win/process-stdio.c
 - ext/asyncengine/libuv/src/win/async.c
 - ext/asyncengine/libuv/src/win/process.c
 - ext/asyncengine/libuv/src/win/threadpool.c
@@ -284,13 +308,18 @@ files:
 - ext/asyncengine/libuv/src/win/error.c
 - ext/asyncengine/libuv/src/win/internal.h
 - ext/asyncengine/libuv/src/win/handle.c
+- ext/asyncengine/libuv/src/win/poll.c
 - ext/asyncengine/libuv/src/win/loop-watcher.c
-- ext/asyncengine/libuv/src/win/cares.c
 - ext/asyncengine/libuv/src/win/pipe.c
 - ext/asyncengine/libuv/src/win/winsock.h
 - ext/asyncengine/libuv/src/win/fs.c
+- ext/asyncengine/libuv/src/win/stream-inl.h
+- ext/asyncengine/libuv/src/win/handle-inl.h
 - ext/asyncengine/libuv/src/win/getaddrinfo.c
 - ext/asyncengine/libuv/src/win/tcp.c
+- ext/asyncengine/libuv/src/cares.o
+- ext/asyncengine/libuv/src/cares.c
+- ext/asyncengine/libuv/src/fs-poll.c
 - ext/asyncengine/libuv/src/uv-common.c
 - ext/asyncengine/libuv/src/ares/ares_expand_name.o
 - ext/asyncengine/libuv/src/ares/ares_getenv.h
@@ -425,43 +454,41 @@ files:
 - ext/asyncengine/libuv/build/gcc_version.py
 - ext/asyncengine/libuv/config-mingw.mk
 - ext/asyncengine/libuv/LICENSE
-- ext/asyncengine/libuv/mkmf.log
 - ext/asyncengine/libuv/uv.gyp
-has_rdoc: true
+- test/ae_test_helper.rb
+- test/test_ip_utils.rb
+- test/test_resolver.rb
+- test/test_next_tick.rb
+- test/test_timer.rb
+- test/test_threads.rb
+- test/test_basic.rb
+- test/test_call_from_other_thread.rb
+- test/test_error.rb
+- test/test_utils.rb
+- test/test_udp.rb
 homepage: https://github.com/ibc/AsyncEngine
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
-      - 2
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Ruby asynchronous event driven library based on libuv
+summary: Ruby asynchronous event driven framework on top of libuv
 test_files: []
-
+has_rdoc: 

data/ext/asyncengine/libuv/mkmf.log

@@ -1,24 +0,0 @@
-"CFLAGS='-shared -fPIC' make"
-ar rcs uv.a src/unix/async.o src/unix/cares.o src/unix/check.o src/unix/core.o src/unix/dl.o src/unix/error.o src/unix/fs.o src/unix/idle.o src/unix/loop.o src/unix/pipe.o src/unix/prepare.o src/unix/process.o src/unix/stream.o src/unix/tcp.o src/unix/thread.o src/unix/timer.o src/unix/tty.o src/unix/udp.o src/unix/linux/core.o src/unix/linux/inotify.o src/unix/linux/syscalls.o src/uv-common.o src/unix/uv-eio.o src/unix/ev/ev.o src/unix/eio/eio.o  src/ares/ares__close_sockets.o src/ares/ares__get_hostent.o src/ares/ares__read_line.o src/ares/ares__timeval.o src/ares/ares_cancel.o src/ares/ares_data.o src/ares/ares_destroy.o src/ares/ares_expand_name.o src/ares/ares_expand_string.o src/ares/ares_fds.o src/ares/ares_free_hostent.o src/ares/ares_free_string.o src/ares/ares_gethostbyaddr.o src/ares/ares_gethostbyname.o src/ares/ares_getnameinfo.o src/ares/ares_getopt.o src/ares/ares_getsock.o src/ares/ares_init.o src/ares/ares_library_init.o src/ares/ares_llist.o src/ares/ares_mkquery.o src/ares/ares_nowarn.o src/ares/ares_options.o src/ares/ares_parse_a_reply.o src/ares/ares_parse_aaaa_reply.o src/ares/ares_parse_mx_reply.o src/ares/ares_parse_ns_reply.o src/ares/ares_parse_ptr_reply.o src/ares/ares_parse_srv_reply.o src/ares/ares_parse_txt_reply.o src/ares/ares_process.o src/ares/ares_query.o src/ares/ares_search.o src/ares/ares_send.o src/ares/ares_strcasecmp.o src/ares/ares_strdup.o src/ares/ares_strerror.o src/ares/ares_timeout.o src/ares/ares_version.o src/ares/ares_writev.o src/ares/bitncmp.o src/ares/inet_net_pton.o src/ares/inet_ntop.o
-have_library: checking for main() in -luv... -------------------- yes
-
-"gcc -o conftest -I/usr/include/ruby-1.9.1/x86_64-linux -I/usr/include/ruby-1.9.1/ruby/backward -I/usr/include/ruby-1.9.1 -I.     -shared -fPIC  conftest.c  -L. -L/usr/lib        -lruby-1.9.1-static  -lpthread -lrt -ldl -lcrypt -lm   -lc"
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2: 
-3: int main() {return 0;}
-/* end */
-
-"gcc -o conftest -I/usr/include/ruby-1.9.1/x86_64-linux -I/usr/include/ruby-1.9.1/ruby/backward -I/usr/include/ruby-1.9.1 -I.     -shared -fPIC  conftest.c  -L. -L/usr/lib        -lruby-1.9.1-static -luv  -lpthread -lrt -ldl -lcrypt -lm   -lc"
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2: 
-3: /*top*/
-4: int main() {return 0;}
-5: int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
-/* end */
-
---------------------
-

data/ext/asyncengine/libuv/src/unix/cares.c

@@ -1,194 +0,0 @@
-/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-#include "uv.h"
-#include "internal.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-
-
-/*
- * This is called once per second by loop->timer. It is used to
- * constantly callback into c-ares for possibly processing timeouts.
- */
-static void uv__ares_timeout(uv_timer_t* handle, int status) {
-  assert(!uv_ares_handles_empty(handle->loop));
-  ares_process_fd(handle->loop->channel, ARES_SOCKET_BAD, ARES_SOCKET_BAD);
-}
-
-
-static void uv__ares_timer_start(uv_loop_t* loop) {
-  if (uv_is_active((uv_handle_t*)&loop->timer)) return;
-  uv_timer_start(&loop->timer, uv__ares_timeout, 1000, 1000);
-  uv_ref(loop);
-}
-
-
-static void uv__ares_timer_stop(uv_loop_t* loop) {
-  if (!uv_is_active((uv_handle_t*)&loop->timer)) return;
-  uv_timer_stop(&loop->timer);
-  uv_unref(loop);
-}
-
-
-static void uv__ares_io(struct ev_loop* ev, struct ev_io* watcher,
-    int revents) {
-  uv_loop_t* loop = ev_userdata(ev);
-
-  assert(ev == loop->ev);
-
-  /* Reset the idle timer */
-  uv_timer_again(&loop->timer);
-
-  /* Process DNS responses */
-  ares_process_fd(loop->channel,
-      revents & EV_READ ? watcher->fd : ARES_SOCKET_BAD,
-      revents & EV_WRITE ? watcher->fd : ARES_SOCKET_BAD);
-}
-
-
-/* Allocates and returns a new uv_ares_task_t */
-static uv_ares_task_t* uv__ares_task_create(uv_loop_t* loop, int fd) {
-  uv_ares_task_t* h = malloc(sizeof(uv_ares_task_t));
-
-  if (h == NULL) {
-    uv_fatal_error(ENOMEM, "malloc");
-    return NULL;
-  }
-
-  h->loop = loop;
-  h->sock = fd;
-
-  ev_io_init(&h->read_watcher, uv__ares_io, fd, EV_READ);
-  ev_io_init(&h->write_watcher, uv__ares_io, fd, EV_WRITE);
-
-  h->read_watcher.data = h;
-  h->write_watcher.data = h;
-
-  return h;
-}
-
-
-/* Callback from ares when socket operation is started */
-static void uv__ares_sockstate_cb(void* data, ares_socket_t sock,
-    int read, int write) {
-  uv_loop_t* loop = data;
-  uv_ares_task_t* h;
-
-  assert((uv_loop_t*)loop->timer.data == loop);
-
-  h = uv_find_ares_handle(loop, sock);
-
-  if (read || write) {
-    if (!h) {
-      /* New socket */
-
-      /* If this is the first socket then start the timer. */
-      if (!uv_is_active((uv_handle_t*)&loop->timer)) {
-        assert(uv_ares_handles_empty(loop));
-        uv__ares_timer_start(loop);
-      }
-
-      h = uv__ares_task_create(loop, sock);
-      uv_add_ares_handle(loop, h);
-    }
-
-    if (read) {
-      ev_io_start(loop->ev, &h->read_watcher);
-    } else {
-      ev_io_stop(loop->ev, &h->read_watcher);
-    }
-
-    if (write) {
-      ev_io_start(loop->ev, &h->write_watcher);
-    } else {
-      ev_io_stop(loop->ev, &h->write_watcher);
-    }
-
-  } else {
-    /*
-     * read == 0 and write == 0 this is c-ares's way of notifying us that
-     * the socket is now closed. We must free the data associated with
-     * socket.
-     */
-    assert(h && "When an ares socket is closed we should have a handle for it");
-
-    ev_io_stop(loop->ev, &h->read_watcher);
-    ev_io_stop(loop->ev, &h->write_watcher);
-
-    uv_remove_ares_handle(h);
-    free(h);
-
-    if (uv_ares_handles_empty(loop)) {
-      uv__ares_timer_stop(loop);
-    }
-  }
-}
-
-
-/* c-ares integration initialize and terminate */
-/* TODO: share this with windows? */
-int uv_ares_init_options(uv_loop_t* loop, ares_channel *channelptr,
-    struct ares_options *options, int optmask) {
-  int rc;
-
-  /* only allow single init at a time */
-  if (loop->channel != NULL) {
-    uv__set_artificial_error(loop, UV_EALREADY);
-    return -1;
-  }
-
-  /* set our callback as an option */
-  options->sock_state_cb = uv__ares_sockstate_cb;
-  options->sock_state_cb_data = loop;
-  optmask |= ARES_OPT_SOCK_STATE_CB;
-
-  /* We do the call to ares_init_option for caller. */
-  rc = ares_init_options(channelptr, options, optmask);
-
-  /* if success, save channel */
-  if (rc == ARES_SUCCESS) {
-    loop->channel = *channelptr;
-  } 
-
-  /*
-   * Initialize the timeout timer. The timer won't be started until the
-   * first socket is opened.
-   */
-  uv_timer_init(loop, &loop->timer);
-  uv_unref(loop);
-  loop->timer.data = loop;
-
-  return rc;
-}
-
-
-/* TODO share this with windows? */
-void uv_ares_destroy(uv_loop_t* loop, ares_channel channel) {
-  /* only allow destroy if did init */
-  if (loop->channel) {
-    uv__ares_timer_stop(loop);
-    ares_destroy(channel);
-    loop->channel = NULL;
-  }
-}