mt-libuv 4.1.01 → 4.1.02

data/ext/libuv/test/test-callback-order.c

@@ -0,0 +1,77 @@
+/* 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"
+
+static int idle_cb_called;
+static int timer_cb_called;
+
+static uv_idle_t idle_handle;
+static uv_timer_t timer_handle;
+
+
+/* idle_cb should run before timer_cb */
+static void idle_cb(uv_idle_t* handle) {
+  ASSERT(idle_cb_called == 0);
+  ASSERT(timer_cb_called == 0);
+  uv_idle_stop(handle);
+  idle_cb_called++;
+}
+
+
+static void timer_cb(uv_timer_t* handle) {
+  ASSERT(idle_cb_called == 1);
+  ASSERT(timer_cb_called == 0);
+  uv_timer_stop(handle);
+  timer_cb_called++;
+}
+
+
+static void next_tick(uv_idle_t* handle) {
+  uv_loop_t* loop = handle->loop;
+  uv_idle_stop(handle);
+  uv_idle_init(loop, &idle_handle);
+  uv_idle_start(&idle_handle, idle_cb);
+  uv_timer_init(loop, &timer_handle);
+  uv_timer_start(&timer_handle, timer_cb, 0, 0);
+}
+
+
+TEST_IMPL(callback_order) {
+  uv_loop_t* loop;
+  uv_idle_t idle;
+
+  loop = uv_default_loop();
+  uv_idle_init(loop, &idle);
+  uv_idle_start(&idle, next_tick);
+
+  ASSERT(idle_cb_called == 0);
+  ASSERT(timer_cb_called == 0);
+
+  uv_run(loop, UV_RUN_DEFAULT);
+
+  ASSERT(idle_cb_called == 1);
+  ASSERT(timer_cb_called == 1);
+
+  MAKE_VALGRIND_HAPPY();
+  return 0;
+}

data/ext/libuv/test/test-callback-stack.c

@@ -0,0 +1,204 @@
+/* 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: Add explanation of why we want on_close to be called from fresh
+ * stack.
+ */
+
+#include "uv.h"
+#include "task.h"
+
+
+static const char MESSAGE[] = "Failure is for the weak. Everyone dies alone.";
+
+static uv_tcp_t client;
+static uv_timer_t timer;
+static uv_connect_t connect_req;
+static uv_write_t write_req;
+static uv_shutdown_t shutdown_req;
+
+static int nested = 0;
+static int close_cb_called = 0;
+static int connect_cb_called = 0;
+static int write_cb_called = 0;
+static int timer_cb_called = 0;
+static int bytes_received = 0;
+static int shutdown_cb_called = 0;
+
+
+static void alloc_cb(uv_handle_t* handle, size_t size, uv_buf_t* buf) {
+  buf->len = size;
+  buf->base = malloc(size);
+  ASSERT(buf->base != NULL);
+}
+
+
+static void close_cb(uv_handle_t* handle) {
+  ASSERT(nested == 0 && "close_cb must be called from a fresh stack");
+
+  close_cb_called++;
+}
+
+
+static void shutdown_cb(uv_shutdown_t* req, int status) {
+  ASSERT(status == 0);
+  ASSERT(nested == 0 && "shutdown_cb must be called from a fresh stack");
+
+  shutdown_cb_called++;
+}
+
+
+static void read_cb(uv_stream_t* tcp, ssize_t nread, const uv_buf_t* buf) {
+  ASSERT(nested == 0 && "read_cb must be called from a fresh stack");
+
+  printf("Read. nread == %d\n", (int)nread);
+  free(buf->base);
+
+  if (nread == 0) {
+    return;
+
+  } else if (nread < 0) {
+    ASSERT(nread == UV_EOF);
+
+    nested++;
+    uv_close((uv_handle_t*)tcp, close_cb);
+    nested--;
+
+    return;
+  }
+
+  bytes_received += nread;
+
+  /* We call shutdown here because when bytes_received == sizeof MESSAGE there
+   * will be no more data sent nor received, so here it would be possible for a
+   * backend to call shutdown_cb immediately and *not* from a fresh stack. */
+  if (bytes_received == sizeof MESSAGE) {
+    nested++;
+
+    puts("Shutdown");
+
+    if (uv_shutdown(&shutdown_req, (uv_stream_t*)tcp, shutdown_cb)) {
+      FATAL("uv_shutdown failed");
+    }
+    nested--;
+  }
+}
+
+
+static void timer_cb(uv_timer_t* handle) {
+  ASSERT(handle == &timer);
+  ASSERT(nested == 0 && "timer_cb must be called from a fresh stack");
+
+  puts("Timeout complete. Now read data...");
+
+  nested++;
+  if (uv_read_start((uv_stream_t*)&client, alloc_cb, read_cb)) {
+    FATAL("uv_read_start failed");
+  }
+  nested--;
+
+  timer_cb_called++;
+
+  uv_close((uv_handle_t*)handle, close_cb);
+}
+
+
+static void write_cb(uv_write_t* req, int status) {
+  int r;
+
+  ASSERT(status == 0);
+  ASSERT(nested == 0 && "write_cb must be called from a fresh stack");
+
+  puts("Data written. 500ms timeout...");
+
+  /* After the data has been sent, we're going to wait for a while, then start
+   * reading. This makes us certain that the message has been echoed back to
+   * our receive buffer when we start reading. This maximizes the temptation
+   * for the backend to use dirty stack for calling read_cb. */
+  nested++;
+  r = uv_timer_init(uv_default_loop(), &timer);
+  ASSERT(r == 0);
+  r = uv_timer_start(&timer, timer_cb, 500, 0);
+  ASSERT(r == 0);
+  nested--;
+
+  write_cb_called++;
+}
+
+
+static void connect_cb(uv_connect_t* req, int status) {
+  uv_buf_t buf;
+
+  puts("Connected. Write some data to echo server...");
+
+  ASSERT(status == 0);
+  ASSERT(nested == 0 && "connect_cb must be called from a fresh stack");
+
+  nested++;
+
+  buf.base = (char*) &MESSAGE;
+  buf.len = sizeof MESSAGE;
+
+  if (uv_write(&write_req, (uv_stream_t*)req->handle, &buf, 1, write_cb)) {
+    FATAL("uv_write failed");
+  }
+
+  nested--;
+
+  connect_cb_called++;
+}
+
+
+TEST_IMPL(callback_stack) {
+  struct sockaddr_in addr;
+
+  ASSERT(0 == uv_ip4_addr("127.0.0.1", TEST_PORT, &addr));
+
+  if (uv_tcp_init(uv_default_loop(), &client)) {
+    FATAL("uv_tcp_init failed");
+  }
+
+  puts("Connecting...");
+
+  nested++;
+
+  if (uv_tcp_connect(&connect_req,
+                     &client,
+                     (const struct sockaddr*) &addr,
+                     connect_cb)) {
+    FATAL("uv_tcp_connect failed");
+  }
+  nested--;
+
+  uv_run(uv_default_loop(), UV_RUN_DEFAULT);
+
+  ASSERT(nested == 0);
+  ASSERT(connect_cb_called == 1 && "connect_cb must be called exactly once");
+  ASSERT(write_cb_called == 1 && "write_cb must be called exactly once");
+  ASSERT(timer_cb_called == 1 && "timer_cb must be called exactly once");
+  ASSERT(bytes_received == sizeof MESSAGE);
+  ASSERT(shutdown_cb_called == 1 && "shutdown_cb must be called exactly once");
+  ASSERT(close_cb_called == 2 && "close_cb must be called exactly twice");
+
+  MAKE_VALGRIND_HAPPY();
+  return 0;
+}

data/ext/libuv/test/test-close-fd.c

@@ -0,0 +1,80 @@
+/* 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.
+ */
+
+#if !defined(_WIN32)
+
+#include "uv.h"
+#include "task.h"
+#include <fcntl.h>
+#include <unistd.h>
+
+static unsigned int read_cb_called;
+
+static void alloc_cb(uv_handle_t *handle, size_t size, uv_buf_t *buf) {
+  static char slab[1];
+  buf->base = slab;
+  buf->len = sizeof(slab);
+}
+
+static void read_cb(uv_stream_t *handle, ssize_t nread, const uv_buf_t *buf) {
+  switch (++read_cb_called) {
+  case 1:
+    ASSERT(nread == 1);
+    uv_read_stop(handle);
+    break;
+  case 2:
+    ASSERT(nread == UV_EOF);
+    uv_close((uv_handle_t *) handle, NULL);
+    break;
+  default:
+    ASSERT(!"read_cb_called > 2");
+  }
+}
+
+TEST_IMPL(close_fd) {
+  uv_pipe_t pipe_handle;
+  int fd[2];
+
+  ASSERT(0 == pipe(fd));
+  ASSERT(0 == uv_pipe_init(uv_default_loop(), &pipe_handle, 0));
+  ASSERT(0 == uv_pipe_open(&pipe_handle, fd[0]));
+  fd[0] = -1;  /* uv_pipe_open() takes ownership of the file descriptor. */
+  ASSERT(1 == write(fd[1], "", 1));
+  ASSERT(0 == close(fd[1]));
+  fd[1] = -1;
+  ASSERT(0 == uv_read_start((uv_stream_t *) &pipe_handle, alloc_cb, read_cb));
+  ASSERT(0 == uv_run(uv_default_loop(), UV_RUN_DEFAULT));
+  ASSERT(1 == read_cb_called);
+  ASSERT(0 == uv_is_active((const uv_handle_t *) &pipe_handle));
+  ASSERT(0 == uv_read_start((uv_stream_t *) &pipe_handle, alloc_cb, read_cb));
+  ASSERT(0 == uv_run(uv_default_loop(), UV_RUN_DEFAULT));
+  ASSERT(2 == read_cb_called);
+  ASSERT(0 != uv_is_closing((const uv_handle_t *) &pipe_handle));
+
+  MAKE_VALGRIND_HAPPY();
+  return 0;
+}
+
+#else
+
+typedef int file_has_no_tests; /* ISO C forbids an empty translation unit. */
+
+#endif /* !_WIN32 */

data/ext/libuv/test/test-close-order.c

@@ -0,0 +1,80 @@
+/* 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"
+
+static int check_cb_called;
+static int timer_cb_called;
+static int close_cb_called;
+
+static uv_check_t check_handle;
+static uv_timer_t timer_handle1;
+static uv_timer_t timer_handle2;
+
+
+static void close_cb(uv_handle_t* handle) {
+  ASSERT(handle != NULL);
+  close_cb_called++;
+}
+
+
+/* check_cb should run before any close_cb */
+static void check_cb(uv_check_t* handle) {
+  ASSERT(check_cb_called == 0);
+  ASSERT(timer_cb_called == 1);
+  ASSERT(close_cb_called == 0);
+  uv_close((uv_handle_t*) handle, close_cb);
+  uv_close((uv_handle_t*) &timer_handle2, close_cb);
+  check_cb_called++;
+}
+
+
+static void timer_cb(uv_timer_t* handle) {
+  uv_close((uv_handle_t*) handle, close_cb);
+  timer_cb_called++;
+}
+
+
+TEST_IMPL(close_order) {
+  uv_loop_t* loop;
+  loop = uv_default_loop();
+
+  uv_check_init(loop, &check_handle);
+  uv_check_start(&check_handle, check_cb);
+  uv_timer_init(loop, &timer_handle1);
+  uv_timer_start(&timer_handle1, timer_cb, 0, 0);
+  uv_timer_init(loop, &timer_handle2);
+  uv_timer_start(&timer_handle2, timer_cb, 100000, 0);
+
+  ASSERT(check_cb_called == 0);
+  ASSERT(close_cb_called == 0);
+  ASSERT(timer_cb_called == 0);
+
+  uv_run(loop, UV_RUN_DEFAULT);
+
+  ASSERT(check_cb_called == 1);
+  ASSERT(close_cb_called == 3);
+  ASSERT(timer_cb_called == 1);
+
+  MAKE_VALGRIND_HAPPY();
+  return 0;
+}

data/ext/libuv/test/test-condvar.c

@@ -0,0 +1,267 @@
+/* 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 <string.h>
+#include <errno.h>
+
+struct worker_config;
+
+typedef void (*signal_func)(struct worker_config* c, int* flag);
+typedef int (*wait_func)(struct worker_config* c, const int* flag);
+
+typedef struct worker_config {
+  uv_sem_t sem_waiting; /* post before waiting. */
+  uv_sem_t sem_signaled; /* post after signaling. */
+  uv_mutex_t mutex;
+  uv_cond_t cond;
+  int use_broadcast;
+  int posted_1;
+  int posted_2;
+  signal_func signal_cond;
+  wait_func wait_cond;
+} worker_config;
+
+void worker_config_init(worker_config* wc,
+                        int use_broadcast,
+                        signal_func signal_f,
+                        wait_func wait_f) {
+  /* Wipe. */
+  memset(wc, 0, sizeof(*wc));
+
+  /* Copy vars. */
+  wc->signal_cond = signal_f;
+  wc->wait_cond = wait_f;
+  wc->use_broadcast = use_broadcast;
+
+  /* Init. */
+  ASSERT(0 == uv_sem_init(&wc->sem_waiting, 0));
+  ASSERT(0 == uv_sem_init(&wc->sem_signaled, 0));
+  ASSERT(0 == uv_cond_init(&wc->cond));
+  ASSERT(0 == uv_mutex_init(&wc->mutex));
+}
+
+void worker_config_destroy(worker_config* wc) {
+  uv_mutex_destroy(&wc->mutex);
+  uv_cond_destroy(&wc->cond);
+  uv_sem_destroy(&wc->sem_signaled);
+  uv_sem_destroy(&wc->sem_waiting);
+}
+
+/* arg is a worker_config.
+ * Call signal_cond then wait_cond.
+ * Partner should call wait then signal. */
+static void worker(void* arg) {
+  worker_config* c = arg;
+  c->signal_cond(c, &c->posted_1);
+  c->wait_cond(c, &c->posted_2);
+}
+
+/* 1. Signal a waiting waiter.
+ * 2. Tell waiter we finished. */
+static void condvar_signal(worker_config* c, int* flag) {
+  /* Wait until waiter holds mutex and is preparing to wait. */
+  uv_sem_wait(&c->sem_waiting);
+
+  /* Make sure waiter has begun waiting. */
+  uv_mutex_lock(&c->mutex);
+
+  /* Help waiter differentiate between spurious and legitimate wakeup. */
+  ASSERT(*flag == 0);
+  *flag = 1;
+
+  if (c->use_broadcast)
+    uv_cond_broadcast(&c->cond);
+  else
+    uv_cond_signal(&c->cond);
+
+  uv_mutex_unlock(&c->mutex);
+
+  /* Done signaling. */
+  uv_sem_post(&c->sem_signaled);
+}
+
+/* 1. Wait on a signal.
+ * 2. Ensure that the signaler finished. */
+static int condvar_wait(worker_config* c, const int* flag) {
+  uv_mutex_lock(&c->mutex);
+
+  /* Tell signal'er that I am waiting. */
+  uv_sem_post(&c->sem_waiting);
+
+  /* Wait until I get a non-spurious signal. */
+  do {
+    uv_cond_wait(&c->cond, &c->mutex);
+  } while (*flag == 0);
+  ASSERT(*flag == 1);
+
+  uv_mutex_unlock(&c->mutex);
+
+  /* Wait for my signal'er to finish. */
+  uv_sem_wait(&c->sem_signaled);
+
+  return 0;
+}
+
+/* uv_cond_wait: One thread signals, the other waits. */
+TEST_IMPL(condvar_1) {
+  worker_config wc;
+  uv_thread_t thread;
+
+  /* Helper signal-then-wait. */
+  worker_config_init(&wc, 0, condvar_signal, condvar_wait);
+  ASSERT(0 == uv_thread_create(&thread, worker, &wc));
+
+  /* We wait-then-signal. */
+  ASSERT(0 == wc.wait_cond(&wc, &wc.posted_1));
+  wc.signal_cond(&wc, &wc.posted_2);
+
+  ASSERT(0 == uv_thread_join(&thread));
+  worker_config_destroy(&wc);
+
+  return 0;
+}
+
+/* uv_cond_wait: One thread broadcasts, the other waits. */
+TEST_IMPL(condvar_2) {
+  worker_config wc;
+  uv_thread_t thread;
+
+  /* Helper to signal-then-wait. */
+  worker_config_init(&wc, 1, condvar_signal, condvar_wait);
+  ASSERT(0 == uv_thread_create(&thread, worker, &wc));
+
+  /* We wait-then-signal. */
+  ASSERT(0 == wc.wait_cond(&wc, &wc.posted_1));
+  wc.signal_cond(&wc, &wc.posted_2);
+
+  ASSERT(0 == uv_thread_join(&thread));
+  worker_config_destroy(&wc);
+
+  return 0;
+}
+
+/* 1. Wait on a signal (hopefully not timeout, else we'll hang).
+ * 2. Ensure that the signaler finished. */
+static int condvar_timedwait(worker_config* c, const int* flag) {
+  int r;
+
+  r = 0;
+
+  uv_mutex_lock(&c->mutex);
+
+  /* Tell signal'er that I am waiting. */
+  uv_sem_post(&c->sem_waiting);
+
+  /* Wait until I get a non-spurious signal. */
+  do {
+    r = uv_cond_timedwait(&c->cond, &c->mutex, (uint64_t)(1 * 1e9)); /* 1 s */
+    ASSERT(r == 0); /* Should not time out. */
+  } while (*flag == 0);
+  ASSERT(*flag == 1);
+
+  uv_mutex_unlock(&c->mutex);
+
+  /* Wait for my signal'er to finish. */
+  uv_sem_wait(&c->sem_signaled);
+  return r;
+}
+
+/* uv_cond_timedwait: One thread signals, the other timedwaits. */
+TEST_IMPL(condvar_3) {
+  worker_config wc;
+  uv_thread_t thread;
+
+  /* Helper to signal-then-wait. */
+  worker_config_init(&wc, 0, condvar_signal, condvar_timedwait);
+  ASSERT(0 == uv_thread_create(&thread, worker, &wc));
+
+  /* We wait-then-signal. */
+  wc.wait_cond(&wc, &wc.posted_1);
+  wc.signal_cond(&wc, &wc.posted_2);
+
+  ASSERT(0 == uv_thread_join(&thread));
+  worker_config_destroy(&wc);
+
+  return 0;
+}
+
+/* uv_cond_timedwait: One thread broadcasts, the other waits. */
+TEST_IMPL(condvar_4) {
+  worker_config wc;
+  uv_thread_t thread;
+
+  /* Helper to signal-then-wait. */
+  worker_config_init(&wc, 1, condvar_signal, condvar_timedwait);
+  ASSERT(0 == uv_thread_create(&thread, worker, &wc));
+
+  /* We wait-then-signal. */
+  wc.wait_cond(&wc, &wc.posted_1);
+  wc.signal_cond(&wc, &wc.posted_2);
+
+  ASSERT(0 == uv_thread_join(&thread));
+  worker_config_destroy(&wc);
+
+  return 0;
+}
+
+/* uv_cond_timedwait: One thread waits, no signal. Timeout should be delivered. */
+TEST_IMPL(condvar_5) {
+  worker_config wc;
+  int r;
+  /* ns */
+  uint64_t before;
+  uint64_t after;
+  uint64_t elapsed;
+  uint64_t timeout;
+
+  timeout = 100 * 1000 * 1000; /* 100 ms in ns */
+
+  /* Mostly irrelevant. We need cond and mutex initialized. */
+  worker_config_init(&wc, 0, NULL, NULL);
+
+  uv_mutex_lock(&wc.mutex);
+
+  /* We wait.
+   * No signaler, so this will only return if timeout is delivered. */
+  before = uv_hrtime();
+  r = uv_cond_timedwait(&wc.cond, &wc.mutex, timeout);
+  after = uv_hrtime();
+
+  uv_mutex_unlock(&wc.mutex);
+
+  /* It timed out. */
+  ASSERT(r == UV_ETIMEDOUT);
+
+  /* It must have taken at least timeout, modulo system timer ticks.
+   * But it should not take too much longer.
+   * cf. MSDN docs:
+   * https://msdn.microsoft.com/en-us/library/ms687069(VS.85).aspx */
+  elapsed = after - before;
+  ASSERT(0.75 * timeout <= elapsed); /* 1.0 too large for Windows. */
+  ASSERT(elapsed <= 5.0 * timeout); /* MacOS has reported failures up to 1.75. */
+
+  worker_config_destroy(&wc);
+
+  return 0;
+}