noderb 0.0.10 → 0.0.11

data/ext/noderb_extension/libuv/uv.gyp

@@ -103,6 +103,7 @@
             'src/win/core.c',
             'src/win/error.c',
             'src/win/fs.c',
+            'src/win/fs-event.c',
             'src/win/getaddrinfo.c',
             'src/win/handle.c',
             'src/win/internal.h',
@@ -163,23 +164,6 @@
             'src/unix/ev/ev_vars.h',
             'src/unix/ev/ev_wrap.h',
             'src/unix/ev/event.h',
-            # TODO: conditionally include the following based on OS?
-            'src/ares/config_cygwin/ares_config.h',
-            'src/ares/config_darwin/ares_config.h',
-            'src/ares/config_freebsd/ares_config.h',
-            'src/ares/config_linux/ares_config.h',
-            'src/ares/config_openbsd/ares_config.h',
-            'src/ares/config_sunos/ares_config.h',
-            'src/unix/eio/config_cygwin.h',
-            'src/unix/eio/config_darwin.h',
-            'src/unix/eio/config_freebsd.h',
-            'src/unix/eio/config_linux.h',
-            'src/unix/eio/config_sunos.h',
-            'src/unix/ev/config_cygwin.h',
-            'src/unix/ev/config_darwin.h',
-            'src/unix/ev/config_freebsd.h',
-            'src/unix/ev/config_linux.h',
-            'src/unix/ev/config_sunos.h',
           ],
           'include_dirs': [ 'src/unix/ev', ],
           'defines': [
@@ -194,7 +178,10 @@
           'include_dirs': [ 'src/ares/config_darwin' ],
           'sources': [ 'src/unix/darwin.c' ],
           'direct_dependent_settings': {
-            'libraries': [ '-framework CoreServices' ],
+            'libraries': [
+              '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
+              '$(SDKROOT)/System/Library/Frameworks/CoreServices.framework',
+            ],
           },
           'defines': [
             'EV_CONFIG_H="config_darwin.h"',
@@ -225,6 +212,14 @@
             'libraries': [ '-lrt' ],
           },
         }],
+        [ 'OS=="freebsd"', {
+          'include_dirs': [ 'src/ares/config_freebsd' ],
+          'sources': [ 'src/unix/freebsd.c' ],
+          'defines': [
+            'EV_CONFIG_H="config_freebsd.h"',
+            'EIO_CONFIG_H="config_freebsd.h"',
+          ],
+        }],
       ]
     },
 
@@ -244,6 +239,7 @@
         'test/test-delayed-accept.c',
         'test/test-fail-always.c',
         'test/test-fs.c',
+        'test/test-fs-event.c',
         'test/test-get-currentexe.c',
         'test/test-getaddrinfo.c',
         'test/test-gethostbyname.c',
@@ -261,10 +257,12 @@
         'test/test-tcp-bind-error.c',
         'test/test-tcp-bind6-error.c',
         'test/test-tcp-close.c',
+        'test/test-tcp-write-error.c',
         'test/test-tcp-writealot.c',
         'test/test-threadpool.c',
         'test/test-timer-again.c',
         'test/test-timer.c',
+        'test/test-tty.c',
         'test/test-udp-dgram-too-big.c',
         'test/test-udp-ipv6.c',
         'test/test-udp-send-and-recv.c',
@@ -338,3 +336,4 @@
   ]
 }
 
+

data/ext/noderb_extension/noderb.c

@@ -25,8 +25,6 @@ VALUE nodeRb_get_nodeRb_pointer(){
 }
 
 void Init_noderb_extension() {
-    // Initialize event loop, but not start it
-    uv_init();
     // Define module
     nodeRb = rb_define_module("NodeRb");
     // Define native pointer

data/ext/noderb_extension/noderb_dns.c

@@ -4,7 +4,7 @@
 #include <noderb_tools.h>
 
 typedef struct {
-    long target;
+    VALUE target;
 } nodeRb_dns_handle;
 
 void nodeRb_dns_resolved(uv_getaddrinfo_t* handle, int status, struct addrinfo* res){
@@ -14,10 +14,9 @@ void nodeRb_dns_resolved(uv_getaddrinfo_t* handle, int status, struct addrinfo*
     char address[INET_ADDRSTRLEN];
     inet_ntop(AF_INET, &(((struct sockaddr_in*) res->ai_addr)->sin_addr), address, INET_ADDRSTRLEN);
     // Call back
-    VALUE callback = nodeRb_get_class_from_id(data->target);
-    rb_funcall(callback, rb_intern("call"), 1, rb_str_new2(address));
+    rb_funcall(data->target, rb_intern("call"), 1, rb_str_new2(address));
     // Let callback GC
-    nodeRb_unregister_instance(callback);
+    nodeRb_unregister_instance(data->target);
     free(handle);
     free(data);
 };
@@ -29,9 +28,9 @@ VALUE nodeRb_dns_resolve(VALUE self, VALUE host, VALUE callback){
     // Save from GC
     nodeRb_register_instance(callback);
     // Save data
-    data->target = rb_num2long(rb_obj_id(callback));
-    // Resolve
-    uv_getaddrinfo(uv_default_loop(), handle, nodeRb_dns_resolved, rb_string_value_cstr(&host), NULL, NULL);
+    data->target = callback;
     // Save callback
     handle->data = data;
+    // Resolve
+    uv_getaddrinfo(uv_default_loop(), handle, nodeRb_dns_resolved, rb_string_value_cstr(&host), NULL, NULL);
 }

data/ext/noderb_extension/noderb_fs.c

@@ -7,13 +7,13 @@
 #include <sys/stat.h>
 
 typedef struct {
-    long target;
+    VALUE target;
     char* buffer;
 } nodeRb_file_handle;
 
 void nodeRb_fs_operation_callback(uv_fs_t* handle){
     nodeRb_file_handle* data = (nodeRb_file_handle*) handle->data;
-    VALUE target = nodeRb_get_class_from_id(data->target);
+    VALUE target = data->target;
     if(handle->result == -1){
         rb_funcall(target, rb_intern("call"), 1, Qnil);
     }else{
@@ -63,7 +63,7 @@ void nodeRb_fs_operation_callback(uv_fs_t* handle){
         }
     }
     nodeRb_unregister_instance(target);
-    free(handle->data);
+    free(data);
     uv_fs_req_cleanup(handle);
 }
 
@@ -71,7 +71,8 @@ VALUE nodeRb_fs_operation(VALUE self, VALUE roperation, VALUE path, VALUE params
     uv_fs_t* handle = malloc(sizeof(uv_fs_t));
     nodeRb_file_handle* data = malloc(sizeof(nodeRb_file_handle));
     nodeRb_register_instance(callback);
-    data->target = rb_num2long(rb_obj_id(callback));
+    data->target = callback;
+    handle->data = data;
     long operation = rb_num2long(roperation);
     switch(operation){
         case 0:
@@ -117,12 +118,12 @@ VALUE nodeRb_fs_operation(VALUE self, VALUE roperation, VALUE path, VALUE params
             uv_fs_chown(uv_default_loop(), handle, rb_string_value_cstr(&path), (int) rb_num2long(rb_ary_entry(params, 0)), (int) rb_num2long(rb_ary_entry(params, 1)), nodeRb_fs_operation_callback);
             break;
     }
-    handle->data = data;
 }
 
 void nodeRb_fs_file_operation_callback(uv_fs_t* handle){
+    printf("Test\n");
     nodeRb_file_handle* data = (nodeRb_file_handle*) handle->data;
-    VALUE target = nodeRb_get_class_from_id(data->target);
+    VALUE target = data->target;
     if(handle->result == -1){
         rb_funcall(target, rb_intern("on_error"), 0, 0);
     }else{
@@ -178,7 +179,7 @@ void nodeRb_fs_file_operation_callback(uv_fs_t* handle){
             case UV_FS_OPEN:
                 {
                     uv_file fd = (uv_file) handle->result;
-                    rb_iv_set(target, "@_handle", INT2NUM(fd));
+                    rb_iv_set(target, "@_handle", INT2NUM(fd)); //INT2NUM(fd)
                     rb_funcall(target, rb_intern("on_open"), 0, 0);
                 }
                 break;
@@ -197,7 +198,7 @@ void nodeRb_fs_file_operation_callback(uv_fs_t* handle){
                 break;
         }
     }
-    free(handle->data);
+    free(data);
     uv_fs_req_cleanup(handle);
 }
 
@@ -211,7 +212,8 @@ VALUE nodeRb_fs_file_operation(VALUE self, VALUE roperation, VALUE params){
     uv_fs_t* handle = malloc(sizeof(uv_fs_t));
     nodeRb_file_handle* data = malloc(sizeof(nodeRb_file_handle));
     // Save Ruby data
-    data->target = rb_num2long(rb_obj_id(self));
+    data->target = self;
+    handle->data = data;
     // Open file
     switch(operation){
         case 0:
@@ -272,5 +274,4 @@ VALUE nodeRb_fs_file_operation(VALUE self, VALUE roperation, VALUE params){
             uv_fs_close(uv_default_loop(), handle, fd, nodeRb_fs_file_operation_callback);
             break;
     }
-    handle->data = data;
 }

data/ext/noderb_extension/noderb_timers.c

@@ -14,7 +14,7 @@ void nodeRb_timers_callback(uv_timer_t* handle, int status){
     nodeRb_timers_handle* data = (nodeRb_timers_handle*) handle->data;
     VALUE handler = nodeRb_get_class_from_id(data->target);
     // Run callback
-    rb_funcall(handler, rb_intern("call"), 1, handler);
+    rb_funcall(nodeRb_get_nodeRb_module(), rb_intern("next_tick_schedule"), 2, handler, handler);
     if(data->repeat == 0){
         // Let the GC work
         nodeRb_unregister_instance(handler);
@@ -28,13 +28,13 @@ VALUE nodeRb_timers_stop(VALUE self){
     // Load data
     uv_timer_t *handle;
     Data_Get_Struct(rb_iv_get(self, "@_handle"), uv_timer_t, handle);
+    // Free memory
+    nodeRb_timers_handle* data = (nodeRb_timers_handle*) handle->data;
+    free(data);
     // Stop timer
     uv_timer_stop(handle);
     // Let the GC work
     nodeRb_unregister_instance(self);
-    // Free memory
-    free((nodeRb_timers_handle*) handle->data);
-    free(handle);
 }
 
 VALUE nodeRb_timers_once(VALUE self, VALUE timeout, VALUE repeat, VALUE handler){
@@ -49,7 +49,7 @@ VALUE nodeRb_timers_once(VALUE self, VALUE timeout, VALUE repeat, VALUE handler)
     }
     data->target = rb_num2long(rb_obj_id(handler));
     // Initialize
-    uv_timer_init1(uv_default_loop(), handle);
+    uv_timer_init(uv_default_loop(), handle);
     handle->data = data;
     // Save handle
     rb_iv_set(handler, "@_handle", Data_Wrap_Struct(nodeRb_get_nodeRb_pointer(), 0, NULL, handle));

data/lib/noderb/version.rb

@@ -1,3 +1,3 @@
 module NodeRb
-  VERSION = "0.0.10" unless const_defined?(:VERSION)
+  VERSION = "0.0.11" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: noderb
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-22 00:00:00.000000000Z
+date: 2011-09-30 00:00:00.000000000Z
 dependencies: []
 description: Port of the NodeJs library to Ruby, featuring asynchronous IO operations
   of all kinds.
@@ -43,12 +43,13 @@ files:
 - ext/noderb_extension/libuv/include/uv-private/ev.h
 - ext/noderb_extension/libuv/include/uv-private/ngx-queue.h
 - ext/noderb_extension/libuv/include/uv-private/tree.h
+- ext/noderb_extension/libuv/include/uv-private/uv-linux.h
 - ext/noderb_extension/libuv/include/uv-private/uv-unix.h
 - ext/noderb_extension/libuv/include/uv-private/uv-win.h
 - ext/noderb_extension/libuv/include/uv.h
 - ext/noderb_extension/libuv/LICENSE
 - ext/noderb_extension/libuv/Makefile
-- ext/noderb_extension/libuv/README
+- ext/noderb_extension/libuv/README.md
 - ext/noderb_extension/libuv/src/ares/ares__close_sockets.c
 - ext/noderb_extension/libuv/src/ares/ares__get_hostent.c
 - ext/noderb_extension/libuv/src/ares/ares__read_line.c
@@ -213,6 +214,7 @@ files:
 - ext/noderb_extension/libuv/src/win/cares.c
 - ext/noderb_extension/libuv/src/win/core.c
 - ext/noderb_extension/libuv/src/win/error.c
+- ext/noderb_extension/libuv/src/win/fs-event.c
 - ext/noderb_extension/libuv/src/win/fs.c
 - ext/noderb_extension/libuv/src/win/getaddrinfo.c
 - ext/noderb_extension/libuv/src/win/handle.c
@@ -259,6 +261,7 @@ files:
 - ext/noderb_extension/libuv/test/test-connection-fail.c
 - ext/noderb_extension/libuv/test/test-delayed-accept.c
 - ext/noderb_extension/libuv/test/test-fail-always.c
+- ext/noderb_extension/libuv/test/test-fs-event.c
 - ext/noderb_extension/libuv/test/test-fs.c
 - ext/noderb_extension/libuv/test/test-get-currentexe.c
 - ext/noderb_extension/libuv/test/test-getaddrinfo.c
@@ -277,10 +280,12 @@ files:
 - ext/noderb_extension/libuv/test/test-tcp-bind-error.c
 - ext/noderb_extension/libuv/test/test-tcp-bind6-error.c
 - ext/noderb_extension/libuv/test/test-tcp-close.c
+- ext/noderb_extension/libuv/test/test-tcp-write-error.c
 - ext/noderb_extension/libuv/test/test-tcp-writealot.c
 - ext/noderb_extension/libuv/test/test-threadpool.c
 - ext/noderb_extension/libuv/test/test-timer-again.c
 - ext/noderb_extension/libuv/test/test-timer.c
+- ext/noderb_extension/libuv/test/test-tty.c
 - ext/noderb_extension/libuv/test/test-udp-dgram-too-big.c
 - ext/noderb_extension/libuv/test/test-udp-ipv6.c
 - ext/noderb_extension/libuv/test/test-udp-send-and-recv.c