From aecd296b6bce9b40f06a61c5c94e43d45ac7308a Mon Sep 17 00:00:00 2001 From: Timothy J Fontaine Date: Wed, 29 Jan 2014 09:41:36 -0800 Subject: [PATCH 1/3] 2014.01.30, Version 0.10.24 (Stable) Changes since version 0.10.23: * linux: move sscanf() out of the assert() (Trevor Norris) * linux: fix C99/C++ comment (Fedor Indutny) --- AUTHORS | 1 + ChangeLog | 9 +++++++++ src/version.c | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index bf8f7ee7..8239bc98 100644 --- a/AUTHORS +++ b/AUTHORS @@ -91,3 +91,4 @@ Alex Gaynor huxingyi Alex Crichton Luca Bruno +Trevor Norris diff --git a/ChangeLog b/ChangeLog index 7c029ae8..ce059d93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2014.01.30, Version 0.10.24 (Stable) + +Changes since version 0.10.23: + +* linux: move sscanf() out of the assert() (Trevor Norris) + +* linux: fix C99/C++ comment (Fedor Indutny) + + 2014.01.23, Version 0.10.23 (Stable), dbd218e699fec8be311d85e4788be9e28ae884f8 Changes since version 0.10.22: diff --git a/src/version.c b/src/version.c index fcecb7a2..2d90f84a 100644 --- a/src/version.c +++ b/src/version.c @@ -35,7 +35,7 @@ #define UV_VERSION_MAJOR 0 #define UV_VERSION_MINOR 10 #define UV_VERSION_PATCH 24 -#define UV_VERSION_IS_RELEASE 0 +#define UV_VERSION_IS_RELEASE 1 #define UV_VERSION ((UV_VERSION_MAJOR << 16) | \ From 79ffe2fb9537a8b9f1db7a2f27a7cd5c3bfb3707 Mon Sep 17 00:00:00 2001 From: Timothy J Fontaine Date: Wed, 29 Jan 2014 09:41:41 -0800 Subject: [PATCH 2/3] Now working on v0.10.25 --- ChangeLog | 2 +- src/version.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce059d93..9de43170 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2014.01.30, Version 0.10.24 (Stable) +2014.01.30, Version 0.10.24 (Stable), aecd296b6bce9b40f06a61c5c94e43d45ac7308a Changes since version 0.10.23: diff --git a/src/version.c b/src/version.c index 2d90f84a..f2975b53 100644 --- a/src/version.c +++ b/src/version.c @@ -34,8 +34,8 @@ #define UV_VERSION_MAJOR 0 #define UV_VERSION_MINOR 10 -#define UV_VERSION_PATCH 24 -#define UV_VERSION_IS_RELEASE 1 +#define UV_VERSION_PATCH 25 +#define UV_VERSION_IS_RELEASE 0 #define UV_VERSION ((UV_VERSION_MAJOR << 16) | \ From a6ff04d2c48be408cdcd76e5d78f4dc0a8fb9312 Mon Sep 17 00:00:00 2001 From: Oguz Bastemur Date: Fri, 31 Jan 2014 12:02:37 +0100 Subject: [PATCH 3/3] stream: start thread after assignments Changed the order of the member assignments since the thread may start before the parameters are assigned. This especially happens when the osx scheduler is very busy. --- src/unix/stream.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/unix/stream.c b/src/unix/stream.c index 0bc5fe85..c1b5e3c5 100644 --- a/src/unix/stream.c +++ b/src/unix/stream.c @@ -282,6 +282,7 @@ int uv__stream_try_select(uv_stream_t* stream, int* fd) { int fds[2]; int ret; int kq; + int old_fd; kq = kqueue(); if (kq == -1) { @@ -333,16 +334,20 @@ int uv__stream_try_select(uv_stream_t* stream, int* fd) { s->fake_fd = fds[0]; s->int_fd = fds[1]; - if (uv_thread_create(&s->thread, uv__stream_osx_select, stream)) - goto fatal4; - + old_fd = *fd; s->stream = stream; stream->select = s; *fd = s->fake_fd; + if (uv_thread_create(&s->thread, uv__stream_osx_select, stream)) + goto fatal4; + return 0; fatal4: + s->stream = NULL; + stream->select = NULL; + *fd = old_fd; close(s->fake_fd); close(s->int_fd); s->fake_fd = -1;