Skip to content

Commit 68dc69a

Browse files
saghulbnoordhuis
saghul
authored and
bnoordhuis
committed
deps: update libuv to version 1.7.4
PR-URL: #2817 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
1 parent 958a94e commit 68dc69a

File tree

19 files changed

+207
-121
lines changed

19 files changed

+207
-121
lines changed

‎deps/uv/AUTHORS‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,3 +219,8 @@ Zachary Hamm <[email protected]>
219219
Karl Skomski <[email protected]>
220220
Jeremy Whitlock <[email protected]>
221221
Willem Thiart <[email protected]>
222+
Ben Trask <[email protected]>
223+
Jianghua Yang <[email protected]>
224+
Colin Snover <[email protected]>
225+
Sakthipriyan Vairamani <[email protected]>
226+
Eli Skeggs <[email protected]>

‎deps/uv/CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ the [Google C/C++ style guide]. Some of the key points, as well as some
4949
additional guidelines, are enumerated below.
5050

5151
* Code that is specific to unix-y platforms should be placed in `src/unix`, and
52-
declarations go into `src/uv-unix.h`.
52+
declarations go into `include/uv-unix.h`.
5353

5454
* Source code that is Windows-specific goes into `src/win`, and related
5555
publicly exported types, functions and macro declarations should generally

‎deps/uv/ChangeLog‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
1+
2015.09.12, Version 1.7.4 (Stable), a7ad4f52189d89cfcba35f78bfc5ff3b1f4105c4
2+
3+
Changes since version 1.7.3:
4+
5+
* doc: uv_read_start and uv_read_cb clarifications (Ben Trask)
6+
7+
* freebsd: obtain true uptime through clock_gettime() (Jianghua Yang)
8+
9+
* win, tty: do not convert \r to \r\n (Colin Snover)
10+
11+
* build,gyp: add DragonFly to the list of OSes (Michael Neumann)
12+
13+
* fs: fix bug in sendfile for DragonFly (Michael Neumann)
14+
15+
* doc: add uv_dlsym() return type (Brian White)
16+
17+
* tests: fix fs tests run w/o full getdents support (Jeremy Whitlock)
18+
19+
* doc: fix typo (Devchandra Meetei Leishangthem)
20+
21+
* doc: fix uv-unix.h location (Sakthipriyan Vairamani)
22+
23+
* unix: fix error check when closing process pipe fd (Ben Noordhuis)
24+
25+
* test,freebsd: fix ipc_listen_xx_write tests (Santiago Gimeno)
26+
27+
* win: fix unsavory rwlock fallback implementation (Bert Belder)
28+
29+
* doc: clarify repeat timer behavior (Eli Skeggs)
30+
31+
132
2015.08.28, Version 1.7.3 (Stable), 93877b11c8b86e0a6befcda83a54555c1e36e4f0
233

334
Changes since version 1.7.2:

‎deps/uv/appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: v1.7.3.build{build}
1+
version: v1.7.4.build{build}
22

33
install:
44
- cinst -y nsis

‎deps/uv/common.gypi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
}]
130130
]
131131
}],
132-
['OS in "freebsd linux openbsd solaris android"', {
132+
['OS in "freebsd dragonflybsd linux openbsd solaris android"', {
133133
'cflags': [ '-Wall' ],
134134
'cflags_cc': [ '-fno-rtti', '-fno-exceptions' ],
135135
'target_conditions': [

‎deps/uv/configure.ac‎

Lines changed: 1 addition & 1 deletion
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.7.3], [https://github.com/libuv/libuv/issues])
16+
AC_INIT([libuv], [1.7.4], [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/dll.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ API
3434
3535
Close the shared library.
3636
37-
.. c:function:: uv_dlsym(uv_lib_t* lib, const char* name, void** ptr)
37+
.. c:function:: int uv_dlsym(uv_lib_t* lib, const char* name, void** ptr)
3838
3939
Retrieves a data pointer from a dynamic library. It is legal for a symbol
4040
to map to NULL. Returns 0 on success and -1 if the symbol was not found.

‎deps/uv/docs/src/request.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Data types
2525
Public members
2626
^^^^^^^^^^^^^^
2727

28-
.. c:member:: void* uv_request_t.data
28+
.. c:member:: void* uv_req_t.data
2929
3030
Space for user-defined arbitrary data. libuv does not use this field.
3131

‎deps/uv/docs/src/stream.rst‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,14 @@ Data types
3232
3333
Callback called when data was read on a stream.
3434

35-
`nread` is > 0 if there is data available, 0 if libuv is done reading for
36-
now, or < 0 on error.
35+
`nread` is > 0 if there is data available or < 0 on error. When we've
36+
reached EOF, `nread` will be set to ``UV_EOF``. When `nread` < 0,
37+
the `buf` parameter might not point to a valid buffer; in that case
38+
`buf.len` and `buf.base` are both set to 0.
39+
40+
.. note::
41+
`nread` might be 0, which does *not* indicate an error or EOF. This
42+
is equivalent to ``EAGAIN`` or ``EWOULDBLOCK`` under ``read(2)``.
3743

3844
The callee is responsible for stopping closing the stream when an error happens
3945
by calling :c:func:`uv_read_stop` or :c:func:`uv_close`. Trying to read
@@ -125,17 +131,9 @@ API
125131
126132
.. c:function:: int uv_read_start(uv_stream_t* stream, uv_alloc_cb alloc_cb, uv_read_cb read_cb)
127133
128-
Read data from an incoming stream. The callback will be made several
129-
times until there is no more data to read or :c:func:`uv_read_stop` is called.
130-
When we've reached EOF `nread` will be set to ``UV_EOF``.
131-
132-
When `nread` < 0, the `buf` parameter might not point to a valid buffer;
133-
in that case `buf.len` and `buf.base` are both set to 0.
134-
135-
.. note::
136-
`nread` might also be 0, which does *not* indicate an error or EOF, it happens when
137-
libuv requested a buffer through the alloc callback but then decided that it didn't
138-
need that buffer.
134+
Read data from an incoming stream. The :c:type:`uv_read_cb` callback will
135+
be made several times until there is no more data to read or
136+
:c:func:`uv_read_stop` is called.
139137
140138
.. c:function:: int uv_read_stop(uv_stream_t*)
141139

‎deps/uv/docs/src/timer.rst‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,15 @@ API
5454
5555
.. c:function:: void uv_timer_set_repeat(uv_timer_t* handle, uint64_t repeat)
5656
57-
Set the repeat value in milliseconds.
57+
Set the repeat interval value in milliseconds. The timer will be scheduled
58+
to run on the given interval, regardless of the callback execution
59+
duration, and will follow normal timer semantics in the case of a
60+
time-slice overrun.
61+
62+
For example, if a 50ms repeating timer first runs for 17ms, it will be
63+
scheduled to run again 33ms later. If other tasks consume more than the
64+
33ms following the first timer callback, then the callback will run as soon
65+
as possible.
5866
5967
.. note::
6068
If the repeat value is set from a timer callback it does not immediately take effect.

0 commit comments

Comments
 (0)