asyncengine 0.0.1.testing1 → 0.0.2.alpha1

data/ext/asyncengine/ip_parser.h

@@ -0,0 +1,16 @@
+#ifndef _AE_IP_PARSER_H
+#define _AE_IP_PARSER_H
+
+
+typedef enum {
+  ip_type_no_ip = 0,
+  ip_type_ipv4,
+  ip_type_ipv6,
+  ip_type_ipv6_reference,
+} enum_ip_type;
+
+
+enum_ip_type ae_ip_parser_execute(const char *str, int len);
+
+
+#endif  /* _AE_IP_PARSER_H */

data/ext/asyncengine/libuv/AUTHORS

@@ -43,3 +43,19 @@ Paddy Byers <paddy.byers@gmail.com>
 Dan VerWeire <dverweire@gmail.com>
 Brandon Benvie <brandon@bbenvie.com>
 Brandon Philips <brandon.philips@rackspace.com>
+Nathan Rajlich <nathan@tootallnate.net>
+Brandon Philips <brandon@ifup.org>
+Charlie McConnell <charlie@charlieistheman.com>
+Vladimir Dronnikov <dronnikov@gmail.com>
+Aaron Bieber <qbit@deftly.net>
+Bulat Shakirzyanov <mallluhuct@gmail.com>
+Brian White <mscdex@mscdex.net>
+Erik Dubbelboer <erik@dubbelboer.com>
+Keno Fischer <kenof@stanford.edu>
+Ira Cooper <Ira.Cooper@mathworks.com>
+Andrius Bentkus <andrius.bentkus@gmail.com>
+Brian White <mscdex@gmail.com>
+Iñaki Baz Castillo <ibc@aliax.net>
+Mark Cavage <mark.cavage@joyent.com>
+George Yohng <georgegh@oss3d.com>
+Xidorn Quan <quanxunzhen@gmail.com>

data/ext/asyncengine/libuv/common.gypi

@@ -24,7 +24,7 @@
               }],
             ],
             'Optimization': 0, # /Od, no optimization
-            'MinimalRebuild': 'true',
+            'MinimalRebuild': 'false',
             'OmitFramePointers': 'false',
             'BasicRuntimeChecks': 3, # /RTC1
           },
@@ -57,9 +57,6 @@
             'OmitFramePointers': 'true',
             'EnableFunctionLevelLinking': 'true',
             'EnableIntrinsicFunctions': 'true',
-            'AdditionalOptions': [
-              '/MP', # compile across multiple CPUs
-            ],
           },
           'VCLibrarianTool': {
             'AdditionalOptions': [
@@ -84,6 +81,9 @@
         'ExceptionHandling': 1, # /EHsc
         'SuppressStartupBanner': 'true',
         'WarnAsError': 'false',
+        'AdditionalOptions': [
+           '/MP', # compile across multiple CPUs
+         ],
       },
       'VCLibrarianTool': {
       },

data/ext/asyncengine/libuv/config-mingw.mk

@@ -37,14 +37,14 @@ RUNNER_LINKFLAGS=$(LINKFLAGS)
 RUNNER_LIBS=-lws2_32 -lpsapi -liphlpapi
 RUNNER_SRC=test/runner-win.c
 
-uv.a: $(WIN_OBJS) src/uv-common.o $(CARES_OBJS)
-	$(AR) rcs uv.a src/win/*.o src/uv-common.o $(CARES_OBJS)
+uv.a: $(WIN_OBJS) src/cares.o src/fs-poll.o src/uv-common.o $(CARES_OBJS)
+	$(AR) rcs uv.a $^
 
-src/win/%.o: src/win/%.c src/win/internal.h
-	$(CC) $(CFLAGS) -o $@ -c $<
+src/%.o: src/%.c include/uv.h include/uv-private/uv-win.h
+	$(CC) $(CFLAGS) -c $< -o $@
 
-src/uv-common.o: src/uv-common.c include/uv.h include/uv-private/uv-win.h
-	$(CC) $(CFLAGS) -c src/uv-common.c -o src/uv-common.o
+src/win/%.o: src/win/%.c include/uv.h include/uv-private/uv-win.h src/win/internal.h
+	$(CC) $(CFLAGS) -o $@ -c $<
 
 EIO_CPPFLAGS += $(CPPFLAGS)
 EIO_CPPFLAGS += -DEIO_STACKSIZE=65536

data/ext/asyncengine/libuv/config-unix.mk

@@ -21,23 +21,21 @@
 E=
 CSTDFLAG=--std=c89 -pedantic -Wall -Wextra -Wno-unused-parameter
 CFLAGS += -g
-CPPFLAGS += -Isrc/unix/ev
+CPPFLAGS += -Isrc -Isrc/unix/ev
 LINKFLAGS=-lm
 
 CPPFLAGS += -D_LARGEFILE_SOURCE
 CPPFLAGS += -D_FILE_OFFSET_BITS=64
 
 OBJS += src/unix/async.o
-OBJS += src/unix/cares.o
-OBJS += src/unix/check.o
 OBJS += src/unix/core.o
 OBJS += src/unix/dl.o
 OBJS += src/unix/error.o
 OBJS += src/unix/fs.o
-OBJS += src/unix/idle.o
 OBJS += src/unix/loop.o
+OBJS += src/unix/loop-watcher.o
 OBJS += src/unix/pipe.o
-OBJS += src/unix/prepare.o
+OBJS += src/unix/poll.o
 OBJS += src/unix/process.o
 OBJS += src/unix/stream.o
 OBJS += src/unix/tcp.o
@@ -69,7 +67,9 @@ EIO_CONFIG=config_linux.h
 CSTDFLAG += -D_GNU_SOURCE
 CPPFLAGS += -Isrc/ares/config_linux
 LINKFLAGS+=-ldl -lrt
-OBJS += src/unix/linux/core.o src/unix/linux/inotify.o src/unix/linux/syscalls.o
+OBJS += src/unix/linux/linux-core.o \
+        src/unix/linux/inotify.o    \
+        src/unix/linux/syscalls.o
 endif
 
 ifeq (FreeBSD,$(uname_S))
@@ -103,7 +103,7 @@ ifeq (OpenBSD,$(uname_S))
 EV_CONFIG=config_openbsd.h
 EIO_CONFIG=config_openbsd.h
 CPPFLAGS += -Isrc/ares/config_openbsd
-LINKFLAGS+=
+LINKFLAGS+=-lkvm
 OBJS += src/unix/openbsd.o
 OBJS += src/unix/kqueue.o
 endif
@@ -131,14 +131,14 @@ endif
 RUNNER_LIBS=
 RUNNER_SRC=test/runner-unix.c
 
-uv.a: $(OBJS) src/uv-common.o src/unix/ev/ev.o src/unix/uv-eio.o src/unix/eio/eio.o $(CARES_OBJS)
-	$(AR) rcs uv.a $(OBJS) src/uv-common.o src/unix/uv-eio.o src/unix/ev/ev.o src/unix/eio/eio.o $(CARES_OBJS)
+uv.a: $(OBJS) src/cares.o src/fs-poll.o src/uv-common.o src/unix/ev/ev.o src/unix/uv-eio.o src/unix/eio/eio.o $(CARES_OBJS)
+	$(AR) rcs uv.a $^
 
-src/unix/%.o: src/unix/%.c include/uv.h include/uv-private/uv-unix.h src/unix/internal.h
-	$(CC) $(CSTDFLAG) $(CPPFLAGS) -Isrc  $(CFLAGS) -c $< -o $@
+src/%.o: src/%.c include/uv.h include/uv-private/uv-unix.h
+	$(CC) $(CSTDFLAG) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
 
-src/uv-common.o: src/uv-common.c include/uv.h include/uv-private/uv-unix.h
-	$(CC) $(CSTDFLAG) $(CPPFLAGS) $(CFLAGS) -c src/uv-common.c -o src/uv-common.o
+src/unix/%.o: src/unix/%.c include/uv.h include/uv-private/uv-unix.h src/unix/internal.h
+	$(CC) $(CSTDFLAG) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
 
 src/unix/ev/ev.o: src/unix/ev/ev.c
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c src/unix/ev/ev.c -o src/unix/ev/ev.o -DEV_CONFIG_H=\"$(EV_CONFIG)\"

data/ext/asyncengine/libuv/gyp_uv

@@ -8,7 +8,11 @@ script_dir = os.path.dirname(__file__)
 uv_root = os.path.normpath(script_dir)
 
 sys.path.insert(0, os.path.join(uv_root, 'build', 'gyp', 'pylib'))
-import gyp
+try:
+  import gyp
+except ImportError:
+  print('You need to install gyp in build/gyp first. See the README.')
+  sys.exit(42)
 
 # Directory within which we want all generated files (including Makefiles)
 # to be written.

data/ext/asyncengine/libuv/ibc_tests/exec_test.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+FILE=$1
+
+gcc $FILE ../uv.a -I../include/ -L../ -lm -lpthread -lrt -o /tmp/ibc_test_uv
+/tmp/ibc_test_uv

data/ext/asyncengine/libuv/ibc_tests/uv_shutdown_write_issue.c

@@ -0,0 +1,171 @@
+/*
+ * Copy this file in libuv directory and run it as follows (Linux):
+ *
+ * In a second terminal run:
+ *   nc -l 127.0.0.1 9999
+ *
+ * libuv reported issue: https://github.com/joyent/libuv/issues/445
+ * Status: FIXED.
+ * 
+ */
+
+
+#include "uv.h"
+#include <stdio.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <assert.h>
+
+
+#define DEBUG(desc)  fprintf(stdout, "DEBUG: %s:%d:%s::  %s\n", __FILE__, __LINE__, __FUNCTION__, desc)
+
+#define SERVER_IP  "127.0.0.1"
+#define SERVER_PORT  9999
+
+
+static uv_tcp_t tcp_client;
+static uv_connect_t connect_req;
+static uv_write_t write_req;
+static uv_shutdown_t shutdown_req;
+static uv_timer_t timer;
+
+static tcp_connected = 0;
+
+static void connect_cb(uv_connect_t* req, int status);
+static void write_cb(uv_write_t* req, int status);
+static void read_cb(uv_stream_t* stream, ssize_t nread, uv_buf_t buf);
+static uv_buf_t alloc_cb(uv_handle_t* handle, size_t suggested_size);
+static void read_cb(uv_stream_t* stream, ssize_t nread, uv_buf_t buf);
+static void shutdown_cb(uv_shutdown_t* req, int status);
+static void timer_cb(uv_timer_t* handle, int status);
+static void close_cb(uv_handle_t* handle);
+
+
+static void connect_cb(uv_connect_t* req, int status)
+{
+  uv_tcp_t* _uv_handle = (uv_tcp_t*)req->handle;
+
+  if (! status) {
+    DEBUG("connected");
+    tcp_connected = 1;
+  }
+  else {
+    DEBUG("connection failed, run 'nc -l SERVER_IP SERVER_PORT' first please...");
+    exit(0);
+  }
+}
+
+
+static void write_cb(uv_write_t* req, int status)
+{
+  if (! status)
+    DEBUG("write ok");
+  else
+    DEBUG("write failed");
+}
+
+
+static uv_buf_t alloc_cb(uv_handle_t* handle, size_t suggested_size)
+{
+  static char buffer[1024];
+
+  DEBUG("called");
+
+  return uv_buf_init(buffer, sizeof(buffer));
+}
+
+
+static void read_cb(uv_stream_t* stream, ssize_t nread, uv_buf_t buf)
+{
+  if (nread >= 0)
+    DEBUG("data received");
+  else {
+    DEBUG("disconnected, so exit()");
+    exit(0);
+  }
+}
+
+
+static void shutdown_cb(uv_shutdown_t* req, int status)
+{
+if (! status)
+    DEBUG("shutdown ok");
+  else {
+    DEBUG("shutdown failed, so exit()");
+    exit(0);
+  }
+
+  DEBUG("uv_close(tcp_client), will close_cb() be called?... (NOT !, WHY ?)");
+  uv_close((uv_handle_t *)&tcp_client, close_cb);
+}
+
+
+static void timer_cb(uv_timer_t* handle, int status)
+{
+  int r;
+  char data[5] = "HELLO";
+  uv_buf_t buf;
+
+  DEBUG("timer fires");
+
+  if (! tcp_connected) {
+    DEBUG("tcp_client is not connected when timer fires, run 'nc -l SERVER_IP SERVER_PORT' first please...");
+    exit(0);
+  }
+
+  DEBUG("uv_close(timer), will close_cb() be called?... (NOT !, WHY ?)");
+  uv_close((uv_handle_t *)&timer, close_cb);
+
+  buf = uv_buf_init(data, 5);
+
+  r = uv_write(&write_req, (uv_stream_t *)&tcp_client,
+               &buf, 1, write_cb);
+  assert(r == 0);
+
+  r = uv_shutdown(&shutdown_req,
+                  (uv_stream_t*)&tcp_client,
+                  shutdown_cb);
+  assert(r == 0);
+}
+
+
+static void close_cb(uv_handle_t* handle)
+{
+  DEBUG("handle closed");
+}
+
+
+int main(int argc, char* argv)
+{
+  uv_loop_t* loop;
+  int r;
+
+  loop = uv_default_loop();
+  assert(loop != NULL);
+
+  r = uv_tcp_init(loop, &tcp_client);
+  assert(r == 0);
+
+  r = uv_tcp_connect(&connect_req,
+                     &tcp_client,
+                     uv_ip4_addr(SERVER_IP, SERVER_PORT),
+                     connect_cb);
+  assert(r == 0);
+
+  r = uv_read_start((uv_stream_t*)&tcp_client,
+                    alloc_cb, read_cb);
+
+  r = uv_timer_init(loop, &timer);
+  assert(r == 0);
+
+  uv_timer_start(&timer, timer_cb, 1000, 0);
+  assert(r == 0);
+
+  r = uv_run(loop);
+  assert(r == 0);
+
+  return 0;
+}

data/ext/asyncengine/libuv/ibc_tests/uv_tcp_close_while_connecting.c

@@ -0,0 +1,102 @@
+/*
+ * libuv reported issue: https://github.com/joyent/libuv/issues/448
+ * Status: PENDING.
+ * 
+ */
+
+
+#include "uv.h"
+#include <stdio.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+
+#define DEBUG(desc)  fprintf(stdout, "DEBUG: %s:%d:%s::  %s\n", __FILE__, __LINE__, __FUNCTION__, desc)
+
+
+static uv_loop_t* loop;
+static uv_tcp_t tcp_client;
+static uv_connect_t connect_req;
+static uv_timer_t timer1;
+static uv_timer_t timer2;
+
+static void connect_cb(uv_connect_t* req, int status);
+static void timer1_cb(uv_timer_t* handle, int status);
+static void timer2_cb(uv_timer_t* handle, int status);
+
+static void tcp_close_cb(uv_handle_t* handle) { DEBUG("tcp handle closed"); }
+static void timer1_close_cb(uv_handle_t* handle) { DEBUG("timer 1 handle closed"); }
+static void timer2_close_cb(uv_handle_t* handle) { DEBUG("timer 2 handle closed"); }
+
+
+static void connect_cb(uv_connect_t* req, int status)
+{
+  if (! status) {
+    DEBUG("connected to 1.2.3.4:9999? really???");
+    exit(1);
+  }
+  else {
+    DEBUG("connection failed or interrupted");
+    printf("... uv last error code: %d\n", uv_last_error(loop).code);
+  }
+}
+
+
+/* timer 1 calls to uv_close() for the TCP handle, which SHOULD provoke the
+ * connect_cb() with error status right now.
+ */
+static void timer1_cb(uv_timer_t* handle, int status)
+{
+  DEBUG("timer 1 fires, calling uv_close() for timer 1 and for tcp handle, connect_cb(EINTR) should be called now !!!");
+  uv_close((uv_handle_t *)&timer1, timer1_close_cb);
+  uv_close((uv_handle_t *)&tcp_client, tcp_close_cb);
+}
+
+
+static void timer2_cb(uv_timer_t* handle, int status)
+{
+  DEBUG("timer 2 fires, calling uv_close() for timer 2... OPPS, connect_cb(EINTR) is called now (so late...), WHY ???");
+  uv_close((uv_handle_t *)&timer2, timer2_close_cb);
+}
+
+
+int main(int argc, char* argv)
+{
+  int r;
+
+  loop = uv_default_loop();
+  assert(loop != NULL);
+
+  r = uv_tcp_init(loop, &tcp_client);
+  assert(r == 0);
+
+  DEBUG("connecting to 1.2.3.4:9999...");
+  r = uv_tcp_connect(&connect_req,
+                     &tcp_client,
+                     uv_ip4_addr("1.2.3.4", 9999),
+                     connect_cb);
+  assert(r == 0);
+
+  r = uv_timer_init(loop, &timer1);
+  assert(r == 0);
+
+  DEBUG("timer 1 will fire in 3 seconds and will call uv_close(tcp handle)...");
+  uv_timer_start(&timer1, timer1_cb, 3000, 0);
+  assert(r == 0);
+
+  r = uv_timer_init(loop, &timer2);
+  assert(r == 0);
+
+  DEBUG("timer 2 will fire in 6 seconds and will do nothing but demonstrate the bug...");
+  uv_timer_start(&timer2, timer2_cb, 6000, 0);
+  assert(r == 0);
+
+  DEBUG("loop started");
+  r = uv_run(loop);
+  assert(r == 0);
+
+  return 0;
+}