noderb 0.0.4 → 0.0.6

data/ext/noderb_extension/libuv/src/{eio → unix/eio}/config_darwin.h

@@ -8,7 +8,11 @@
 /* #undef HAVE_FALLOCATE */
 
 /* fdatasync(2) is available */
+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1060
 #define HAVE_FDATASYNC 1
+#else
+#define HAVE_FDATASYNC 0
+#endif
 
 /* futimes(2) is available */
 #define HAVE_FUTIMES 1

data/ext/noderb_extension/libuv/src/{eio → unix/eio}/config_linux.h

@@ -2,17 +2,7 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
 #include <linux/version.h>
-
-#define LINUX_VERSION_CODE_FOR(major, minor, patch) \
-  (((major & 255) << 16) | ((minor & 255) << 8) | (patch & 255))
-
-#define LINUX_VERSION_AT_LEAST(major, minor, patch) \
-  (LINUX_VERSION_CODE >= LINUX_VERSION_CODE_FOR(major, minor, patch))
-
-#ifdef __GLIBC__
-#define GLIBC_VERSION_AT_LEAST(major, minor) \
-  (__GLIBC__ > major || (__GLIBC__ == major && __GLIBC_MINOR__ >= minor))
-#endif
+#include <features.h>
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1
@@ -53,11 +43,11 @@
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
 
-/* sync_file_range(2) is available */
-#ifdef __GLIBC__
-#define HAVE_SYNC_FILE_RANGE (LINUX_VERSION_AT_LEAST(2, 6, 17) && GLIBC_VERSION_AT_LEAST(2, 6))
+/* sync_file_range(2) is available if kernel >= 2.6.17 and glibc >= 2.6 */
+#if LINUX_VERSION_CODE >= 0x020611 && __GLIBC_PREREQ(2, 6)
+#define HAVE_SYNC_FILE_RANGE 1
 #else
-#define HAVE_SYNC_FILE_RANGE LINUX_VERSION_AT_LEAST(2, 6, 17)
+#define HAVE_SYNC_FILE_RANGE 0
 #endif
 
 /* Define to 1 if you have the <sys/stat.h> header file. */

data/ext/noderb_extension/libuv/src/{eio → unix/eio}/eio.c

@@ -401,6 +401,16 @@ static xmutex_t reslock;
 static xmutex_t reqlock;
 static xcond_t  reqwait;
 
+/* Fix for test-fs-sir-writes-alot */
+/* Apple's OSX can't safely write() concurrently from 2 threads */
+/* for more info see the thread "fs.write Data Munging" in the nodejs google group */
+/* http://groups.google.com/group/nodejs/browse_thread/thread/c11f8b683f37cef/b18ad9e0a15314c5 */
+/* And the thread "write()s and pwrite()s from multiple threads in OSX" in libev@lists.schmorp.de */
+/* http://lists.schmorp.de/pipermail/libev/2010q4/001185.html */
+#if defined (__APPLE__)
+static xmutex_t apple_bug_writelock = X_MUTEX_INIT;
+#endif
+
 #if !HAVE_PREADWRITE
 /*
  * make our pread/pwrite emulation safe against themselves, but not against
@@ -2153,9 +2163,20 @@ eio_execute (etp_worker *self, eio_req *req)
                           req->result = req->offs >= 0
                                       ? pread     (req->int1, req->ptr2, req->size, req->offs)
                                       : read      (req->int1, req->ptr2, req->size); break;
-      case EIO_WRITE:     req->result = req->offs >= 0
+
+      case EIO_WRITE:
+#if defined (__APPLE__)
+                          pthread_mutex_lock (&apple_bug_writelock);
+#endif
+
+                          req->result = req->offs >= 0
                                       ? pwrite    (req->int1, req->ptr2, req->size, req->offs)
-                                      : write     (req->int1, req->ptr2, req->size); break;
+                                      : write     (req->int1, req->ptr2, req->size);
+
+#if defined (__APPLE__)
+                          pthread_mutex_unlock (&apple_bug_writelock);
+#endif
+                          break;
 
       case EIO_READAHEAD: req->result = readahead     (req->int1, req->offs, req->size); break;
       case EIO_SENDFILE:  req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;

data/ext/noderb_extension/libuv/src/unix/error.c

@@ -0,0 +1,102 @@
+/* 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.
+ */
+
+/*
+ * TODO Share this code with Windows.
+ * See https://github.com/joyent/libuv/issues/76
+ */
+
+#include "uv.h"
+#include "internal.h"
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+
+/* TODO Expose callback to user to handle fatal error like V8 does. */
+void uv_fatal_error(const int errorno, const char* syscall) {
+  char* buf = NULL;
+  const char* errmsg;
+
+  if (buf) {
+    errmsg = buf;
+  } else {
+    errmsg = "Unknown error";
+  }
+
+  if (syscall) {
+    fprintf(stderr, "\nlibuv fatal error. %s: (%d) %s\n", syscall, errorno,
+        errmsg);
+  } else {
+    fprintf(stderr, "\nlibuv fatal error. (%d) %s\n", errorno, errmsg);
+  }
+
+  abort();
+}
+
+
+uv_err_t uv_last_error(uv_loop_t* loop) {
+  return loop->last_err;
+}
+
+
+char* uv_strerror(uv_err_t err) {
+  return strerror(err.sys_errno_);
+}
+
+
+static uv_err_code uv_translate_sys_error(int sys_errno) {
+  switch (sys_errno) {
+    case 0: return UV_OK;
+    case EACCES: return UV_EACCESS;
+    case EBADF: return UV_EBADF;
+    case EPIPE: return UV_EPIPE;
+    case EAGAIN: return UV_EAGAIN;
+    case ECONNRESET: return UV_ECONNRESET;
+    case EFAULT: return UV_EFAULT;
+    case EMFILE: return UV_EMFILE;
+    case EMSGSIZE: return UV_EMSGSIZE;
+    case EINVAL: return UV_EINVAL;
+    case ECONNREFUSED: return UV_ECONNREFUSED;
+    case EADDRINUSE: return UV_EADDRINUSE;
+    case EADDRNOTAVAIL: return UV_EADDRNOTAVAIL;
+    default: return UV_UNKNOWN;
+  }
+}
+
+
+uv_err_t uv_err_new_artificial(uv_loop_t* loop, int code) {
+  uv_err_t err;
+  err.sys_errno_ = 0;
+  err.code = code;
+  loop->last_err = err;
+  return err;
+}
+
+
+uv_err_t uv_err_new(uv_loop_t* loop, int sys_error) {
+  uv_err_t err;
+  err.sys_errno_ = sys_error;
+  err.code = uv_translate_sys_error(sys_error);
+  loop->last_err = err;
+  return err;
+}

data/ext/noderb_extension/libuv/src/{ev → unix/ev}/config_linux.h

@@ -2,12 +2,7 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
 #include <linux/version.h>
-
-#define LINUX_VERSION_CODE_FOR(major, minor, patch) \
-  (((major & 255) << 16) | ((minor & 255) << 8) | (patch & 255))
-
-#define LINUX_VERSION_AT_LEAST(major, minor, patch) \
-  (LINUX_VERSION_CODE >= LINUX_VERSION_CODE_FOR(major, minor, patch))
+#include <features.h>
 
 /* Define to 1 if you have the `clock_gettime' function. */
 /* #undef HAVE_CLOCK_GETTIME */
@@ -18,14 +13,26 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1
 
-/* Define to 1 if you have the `epoll_ctl' function. */
+/* epoll_ctl(2) is available if kernel >= 2.6.9 and glibc >= 2.4 */
+#if LINUX_VERSION_CODE >= 0x020609 && __GLIBC_PREREQ(2, 4)
 #define HAVE_EPOLL_CTL 1
-
-/* Define to 1 if you have the `eventfd' function. */
-#define HAVE_EVENTFD LINUX_VERSION_AT_LEAST(2, 6, 22)
-
-/* Define to 1 if you have the `inotify_init' function. */
-#define HAVE_INOTIFY_INIT LINUX_VERSION_AT_LEAST(2, 6, 13)
+#else
+#define HAVE_EPOLL_CTL 0
+#endif
+
+/* eventfd(2) is available if kernel >= 2.6.22 and glibc >= 2.8 */
+#if LINUX_VERSION_CODE >= 0x020616 && __GLIBC_PREREQ(2, 8)
+#define HAVE_EVENTFD 1
+#else
+#define HAVE_EVENTFD 0
+#endif
+
+/* inotify_init(2) is available if kernel >= 2.6.13 and glibc >= 2.4 */
+#if LINUX_VERSION_CODE >= 0x02060d && __GLIBC_PREREQ(2, 4)
+#define HAVE_INOTIFY_INIT 1
+#else
+#define HAVE_INOTIFY_INIT 0
+#endif
 
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1
@@ -60,8 +67,12 @@
 /* Define to 1 if you have the `select' function. */
 #define HAVE_SELECT 1
 
-/* Define to 1 if you have the `signalfd' function. */
-#define HAVE_SIGNALFD LINUX_VERSION_AT_LEAST(2, 6, 22)
+/* signalfd(2) is available if kernel >= 2.6.22 and glibc >= 2.8 */
+#if LINUX_VERSION_CODE >= 0x020616 && __GLIBC_PREREQ(2, 8)
+#define HAVE_SIGNALFD 1
+#else
+#define HAVE_SIGNALFD 0
+#endif
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1