Skip to content

Commit bdbeb75

Browse files
brsonbrson
committed
Upgrade libuv to 179f475b2ad64729feb0422f06ce133cb364482a
1 parent 81a44cc commit bdbeb75

File tree

150 files changed

+19561
-1836
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+19561
-1836
lines changed

‎mk/libuv/mac/Makefile

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,19 @@ abs_obj := $(abspath $(obj))
3737
# generated dependency rule Makefiles in one pass.
3838
all_deps :=
3939

40-
# C++ apps need to be linked with g++. Not sure what's appropriate.
40+
41+
42+
# C++ apps need to be linked with g++.
4143
#
42-
# Note, the flock is used to seralize linking. Linking is a memory-intensive
44+
# Note: flock is used to seralize linking. Linking is a memory-intensive
4345
# process so running parallel links can often lead to thrashing. To disable
44-
# the serialization, override FLOCK via an envrionment variable as follows:
46+
# the serialization, override LINK via an envrionment variable as follows:
4547
#
46-
# export FLOCK=
48+
# export LINK=g++
4749
#
4850
# This will allow make to invoke N linker processes as specified in -jN.
49-
FLOCK ?= ./gyp-mac-tool flock $(builddir)/linker.lock
50-
51+
LINK ?= ./gyp-mac-tool flock $(builddir)/linker.lock $(CXX)
5152

52-
53-
LINK ?= $(FLOCK) $(CXX)
5453
CC.target ?= $(CC)
5554
CFLAGS.target ?= $(CFLAGS)
5655
CXX.target ?= $(CXX)
@@ -223,6 +222,23 @@ command_changed = $(or $(subst $(cmd_$(1)),,$(cmd_$(call replace_spaces,$@))),\
223222
# $| -- order-only dependencies
224223
prereq_changed = $(filter-out FORCE_DO_CMD,$(filter-out $|,$?))
225224

225+
# Helper that executes all postbuilds, and deletes the output file when done
226+
# if any of the postbuilds failed.
227+
define do_postbuilds
228+
@E=0;\
229+
for p in $(POSTBUILDS); do\
230+
eval $$p;\
231+
F=$$?;\
232+
if [ $$F -ne 0 ]; then\
233+
E=$$F;\
234+
fi;\
235+
done;\
236+
if [ $$E -ne 0 ]; then\
237+
rm -rf "$@";\
238+
exit $$E;\
239+
fi
240+
endef
241+
226242
# do_cmd: run a command via the above cmd_foo names, if necessary.
227243
# Should always run for a given target to handle command-line changes.
228244
# Second argument, if non-zero, makes it do asm/C/C++ dependency munging.
@@ -241,7 +257,7 @@ $(if $(or $(command_changed),$(prereq_changed)),
241257
@$(call exact_echo,$(call escape_vars,cmd_$(call replace_spaces,$@) := $(cmd_$(1)))) > $(depfile)
242258
@$(if $(2),$(fixup_dep))
243259
$(if $(and $(3), $(POSTBUILDS)),
244-
@for p in $(POSTBUILDS); do eval $$p; done
260+
$(call do_postbuilds)
245261
)
246262
)
247263
endef

‎mk/libuv/mac/gyp-mac-tool

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,14 @@ class MacTool(object):
7474
if not plist:
7575
return
7676

77+
# Only create PkgInfo for executable types.
78+
package_type = plist['CFBundlePackageType']
79+
if package_type != 'APPL':
80+
return
81+
7782
# The format of PkgInfo is eight characters, representing the bundle type
78-
# and bundle signature, each four characters. If either is missing, four
83+
# and bundle signature, each four characters. If that is missing, four
7984
# '?' characters are used instead.
80-
package_type = plist['CFBundlePackageType']
81-
if len(package_type) != 4:
82-
package_type = '?' * 4
8385
signature_code = plist['CFBundleSignature']
8486
if len(signature_code) != 4:
8587
signature_code = '?' * 4

‎mk/libuv/mac/src/rt/libuv/run-benchmarks.target.mk

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@
22

33
TOOLSET := target
44
TARGET := run-benchmarks
5-
DEFS_Default := '-D_GNU_SOURCE'
5+
DEFS_Default := '-D_LARGEFILE_SOURCE' \
6+
'-D_FILE_OFFSET_BITS=64' \
7+
'-D_GNU_SOURCE' \
8+
'-DEIO_STACKSIZE=262144'
69

710
# Flags passed to all source files.
811
CFLAGS_Default := -fasm-blocks \
912
-mpascal-strings \
13+
-Os \
1014
-gdwarf-2 \
1115
-arch i386
1216

@@ -31,9 +35,11 @@ OBJS := $(obj).target/$(TARGET)/src/rt/libuv/test/benchmark-ares.o \
3135
$(obj).target/$(TARGET)/src/rt/libuv/test/benchmark-pump.o \
3236
$(obj).target/$(TARGET)/src/rt/libuv/test/benchmark-sizes.o \
3337
$(obj).target/$(TARGET)/src/rt/libuv/test/benchmark-spawn.o \
38+
$(obj).target/$(TARGET)/src/rt/libuv/test/benchmark-tcp-write-batch.o \
3439
$(obj).target/$(TARGET)/src/rt/libuv/test/benchmark-udp-packet-storm.o \
3540
$(obj).target/$(TARGET)/src/rt/libuv/test/dns-server.o \
3641
$(obj).target/$(TARGET)/src/rt/libuv/test/echo-server.o \
42+
$(obj).target/$(TARGET)/src/rt/libuv/test/blackhole-server.o \
3743
$(obj).target/$(TARGET)/src/rt/libuv/test/run-benchmarks.o \
3844
$(obj).target/$(TARGET)/src/rt/libuv/test/runner.o \
3945
$(obj).target/$(TARGET)/src/rt/libuv/test/runner-unix.o

‎mk/libuv/mac/src/rt/libuv/run-tests.target.mk

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@
22

33
TOOLSET := target
44
TARGET := run-tests
5-
DEFS_Default := '-D_GNU_SOURCE'
5+
DEFS_Default := '-D_LARGEFILE_SOURCE' \
6+
'-D_FILE_OFFSET_BITS=64' \
7+
'-D_GNU_SOURCE' \
8+
'-DEIO_STACKSIZE=262144'
69

710
# Flags passed to all source files.
811
CFLAGS_Default := -fasm-blocks \
912
-mpascal-strings \
13+
-Os \
1014
-gdwarf-2 \
1115
-arch i386
1216

@@ -24,32 +28,41 @@ CFLAGS_OBJCC_Default :=
2428

2529
INCS_Default := -I$(srcdir)/src/rt/libuv/include
2630

27-
OBJS := $(obj).target/$(TARGET)/src/rt/libuv/test/echo-server.o \
31+
OBJS := $(obj).target/$(TARGET)/src/rt/libuv/test/blackhole-server.o \
32+
$(obj).target/$(TARGET)/src/rt/libuv/test/echo-server.o \
2833
$(obj).target/$(TARGET)/src/rt/libuv/test/run-tests.o \
2934
$(obj).target/$(TARGET)/src/rt/libuv/test/runner.o \
35+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-get-loadavg.o \
3036
$(obj).target/$(TARGET)/src/rt/libuv/test/test-async.o \
37+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-error.o \
3138
$(obj).target/$(TARGET)/src/rt/libuv/test/test-callback-stack.o \
3239
$(obj).target/$(TARGET)/src/rt/libuv/test/test-connection-fail.o \
3340
$(obj).target/$(TARGET)/src/rt/libuv/test/test-delayed-accept.o \
3441
$(obj).target/$(TARGET)/src/rt/libuv/test/test-fail-always.o \
3542
$(obj).target/$(TARGET)/src/rt/libuv/test/test-fs.o \
3643
$(obj).target/$(TARGET)/src/rt/libuv/test/test-fs-event.o \
3744
$(obj).target/$(TARGET)/src/rt/libuv/test/test-get-currentexe.o \
45+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-get-memory.o \
3846
$(obj).target/$(TARGET)/src/rt/libuv/test/test-getaddrinfo.o \
3947
$(obj).target/$(TARGET)/src/rt/libuv/test/test-gethostbyname.o \
4048
$(obj).target/$(TARGET)/src/rt/libuv/test/test-getsockname.o \
4149
$(obj).target/$(TARGET)/src/rt/libuv/test/test-hrtime.o \
4250
$(obj).target/$(TARGET)/src/rt/libuv/test/test-idle.o \
51+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-ipc.o \
4352
$(obj).target/$(TARGET)/src/rt/libuv/test/test-loop-handles.o \
4453
$(obj).target/$(TARGET)/src/rt/libuv/test/test-pass-always.o \
4554
$(obj).target/$(TARGET)/src/rt/libuv/test/test-ping-pong.o \
4655
$(obj).target/$(TARGET)/src/rt/libuv/test/test-pipe-bind-error.o \
4756
$(obj).target/$(TARGET)/src/rt/libuv/test/test-ref.o \
4857
$(obj).target/$(TARGET)/src/rt/libuv/test/test-shutdown-eof.o \
4958
$(obj).target/$(TARGET)/src/rt/libuv/test/test-spawn.o \
59+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-stdio-over-pipes.o \
5060
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-bind-error.o \
5161
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-bind6-error.o \
5262
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-close.o \
63+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-flags.o \
64+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-connect-error.o \
65+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-connect6-error.o \
5366
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-write-error.o \
5467
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-writealot.o \
5568
$(obj).target/$(TARGET)/src/rt/libuv/test/test-threadpool.o \
@@ -59,6 +72,7 @@ OBJS := $(obj).target/$(TARGET)/src/rt/libuv/test/echo-server.o \
5972
$(obj).target/$(TARGET)/src/rt/libuv/test/test-udp-dgram-too-big.o \
6073
$(obj).target/$(TARGET)/src/rt/libuv/test/test-udp-ipv6.o \
6174
$(obj).target/$(TARGET)/src/rt/libuv/test/test-udp-send-and-recv.o \
75+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-udp-multicast-join.o \
6276
$(obj).target/$(TARGET)/src/rt/libuv/test/runner-unix.o
6377

6478
# Add to the list of files we specially track dependencies for.

‎mk/libuv/mac/src/rt/libuv/uv.target.mk

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@
22

33
TOOLSET := target
44
TARGET := uv
5-
DEFS_Default := '-DHAVE_CONFIG_H' \
6-
'-D_LARGEFILE_SOURCE' \
5+
DEFS_Default := '-D_LARGEFILE_SOURCE' \
76
'-D_FILE_OFFSET_BITS=64' \
87
'-D_GNU_SOURCE' \
98
'-DEIO_STACKSIZE=262144' \
9+
'-DHAVE_CONFIG_H' \
1010
'-DEV_CONFIG_H="config_darwin.h"' \
1111
'-DEIO_CONFIG_H="config_darwin.h"'
1212

1313
# Flags passed to all source files.
1414
CFLAGS_Default := -fasm-blocks \
1515
-mpascal-strings \
16+
-Os \
1617
-gdwarf-2 \
1718
-arch i386
1819

@@ -35,11 +36,8 @@ INCS_Default := -I$(srcdir)/src/rt/libuv/include \
3536
-I$(srcdir)/src/rt/libuv/src/ares/config_darwin
3637

3738
OBJS := $(obj).target/$(TARGET)/src/rt/libuv/src/uv-common.o \
38-
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares__close_sockets.o \
39-
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares__get_hostent.o \
40-
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares__read_line.o \
41-
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares__timeval.o \
4239
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_cancel.o \
40+
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares__close_sockets.o \
4341
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_data.o \
4442
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_destroy.o \
4543
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_expand_name.o \
@@ -49,6 +47,7 @@ OBJS := $(obj).target/$(TARGET)/src/rt/libuv/src/uv-common.o \
4947
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_free_string.o \
5048
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_gethostbyaddr.o \
5149
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_gethostbyname.o \
50+
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares__get_hostent.o \
5251
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_getnameinfo.o \
5352
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_getopt.o \
5453
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_getsock.o \
@@ -58,26 +57,29 @@ OBJS := $(obj).target/$(TARGET)/src/rt/libuv/src/uv-common.o \
5857
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_mkquery.o \
5958
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_nowarn.o \
6059
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_options.o \
61-
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_parse_a_reply.o \
6260
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_parse_aaaa_reply.o \
61+
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_parse_a_reply.o \
6362
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_parse_mx_reply.o \
6463
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_parse_ns_reply.o \
6564
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_parse_ptr_reply.o \
6665
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_parse_srv_reply.o \
6766
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_parse_txt_reply.o \
6867
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_process.o \
6968
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_query.o \
69+
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares__read_line.o \
7070
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_search.o \
7171
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_send.o \
7272
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_strcasecmp.o \
7373
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_strdup.o \
7474
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_strerror.o \
7575
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_timeout.o \
76+
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares__timeval.o \
7677
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_version.o \
7778
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/ares_writev.o \
7879
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/bitncmp.o \
7980
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/inet_net_pton.o \
8081
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/inet_ntop.o \
82+
$(obj).target/$(TARGET)/src/rt/libuv/src/ares/windows_port.o \
8183
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/core.o \
8284
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/uv-eio.o \
8385
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/fs.o \
@@ -91,7 +93,8 @@ OBJS := $(obj).target/$(TARGET)/src/rt/libuv/src/uv-common.o \
9193
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/process.o \
9294
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/eio/eio.o \
9395
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/ev/ev.o \
94-
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/darwin.o
96+
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/darwin.o \
97+
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/kqueue.o
9598

9699
# Add to the list of files we specially track dependencies for.
97100
all_deps += $(OBJS)

‎mk/libuv/unix/Makefile

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,19 @@ abs_obj := $(abspath $(obj))
3737
# generated dependency rule Makefiles in one pass.
3838
all_deps :=
3939

40-
# C++ apps need to be linked with g++. Not sure what's appropriate.
40+
41+
42+
# C++ apps need to be linked with g++.
4143
#
42-
# Note, the flock is used to seralize linking. Linking is a memory-intensive
44+
# Note: flock is used to seralize linking. Linking is a memory-intensive
4345
# process so running parallel links can often lead to thrashing. To disable
44-
# the serialization, override FLOCK via an envrionment variable as follows:
46+
# the serialization, override LINK via an envrionment variable as follows:
4547
#
46-
# export FLOCK=
48+
# export LINK=g++
4749
#
4850
# This will allow make to invoke N linker processes as specified in -jN.
49-
FLOCK ?= flock $(builddir)/linker.lock
50-
51+
LINK ?= flock $(builddir)/linker.lock $(CXX)
5152

52-
53-
LINK ?= $(FLOCK) $(CXX)
5453
CC.target ?= $(CC)
5554
CFLAGS.target ?= $(CFLAGS)
5655
CXX.target ?= $(CXX)
@@ -213,6 +212,23 @@ command_changed = $(or $(subst $(cmd_$(1)),,$(cmd_$(call replace_spaces,$@))),\
213212
# $| -- order-only dependencies
214213
prereq_changed = $(filter-out FORCE_DO_CMD,$(filter-out $|,$?))
215214

215+
# Helper that executes all postbuilds, and deletes the output file when done
216+
# if any of the postbuilds failed.
217+
define do_postbuilds
218+
@E=0;\
219+
for p in $(POSTBUILDS); do\
220+
eval $$p;\
221+
F=$$?;\
222+
if [ $$F -ne 0 ]; then\
223+
E=$$F;\
224+
fi;\
225+
done;\
226+
if [ $$E -ne 0 ]; then\
227+
rm -rf "$@";\
228+
exit $$E;\
229+
fi
230+
endef
231+
216232
# do_cmd: run a command via the above cmd_foo names, if necessary.
217233
# Should always run for a given target to handle command-line changes.
218234
# Second argument, if non-zero, makes it do asm/C/C++ dependency munging.
@@ -231,7 +247,7 @@ $(if $(or $(command_changed),$(prereq_changed)),
231247
@$(call exact_echo,$(call escape_vars,cmd_$(call replace_spaces,$@) := $(cmd_$(1)))) > $(depfile)
232248
@$(if $(2),$(fixup_dep))
233249
$(if $(and $(3), $(POSTBUILDS)),
234-
@for p in $(POSTBUILDS); do eval $$p; done
250+
$(call do_postbuilds)
235251
)
236252
)
237253
endef

‎mk/libuv/unix/src/rt/libuv/run-benchmarks.target.mk

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
TOOLSET := target
44
TARGET := run-benchmarks
5-
DEFS_Default := '-D_GNU_SOURCE'
5+
DEFS_Default := '-D_LARGEFILE_SOURCE' \
6+
'-D_FILE_OFFSET_BITS=64' \
7+
'-D_GNU_SOURCE' \
8+
'-DEIO_STACKSIZE=262144'
69

710
# Flags passed to all source files.
811
CFLAGS_Default :=
@@ -22,9 +25,11 @@ OBJS := $(obj).target/$(TARGET)/src/rt/libuv/test/benchmark-ares.o \
2225
$(obj).target/$(TARGET)/src/rt/libuv/test/benchmark-pump.o \
2326
$(obj).target/$(TARGET)/src/rt/libuv/test/benchmark-sizes.o \
2427
$(obj).target/$(TARGET)/src/rt/libuv/test/benchmark-spawn.o \
28+
$(obj).target/$(TARGET)/src/rt/libuv/test/benchmark-tcp-write-batch.o \
2529
$(obj).target/$(TARGET)/src/rt/libuv/test/benchmark-udp-packet-storm.o \
2630
$(obj).target/$(TARGET)/src/rt/libuv/test/dns-server.o \
2731
$(obj).target/$(TARGET)/src/rt/libuv/test/echo-server.o \
32+
$(obj).target/$(TARGET)/src/rt/libuv/test/blackhole-server.o \
2833
$(obj).target/$(TARGET)/src/rt/libuv/test/run-benchmarks.o \
2934
$(obj).target/$(TARGET)/src/rt/libuv/test/runner.o \
3035
$(obj).target/$(TARGET)/src/rt/libuv/test/runner-unix.o

0 commit comments

Comments
 (0)