1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: fix issues reported by Coverity

Browse Source 
Wrapped the timer into class to ensure it is cleaned up properly.

PR-URL: https://github.com/nodejs/node/pull/8870
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
This commit is contained in:
Eugene Ostroukhov 2016-09-30 14:24:02 -07:00
parent aa4698b66d
commit ec7f3a1674
1 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
test/cctest/test_inspector_socket.cc
View File

@ -10,13 +10,11 @@ static const int MAX_LOOP_ITERATIONS = 10000;
#define SPIN_WHILE(condition) \ #define SPIN_WHILE(condition) \
{ \ { \
bool timed_out = false; \ Timeout timeout(&loop); \
uv_timer_t* timer = start_timer(&timed_out); \ while ((condition) && !timeout.timed_out) { \
while (((condition)) && !timed_out) { \
uv_run(&loop, UV_RUN_NOWAIT); \ uv_run(&loop, UV_RUN_NOWAIT); \
} \ } \
ASSERT_FALSE((condition)); \ ASSERT_FALSE((condition)); \
cleanup_timer(timer); \
} }
static bool connected = false; static bool connected = false;
@ -46,32 +44,36 @@ static const char HANDSHAKE_REQ[] = "GET /ws/path HTTP/1.1\r\n"
"Sec-WebSocket-Key: aaa==\r\n" "Sec-WebSocket-Key: aaa==\r\n"
"Sec-WebSocket-Version: 13\r\n\r\n"; "Sec-WebSocket-Version: 13\r\n\r\n";
static void dispose_handle(uv_handle_t* handle) { class Timeout {
*static_cast<bool*>(handle->data) = true; public:
} explicit Timeout(uv_loop_t* loop) : timed_out(false), done_(false) {
uv_timer_init(loop, &timer_);
static void set_timeout_flag(uv_timer_t* timer) { uv_timer_start(&timer_, Timeout::set_flag, 5000, 0);
*(static_cast<bool*>(timer->data)) = true;
}
static uv_timer_t* start_timer(bool* flag) {
uv_timer_t* timer = new uv_timer_t();
uv_timer_init(&loop, timer);
timer->data = flag;
uv_timer_start(timer, set_timeout_flag, 5000, 0);
return timer;
}
static void cleanup_timer(uv_timer_t* timer) {
bool done = false;
timer->data = &done;
uv_timer_stop(timer);
uv_close(reinterpret_cast<uv_handle_t*>(timer), dispose_handle);
while (!done) {
uv_run(&loop, UV_RUN_NOWAIT);
} }
delete timer;
} ~Timeout() {
uv_timer_stop(&timer_);
uv_close(reinterpret_cast<uv_handle_t*>(&timer_), mark_done);
while (!done_) {
uv_run(&loop, UV_RUN_NOWAIT);
}
}
bool timed_out;
private:
static void set_flag(uv_timer_t* timer) {
Timeout* t = node::ContainerOf(&Timeout::timer_, timer);
t->timed_out = true;
}
static void mark_done(uv_handle_t* timer) {
Timeout* t = node::ContainerOf(&Timeout::timer_,
reinterpret_cast<uv_timer_t*>(timer));
t->done_ = true;
}
bool done_;
uv_timer_t timer_;
};
static void stop_if_stop_path(enum inspector_handshake_event state, static void stop_if_stop_path(enum inspector_handshake_event state,
const std::string& path, bool* cont) { const std::string& path, bool* cont) {