This repository has been archived by the owner on May 4, 2018. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix a rather obscure bug where the event loop stalls when an I/O watcher is stopped while an artificial event, generated with uv__io_feed(), is pending.
- Loading branch information
1 parent
92fb84b
commit e079a99
Showing
7 changed files
with
87 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
/* Copyright Joyent, Inc. and other Node contributors. All rights reserved. | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
* of this software and associated documentation files (the "Software"), to | ||
* deal in the Software without restriction, including without limitation the | ||
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or | ||
* sell copies of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in | ||
* all copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS | ||
* IN THE SOFTWARE. | ||
*/ | ||
|
||
#include "uv.h" | ||
#include "task.h" | ||
|
||
static uv_timer_t timer_handle; | ||
static uv_tcp_t tcp_handle; | ||
static uv_write_t write_req; | ||
|
||
|
||
static void fail_cb(void) { | ||
ASSERT(0 && "fail_cb called"); | ||
} | ||
|
||
|
||
static void write_cb(uv_write_t* req, int status) { | ||
uv_close((uv_handle_t*) &timer_handle, NULL); | ||
uv_close((uv_handle_t*) &tcp_handle, NULL); | ||
} | ||
|
||
|
||
static void timer_cb(uv_timer_t* handle, int status) { | ||
uv_buf_t buf = uv_buf_init("PING", 4); | ||
ASSERT(0 == uv_write(&write_req, | ||
(uv_stream_t*) &tcp_handle, | ||
&buf, | ||
1, | ||
write_cb)); | ||
ASSERT(0 == uv_read_stop((uv_stream_t*) &tcp_handle)); | ||
} | ||
|
||
|
||
static void connect_cb(uv_connect_t* req, int status) { | ||
ASSERT(0 == status); | ||
ASSERT(0 == uv_timer_start(&timer_handle, timer_cb, 50, 0)); | ||
ASSERT(0 == uv_read_start((uv_stream_t*) &tcp_handle, | ||
(uv_alloc_cb) fail_cb, | ||
(uv_read_cb) fail_cb)); | ||
} | ||
|
||
|
||
TEST_IMPL(tcp_read_stop) { | ||
uv_connect_t connect_req; | ||
struct sockaddr_in addr; | ||
|
||
addr = uv_ip4_addr("127.0.0.1", TEST_PORT); | ||
ASSERT(0 == uv_timer_init(uv_default_loop(), &timer_handle)); | ||
ASSERT(0 == uv_tcp_init(uv_default_loop(), &tcp_handle)); | ||
ASSERT(0 == uv_tcp_connect(&connect_req, &tcp_handle, addr, connect_cb)); | ||
ASSERT(0 == uv_run(uv_default_loop())); | ||
MAKE_VALGRIND_HAPPY(); | ||
|
||
return 0; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
e079a99
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@isaacs ship it
e079a99
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm a bit iffy on changing the uv_work signature. Is there any way around that? It's going to break a lot of addons.
e079a99
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Convinced by sound reasoning. Shipped.