gre-ilya/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v0.10'

Browse Source 
Conflicts:
	AUTHORS
	ChangeLog
	src/unix/stream.c
	src/version.c
This commit is contained in:
Ben Noordhuis 2013-06-07 11:41:41 +02:00
commit c16ed503b0
4 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -1,3 +1,23 @@
2013.06.05, Version 0.10.10 (Stable), 0d95a88bd35fce93863c57a460be613aea34d2c5
Changes since version 0.10.9:
* include: document uv_update_time() and uv_now() (Ben Noordhuis)
* linux: fix cpu model parsing on newer arm kernels (Ben Noordhuis)
* linux: fix a memory leak in uv_cpu_info() error path (Ben Noordhuis)
* linux: don't ignore out-of-memory errors in uv_cpu_info() (Ben Noordhuis)
* unix, windows: move uv_now() to uv-common.c (Ben Noordhuis)
* test: fix a compilation problem in test-osx-select.c that was caused by the
use of c-style comments (Bert Belder)
* darwin: use uv_fs_sendfile() use the sendfile api correctly (Wynn Wilkes)
2013.05.30, Version 0.11.4 (Unstable), e43e5b3d954a0989db5588aa110e1fe4fe6e0219 2013.05.30, Version 0.11.4 (Unstable), e43e5b3d954a0989db5588aa110e1fe4fe6e0219
Changes since version 0.11.3: Changes since version 0.11.3:

11
config-unix.mk
View File

@ -30,7 +30,6 @@ RUNNER_SRC=test/runner-unix.c
RUNNER_CFLAGS=$(CFLAGS) -I$(SRCDIR)/test RUNNER_CFLAGS=$(CFLAGS) -I$(SRCDIR)/test
RUNNER_LDFLAGS=-L"$(CURDIR)" -luv RUNNER_LDFLAGS=-L"$(CURDIR)" -luv
HAVE_DTRACE=
DTRACE_OBJS= DTRACE_OBJS=
DTRACE_HEADER= DTRACE_HEADER=
@ -59,14 +58,16 @@ OBJS += src/inet.o
OBJS += src/version.o OBJS += src/version.o
ifeq (sunos,$(PLATFORM)) ifeq (sunos,$(PLATFORM))
HAVE_DTRACE=1 HAVE_DTRACE ?= 1
CPPFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=500 CPPFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=500
LDFLAGS+=-lkstat -lnsl -lsendfile -lsocket LDFLAGS+=-lkstat -lnsl -lsendfile -lsocket
# Library dependencies are not transitive. # Library dependencies are not transitive.
OBJS += src/unix/sunos.o OBJS += src/unix/sunos.o
ifeq (1, $(HAVE_DTRACE))
OBJS += src/unix/dtrace.o OBJS += src/unix/dtrace.o
DTRACE_OBJS += src/unix/core.o DTRACE_OBJS += src/unix/core.o
endif endif
endif
ifeq (aix,$(PLATFORM)) ifeq (aix,$(PLATFORM))
CPPFLAGS += -D_ALL_SOURCE -D_XOPEN_SOURCE=500 CPPFLAGS += -D_ALL_SOURCE -D_XOPEN_SOURCE=500
@ -75,7 +76,7 @@ OBJS += src/unix/aix.o
endif endif
ifeq (darwin,$(PLATFORM)) ifeq (darwin,$(PLATFORM))
HAVE_DTRACE=1 HAVE_DTRACE ?= 1
# dtrace(1) probes contain dollar signs on OS X. Mute the warnings they # dtrace(1) probes contain dollar signs on OS X. Mute the warnings they
# generate but only when CC=clang, -Wno-dollar-in-identifier-extension # generate but only when CC=clang, -Wno-dollar-in-identifier-extension
# is a clang extension. # is a clang extension.
@ -117,7 +118,9 @@ CFLAGS += -std=c89
endif endif
ifeq (freebsd,$(PLATFORM)) ifeq (freebsd,$(PLATFORM))
HAVE_DTRACE=1 ifeq ($(shell dtrace -l 1>&2 2>/dev/null; echo $$?),0)
HAVE_DTRACE ?= 1
endif
LDFLAGS+=-lkvm LDFLAGS+=-lkvm
OBJS += src/unix/freebsd.o OBJS += src/unix/freebsd.o
OBJS += src/unix/kqueue.o OBJS += src/unix/kqueue.o

2
include/uv.h
View File

@ -1871,8 +1871,6 @@ UV_EXTERN extern uint64_t uv_hrtime(void);
* Note that this function works on a best-effort basis: there is no guarantee * Note that this function works on a best-effort basis: there is no guarantee
* that libuv can discover all file descriptors that were inherited. In general * that libuv can discover all file descriptors that were inherited. In general
* it does a better job on Windows than it does on unix. * it does a better job on Windows than it does on unix.
*
* TODO(bb): insert snarky remark to annoy bnoordhuis and the folks at joyent.
*/ */
UV_EXTERN void uv_disable_stdio_inheritance(void); UV_EXTERN void uv_disable_stdio_inheritance(void);

3
src/unix/stream.c
View File

@ -1419,8 +1419,9 @@ void uv__stream_close(uv_stream_t* handle) {
} }
#endif /* defined(__APPLE__) */ #endif /* defined(__APPLE__) */
uv_read_stop(handle);
uv__io_close(handle->loop, &handle->io_watcher); uv__io_close(handle->loop, &handle->io_watcher);
uv_read_stop(handle);
uv__handle_stop(handle);
close(handle->io_watcher.fd); close(handle->io_watcher.fd);
handle->io_watcher.fd = -1; handle->io_watcher.fd = -1;