Permalink
Browse files

uv: upgrade to e7758e1

  • Loading branch information...
1 parent 03e689f commit f0c629a36be217db68261eb54c6e134a4dba1c61 @indutny indutny committed Jan 16, 2012
@@ -23,6 +23,7 @@
# define _WIN32_WINNT 0x0502
#endif
+#include <process.h>
#include <stdint.h>
#include <winsock2.h>
#include <mswsock.h>
@@ -102,6 +103,9 @@
LPOVERLAPPED lpOverlapped,
LPTRANSMIT_FILE_BUFFERS lpTransmitBuffers,
DWORD dwFlags);
+
+ typedef PVOID RTL_SRWLOCK;
+ typedef RTL_SRWLOCK SRWLOCK, *PSRWLOCK;
#endif
typedef int (WSAAPI* LPFN_WSARECV)
@@ -144,7 +148,7 @@ typedef CRITICAL_SECTION uv_mutex_t;
typedef union {
/* srwlock_ has type SRWLOCK, but not all toolchains define this type in */
/* windows.h. */
- void* srwlock_;
+ SRWLOCK srwlock_;
struct {
uv_mutex_t read_mutex_;
uv_mutex_t write_mutex_;
View
@@ -785,13 +785,6 @@ struct uv_pipe_s {
UV_EXTERN int uv_pipe_init(uv_loop_t*, uv_pipe_t* handle, int ipc);
/*
- * Connects two initialized pipes on different loops.
- * Data written to one pipe will appear on the other side.
- * This function is thread-safe.
- */
-UV_EXTERN uv_err_t uv_pipe_pair(uv_pipe_t* a, uv_pipe_t* b);
-
-/*
* Opens an existing file descriptor or HANDLE as a pipe.
*/
UV_EXTERN void uv_pipe_open(uv_pipe_t*, uv_file file);
@@ -1356,7 +1349,6 @@ UV_EXTERN void uv_once(uv_once_t* guard, void (*callback)(void));
UV_EXTERN int uv_thread_create(uv_thread_t *tid,
void (*entry)(void *arg), void *arg);
UV_EXTERN int uv_thread_join(uv_thread_t *tid);
-UV_EXTERN uv_thread_t uv_thread_self(void);
/* the presence of these unions force similar struct layout */
union uv_any_handle {
View
@@ -221,7 +221,7 @@ int uv_run(uv_loop_t* loop) {
int uv_run_once(uv_loop_t* loop) {
- ev_run(loop->ev, EVRUN_NOWAIT);
+ ev_run(loop->ev, EVRUN_ONCE);
return 0;
}
View
@@ -30,10 +30,6 @@
#include <stdlib.h>
-static uv_once_t uv__pipe_pair_lock_guard = UV_ONCE_INIT;
-static uv_mutex_t uv__pipe_pair_lock;
-
-
int uv_pipe_init(uv_loop_t* loop, uv_pipe_t* handle, int ipc) {
uv__stream_init(loop, (uv_stream_t*)handle, UV_NAMED_PIPE);
loop->counters.pipe_init++;
@@ -43,38 +39,6 @@ int uv_pipe_init(uv_loop_t* loop, uv_pipe_t* handle, int ipc) {
}
-void uv__pipe_pair_lock_init() {
- uv_mutex_init(&uv__pipe_pair_lock);
-}
-
-
-uv_err_t uv_pipe_pair(uv_pipe_t* a, uv_pipe_t* b) {
- int fds[2];
- int r;
- uv_err_t err;
-
- /* Make sure that the mutex is only initialized once. */
- uv_once(&uv__pipe_pair_lock_guard, uv__pipe_pair_lock_init);
-
- uv_mutex_lock(&uv__pipe_pair_lock);
-
- r = uv__make_socketpair(fds, UV__F_NONBLOCK | UV__F_IPC);
-
- if (r) {
- err = uv__new_sys_error(errno);
- } else {
- uv_pipe_open(a, fds[0]);
- uv_pipe_open(b, fds[1]);
- err = uv_ok_;
- }
-
- uv_mutex_unlock(&uv__pipe_pair_lock);
-
- return err;
-}
-
-
-
int uv_pipe_bind(uv_pipe_t* handle, const char* name) {
struct sockaddr_un saddr;
const char* pipe_fname;
@@ -47,10 +47,6 @@ int uv_thread_join(uv_thread_t *tid) {
return 0;
}
-uv_thread_t uv_thread_self(void) {
- return pthread_self();
-}
-
int uv_mutex_init(uv_mutex_t* mutex) {
if (pthread_mutex_init(mutex, NULL))
@@ -98,11 +98,6 @@ static void uv_eio_done_poll(eio_channel *channel) {
static void uv__eio_init(void) {
eio_init(uv_eio_want_poll, uv_eio_done_poll);
- /*
- * Don't handle more than 10 reqs on each eio_poll(). This is to avoid
- * race conditions. See Node's test/simple/test-eio-race.js
- */
- eio_set_max_poll_reqs(10);
}
static uv_once_t uv__eio_init_once_guard = UV_ONCE_INIT;
View
@@ -91,12 +91,6 @@ int uv_pipe_init(uv_loop_t* loop, uv_pipe_t* handle, int ipc) {
}
-uv_err_t uv_pipe_pair(uv_pipe_t* a, uv_pipe_t* b) {
- /* Implement me */
- return uv__new_artificial_error(UV_ENOSYS);
-}
-
-
static void uv_pipe_connection_init(uv_pipe_t* handle) {
uv_connection_init((uv_stream_t*) handle);
handle->read_req.data = handle;
View
@@ -113,11 +113,6 @@ int uv_thread_join(uv_thread_t *tid) {
}
-uv_thread_t uv_thread_self(void) {
- return GetCurrentThreadId();
-}
-
-
int uv_mutex_init(uv_mutex_t* mutex) {
InitializeCriticalSection(mutex);
return 0;
View
@@ -4337,11 +4337,6 @@ typedef NTSTATUS (NTAPI *sNtSetInformationFile)
} OVERLAPPED_ENTRY, *LPOVERLAPPED_ENTRY;
#endif
-#ifdef __MINGW32__
- typedef PVOID RTL_SRWLOCK;
- typedef RTL_SRWLOCK SRWLOCK, *PSRWLOCK;
-#endif
-
/* from wincon.h */
#ifndef ENABLE_INSERT_MODE
# define ENABLE_INSERT_MODE 0x20
@@ -0,0 +1,88 @@
+/* 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.
+ */
+
+#include "uv.h"
+#include "task.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+
+static uv_idle_t idle;
+
+static const int max_opened = 10000;
+static const int max_delta = 4000;
+
+static int opened = 0;
+static int closed = 0;
+
+
+void work_cb(uv_work_t* work) {
+ /* continue as fast as possible */
+}
+
+
+void after_work_cb(uv_work_t* work) {
+ free(work);
+ closed++;
+}
+
+
+void make_eio_req(void) {
+ opened++;
+
+ uv_work_t* w = (uv_work_t*) malloc(sizeof(*w));
+ ASSERT(w != NULL);
+
+ uv_queue_work(uv_default_loop(), w, work_cb, after_work_cb);
+}
+
+
+void idle_cb(uv_idle_t* idle, int status) {
+ ASSERT(opened - closed < max_delta);
+ if (opened <= max_opened) {
+ int i;
+ for (i = 0; i < 30; i++) {
+ make_eio_req();
+ }
+ } else {
+ int r;
+
+ r = uv_idle_stop(idle);
+ uv_unref(uv_default_loop());
+ ASSERT(r == 0);
+ }
+}
+
+
+TEST_IMPL(eio_overflow) {
+ int r;
+
+ r = uv_idle_init(uv_default_loop(), &idle);
+ ASSERT(r == 0);
+
+ r = uv_idle_start(&idle, idle_cb);
+ ASSERT(r == 0);
+
+ r = uv_run(uv_default_loop());
+ ASSERT(r == 0);
+
+ return 0;
+}
View
@@ -29,7 +29,6 @@ TEST_DECLARE (tcp_ping_pong_v6)
TEST_DECLARE (tcp_ref)
TEST_DECLARE (tcp_ref2)
TEST_DECLARE (pipe_ping_pong)
-TEST_DECLARE (pipe_pair)
TEST_DECLARE (delayed_accept)
TEST_DECLARE (multiple_listen)
TEST_DECLARE (tcp_writealot)
@@ -123,10 +122,10 @@ TEST_DECLARE (fs_open_dir)
TEST_DECLARE (fs_rename_to_existing_file)
TEST_DECLARE (threadpool_queue_work_simple)
TEST_DECLARE (threadpool_multiple_event_loops)
+TEST_DECLARE (eio_overflow)
TEST_DECLARE (thread_mutex)
TEST_DECLARE (thread_rwlock)
TEST_DECLARE (thread_create)
-TEST_DECLARE (thread_self)
TEST_DECLARE (strlcpy)
TEST_DECLARE (strlcat)
TEST_DECLARE (counters_init)
@@ -166,8 +165,6 @@ TASK_LIST_START
TEST_ENTRY (pipe_ping_pong)
TEST_HELPER (pipe_ping_pong, pipe_echo_server)
- TEST_ENTRY (pipe_pair)
-
TEST_ENTRY (delayed_accept)
TEST_ENTRY (multiple_listen)
@@ -294,10 +291,10 @@ TASK_LIST_START
TEST_ENTRY (fs_rename_to_existing_file)
TEST_ENTRY (threadpool_queue_work_simple)
TEST_ENTRY (threadpool_multiple_event_loops)
+ TEST_ENTRY (eio_overflow)
TEST_ENTRY (thread_mutex)
TEST_ENTRY (thread_rwlock)
TEST_ENTRY (thread_create)
- TEST_ENTRY (thread_self)
TEST_ENTRY (strlcpy)
TEST_ENTRY (strlcat)
TEST_ENTRY (counters_init)
Oops, something went wrong.

0 comments on commit f0c629a

Please sign in to comment.