Permalink
Browse files

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

  • Loading branch information...
2 parents 0635e29 + 9e90cde commit 23947fdabbc3e3f36bab33cda91fc49c56554c4d @bnoordhuis bnoordhuis committed Mar 29, 2013
Showing with 27 additions and 12 deletions.
  1. +17 −0 ChangeLog
  2. +3 −7 src/unix/stream.c
  3. +0 −1 src/unix/udp.c
  4. +1 −1 src/version.c
  5. +1 −0 test/test-udp-send-and-recv.c
  6. +5 −3 uv.gyp
View
@@ -1,3 +1,20 @@
+2013.02.04, Version 0.10.3 (Stable)
+
+Changes since version 0.10.2:
+
+* include: remove extraneous const from uv_version() (Ben Noordhuis)
+
+* doc: update README, replace `OS` by `PLATFORM` (Ben Noordhuis)
+
+* build: simplify .buildstamp rule (Ben Noordhuis)
+
+* build: disable -Wstrict-aliasing on darwin (Ben Noordhuis)
+
+* darwin: don't select(&exceptfds) in fallback path (Ben Noordhuis)
+
+* unix: don't clear flags after closing UDP handle (Saúl Ibarra Corretgé)
+
+
2013.03.25, Version 0.10.2 (Stable)
This is the first officially versioned release of libuv. Starting now
View
@@ -131,7 +131,6 @@ static void uv__stream_osx_select(void* arg) {
char buf[1024];
fd_set sread;
fd_set swrite;
- fd_set serror;
int events;
int fd;
int r;
@@ -154,17 +153,15 @@ static void uv__stream_osx_select(void* arg) {
/* Watch fd using select(2) */
FD_ZERO(&sread);
FD_ZERO(&swrite);
- FD_ZERO(&serror);
if (uv_is_readable(stream))
FD_SET(fd, &sread);
if (uv_is_writable(stream))
FD_SET(fd, &swrite);
- FD_SET(fd, &serror);
FD_SET(s->int_fd, &sread);
/* Wait indefinitely for fd events */
- r = select(max_fd + 1, &sread, &swrite, &serror, NULL);
+ r = select(max_fd + 1, &sread, &swrite, NULL, NULL);
if (r == -1) {
if (errno == EINTR)
continue;
@@ -203,8 +200,6 @@ static void uv__stream_osx_select(void* arg) {
events |= UV__POLLIN;
if (FD_ISSET(fd, &swrite))
events |= UV__POLLOUT;
- if (FD_ISSET(fd, &serror))
- events |= UV__POLLERR;
uv_mutex_lock(&s->mutex);
s->events |= events;
@@ -249,7 +244,8 @@ static void uv__stream_osx_select_cb(uv_async_t* handle, int status) {
s->events = 0;
uv_mutex_unlock(&s->mutex);
- assert(0 == (events & UV__POLLERR));
+ assert(events != 0);
+ assert(events == (events & (UV__POLLIN | UV__POLLOUT)));
/* Invoke callback on event-loop */
if ((events & UV__POLLIN) && uv__io_active(&stream->io_watcher, UV__POLLIN))
View
@@ -79,7 +79,6 @@ void uv__udp_finish_close(uv_udp_t* handle) {
}
/* Now tear down the handle. */
- handle->flags = 0;
handle->recv_cb = NULL;
handle->alloc_cb = NULL;
/* but _do not_ touch close_cb */
View
@@ -28,7 +28,7 @@
#define UV_VERSION_MAJOR 0
#define UV_VERSION_MINOR 10
-#define UV_VERSION_PATCH 3
+#define UV_VERSION_PATCH 4
#define UV_VERSION_IS_RELEASE 0
@@ -53,6 +53,7 @@ static uv_buf_t alloc_cb(uv_handle_t* handle, size_t suggested_size) {
static void close_cb(uv_handle_t* handle) {
CHECK_HANDLE(handle);
+ ASSERT(uv_is_closing(handle));
close_cb_called++;
}
View
8 uv.gyp
@@ -115,7 +115,6 @@
'-pedantic',
'-Wall',
'-Wextra',
- '-Wstrict-aliasing',
'-Wno-unused-parameter',
],
'sources': [
@@ -181,6 +180,11 @@
'_DARWIN_USE_64_BIT_INODE=1',
]
}],
+ [ 'OS!="mac"', {
+ # Enable on all platforms except OS X. The antique gcc/clang that
+ # ships with Xcode emits waaaay too many false positives.
+ 'cflags': [ '-Wstrict-aliasing' ],
+ }],
[ 'OS=="linux"', {
'sources': [
'src/unix/linux-core.c',
@@ -425,5 +429,3 @@
}
]
}
-
-

0 comments on commit 23947fd

Please sign in to comment.