luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v0.10'

Browse Source 
Conflicts:
	ChangeLog
	build.mk
	src/unix/darwin.c
	src/unix/getaddrinfo.c
	src/version.c
	test/test-list.h
This commit is contained in:
Saúl Ibarra Corretgé 2014-06-25 10:29:53 +02:00
commit 570caf04db
4 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
ChangeLog
View File

@ -33,8 +33,6 @@ Changes since version 0.11.23:
* inet: allow scopeid in uv_inet_pton (Fedor Indutny)
* win: always leave crit section in get_proc_title (Fedor Indutny)
2014.04.07, Version 0.11.23 (Unstable), e54de537efcacd593f36fcaaf8b4cb9e64313275
@ -77,25 +75,6 @@ Changes since version 0.11.22:
* unix: fix setting written size on uv_wd (Saúl Ibarra Corretgé)
2014.04.07, Version 0.10.26 (Stable), d864907611c25ec986c5e77d4d6d6dee88f26926
Changes since version 0.10.25:
* process: don't close stdio fds during spawn (Tonis Tiigi)
* build, windows: do not fail on Windows SDK Prompt (Marc Schlaich)
* build, windows: fix x64 configuration issue (Marc Schlaich)
* win: fix buffer leak on error in pipe.c (Fedor Indutny)
* kqueue: invalidate fd in uv_fs_event_t (Fedor Indutny)
* linux: always deregister closing fds from epoll (Geoffry Song)
* error: add ENXIO for O_NONBLOCK FIFO open() (Fedor Indutny)
2014.03.11, Version 0.11.22 (Unstable), cd0c19b1d3c56acf0ade7687006e12e75fbda36d
Changes since version 0.11.21:
@ -225,6 +204,34 @@ Changes since version 0.11.18:
* linux: fix C99/C++ comment (Fedor Indutny)
2014.05.02, Version 0.10.27 (Stable), 6e24ce23b1e7576059f85a608eca13b766458a01
Changes since version 0.10.26:
* windows: fix console signal handler refcount (Saúl Ibarra Corretgé)
* win: always leave crit section in get_proc_title (Fedor Indutny)
2014.04.07, Version 0.10.26 (Stable), d864907611c25ec986c5e77d4d6d6dee88f26926
Changes since version 0.10.25:
* process: don't close stdio fds during spawn (Tonis Tiigi)
* build, windows: do not fail on Windows SDK Prompt (Marc Schlaich)
* build, windows: fix x64 configuration issue (Marc Schlaich)
* win: fix buffer leak on error in pipe.c (Fedor Indutny)
* kqueue: invalidate fd in uv_fs_event_t (Fedor Indutny)
* linux: always deregister closing fds from epoll (Geoffry Song)
* error: add ENXIO for O_NONBLOCK FIFO open() (Fedor Indutny)
2014.02.19, Version 0.10.25 (Stable), d778dc588507588b12b9f9d2905078db542ed751
Changes since version 0.10.24:

6
src/unix/darwin.c
View File

@ -53,9 +53,11 @@ void uv__platform_loop_delete(uv_loop_t* loop) {
uint64_t uv__hrtime(uv_clocktype_t type) {
mach_timebase_info_data_t info;
static mach_timebase_info_data_t info;
if (mach_timebase_info(&info) != KERN_SUCCESS)
if ((ACCESS_ONCE(uint32_t, info.numer) == 0 ||
ACCESS_ONCE(uint32_t, info.denom) == 0) &&
mach_timebase_info(&info) != KERN_SUCCESS)
abort();
return mach_absolute_time() * info.numer / info.denom;

10
test/test-list.h
View File

@ -241,12 +241,12 @@ TEST_DECLARE (dlerror)
TEST_DECLARE (poll_duplex)
TEST_DECLARE (poll_unidirectional)
TEST_DECLARE (poll_close)
#ifdef _WIN32
TEST_DECLARE (poll_closesocket)
#endif
TEST_DECLARE (ip4_addr)
TEST_DECLARE (ip6_addr_link_local)
#ifdef _WIN32
TEST_DECLARE (poll_closesocket)
TEST_DECLARE (spawn_detect_pipe_name_collisions_on_windows)
TEST_DECLARE (argument_escaping)
TEST_DECLARE (environment_creation)
@ -487,9 +487,6 @@ TASK_LIST_START
TEST_ENTRY (poll_duplex)
TEST_ENTRY (poll_unidirectional)
TEST_ENTRY (poll_close)
#ifdef _WIN32
TEST_ENTRY (poll_closesocket)
#endif
TEST_ENTRY (spawn_fails)
TEST_ENTRY (spawn_exit_code)
@ -513,6 +510,7 @@ TASK_LIST_START
TEST_ENTRY (kill)
#ifdef _WIN32
TEST_ENTRY (poll_closesocket)
TEST_ENTRY (spawn_detect_pipe_name_collisions_on_windows)
TEST_ENTRY (argument_escaping)
TEST_ENTRY (environment_creation)

2
vcbuild.bat
View File

@ -51,8 +51,8 @@ call "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat" %vs_toolset%
set GYP_MSVS_VERSION=2013
goto select-target
@rem Look for Visual Studio 2012
:vc-set-2012
@rem Look for Visual Studio 2012
if not defined VS110COMNTOOLS goto vc-set-2010
if not exist "%VS110COMNTOOLS%\..\..\vc\vcvarsall.bat" goto vc-set-2010
call "%VS110COMNTOOLS%\..\..\vc\vcvarsall.bat" %vs_toolset%