Merge branch 'v1.x' into v1.x
This commit is contained in:
commit
775ddbe0f7
@ -923,9 +923,6 @@ void uv__io_cb(uv_loop_t* loop, uv__io_t* w, unsigned int events) {
|
|||||||
case UV__POLL_IO:
|
case UV__POLL_IO:
|
||||||
uv__poll_io(loop, w, events);
|
uv__poll_io(loop, w, events);
|
||||||
break;
|
break;
|
||||||
case UV__SIGNAL_EVENT:
|
|
||||||
uv__signal_event(loop, w, events);
|
|
||||||
break;
|
|
||||||
case UV__SERVER_IO:
|
case UV__SERVER_IO:
|
||||||
uv__server_io(loop, w, events);
|
uv__server_io(loop, w, events);
|
||||||
break;
|
break;
|
||||||
@ -2048,8 +2045,8 @@ unsigned int uv_available_parallelism(void) {
|
|||||||
#elif defined(__NetBSD__)
|
#elif defined(__NetBSD__)
|
||||||
cpuset_t* set = cpuset_create();
|
cpuset_t* set = cpuset_create();
|
||||||
if (set != NULL) {
|
if (set != NULL) {
|
||||||
if (0 == sched_getaffinity_np(getpid(), sizeof(set), &set))
|
if (0 == sched_getaffinity_np(getpid(), cpuset_size(set), set))
|
||||||
rc = uv__cpu_count(&set);
|
rc = uv__cpu_count(set);
|
||||||
cpuset_destroy(set);
|
cpuset_destroy(set);
|
||||||
}
|
}
|
||||||
#elif defined(__APPLE__)
|
#elif defined(__APPLE__)
|
||||||
|
|||||||
@ -297,7 +297,11 @@ void uv__udp_io(uv_loop_t* loop, uv__io_t* w, unsigned int events);
|
|||||||
#define uv__ahafs_event(loop, w, events) UNREACHABLE()
|
#define uv__ahafs_event(loop, w, events) UNREACHABLE()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __APPLE__
|
#if !defined(__APPLE__) && \
|
||||||
|
!defined(__DragonFly__) && \
|
||||||
|
!defined(__FreeBSD__) && \
|
||||||
|
!defined(__NetBSD__) && \
|
||||||
|
!defined(__OpenBSD__)
|
||||||
#define uv__fs_event(loop, w, events) UNREACHABLE()
|
#define uv__fs_event(loop, w, events) UNREACHABLE()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user