Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 3a493b8

Browse filesBrowse files
cjihrigtargos
cjihrig
authored and
targos
committed
deps: upgrade to libuv 1.30.1
This upgrade is a small patch release, fixing compilation errors on Android, Cygwin, and uClibc - none of which are tested in the CI. PR-URL: #28511 Reviewed-By: Saúl Ibarra Corretgé <saghul@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
1 parent cd71aad commit 3a493b8
Copy full SHA for 3a493b8

File tree

Expand file treeCollapse file tree

8 files changed

+39
-11
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

8 files changed

+39
-11
lines changed
Open diff view settings
Collapse file

‎deps/uv/CMakeLists.txt‎

Copy file name to clipboardExpand all lines: deps/uv/CMakeLists.txt
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Android")
260260
src/unix/linux-syscalls.c
261261
src/unix/procfs-exepath.c
262262
src/unix/pthread-fixes.c
263-
src/unix/sysinfo-loadavg.c
264-
src/unix/sysinfo-memory.c)
263+
src/unix/sysinfo-loadavg.c)
265264
endif()
266265

267266
if(APPLE OR CMAKE_SYSTEM_NAME MATCHES "Android|Linux|OS/390")
Collapse file

‎deps/uv/ChangeLog‎

Copy file name to clipboardExpand all lines: deps/uv/ChangeLog
+17Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
2019.07.03, Version 1.30.1 (Stable), 1551969c84c2f546a429dac169c7fdac3e38115e
2+
3+
Changes since version 1.30.0:
4+
5+
* doc: fix incorrect versionchanged (cjihrig)
6+
7+
* test: allow UV_ECONNRESET in tcp_try_write_error (cjihrig)
8+
9+
* unix: add uv_get_constrained_memory() cygwin stub (cjihrig)
10+
11+
* build: fix android cmake build (Ben Noordhuis)
12+
13+
* unix: squelch -Wcast-function-type warning (Ben Noordhuis)
14+
15+
* build: fix compile error with uClibc (zlargon)
16+
17+
118
2019.06.28, Version 1.30.0 (Stable), 365b6f2a0eacda1ff52be8e57ab9381cfddc5dbb
219

320
Changes since version 1.29.1:
Collapse file

‎deps/uv/configure.ac‎

Copy file name to clipboardExpand all lines: deps/uv/configure.ac
+1-1Lines 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.30.0], [https://github.com/libuv/libuv/issues])
16+
AC_INIT([libuv], [1.30.1], [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])
Collapse file

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

Copy file name to clipboardExpand all lines: deps/uv/docs/src/threadpool.rst
+1-1Lines changed: 1 addition & 1 deletion
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Its default size is 4, but it can be changed at startup time by setting the
1212
``UV_THREADPOOL_SIZE`` environment variable to any value (the absolute maximum
1313
is 1024).
1414

15-
.. versionchanged:: 1.29.2 the maximum UV_THREADPOOL_SIZE allowed was increased from 128 to 1024.
15+
.. versionchanged:: 1.30.0 the maximum UV_THREADPOOL_SIZE allowed was increased from 128 to 1024.
1616

1717
The threadpool is global and shared across all event loops. When a particular
1818
function makes use of the threadpool (i.e. when using :c:func:`uv_queue_work`)
Collapse file

‎deps/uv/include/uv/version.h‎

Copy file name to clipboardExpand all lines: deps/uv/include/uv/version.h
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
#define UV_VERSION_MAJOR 1
3434
#define UV_VERSION_MINOR 30
35-
#define UV_VERSION_PATCH 0
35+
#define UV_VERSION_PATCH 1
3636
#define UV_VERSION_IS_RELEASE 1
3737
#define UV_VERSION_SUFFIX ""
3838

Collapse file

‎deps/uv/src/unix/cygwin.c‎

Copy file name to clipboardExpand all lines: deps/uv/src/unix/cygwin.c
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,7 @@ void uv_free_cpu_info(uv_cpu_info_t* cpu_infos, int count) {
5252
(void)cpu_infos;
5353
(void)count;
5454
}
55+
56+
uint64_t uv_get_constrained_memory(void) {
57+
return 0; /* Memory constraints are unknown. */
58+
}
Collapse file

‎deps/uv/src/unix/thread.c‎

Copy file name to clipboardExpand all lines: deps/uv/src/unix/thread.c
+13-5Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include <sys/sem.h>
3838
#endif
3939

40-
#ifdef __GLIBC__
40+
#if defined(__GLIBC__) && !defined(__UCLIBC__)
4141
#include <gnu/libc-version.h> /* gnu_get_libc_version() */
4242
#endif
4343

@@ -222,6 +222,12 @@ int uv_thread_create_ex(uv_thread_t* tid,
222222
size_t pagesize;
223223
size_t stack_size;
224224

225+
/* Used to squelch a -Wcast-function-type warning. */
226+
union {
227+
void (*in)(void*);
228+
void* (*out)(void*);
229+
} f;
230+
225231
stack_size =
226232
params->flags & UV_THREAD_HAS_STACK_SIZE ? params->stack_size : 0;
227233

@@ -248,7 +254,8 @@ int uv_thread_create_ex(uv_thread_t* tid,
248254
abort();
249255
}
250256

251-
err = pthread_create(tid, attr, (void*(*)(void*)) entry, arg);
257+
f.in = entry;
258+
err = pthread_create(tid, attr, f.out, arg);
252259

253260
if (attr != NULL)
254261
pthread_attr_destroy(attr);
@@ -474,7 +481,7 @@ int uv_sem_trywait(uv_sem_t* sem) {
474481

475482
#else /* !(defined(__APPLE__) && defined(__MACH__)) */
476483

477-
#ifdef __GLIBC__
484+
#if defined(__GLIBC__) && !defined(__UCLIBC__)
478485

479486
/* Hack around https://sourceware.org/bugzilla/show_bug.cgi?id=12674
480487
* by providing a custom implementation for glibc < 2.21 in terms of other
@@ -510,7 +517,8 @@ typedef struct uv_semaphore_s {
510517
unsigned int value;
511518
} uv_semaphore_t;
512519

513-
#if defined(__GLIBC__) || platform_needs_custom_semaphore
520+
#if (defined(__GLIBC__) && !defined(__UCLIBC__)) || \
521+
platform_needs_custom_semaphore
514522
STATIC_ASSERT(sizeof(uv_sem_t) >= sizeof(uv_semaphore_t*));
515523
#endif
516524

@@ -639,7 +647,7 @@ static int uv__sem_trywait(uv_sem_t* sem) {
639647
}
640648

641649
int uv_sem_init(uv_sem_t* sem, unsigned int value) {
642-
#ifdef __GLIBC__
650+
#if defined(__GLIBC__) && !defined(__UCLIBC__)
643651
uv_once(&glibc_version_check_once, glibc_version_check);
644652
#endif
645653

Collapse file

‎deps/uv/test/test-tcp-try-write-error.c‎

Copy file name to clipboardExpand all lines: deps/uv/test/test-tcp-try-write-error.c
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ static void incoming_close_cb(uv_handle_t* handle) {
4848
while (r > 0)
4949
r = uv_try_write((uv_stream_t*) &client, &buf, 1);
5050
fprintf(stderr, "uv_try_write error: %d %s\n", r, uv_strerror(r));
51-
ASSERT(r == UV_EPIPE || r == UV_ECONNABORTED);
51+
ASSERT(r == UV_EPIPE || r == UV_ECONNABORTED || r == UV_ECONNRESET);
5252
ASSERT(client.write_queue_size == 0);
5353
}
5454

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.