rbuv 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 308a6259f4457d5dd3ccd17dfd092940a75359ca
-  data.tar.gz: b8f8ef7b0a3aca6e69539fe09d047fc865f46614
+  metadata.gz: 1a1dfffa85f5a82907b4f1f80843450aecd5f8a4
+  data.tar.gz: 3ee4a61701cbc7cfbdc7f111ba42f5ca7856ad07
 SHA512:
-  metadata.gz: d9d906a50927d5e8c81439cce4f73a800e2e86812050dcfb91dda274a4ba4ef78bb69e06fc301f3fdfb66dbb63580d41d4b86a1e2be25cd1e09295e815132fde
-  data.tar.gz: 1b784c9a54821db879f02335f17067d59d90176c5618bb0e571c8cd2591f51043fbc05f0184db052e0f1c323b65be16783ee50acbf580c8931b8ceaa01d172da
+  metadata.gz: cca669ba3307ed5adb8b863e97a2933fe4d0adcc919b6546e5053e0ab2865b207f48fdbbc05ae75d5c2fa7caff24acba9adfdb440b62418097a3e423641c9f81
+  data.tar.gz: 791a1ebff000cbe65ebde2066ad334088f6c2401251c3de5dad9a8b13a2503bc5e8bb03583fa99320d9e4f9c483c68180d4741c5dc4f28776d9f8ade94672604

data/examples/echo_client_tcp.rb

@@ -0,0 +1,18 @@
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'rbuv'
+
+puts "Rbuv version #{Rbuv::VERSION}"
+
+Rbuv.run do
+  client = Rbuv::Tcp.new
+  client.connect "127.0.0.1", 1234 do
+    client.read_start do |data, error|
+      puts data unless error
+      client.close
+    end
+    client.write "Hello, world"
+  end
+end
+
+puts "Stopped!"

data/examples/echo_server_tcp.rb

@@ -0,0 +1,35 @@
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'rbuv'
+
+puts "Rbuv version #{Rbuv::VERSION}"
+
+clients = []
+
+Rbuv.run do
+  signal = Rbuv::Signal.new
+  server = Rbuv::Tcp.new
+
+  signal.start Rbuv::Signal::INT do
+    clients.each(&:close)
+    signal.close
+    server.close
+  end
+
+  server.bind "127.0.0.1", 1234
+  server.listen 10 do
+    client = Rbuv::Tcp.new
+    server.accept client
+    clients << client
+    client.read_start do |data, error|
+      if error
+        client.close
+        clients.delete client
+      else
+        client.write data
+      end
+    end
+  end
+end
+
+puts "Stopped!"

data/ext/rbuv/rbuv_stream.c

@@ -40,6 +40,7 @@ static VALUE rbuv_stream_write(VALUE self, VALUE data);
 /* Private methods */
 static void _uv_stream_on_connection(uv_stream_t *server, int status);
 static void _uv_stream_on_connection_no_gvl(_uv_stream_on_connection_arg_t *arg);
+void __uv_stream_on_connection_no_gvl(uv_stream_t *stream, int status);
 static uv_buf_t _uv_alloc_buffer(uv_handle_t *handle, size_t suggested_size);
 static void _uv_stream_on_read(uv_stream_t *stream, ssize_t nread, uv_buf_t buf);
 static void _uv_stream_on_read_no_gvl(_uv_stream_on_read_arg_t *arg);
@@ -166,33 +167,44 @@ VALUE rbuv_stream_write(VALUE self, VALUE data) {
   return data;
 }
 
-void _uv_stream_on_connection(uv_stream_t *uv_server, int status) {
-  _uv_stream_on_connection_arg_t arg = { .uv_stream = uv_server, .status = status };
+void _uv_stream_on_connection(uv_stream_t *uv_stream, int status) {
+  _uv_stream_on_connection_arg_t arg = { .uv_stream = uv_stream, .status = status };
   rb_thread_call_with_gvl((rbuv_rb_blocking_function_t)_uv_stream_on_connection_no_gvl, &arg);
 }
 
 void _uv_stream_on_connection_no_gvl(_uv_stream_on_connection_arg_t *arg) {
-  uv_stream_t *uv_server = arg->uv_stream;
+  uv_stream_t *uv_stream = arg->uv_stream;
   int status = arg->status;
 
-  VALUE server;
-  rbuv_stream_t *rbuv_server;
+  __uv_stream_on_connection_no_gvl(uv_stream, status);
+}
+
+void __uv_stream_on_connection_no_gvl(uv_stream_t *uv_stream, int status) {
+  VALUE stream;
+  rbuv_stream_t *rbuv_stream;
   VALUE on_connection;
+  VALUE error;
+  uv_err_t uv_err;
   
-  RBUV_DEBUG_LOG("uv_server: %p, status: %d", uv_server, status);
-  if (status == -1) {
-    return;
-  }
+  RBUV_DEBUG_LOG("uv_stream: %p, status: %d", uv_stream, status);
   
-  server = (VALUE)uv_server->data;
-  Data_Get_Struct(server, rbuv_stream_t, rbuv_server);
-  on_connection = rbuv_server->cb_on_connection;
+  stream = (VALUE)uv_stream->data;
+  Data_Get_Struct(stream, rbuv_stream_t, rbuv_stream);
+  on_connection = rbuv_stream->cb_on_connection;
   
-  RBUV_DEBUG_LOG_DETAIL("server: %s, on_connection: %s",
-                        RSTRING_PTR(rb_inspect(server)),
+  RBUV_DEBUG_LOG_DETAIL("stream: %s, on_connection: %s",
+                        RSTRING_PTR(rb_inspect(stream)),
                         RSTRING_PTR(rb_inspect(on_connection)));
   
-  rb_funcall(on_connection, id_call, 1, server);
+  if (status == -1) {
+    uv_err = uv_last_error(uv_default_loop());
+    RBUV_DEBUG_LOG_DETAIL("uv_stream: %p, status: %d, error: %s", uv_stream, status,
+                          uv_strerror(uv_err));
+    error = rb_exc_new2(eRbuvError, uv_strerror(uv_err));
+    rb_funcall(on_connection, id_call, 2, stream, error);
+  } else {
+    rb_funcall(on_connection, id_call, 1, stream);
+  }
 }
 
 uv_buf_t _uv_alloc_buffer(uv_handle_t *handle, size_t suggested_size) {
@@ -215,7 +227,7 @@ void _uv_stream_on_read_no_gvl(_uv_stream_on_read_arg_t *arg) {
   uv_err_t uv_err;
   VALUE error;
 
-  RBUV_DEBUG_LOG("uv_stream: %p, nread: %s", uv_stream, RSTRING_PTR(rb_inspect(nread)));
+  RBUV_DEBUG_LOG("uv_stream: %p, nread: %lu", uv_stream, nread);
 
   stream = (VALUE)uv_stream->data;
   Data_Get_Struct(stream, rbuv_stream_t, rbuv_stream);

data/ext/rbuv/rbuv_tcp.c

@@ -7,6 +7,11 @@ struct rbuv_tcp_s {
   VALUE cb_on_read;
 };
 
+typedef struct {
+  uv_connect_t *uv_connect;
+  int status;
+} _uv_tcp_on_connect_arg_t;
+
 VALUE cRbuvTcp;
 
 /* Allocator/deallocator */
@@ -30,6 +35,13 @@ static void rbuv_tcp_free(rbuv_tcp_t *rbuv_tcp);
  */
 static VALUE rbuv_tcp_bind(VALUE self, VALUE ip, VALUE port);
 //static VALUE rbuv_tcp_bind6(VALUE self, VALUE ip, VALUE port);
+static VALUE rbuv_tcp_connect(VALUE self, VALUE ip, VALUE port);
+//static VALUE rbuv_tcp_connect6(VALUE self, VALUE ip, VALUE port);
+
+/* Private methods */
+static void _uv_tcp_on_connect(uv_connect_t *uv_connect, int status);
+static void _uv_tcp_on_connect_no_gvl(_uv_tcp_on_connect_arg_t *arg);
+extern void __uv_stream_on_connection_no_gvl(uv_stream_t *uv_stream, int status);
 
 void Init_rbuv_tcp() {
   cRbuvTcp = rb_define_class_under(mRbuv, "Tcp", cRbuvStream);
@@ -37,6 +49,8 @@ void Init_rbuv_tcp() {
   
   rb_define_method(cRbuvTcp, "bind", rbuv_tcp_bind, 2);
   //rb_define_method(cRbuvTcp, "bind6", rbuv_tcp_bind6, 2);
+  rb_define_method(cRbuvTcp, "connect", rbuv_tcp_connect, 2);
+  //rb_define_method(cRbuvTcp, "connect6", rbuv_tcp_connect6, 2);
 }
 
 VALUE rbuv_tcp_alloc(VALUE klass) {
@@ -100,3 +114,44 @@ VALUE rbuv_tcp_bind(VALUE self, VALUE ip, VALUE port) {
   
   return self;
 }
+
+VALUE rbuv_tcp_connect(VALUE self, VALUE ip, VALUE port) {
+  VALUE block;
+  const char *uv_ip;
+  int uv_port;
+  rbuv_tcp_t *rbuv_tcp;
+  struct sockaddr_in connect_addr;
+  uv_connect_t uv_connect;
+
+  rb_need_block();
+  block = rb_block_proc();
+
+  uv_ip = RSTRING_PTR(ip);
+  uv_port = FIX2INT(port);
+
+  Data_Get_Struct(self, rbuv_tcp_t, rbuv_tcp);
+  rbuv_tcp->cb_on_connection = block;
+
+  connect_addr = uv_ip4_addr(uv_ip, uv_port);
+
+  RBUV_CHECK_UV_RETURN(uv_tcp_connect(&uv_connect, rbuv_tcp->uv_handle,
+                                      connect_addr, _uv_tcp_on_connect));
+
+  RBUV_DEBUG_LOG_DETAIL("self: %s, ip: %s, port: %d, rbuv_tcp: %p, uv_handle: %p",
+                        RSTRING_PTR(rb_inspect(self)), uv_ip, uv_port, rbuv_tcp,
+                        rbuv_tcp->uv_handle);
+
+  return self;
+}
+
+void _uv_tcp_on_connect(uv_connect_t *uv_connect, int status) {
+  _uv_tcp_on_connect_arg_t arg = { .uv_connect = uv_connect, .status = status };
+  rb_thread_call_with_gvl((rbuv_rb_blocking_function_t)_uv_tcp_on_connect_no_gvl, &arg);
+}
+
+void _uv_tcp_on_connect_no_gvl(_uv_tcp_on_connect_arg_t *arg) {
+  uv_connect_t *uv_connect = arg->uv_connect;
+  int status = arg->status;
+
+  __uv_stream_on_connection_no_gvl(uv_connect->handle, status);
+}

data/lib/rbuv/version.rb

@@ -1,3 +1,3 @@
 module Rbuv
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/tcp_spec.rb

@@ -155,6 +155,35 @@ describe Rbuv::Tcp do
           no_on_close.call
         end
       end
+    end # context "#close"
+
+    context "#connect" do
+      it "when server does not exist" do
+        Rbuv.run do
+          c = Rbuv::Tcp.new
+          c.connect('127.0.0.1', 60000) do |client, error|
+            error.should be_a_kind_of Rbuv::Error
+            c.close
+          end
+        end
+      end
+
+      it "when server exists" do
+        s = TCPServer.new '127.0.0.1', 60000
+        s.listen 10
+
+        on_connect = mock
+        on_connect.should_receive(:call).once
+
+        Rbuv.run do
+          c = Rbuv::Tcp.new
+          c.connect('127.0.0.1', 60000) do
+            on_connect.call
+            c.close
+            s.close
+          end
+        end
+      end
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbuv
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Hanfei Shen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -301,6 +301,8 @@ files:
 - deps/libuv/test/test-walk-handles.c
 - deps/libuv/uv.gyp
 - deps/libuv/vcbuild.bat
+- examples/echo_client_tcp.rb
+- examples/echo_server_tcp.rb
 - ext/rbuv/extconf.rb
 - ext/rbuv/libuv.mk
 - ext/rbuv/rbuv.c