Skip to content

Commit 9dd9792

Browse files
committed
Upgrade libuv to 7108ca88
1 parent de0b8d6 commit 9dd9792

File tree

9 files changed

+260
-45
lines changed

9 files changed

+260
-45
lines changed

deps/uv/config-unix.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ src/ev/ev.o: src/ev/ev.c
9898

9999
EIO_CPPFLAGS += $(CPPFLAGS)
100100
EIO_CPPFLAGS += -DEIO_CONFIG_H=\"$(EIO_CONFIG)\"
101-
EIO_CPPFLAGS += -DEIO_STACKSIZE=65536
101+
EIO_CPPFLAGS += -DEIO_STACKSIZE=262144
102102
EIO_CPPFLAGS += -D_GNU_SOURCE
103103

104104
src/eio/eio.o: src/eio/eio.c

deps/uv/include/uv-unix.h

+1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ typedef struct {
8888
#define UV_PIPE_PRIVATE_FIELDS \
8989
UV_TCP_PRIVATE_FIELDS \
9090
const char* pipe_fname; /* strdup'ed */ \
91+
void* pipe_flock;
9192

9293

9394
/* UV_PREPARE */ \

deps/uv/include/uv.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -508,9 +508,8 @@ typedef struct uv_process_options_s {
508508
char** env;
509509
char* cwd;
510510
/*
511-
* The user should supply pointers to uninitialized uv_pipe_t structs for
512-
* stdio. They will be initialized by uv_spawn. The user is reponsible for
513-
* calling uv_close on them.
511+
* The user should supply pointers to initialized uv_pipe_t structs for
512+
* stdio. The user is reponsible for calling uv_close on them.
514513
*/
515514
uv_pipe_t* stdin_stream;
516515
uv_pipe_t* stdout_stream;

deps/uv/src/eio/eio.c

+5-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#include "eio.h"
4141

4242
#ifdef EIO_STACKSIZE
43-
# define XTHREAD_STACKSIZE EIO_STACKSIZE
43+
# define X_STACKSIZE EIO_STACKSIZE
4444
#endif
4545

4646
// For statically-linked pthreads-w32, use:
@@ -1270,6 +1270,10 @@ eio__scandir (eio_req *req, etp_worker *self)
12701270
X_LOCK (wrklock);
12711271
/* the corresponding closedir is in ETP_WORKER_CLEAR */
12721272
self->dirp = dirp = opendir (req->ptr1);
1273+
1274+
if (req->flags & EIO_FLAG_PTR1_FREE)
1275+
free (req->ptr1);
1276+
12731277
req->flags |= EIO_FLAG_PTR1_FREE | EIO_FLAG_PTR2_FREE;
12741278
req->ptr1 = dents = flags ? malloc (dentalloc * sizeof (eio_dirent)) : 0;
12751279
req->ptr2 = names = malloc (namesalloc);

0 commit comments

Comments
 (0)