noderb 0.0.4 → 0.0.6

data/ext/noderb_extension/libuv/{all.gyp → uv.gyp}

@@ -1,49 +1,13 @@
 {
-  'target_defaults': {
-    'default_configuration': 'Debug',
-    'configurations': {
-      # TODO: hoist these out and put them somewhere common, because
-      #       RuntimeLibrary MUST MATCH across the entire project
-      'Debug': {
-        'defines': [ 'DEBUG', '_DEBUG' ],
-        'msvs_settings': {
-          'VCCLCompilerTool': {
-            'RuntimeLibrary': 1, # static debug
-          },
-        },
-      },
-      'Release': {
-        'defines': [ 'NDEBUG' ],
-        'msvs_settings': {
-          'VCCLCompilerTool': {
-            'RuntimeLibrary': 0, # static release
-          },
-        },
-      }
-    },
-    'msvs_settings': {
-      'VCCLCompilerTool': {
-      },
-      'VCLibrarianTool': {
-      },
-      'VCLinkerTool': {
-        'GenerateDebugInformation': 'true',
-      },
-    },
-    'conditions': [
-      ['OS == "win"', {
-        'defines': [
-          'WIN32'
-        ],
-      }]
-    ],
-  },
-
   'targets': [
     {
       'target_name': 'uv',
-      'type': 'static_library',
-      'include_dirs': [ 'include' ],
+      'type': '<(library)',
+      'include_dirs': [
+        'include',
+        'include/uv-private',
+        'src/',
+      ],
       'direct_dependent_settings': {
         'include_dirs': [ 'include' ],
       },
@@ -131,28 +95,38 @@
             '_GNU_SOURCE',
           ],
           'sources': [
-            'include/tree.h',
-            'include/uv-win.h',
+            'include/uv-private/tree.h',
+            'include/uv-private/uv-win.h',
             'src/ares/config_win32/ares_config.h',
             'src/win/async.c',
             'src/win/cares.c',
             'src/win/core.c',
             'src/win/error.c',
+            'src/win/fs.c',
             'src/win/getaddrinfo.c',
             'src/win/handle.c',
             'src/win/internal.h',
             'src/win/loop-watcher.c',
-            'src/win/ntdll.h',
             'src/win/pipe.c',
             'src/win/process.c',
             'src/win/req.c',
             'src/win/stdio.c',
             'src/win/stream.c',
             'src/win/tcp.c',
+            'src/win/threadpool.c',
             'src/win/timer.c',
+            'src/win/udp.c',
             'src/win/util.c',
             'src/win/winapi.c',
-          ]
+            'src/win/winapi.h',
+            'src/win/winsock.c',
+            'src/win/winsock.h',
+          ],
+          'link_settings': {
+            'libraries': [
+              '-lws2_32.lib',
+            ],
+          },
         }, { # Not Windows i.e. POSIX
           'cflags': [
             '-g',
@@ -163,40 +137,48 @@
             '-Wno-unused-parameter'
           ],
           'sources': [
-            'include/eio.h',
-            'include/ev.h',
-            'include/ngx-queue.h',
-            'include/uv-unix.h',
-            'src/uv-eio.c',
-            'src/uv-eio.h',
-            'src/uv-unix.c',
+            'include/uv-private/eio.h',
+            'include/uv-private/ev.h',
+            'include/uv-private/ngx-queue.h',
+            'include/uv-private/uv-unix.h',
+            'src/unix/core.c',
+            'src/unix/uv-eio.c',
+            'src/unix/uv-eio.h',
+            'src/unix/fs.c',
+            'src/unix/udp.c',
+            'src/unix/tcp.c',
+            'src/unix/pipe.c',
+            'src/unix/stream.c',
+            'src/unix/cares.c',
+            'src/unix/error.c',
+            'src/unix/process.c',
+            'src/unix/internal.h',
+            'src/unix/eio/ecb.h',
+            'src/unix/eio/eio.c',
+            'src/unix/eio/xthread.h',
+            'src/unix/ev/ev.c',
+            '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/eio/config_cygwin.h',
-            'src/eio/config_darwin.h',
-            'src/eio/config_freebsd.h',
-            'src/eio/config_linux.h',
-            'src/eio/config_sunos.h',
-            'src/eio/ecb.h',
-            'src/eio/eio.c',
-            'src/eio/xthread.h',
-            'src/ev/config_cygwin.h',
-            'src/ev/config_darwin.h',
-            'src/ev/config_freebsd.h',
-            'src/ev/config_linux.h',
-            'src/ev/config_sunos.h',
-            'src/ev/ev.c',
-            'src/ev/ev_vars.h',
-            'src/ev/ev_wrap.h',
-            'src/ev/event.h',
-          ],
-          'include_dirs': [
-            'src/ev'
+            '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': [
             '_LARGEFILE_SOURCE',
             '_FILE_OFFSET_BITS=64',
@@ -207,7 +189,7 @@
         }],
         [ 'OS=="mac"', {
           'include_dirs': [ 'src/ares/config_darwin' ],
-          'sources': [ 'src/uv-darwin.c' ],
+          'sources': [ 'src/unix/darwin.c' ],
           'direct_dependent_settings': {
             'libraries': [ '-framework CoreServices' ],
           },
@@ -218,7 +200,7 @@
         }],
         [ 'OS=="linux"', {
           'include_dirs': [ 'src/ares/config_linux' ],
-          'sources': [ 'src/uv-linux.c' ],
+          'sources': [ 'src/unix/linux.c' ],
           'defines': [
             'EV_CONFIG_H="config_linux.h"',
             'EIO_CONFIG_H="config_linux.h"',
@@ -246,6 +228,7 @@
         'test/test-connection-fail.c',
         'test/test-delayed-accept.c',
         'test/test-fail-always.c',
+        'test/test-fs.c',
         'test/test-get-currentexe.c',
         'test/test-getaddrinfo.c',
         'test/test-gethostbyname.c',
@@ -263,8 +246,12 @@
         'test/test-tcp-bind-error.c',
         'test/test-tcp-bind6-error.c',
         'test/test-tcp-writealot.c',
+        'test/test-threadpool.c',
         'test/test-timer-again.c',
         'test/test-timer.c',
+        'test/test-udp-dgram-too-big.c',
+        'test/test-udp-ipv6.c',
+        'test/test-udp-send-and-recv.c',
       ],
       'conditions': [
         [ 'OS=="win"', {
@@ -281,7 +268,12 @@
             'test/runner-unix.h',
           ]
         }]
-      ]
+      ],
+      'msvs-settings': {
+        'VCLinkerTool': {
+          'SubSystem': 1, # /subsystem:console
+        },
+      },
     },
 
     {
@@ -297,6 +289,7 @@
         'test/benchmark-pump.c',
         'test/benchmark-sizes.c',
         'test/benchmark-spawn.c',
+        'test/benchmark-udp-packet-storm.c',
         'test/dns-server.c',
         'test/echo-server.c',
         'test/run-benchmarks.c',
@@ -319,7 +312,12 @@
             'test/runner-unix.h',
           ]
         }]
-      ]
+      ],
+      'msvs-settings': {
+        'VCLinkerTool': {
+          'SubSystem': 1, # /subsystem:console
+        },
+      },
     }
   ]
 }

data/ext/noderb_extension/libuv/vcbuild.bat

@@ -0,0 +1,93 @@
+@echo off
+
+cd %~dp0
+
+if /i "%1"=="help" goto help
+if /i "%1"=="--help" goto help
+if /i "%1"=="-help" goto help
+if /i "%1"=="/help" goto help
+if /i "%1"=="?" goto help
+if /i "%1"=="-?" goto help
+if /i "%1"=="--?" goto help
+if /i "%1"=="/?" goto help
+
+@rem Process arguments.
+set config=
+set target=Build
+set noprojgen=
+set nobuild=
+set run=
+
+:next-arg
+if "%1"=="" goto args-done
+if /i "%1"=="debug"        set config=Debug&goto arg-ok
+if /i "%1"=="release"      set config=Release&goto arg-ok
+if /i "%1"=="test"         set run=run-tests.exe&goto arg-ok
+if /i "%1"=="bench"        set run=run-benchmarks.exe&goto arg-ok
+if /i "%1"=="clean"        set target=Clean&goto arg-ok
+if /i "%1"=="noprojgen"    set noprojgen=1&goto arg-ok
+if /i "%1"=="nobuild"      set nobuild=1&goto arg-ok
+:arg-ok
+shift
+goto next-arg
+:args-done
+
+if not "%config%"=="" goto project-gen
+if "%run%"=="run-tests.exe" set config=Debug& goto project-gen
+if "%run%"=="run-benchmarks.exe" set config=Release& goto project-gen
+set config=Debug
+
+:project-gen
+@rem Skip project generation if requested.
+if defined noprojgen goto msbuild
+
+@rem Generate the VS project.
+
+if exist build\gyp goto have_gyp
+echo svn co http://gyp.googlecode.com/svn/trunk@983 build/gyp
+svn co http://gyp.googlecode.com/svn/trunk@983 build/gyp
+if errorlevel 1 goto gyp_install_failed
+goto have_gyp
+
+:gyp_install_failed
+echo Failed to download gyp. Make sure you have subversion installed, or 
+echo manually install gyp into %~dp0build\gyp.
+goto exit
+
+:have_gyp
+python gyp_uv
+if errorlevel 1 goto create-msvs-files-failed
+if not exist uv.sln goto create-msvs-files-failed
+echo Project files generated.
+
+:msbuild
+@rem Skip project generation if requested.
+if defined nobuild goto run
+
+if not defined VCINSTALLDIR echo Build skipped. To build, this file needs to run from VS cmd prompt.& goto run
+
+@rem Build the sln with msbuild.
+msbuild uv.sln /t:%target% /p:Configuration=%config% /clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal /nologo
+if errorlevel 1 goto exit
+
+:run
+@rem Run tests if requested.
+if "%run%"=="" goto exit
+if not exist %config%\%run% goto exit
+echo running '%config%\%run%'
+%config%\%run%
+goto exit
+
+:create-msvs-files-failed
+echo Failed to create vc project files. 
+goto exit
+
+:help
+echo vcbuild.bat [debug/release] [test/bench] [clean] [noprojgen] [nobuild]
+echo Examples:
+echo   vcbuild.bat              : builds debug build
+echo   vcbuild.bat test         : builds debug build and runs tests
+echo   vcbuild.bat release bench: builds release build and runs benchmarks
+goto exit
+
+:exit

data/ext/noderb_extension/noderb.c

@@ -6,6 +6,8 @@
 #include <noderb_dns.h>
 #include <noderb_timers.h>
 #include <noderb_tools.h>
+//#include <noderb_defer.h>
+#include <noderb_fs.h>
 
 // Core NodeRb module
 VALUE nodeRb;
@@ -40,12 +42,23 @@ void Init_noderb_extension() {
     rb_define_method(nodeRbProcess, "kill_process", nodeRb_process_kill, 1);
     // Define utility methods
     rb_define_singleton_method(nodeRb, "next_tick_native", nodeRb_nextTick, 0);
+    rb_define_singleton_method(nodeRb, "start_proxy", nodeRb_startProxy, 2);
+    rb_define_singleton_method(nodeRb, "stop_proxy", nodeRb_stopProxy, 1);
     // DNS related methods
     rb_define_singleton_method(nodeRb, "resolve_native", nodeRb_dns_resolve, 2);
     // Timer related functions
     rb_define_singleton_method(nodeRb, "once_native", nodeRb_timers_once, 3);
     VALUE timer = rb_define_module_under(nodeRb, "Timer");
     rb_define_method(timer, "stop_timer", nodeRb_timers_stop, 0);
+    // Defer functions
+    //rb_define_singleton_method(nodeRb, "defer_native", nodeRb_defer, 2);
+    // Filesystem functions
+    VALUE nodeRbFile = rb_define_module_under(nodeRb, "File");
+    VALUE nodeRbFS = rb_define_class_under(nodeRb, "FileSystem", rb_cObject);
+    // File operations
+    rb_define_method(nodeRbFile, "operation_native", nodeRb_fs_file_operation, 2);
+    // Filesystem operations
+    rb_define_singleton_method(nodeRbFS, "fs_native", nodeRb_fs_operation, 4);
     // Define starting methods
     rb_define_singleton_method(nodeRb, "start", nodeRb_start, 0);
     rb_define_singleton_method(nodeRb, "start_server_native", nodeRb_tcp_startServer, 3);

data/ext/noderb_extension/noderb_common.h

@@ -4,7 +4,8 @@
 #define NODERB_BASIC_HANDLE \
     long target; \
     char* target_callback; \
-    void* proxy;
+    int proxy_enabled; \
+    void* proxy_target;
 
 typedef struct {
     NODERB_BASIC_HANDLE

data/ext/noderb_extension/noderb_defer.c

@@ -0,0 +1,54 @@
+#include <noderb_common.h>
+
+#include <noderb_defer.h>
+#include <noderb_tools.h>
+
+typedef struct {
+    long worker;
+    long callback;
+    long result;
+} nodeRb_defer_handle;
+
+void nodeRb_defer_work_done(uv_work_t* req){
+//    // Load data
+//    nodeRb_defer_handle* data = (nodeRb_defer_handle*) req->data;
+//    printf("Finish: %p\n", data);
+//    VALUE result = nodeRb_get_class_from_id(data->result);
+//    VALUE callback = nodeRb_get_class_from_id(data->callback);
+//    // Call the callback
+//    rb_funcall(callback, rb_intern("call"), 1, result);
+//    // Clean up
+//    nodeRb_unregister_instance(callback);
+//    nodeRb_unregister_instance(result);
+//    free(data);
+//    free(req);
+}
+
+void nodeRb_defer_work(uv_work_t* req){
+//    // Load data
+//    nodeRb_defer_handle* data = (nodeRb_defer_handle*) req->data;
+//    VALUE callback = nodeRb_get_class_from_id(data->worker);
+//    printf("Run: %p\n", data);
+//    // Call the callback
+//    rb_funcall(callback, rb_intern("start"), 0, 0);
+//    // Clean up
+//    printf("Run2: %p\n", data);
+//    nodeRb_unregister_instance(callback);
+//    data->worker = 0;
+}
+
+VALUE nodeRb_defer(VALUE self, VALUE worker, VALUE callback){
+//    // Initialize memory
+//    uv_work_t* handle = (uv_work_t*) malloc(sizeof(uv_work_t));
+//    nodeRb_defer_handle* data = (nodeRb_defer_handle*) malloc(sizeof(nodeRb_defer_handle));
+//    printf("Request: %p\n", data);
+//    // Safe from GC
+//    nodeRb_register_instance(worker);
+//    nodeRb_register_instance(callback);
+//    // Save data
+//    data->worker = rb_num2long(rb_obj_id(worker));
+//    data->callback = rb_num2long(rb_obj_id(callback));
+//    handle->data = data;
+//    // Queue the work
+//    uv_queue_work(handle, nodeRb_defer_work, nodeRb_defer_work_done);
+}

data/ext/noderb_extension/noderb_defer.h

@@ -0,0 +1,15 @@
+#ifndef NODERB_DEFER_H
+#define	NODERB_DEFER_H
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+VALUE nodeRb_defer(VALUE self, VALUE worker, VALUE callback);
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* NODERB_DEFER_H */
+

data/ext/noderb_extension/noderb_dns.c

@@ -31,7 +31,7 @@ VALUE nodeRb_dns_resolve(VALUE self, VALUE host, VALUE callback){
     // Save data
     data->target = rb_num2long(rb_obj_id(callback));
     // Resolve
-    uv_getaddrinfo(handle, nodeRb_dns_resolved, rb_string_value_cstr(&host), NULL, NULL);
+    uv_getaddrinfo(uv_default_loop(), handle, nodeRb_dns_resolved, rb_string_value_cstr(&host), NULL, NULL);
     // Save callback
     handle->data = data;
 }