diff options
author | Ben Noordhuis <info@bnoordhuis.nl> | 2013-03-29 16:10:56 +0100 |
---|---|---|
committer | Ben Noordhuis <info@bnoordhuis.nl> | 2013-03-29 16:10:56 +0100 |
commit | 87f9ece334953bcf0f2d07811728df72cb572ea3 (patch) | |
tree | 495dcec91865d6feef451631b2d82f9d547e82fa /deps/uv/src/unix/stream.c | |
parent | 74ef94907277d8aa29d23cef29aee25161960376 (diff) | |
download | android-node-v8-87f9ece334953bcf0f2d07811728df72cb572ea3.tar.gz android-node-v8-87f9ece334953bcf0f2d07811728df72cb572ea3.tar.bz2 android-node-v8-87f9ece334953bcf0f2d07811728df72cb572ea3.zip |
deps: upgrade libuv to c43e851
Diffstat (limited to 'deps/uv/src/unix/stream.c')
-rw-r--r-- | deps/uv/src/unix/stream.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/deps/uv/src/unix/stream.c b/deps/uv/src/unix/stream.c index d95fa0dbe6..ad1845826a 100644 --- a/deps/uv/src/unix/stream.c +++ b/deps/uv/src/unix/stream.c @@ -109,8 +109,8 @@ void uv__stream_init(uv_loop_t* loop, stream->shutdown_req = NULL; stream->accepted_fd = -1; stream->delayed_error = 0; - ngx_queue_init(&stream->write_queue); - ngx_queue_init(&stream->write_completed_queue); + QUEUE_INIT(&stream->write_queue); + QUEUE_INIT(&stream->write_completed_queue); stream->write_queue_size = 0; if (loop->emfile_fd == -1) @@ -373,7 +373,7 @@ int uv__stream_open(uv_stream_t* stream, int fd, int flags) { void uv__stream_destroy(uv_stream_t* stream) { uv_write_t* req; - ngx_queue_t* q; + QUEUE* q; assert(!uv__io_active(&stream->io_watcher, UV__POLLIN | UV__POLLOUT)); assert(stream->flags & UV_CLOSED); @@ -385,11 +385,11 @@ void uv__stream_destroy(uv_stream_t* stream) { stream->connect_req = NULL; } - while (!ngx_queue_empty(&stream->write_queue)) { - q = ngx_queue_head(&stream->write_queue); - ngx_queue_remove(q); + while (!QUEUE_EMPTY(&stream->write_queue)) { + q = QUEUE_HEAD(&stream->write_queue); + QUEUE_REMOVE(q); - req = ngx_queue_data(q, uv_write_t, queue); + req = QUEUE_DATA(q, uv_write_t, queue); uv__req_unregister(stream->loop, req); if (req->bufs != req->bufsml) @@ -401,11 +401,11 @@ void uv__stream_destroy(uv_stream_t* stream) { } } - while (!ngx_queue_empty(&stream->write_completed_queue)) { - q = ngx_queue_head(&stream->write_completed_queue); - ngx_queue_remove(q); + while (!QUEUE_EMPTY(&stream->write_completed_queue)) { + q = QUEUE_HEAD(&stream->write_completed_queue); + QUEUE_REMOVE(q); - req = ngx_queue_data(q, uv_write_t, queue); + req = QUEUE_DATA(q, uv_write_t, queue); uv__req_unregister(stream->loop, req); if (req->cb) { @@ -638,7 +638,7 @@ int uv_listen(uv_stream_t* stream, int backlog, uv_connection_cb cb) { static void uv__drain(uv_stream_t* stream) { uv_shutdown_t* req; - assert(ngx_queue_empty(&stream->write_queue)); + assert(QUEUE_EMPTY(&stream->write_queue)); assert(stream->write_queue_size == 0); uv__io_stop(stream->loop, &stream->io_watcher, UV__POLLOUT); @@ -685,7 +685,7 @@ static void uv__write_req_finish(uv_write_t* req) { uv_stream_t* stream = req->handle; /* Pop the req off tcp->write_queue. */ - ngx_queue_remove(&req->queue); + QUEUE_REMOVE(&req->queue); if (req->bufs != req->bufsml) { free(req->bufs); } @@ -694,7 +694,7 @@ static void uv__write_req_finish(uv_write_t* req) { /* Add it to the write_completed_queue where it will have its * callback called in the near future. */ - ngx_queue_insert_tail(&stream->write_completed_queue, &req->queue); + QUEUE_INSERT_TAIL(&stream->write_completed_queue, &req->queue); uv__io_feed(stream->loop, &stream->io_watcher); } @@ -716,7 +716,7 @@ static int uv__handle_fd(uv_handle_t* handle) { static void uv__write(uv_stream_t* stream) { struct iovec* iov; - ngx_queue_t* q; + QUEUE* q; uv_write_t* req; int iovcnt; ssize_t n; @@ -725,13 +725,13 @@ start: assert(uv__stream_fd(stream) >= 0); - if (ngx_queue_empty(&stream->write_queue)) { + if (QUEUE_EMPTY(&stream->write_queue)) { assert(stream->write_queue_size == 0); return; } - q = ngx_queue_head(&stream->write_queue); - req = ngx_queue_data(q, uv_write_t, queue); + q = QUEUE_HEAD(&stream->write_queue); + req = QUEUE_DATA(q, uv_write_t, queue); assert(req->handle == stream); /* @@ -863,13 +863,13 @@ start: static void uv__write_callbacks(uv_stream_t* stream) { uv_write_t* req; - ngx_queue_t* q; + QUEUE* q; - while (!ngx_queue_empty(&stream->write_completed_queue)) { + while (!QUEUE_EMPTY(&stream->write_completed_queue)) { /* Pop a req off write_completed_queue. */ - q = ngx_queue_head(&stream->write_completed_queue); - req = ngx_queue_data(q, uv_write_t, queue); - ngx_queue_remove(q); + q = QUEUE_HEAD(&stream->write_completed_queue); + req = QUEUE_DATA(q, uv_write_t, queue); + QUEUE_REMOVE(q); uv__req_unregister(stream->loop, req); /* NOTE: call callback AFTER freeing the request data. */ @@ -879,10 +879,10 @@ static void uv__write_callbacks(uv_stream_t* stream) { } } - assert(ngx_queue_empty(&stream->write_completed_queue)); + assert(QUEUE_EMPTY(&stream->write_completed_queue)); /* Write queue drained. */ - if (ngx_queue_empty(&stream->write_queue)) + if (QUEUE_EMPTY(&stream->write_queue)) uv__drain(stream); } @@ -1200,7 +1200,7 @@ int uv_write2(uv_write_t* req, req->handle = stream; req->error = 0; req->send_handle = send_handle; - ngx_queue_init(&req->queue); + QUEUE_INIT(&req->queue); if (bufcnt <= (int) ARRAY_SIZE(req->bufsml)) req->bufs = req->bufsml; @@ -1213,7 +1213,7 @@ int uv_write2(uv_write_t* req, stream->write_queue_size += uv__buf_count(bufs, bufcnt); /* Append the request to write_queue. */ - ngx_queue_insert_tail(&stream->write_queue, &req->queue); + QUEUE_INSERT_TAIL(&stream->write_queue, &req->queue); /* If the queue was empty when this function began, we should attempt to * do the write immediately. Otherwise start the write_watcher and wait |