Skip to content

Commit ce112c2

Browse files
saghultrevnorris
saghul
authored and
trevnorris
committed
deps: update uv to v1.0.0-rc2
PR-URL: nodejs/node-v0.x-archive#8566 Reviewed-by: Fedor Indutny <fedor@indutny.com> Reviewed-by: Trevor Norris <trev.norris@gmail.com>
1 parent 28ae70e commit ce112c2

32 files changed

Lines changed: 921 additions & 150 deletions

‎deps/uv/AUTHORS‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,3 +157,12 @@ John Firebaugh <john.firebaugh@gmail.com>
157157
lilohuang <lilohuang@hotmail.com>
158158
Paul Goldsmith <paul.goldsmith@aplink.net>
159159
Julien Gilli <julien.gilli@joyent.com>
160+
Michael Hudson-Doyle <michael.hudson@linaro.org>
161+
Recep ASLANTAS <m@recp.me>
162+
Rob Adams <readams@readams.net>
163+
Zachary Newman <znewman01@gmail.com>
164+
Robin Hahling <robin.hahling@gw-computing.net>
165+
Jeff Widman <jeff@jeffwidman.com>
166+
cjihrig <cjihrig@gmail.com>
167+
Tomasz Kołodziejski <tkolodziejski@mozilla.com>
168+
Unknown W. Brackets <checkins@unknownbrackets.org>

‎deps/uv/CONTRIBUTING.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ Okay, so you have decided on the proper branch. Create a feature branch
3737
and start hacking:
3838

3939
```
40-
$ git checkout -b my-feature-branch -t origin/v0.10
40+
$ git checkout -b my-feature-branch -t origin/v1.x
4141
```
4242

43-
(Where v0.10 is the latest stable branch as of this writing.)
43+
(Where v1.x is the latest stable branch as of this writing.)
4444

4545
### CODE
4646

@@ -131,7 +131,7 @@ Use `git rebase` (not `git merge`) to sync your work from time to time.
131131

132132
```
133133
$ git fetch upstream
134-
$ git rebase upstream/v0.10 # or upstream/master
134+
$ git rebase upstream/v1.x # or upstream/master
135135
```
136136

137137

‎deps/uv/ChangeLog‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,47 @@
1+
2014.10.21, Version 1.0.0-rc2 (Pre-release)
2+
3+
Changes since version 1.0.0-rc1:
4+
5+
* build: add missing fixtures to distribution tarball (Rob Adams)
6+
7+
* doc: update references to current stable branch (Zachary Newman)
8+
9+
* fs: fix readdir on empty directory (Fedor Indutny)
10+
11+
* fs: rename uv_fs_readdir to uv_fs_scandir (Saúl Ibarra Corretgé)
12+
13+
* doc: document uv_alloc_cb (Saúl Ibarra Corretgé)
14+
15+
* doc: add migration guide from version 0.10 (Saúl Ibarra Corretgé)
16+
17+
* build: add DragonFly BSD support in autotools (Robin Hahling)
18+
19+
* doc: document missing stream related structures (Saúl Ibarra Corretgé)
20+
21+
* doc: clarify uv_loop_t.data field lifetime (Saúl Ibarra Corretgé)
22+
23+
* doc: add documentation for missing functions and structures (Saúl Ibarra
24+
Corretgé)
25+
26+
* doc: fix punctuation and grammar in README (Jeff Widman)
27+
28+
* windows: return libuv error codes in uv_poll_init() (cjihrig)
29+
30+
* unix, windows: add uv_fs_access() (cjihrig)
31+
32+
* windows: fix netmask detection (Alexis Campailla)
33+
34+
* unix, windows: don't include null byte in uv_cwd size (Saúl Ibarra Corretgé)
35+
36+
* unix, windows: add uv_thread_equal (Tomasz Kołodziejski)
37+
38+
* windows: fix fs_write with nbufs > 1 and offset (Unknown W. Brackets)
39+
40+
141
2014.09.18, Version 1.0.0-rc1 (Unstable), 0c28bbf7b42882853d1799ab96ff68b07f7f8d49
242

43+
Changes since version 0.11.29:
44+
345
* windows: improve timer precision (Alexis Campailla)
446

547
* build, gyp: set xcode flags (Recep ASLANTAS)

‎deps/uv/Makefile.am‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ libuv_la_SOURCES += src/unix/async.c \
106106

107107
endif # WINNT
108108

109+
EXTRA_DIST = test/fixtures/empty_file \
110+
test/fixtures/load_error.node
111+
109112
TESTS = test/run-tests
110113
check_PROGRAMS = test/run-tests
111114
test_run_tests_CFLAGS =
@@ -203,6 +206,7 @@ test_run_tests_SOURCES = test/blackhole-server.c \
203206
test/test-tcp-writealot.c \
204207
test/test-tcp-try-write.c \
205208
test/test-tcp-write-queue-order.c \
209+
test/test-thread-equal.c \
206210
test/test-thread.c \
207211
test/test-threadpool-cancel.c \
208212
test/test-threadpool.c \
@@ -268,6 +272,11 @@ libuv_la_SOURCES += src/unix/darwin.c \
268272
src/unix/proctitle.c
269273
endif
270274

275+
if DRAGONFLY
276+
include_HEADERS += include/uv-bsd.h
277+
libuv_la_SOURCES += src/unix/kqueue.c src/unix/freebsd.c
278+
endif
279+
271280
if FREEBSD
272281
include_HEADERS += include/uv-bsd.h
273282
libuv_la_SOURCES += src/unix/freebsd.c src/unix/kqueue.c

‎deps/uv/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Documentation can be browsed online [here](http://docs.libuv.org).
8585

8686
## Build Instructions
8787

88-
For GCC there are two methods building: via autotools or via [GYP][].
88+
For GCC there are two build methods: via autotools or via [GYP][].
8989
GYP is a meta-build system which can generate MSVS, Makefile, and XCode
9090
backends. It is best used for integration into other projects.
9191

@@ -100,7 +100,7 @@ To build with autotools:
100100
### Windows
101101

102102
First, [Python][] 2.6 or 2.7 must be installed as it is required by [GYP][].
103-
If python is not in your path set the environment variable `PYTHON` to its
103+
If python is not in your path, set the environment variable `PYTHON` to its
104104
location. For example: `set PYTHON=C:\Python27\python.exe`
105105

106106
To build with Visual Studio, launch a git shell (e.g. Cmd or PowerShell)

‎deps/uv/configure.ac‎

Lines changed: 11 additions & 10 deletions
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.0.0], [https://github.com/joyent/libuv/issues])
16+
AC_INIT([libuv], [1.0.0-rc2], [https://github.com/joyent/libuv/issues])
1717
AC_CONFIG_MACRO_DIR([m4])
1818
m4_include([m4/libuv-extra-automake-flags.m4])
1919
m4_include([m4/as_case.m4])
@@ -40,15 +40,16 @@ AC_CHECK_LIB([rt], [clock_gettime])
4040
AC_CHECK_LIB([sendfile], [sendfile])
4141
AC_CHECK_LIB([socket], [socket])
4242
AC_SYS_LARGEFILE
43-
AM_CONDITIONAL([AIX], [AS_CASE([$host_os],[aix*], [true], [false])])
44-
AM_CONDITIONAL([ANDROID],[AS_CASE([$host_os],[linux-android*],[true], [false])])
45-
AM_CONDITIONAL([DARWIN], [AS_CASE([$host_os],[darwin*], [true], [false])])
46-
AM_CONDITIONAL([FREEBSD],[AS_CASE([$host_os],[freebsd*], [true], [false])])
47-
AM_CONDITIONAL([LINUX], [AS_CASE([$host_os],[linux*], [true], [false])])
48-
AM_CONDITIONAL([NETBSD], [AS_CASE([$host_os],[netbsd*], [true], [false])])
49-
AM_CONDITIONAL([OPENBSD],[AS_CASE([$host_os],[openbsd*], [true], [false])])
50-
AM_CONDITIONAL([SUNOS], [AS_CASE([$host_os],[solaris*], [true], [false])])
51-
AM_CONDITIONAL([WINNT], [AS_CASE([$host_os],[mingw*], [true], [false])])
43+
AM_CONDITIONAL([AIX], [AS_CASE([$host_os],[aix*], [true], [false])])
44+
AM_CONDITIONAL([ANDROID], [AS_CASE([$host_os],[linux-android*],[true], [false])])
45+
AM_CONDITIONAL([DARWIN], [AS_CASE([$host_os],[darwin*], [true], [false])])
46+
AM_CONDITIONAL([DRAGONFLY],[AS_CASE([$host_os],[dragonfly*], [true], [false])])
47+
AM_CONDITIONAL([FREEBSD], [AS_CASE([$host_os],[freebsd*], [true], [false])])
48+
AM_CONDITIONAL([LINUX], [AS_CASE([$host_os],[linux*], [true], [false])])
49+
AM_CONDITIONAL([NETBSD], [AS_CASE([$host_os],[netbsd*], [true], [false])])
50+
AM_CONDITIONAL([OPENBSD], [AS_CASE([$host_os],[openbsd*], [true], [false])])
51+
AM_CONDITIONAL([SUNOS], [AS_CASE([$host_os],[solaris*], [true], [false])])
52+
AM_CONDITIONAL([WINNT], [AS_CASE([$host_os],[mingw*], [true], [false])])
5253
PANDORA_ENABLE_DTRACE
5354
AC_CHECK_PROG(PKG_CONFIG, pkg-config, yes)
5455
AM_CONDITIONAL([HAVE_PKG_CONFIG], [test "x$PKG_CONFIG" != "x"])

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

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,20 @@ Data types
2020
2121
Filesystem request type.
2222

23+
.. c:type:: uv_timespec_t
24+
25+
Portable equivalent of ``struct timespec``.
26+
27+
::
28+
29+
typedef struct {
30+
long tv_sec;
31+
long tv_nsec;
32+
} uv_timespec_t;
33+
2334
.. c:type:: uv_stat_t
2435
25-
Portable equivalent of `struct stat`.
36+
Portable equivalent of ``struct stat``.
2637

2738
::
2839

@@ -65,6 +76,7 @@ Data types
6576
UV_FS_FTRUNCATE,
6677
UV_FS_UTIME,
6778
UV_FS_FUTIME,
79+
UV_FS_ACCESS,
6880
UV_FS_CHMOD,
6981
UV_FS_FCHMOD,
7082
UV_FS_FSYNC,
@@ -74,7 +86,7 @@ Data types
7486
UV_FS_MKDIR,
7587
UV_FS_MKDTEMP,
7688
UV_FS_RENAME,
77-
UV_FS_READDIR,
89+
UV_FS_SCANDIR,
7890
UV_FS_LINK,
7991
UV_FS_SYMLINK,
8092
UV_FS_READLINK,
@@ -85,7 +97,7 @@ Data types
8597
.. c:type:: uv_dirent_t
8698
8799
Cross platform (reduced) equivalent of ``struct dirent``.
88-
Used in :c:func:`uv_fs_readdir_next`.
100+
Used in :c:func:`uv_fs_scandir_next`.
89101

90102
::
91103

@@ -183,11 +195,11 @@ API
183195
184196
Equivalent to ``rmdir(2)``.
185197
186-
.. c:function:: int uv_fs_readdir(uv_loop_t* loop, uv_fs_t* req, const char* path, int flags, uv_fs_cb cb)
187-
.. c:function:: int uv_fs_readdir_next(uv_fs_t* req, uv_dirent_t* ent)
198+
.. c:function:: int uv_fs_scandir(uv_loop_t* loop, uv_fs_t* req, const char* path, int flags, uv_fs_cb cb)
199+
.. c:function:: int uv_fs_scandir_next(uv_fs_t* req, uv_dirent_t* ent)
188200
189-
Equivalent to ``readdir(2)``, with a slightly different API. Once the callback
190-
for the request is called, the user can use :c:func:`uv_fs_readdir_next` to
201+
Equivalent to ``scandir(3)``, with a slightly different API. Once the callback
202+
for the request is called, the user can use :c:func:`uv_fs_scandir_next` to
191203
get `ent` populated with the next directory entry data. When there are no
192204
more entries ``UV_EOF`` will be returned.
193205
@@ -217,6 +229,10 @@ API
217229
218230
Limited equivalent to ``sendfile(2)``.
219231
232+
.. c:function:: int uv_fs_access(uv_loop_t* loop, uv_fs_t* req, const char* path, int flags, uv_fs_cb cb)
233+
234+
Equivalent to ``access(2)`` on Unix. Windows uses ``GetFileAttributesW()``.
235+
220236
.. c:function:: int uv_fs_chmod(uv_loop_t* loop, uv_fs_t* req, const char* path, int mode, uv_fs_cb cb)
221237
.. c:function:: int uv_fs_fchmod(uv_loop_t* loop, uv_fs_t* req, uv_file file, int mode, uv_fs_cb cb)
222238

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ N/A
4242
API
4343
---
4444

45+
.. c:function:: int uv_fs_poll_init(uv_loop_t* loop, uv_fs_poll_t* handle)
46+
47+
Initialize the handle.
48+
4549
.. c:function:: int uv_fs_poll_start(uv_fs_poll_t* handle, uv_fs_poll_cb poll_cb, const char* path, unsigned int interval)
4650
4751
Check the file at `path` for changes every `interval` milliseconds.

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,15 @@ Data types
2121
2222
Union of all handle types.
2323

24+
.. c:type:: void (*uv_alloc_cb)(uv_handle_t* handle, size_t suggested_size, uv_buf_t* buf)
25+
26+
Type definition for callback passed to :c:func:`uv_read_start` and
27+
:c:func:`uv_udp_recv_start`. The user must fill the supplied :c:type:`uv_buf_t`
28+
structure with whatever size, as long as it's > 0. A suggested size (65536 at the moment)
29+
is provided, but it doesn't need to be honored. Setting the buffer's length to 0
30+
will trigger a ``UV_ENOBUFS`` error in the :c:type:`uv_udp_recv_cb` or
31+
:c:type:`uv_read_cb` callback.
32+
2433
.. c:type:: void (*uv_close_cb)(uv_handle_t* handle)
2534
2635
Type definition for callback passed to :c:func:`uv_close`.

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,17 @@ Installation
5050
Installation instructions can be found on `the README <https://github.com/joyent/libuv/blob/master/README.md>`_.
5151

5252

53+
Upgrading
54+
---------
55+
56+
Migration guides for different libuv versions, starting with 1.0.
57+
58+
.. toctree::
59+
:maxdepth: 1
60+
61+
migration_010_100
62+
63+
5364
Documentation
5465
-------------
5566

0 commit comments

Comments
 (0)