Skip to content

Commit d58dcec

Browse files
cjihrigaddaleax
authored andcommitted
deps: upgrade libuv to 1.19.2
PR-URL: nodejs#18918 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
1 parent 5477060 commit d58dcec

Some content is hidden

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

66 files changed

+1071
-891
lines changed

deps/uv/AUTHORS

+5
Original file line numberDiff line numberDiff line change
@@ -325,3 +325,8 @@ Anna Henningsen <anna@addaleax.net>
325325
Jérémy Lal <kapouer@melix.org>
326326
Ben Wijen <ben@wijen.net>
327327
elephantp <elephantp@elephantp.blog>
328+
Felix Yan <felixonmars@archlinux.org>
329+
Mason X <me@masonx.ca>
330+
Jesse Gorzinski <jgorzinski@gmail.com>
331+
Ryuichi KAWAMATA <ryuichi.kawamata@dena.jp>
332+
Joyee Cheung <joyeec9h3@gmail.com>

deps/uv/ChangeLog

+45
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,48 @@
1+
2018.02.22, Version 1.19.2 (Stable), c5afc37e2a8a70d8ab0da8dac10b77ba78c0488c
2+
3+
Changes since version 1.19.1:
4+
5+
* test: fix incorrect asserts (cjihrig)
6+
7+
* test: fix a typo in test-fork.c (Felix Yan)
8+
9+
* build: remove long-obsolete gyp workarounds (Ben Noordhuis)
10+
11+
* build: split off tests into separate gyp file (Ben Noordhuis)
12+
13+
* test: check uv_cond_timedwait more carefully (Jamie Davis)
14+
15+
* include,src: introduce UV__ERR() macro (Mason X)
16+
17+
* build: add url field to libuv.pc (Ben Noordhuis)
18+
19+
* doc: mark IBM i as Tier 3 support (Jesse Gorzinski)
20+
21+
* win,build: correct C2059 errors (Michael Fero)
22+
23+
* zos: fix timeout for condition variable (jBarz)
24+
25+
* win: CREATE_NO_WINDOW when stdio is not inherited (Nick Logan)
26+
27+
* build: fix commmon.gypi comment (Ryuichi KAWAMATA)
28+
29+
* doc: document uv_timer_start() on an active timer (Vladimír Čunát)
30+
31+
* doc: add note about handle movability (Bartosz Sosnowski)
32+
33+
* doc: fix syntax error in loop documentation (Bartosz Sosnowski)
34+
35+
* osx,stream: retry sending handle on EMSGSIZE error (Santiago Gimeno)
36+
37+
* unix: delay fs req register until after validation (cjihrig)
38+
39+
* test: add tests for bad inputs (Joyee Cheung)
40+
41+
* unix,win: ensure req->bufs is freed (cjihrig)
42+
43+
* test: add additional fs memory management checks (cjihrig)
44+
45+
146
2018.01.20, Version 1.19.1 (Stable), 8202d1751196c2374ad370f7f3779daef89befae
247

348
Changes since version 1.19.0:

deps/uv/SUPPORTED_PLATFORMS.md

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
| Linux with musl | Tier 2 | musl >= 1.0 | |
1212
| SmartOS | Tier 2 | >= 14.4 | Maintainers: @libuv/smartos |
1313
| Android | Tier 3 | NDK >= r15b | |
14+
| IBM i | Tier 3 | >= IBM i 7.2 | Maintainers: @libuv/ibmi |
1415
| MinGW | Tier 3 | MinGW32 and MinGW-w64 | |
1516
| SunOS | Tier 3 | Solaris 121 and later | |
1617
| Other | Tier 3 | N/A | |

deps/uv/common.gypi

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
'VCCLCompilerTool': {
1717
'target_conditions': [
1818
['uv_library=="static_library"', {
19-
'RuntimeLibrary': 1, # static debug
19+
'RuntimeLibrary': 1, # /MTd static debug
2020
}, {
21-
'RuntimeLibrary': 3, # DLL debug
21+
'RuntimeLibrary': 3, # /MDd DLL debug
2222
}],
2323
],
2424
'Optimization': 0, # /Od, no optimization
@@ -52,9 +52,9 @@
5252
'VCCLCompilerTool': {
5353
'target_conditions': [
5454
['uv_library=="static_library"', {
55-
'RuntimeLibrary': 0, # static release
55+
'RuntimeLibrary': 0, # /MT static release
5656
}, {
57-
'RuntimeLibrary': 2, # debug release
57+
'RuntimeLibrary': 2, # /MD DLL release
5858
}],
5959
],
6060
'Optimization': 3, # /Ox, full optimization

deps/uv/configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1414

1515
AC_PREREQ(2.57)
16-
AC_INIT([libuv], [1.19.1], [https://github.com/libuv/libuv/issues])
16+
AC_INIT([libuv], [1.19.2], [https://github.com/libuv/libuv/issues])
1717
AC_CONFIG_MACRO_DIR([m4])
1818
m4_include([m4/libuv-extra-automake-flags.m4])
1919
m4_include([m4/as_case.m4])

deps/uv/docs/src/handle.rst

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
Structures are aligned so that any libuv handle can be cast to `uv_handle_t`.
1010
All API functions defined here work with any handle type.
1111

12+
Libuv handles are not movable. Pointers to handle structures passed to
13+
functions must remain valid for the duration of the requested operation. Take
14+
care when using stack allocated handles.
1215

1316
Data types
1417
----------

deps/uv/docs/src/loop.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ API
219219
220220
.. caution::
221221

222-
Any previous value returned from :c:func`uv_backend_fd` is now
222+
Any previous value returned from :c:func:`uv_backend_fd` is now
223223
invalid. That function must be called again to determine the
224224
correct backend file descriptor.
225225

deps/uv/docs/src/threading.rst

+9-2
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,15 @@ Functions return 0 on success or an error code < 0 (unless the
131131
return type is void, of course).
132132
133133
.. note::
134-
Callers should be prepared to deal with spurious wakeups on :c:func:`uv_cond_wait` and
135-
:c:func:`uv_cond_timedwait`.
134+
1. Callers should be prepared to deal with spurious wakeups on :c:func:`uv_cond_wait`
135+
and :c:func:`uv_cond_timedwait`.
136+
2. The timeout parameter for :c:func:`uv_cond_timedwait` is relative to the time
137+
at which function is called.
138+
3. On z/OS, the timeout parameter for :c:func:`uv_cond_timedwait` is converted to an
139+
absolute system time at which the wait expires. If the current system clock time
140+
passes the absolute time calculated before the condition is signaled, an ETIMEDOUT
141+
error results. After the wait begins, the wait time is not affected by changes
142+
to the system clock.
136143
137144
.. c:function:: int uv_cond_init(uv_cond_t* cond)
138145
.. c:function:: void uv_cond_destroy(uv_cond_t* cond)

deps/uv/docs/src/timer.rst

+2
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ API
4545
.. note::
4646
Does not update the event loop's concept of "now". See :c:func:`uv_update_time` for more information.
4747
48+
If the timer is already active, it is simply updated.
49+
4850
.. c:function:: int uv_timer_stop(uv_timer_t* handle)
4951
5052
Stop the timer, the callback will not be called anymore.

deps/uv/gyp_uv.py

+1-22
Original file line numberDiff line numberDiff line change
@@ -43,28 +43,7 @@ def run_gyp(args):
4343

4444
if __name__ == '__main__':
4545
args = sys.argv[1:]
46-
47-
# GYP bug.
48-
# On msvs it will crash if it gets an absolute path.
49-
# On Mac/make it will crash if it doesn't get an absolute path.
50-
if sys.platform == 'win32':
51-
args.append(os.path.join(uv_root, 'uv.gyp'))
52-
common_fn = os.path.join(uv_root, 'common.gypi')
53-
options_fn = os.path.join(uv_root, 'options.gypi')
54-
# we force vs 2010 over 2008 which would otherwise be the default for gyp
55-
if not os.environ.get('GYP_MSVS_VERSION'):
56-
os.environ['GYP_MSVS_VERSION'] = '2010'
57-
else:
58-
args.append(os.path.join(os.path.abspath(uv_root), 'uv.gyp'))
59-
common_fn = os.path.join(os.path.abspath(uv_root), 'common.gypi')
60-
options_fn = os.path.join(os.path.abspath(uv_root), 'options.gypi')
61-
62-
if os.path.exists(common_fn):
63-
args.extend(['-I', common_fn])
64-
65-
if os.path.exists(options_fn):
66-
args.extend(['-I', options_fn])
67-
46+
args.extend('-I common.gypi test/test.gyp'.split(' '))
6847
args.append('--depth=' + uv_root)
6948

7049
# There's a bug with windows which doesn't allow this feature.

0 commit comments

Comments
 (0)