diff options
Diffstat (limited to 'Utilities/cmlibuv/src/win/tty.c')
-rw-r--r-- | Utilities/cmlibuv/src/win/tty.c | 221 |
1 files changed, 112 insertions, 109 deletions
diff --git a/Utilities/cmlibuv/src/win/tty.c b/Utilities/cmlibuv/src/win/tty.c index 1b9d4f8..267ca64 100644 --- a/Utilities/cmlibuv/src/win/tty.c +++ b/Utilities/cmlibuv/src/win/tty.c @@ -67,10 +67,10 @@ #define CURSOR_SIZE_SMALL 25 #define CURSOR_SIZE_LARGE 100 -static void uv_tty_capture_initial_style( +static void uv__tty_capture_initial_style( CONSOLE_SCREEN_BUFFER_INFO* screen_buffer_info, CONSOLE_CURSOR_INFO* cursor_info); -static void uv_tty_update_virtual_window(CONSOLE_SCREEN_BUFFER_INFO* info); +static void uv__tty_update_virtual_window(CONSOLE_SCREEN_BUFFER_INFO* info); static int uv__cancel_read_console(uv_tty_t* handle); @@ -163,7 +163,7 @@ static BOOL uv__need_check_vterm_state = TRUE; static uv_tty_vtermstate_t uv__vterm_state = UV_TTY_UNSUPPORTED; static void uv__determine_vterm_state(HANDLE handle); -void uv_console_init(void) { +void uv__console_init(void) { if (uv_sem_init(&uv_tty_output_lock, 1)) abort(); uv__tty_console_handle = CreateFileW(L"CONOUT$", @@ -238,16 +238,16 @@ int uv_tty_init(uv_loop_t* loop, uv_tty_t* tty, uv_file fd, int unused) { uv__determine_vterm_state(handle); /* Remember the original console text attributes and cursor info. */ - uv_tty_capture_initial_style(&screen_buffer_info, &cursor_info); + uv__tty_capture_initial_style(&screen_buffer_info, &cursor_info); - uv_tty_update_virtual_window(&screen_buffer_info); + uv__tty_update_virtual_window(&screen_buffer_info); uv_sem_post(&uv_tty_output_lock); } - uv_stream_init(loop, (uv_stream_t*) tty, UV_TTY); - uv_connection_init((uv_stream_t*) tty); + uv__stream_init(loop, (uv_stream_t*) tty, UV_TTY); + uv__connection_init((uv_stream_t*) tty); tty->handle = handle; tty->u.fd = fd; @@ -289,7 +289,7 @@ int uv_tty_init(uv_loop_t* loop, uv_tty_t* tty, uv_file fd, int unused) { /* Set the default console text attributes based on how the console was * configured when libuv started. */ -static void uv_tty_capture_initial_style( +static void uv__tty_capture_initial_style( CONSOLE_SCREEN_BUFFER_INFO* screen_buffer_info, CONSOLE_CURSOR_INFO* cursor_info) { static int style_captured = 0; @@ -380,7 +380,7 @@ int uv_tty_set_mode(uv_tty_t* tty, uv_tty_mode_t mode) { was_reading = 1; alloc_cb = tty->alloc_cb; read_cb = tty->read_cb; - err = uv_tty_read_stop(tty); + err = uv__tty_read_stop(tty); if (err) { return uv_translate_sys_error(err); } @@ -404,7 +404,7 @@ int uv_tty_set_mode(uv_tty_t* tty, uv_tty_mode_t mode) { /* If we just stopped reading, restart. */ if (was_reading) { - err = uv_tty_read_start(tty, alloc_cb, read_cb); + err = uv__tty_read_start(tty, alloc_cb, read_cb); if (err) { return uv_translate_sys_error(err); } @@ -422,7 +422,7 @@ int uv_tty_get_winsize(uv_tty_t* tty, int* width, int* height) { } uv_sem_wait(&uv_tty_output_lock); - uv_tty_update_virtual_window(&info); + uv__tty_update_virtual_window(&info); uv_sem_post(&uv_tty_output_lock); *width = uv_tty_virtual_width; @@ -452,7 +452,7 @@ static void CALLBACK uv_tty_post_raw_read(void* data, BOOLEAN didTimeout) { } -static void uv_tty_queue_read_raw(uv_loop_t* loop, uv_tty_t* handle) { +static void uv__tty_queue_read_raw(uv_loop_t* loop, uv_tty_t* handle) { uv_read_t* req; BOOL r; @@ -475,7 +475,7 @@ static void uv_tty_queue_read_raw(uv_loop_t* loop, uv_tty_t* handle) { if (!r) { handle->tty.rd.read_raw_wait = NULL; SET_REQ_ERROR(req, GetLastError()); - uv_insert_pending_req(loop, (uv_req_t*)req); + uv__insert_pending_req(loop, (uv_req_t*)req); } handle->flags |= UV_HANDLE_READ_PENDING; @@ -579,7 +579,7 @@ static DWORD CALLBACK uv_tty_line_read_thread(void* data) { } -static void uv_tty_queue_read_line(uv_loop_t* loop, uv_tty_t* handle) { +static void uv__tty_queue_read_line(uv_loop_t* loop, uv_tty_t* handle) { uv_read_t* req; BOOL r; @@ -611,7 +611,7 @@ static void uv_tty_queue_read_line(uv_loop_t* loop, uv_tty_t* handle) { WT_EXECUTELONGFUNCTION); if (!r) { SET_REQ_ERROR(req, GetLastError()); - uv_insert_pending_req(loop, (uv_req_t*)req); + uv__insert_pending_req(loop, (uv_req_t*)req); } handle->flags |= UV_HANDLE_READ_PENDING; @@ -619,11 +619,11 @@ static void uv_tty_queue_read_line(uv_loop_t* loop, uv_tty_t* handle) { } -static void uv_tty_queue_read(uv_loop_t* loop, uv_tty_t* handle) { +static void uv__tty_queue_read(uv_loop_t* loop, uv_tty_t* handle) { if (handle->flags & UV_HANDLE_TTY_RAW) { - uv_tty_queue_read_raw(loop, handle); + uv__tty_queue_read_raw(loop, handle); } else { - uv_tty_queue_read_line(loop, handle); + uv__tty_queue_read_line(loop, handle); } } @@ -947,7 +947,7 @@ void uv_process_tty_read_raw_req(uv_loop_t* loop, uv_tty_t* handle, /* Wait for more input events. */ if ((handle->flags & UV_HANDLE_READING) && !(handle->flags & UV_HANDLE_READ_PENDING)) { - uv_tty_queue_read(loop, handle); + uv__tty_queue_read(loop, handle); } DECREASE_PENDING_REQ_COUNT(handle); @@ -992,14 +992,14 @@ void uv_process_tty_read_line_req(uv_loop_t* loop, uv_tty_t* handle, /* Wait for more input events. */ if ((handle->flags & UV_HANDLE_READING) && !(handle->flags & UV_HANDLE_READ_PENDING)) { - uv_tty_queue_read(loop, handle); + uv__tty_queue_read(loop, handle); } DECREASE_PENDING_REQ_COUNT(handle); } -void uv_process_tty_read_req(uv_loop_t* loop, uv_tty_t* handle, +void uv__process_tty_read_req(uv_loop_t* loop, uv_tty_t* handle, uv_req_t* req) { assert(handle->type == UV_TTY); assert(handle->flags & UV_HANDLE_TTY_READABLE); @@ -1015,7 +1015,7 @@ void uv_process_tty_read_req(uv_loop_t* loop, uv_tty_t* handle, } -int uv_tty_read_start(uv_tty_t* handle, uv_alloc_cb alloc_cb, +int uv__tty_read_start(uv_tty_t* handle, uv_alloc_cb alloc_cb, uv_read_cb read_cb) { uv_loop_t* loop = handle->loop; @@ -1038,20 +1038,20 @@ int uv_tty_read_start(uv_tty_t* handle, uv_alloc_cb alloc_cb, * Short-circuit if this could be the case. */ if (handle->tty.rd.last_key_len > 0) { SET_REQ_SUCCESS(&handle->read_req); - uv_insert_pending_req(handle->loop, (uv_req_t*) &handle->read_req); + uv__insert_pending_req(handle->loop, (uv_req_t*) &handle->read_req); /* Make sure no attempt is made to insert it again until it's handled. */ handle->flags |= UV_HANDLE_READ_PENDING; handle->reqs_pending++; return 0; } - uv_tty_queue_read(loop, handle); + uv__tty_queue_read(loop, handle); return 0; } -int uv_tty_read_stop(uv_tty_t* handle) { +int uv__tty_read_stop(uv_tty_t* handle) { INPUT_RECORD record; DWORD written, err; @@ -1137,7 +1137,7 @@ static int uv__cancel_read_console(uv_tty_t* handle) { } -static void uv_tty_update_virtual_window(CONSOLE_SCREEN_BUFFER_INFO* info) { +static void uv__tty_update_virtual_window(CONSOLE_SCREEN_BUFFER_INFO* info) { uv_tty_virtual_width = info->dwSize.X; uv_tty_virtual_height = info->srWindow.Bottom - info->srWindow.Top + 1; @@ -1160,12 +1160,12 @@ static void uv_tty_update_virtual_window(CONSOLE_SCREEN_BUFFER_INFO* info) { } -static COORD uv_tty_make_real_coord(uv_tty_t* handle, +static COORD uv__tty_make_real_coord(uv_tty_t* handle, CONSOLE_SCREEN_BUFFER_INFO* info, int x, unsigned char x_relative, int y, unsigned char y_relative) { COORD result; - uv_tty_update_virtual_window(info); + uv__tty_update_virtual_window(info); /* Adjust y position */ if (y_relative) { @@ -1197,7 +1197,7 @@ static COORD uv_tty_make_real_coord(uv_tty_t* handle, } -static int uv_tty_emit_text(uv_tty_t* handle, WCHAR buffer[], DWORD length, +static int uv__tty_emit_text(uv_tty_t* handle, WCHAR buffer[], DWORD length, DWORD* error) { DWORD written; @@ -1218,7 +1218,7 @@ static int uv_tty_emit_text(uv_tty_t* handle, WCHAR buffer[], DWORD length, } -static int uv_tty_move_caret(uv_tty_t* handle, int x, unsigned char x_relative, +static int uv__tty_move_caret(uv_tty_t* handle, int x, unsigned char x_relative, int y, unsigned char y_relative, DWORD* error) { CONSOLE_SCREEN_BUFFER_INFO info; COORD pos; @@ -1232,7 +1232,7 @@ static int uv_tty_move_caret(uv_tty_t* handle, int x, unsigned char x_relative, *error = GetLastError(); } - pos = uv_tty_make_real_coord(handle, &info, x, x_relative, y, y_relative); + pos = uv__tty_make_real_coord(handle, &info, x, x_relative, y, y_relative); if (!SetConsoleCursorPosition(handle->handle, pos)) { if (GetLastError() == ERROR_INVALID_PARAMETER) { @@ -1248,7 +1248,7 @@ static int uv_tty_move_caret(uv_tty_t* handle, int x, unsigned char x_relative, } -static int uv_tty_reset(uv_tty_t* handle, DWORD* error) { +static int uv__tty_reset(uv_tty_t* handle, DWORD* error) { const COORD origin = {0, 0}; const WORD char_attrs = uv_tty_default_text_attributes; CONSOLE_SCREEN_BUFFER_INFO screen_buffer_info; @@ -1300,7 +1300,7 @@ static int uv_tty_reset(uv_tty_t* handle, DWORD* error) { /* Move the virtual window up to the top. */ uv_tty_virtual_offset = 0; - uv_tty_update_virtual_window(&screen_buffer_info); + uv__tty_update_virtual_window(&screen_buffer_info); /* Reset the cursor size and the cursor state. */ if (!SetConsoleCursorInfo(handle->handle, &uv_tty_default_cursor_info)) { @@ -1312,7 +1312,7 @@ static int uv_tty_reset(uv_tty_t* handle, DWORD* error) { } -static int uv_tty_clear(uv_tty_t* handle, int dir, char entire_screen, +static int uv__tty_clear(uv_tty_t* handle, int dir, char entire_screen, DWORD* error) { CONSOLE_SCREEN_BUFFER_INFO info; COORD start, end; @@ -1341,7 +1341,7 @@ static int uv_tty_clear(uv_tty_t* handle, int dir, char entire_screen, x2r = 1; } else { /* Clear to end of row. We pretend the console is 65536 characters wide, - * uv_tty_make_real_coord will clip it to the actual console width. */ + * uv__tty_make_real_coord will clip it to the actual console width. */ x2 = 0xffff; x2r = 0; } @@ -1364,8 +1364,8 @@ static int uv_tty_clear(uv_tty_t* handle, int dir, char entire_screen, return -1; } - start = uv_tty_make_real_coord(handle, &info, x1, x1r, y1, y1r); - end = uv_tty_make_real_coord(handle, &info, x2, x2r, y2, y2r); + start = uv__tty_make_real_coord(handle, &info, x1, x1r, y1, y1r); + end = uv__tty_make_real_coord(handle, &info, x2, x2r, y2, y2r); count = (end.Y * info.dwSize.X + end.X) - (start.Y * info.dwSize.X + start.X) + 1; @@ -1400,7 +1400,7 @@ static int uv_tty_clear(uv_tty_t* handle, int dir, char entire_screen, info.wAttributes |= bg >> 4; \ } while (0) -static int uv_tty_set_style(uv_tty_t* handle, DWORD* error) { +static int uv__tty_set_style(uv_tty_t* handle, DWORD* error) { unsigned short argc = handle->tty.wr.ansi_csi_argc; unsigned short* argv = handle->tty.wr.ansi_csi_argv; int i; @@ -1556,7 +1556,7 @@ static int uv_tty_set_style(uv_tty_t* handle, DWORD* error) { } -static int uv_tty_save_state(uv_tty_t* handle, unsigned char save_attributes, +static int uv__tty_save_state(uv_tty_t* handle, unsigned char save_attributes, DWORD* error) { CONSOLE_SCREEN_BUFFER_INFO info; @@ -1569,10 +1569,11 @@ static int uv_tty_save_state(uv_tty_t* handle, unsigned char save_attributes, return -1; } - uv_tty_update_virtual_window(&info); + uv__tty_update_virtual_window(&info); handle->tty.wr.saved_position.X = info.dwCursorPosition.X; - handle->tty.wr.saved_position.Y = info.dwCursorPosition.Y - uv_tty_virtual_offset; + handle->tty.wr.saved_position.Y = info.dwCursorPosition.Y - + uv_tty_virtual_offset; handle->flags |= UV_HANDLE_TTY_SAVED_POSITION; if (save_attributes) { @@ -1585,7 +1586,7 @@ static int uv_tty_save_state(uv_tty_t* handle, unsigned char save_attributes, } -static int uv_tty_restore_state(uv_tty_t* handle, +static int uv__tty_restore_state(uv_tty_t* handle, unsigned char restore_attributes, DWORD* error) { CONSOLE_SCREEN_BUFFER_INFO info; WORD new_attributes; @@ -1595,7 +1596,7 @@ static int uv_tty_restore_state(uv_tty_t* handle, } if (handle->flags & UV_HANDLE_TTY_SAVED_POSITION) { - if (uv_tty_move_caret(handle, + if (uv__tty_move_caret(handle, handle->tty.wr.saved_position.X, 0, handle->tty.wr.saved_position.Y, @@ -1625,7 +1626,7 @@ static int uv_tty_restore_state(uv_tty_t* handle, return 0; } -static int uv_tty_set_cursor_visibility(uv_tty_t* handle, +static int uv__tty_set_cursor_visibility(uv_tty_t* handle, BOOL visible, DWORD* error) { CONSOLE_CURSOR_INFO cursor_info; @@ -1645,7 +1646,7 @@ static int uv_tty_set_cursor_visibility(uv_tty_t* handle, return 0; } -static int uv_tty_set_cursor_shape(uv_tty_t* handle, int style, DWORD* error) { +static int uv__tty_set_cursor_shape(uv_tty_t* handle, int style, DWORD* error) { CONSOLE_CURSOR_INFO cursor_info; if (!GetConsoleCursorInfo(handle->handle, &cursor_info)) { @@ -1670,7 +1671,7 @@ static int uv_tty_set_cursor_shape(uv_tty_t* handle, int style, DWORD* error) { } -static int uv_tty_write_bufs(uv_tty_t* handle, +static int uv__tty_write_bufs(uv_tty_t* handle, const uv_buf_t bufs[], unsigned int nbufs, DWORD* error) { @@ -1683,7 +1684,7 @@ static int uv_tty_write_bufs(uv_tty_t* handle, #define FLUSH_TEXT() \ do { \ if (utf16_buf_used > 0) { \ - uv_tty_emit_text(handle, utf16_buf, utf16_buf_used, error); \ + uv__tty_emit_text(handle, utf16_buf, utf16_buf_used, error); \ utf16_buf_used = 0; \ } \ } while (0) @@ -1802,21 +1803,21 @@ static int uv_tty_write_bufs(uv_tty_t* handle, case 'c': /* Full console reset. */ FLUSH_TEXT(); - uv_tty_reset(handle, error); + uv__tty_reset(handle, error); ansi_parser_state = ANSI_NORMAL; continue; case '7': /* Save the cursor position and text attributes. */ FLUSH_TEXT(); - uv_tty_save_state(handle, 1, error); + uv__tty_save_state(handle, 1, error); ansi_parser_state = ANSI_NORMAL; continue; case '8': /* Restore the cursor position and text attributes */ FLUSH_TEXT(); - uv_tty_restore_state(handle, 1, error); + uv__tty_restore_state(handle, 1, error); ansi_parser_state = ANSI_NORMAL; continue; @@ -1849,7 +1850,7 @@ static int uv_tty_write_bufs(uv_tty_t* handle, ? handle->tty.wr.ansi_csi_argv[0] : 1; if (style >= 0 && style <= 6) { FLUSH_TEXT(); - uv_tty_set_cursor_shape(handle, style, error); + uv__tty_set_cursor_shape(handle, style, error); } } @@ -1947,7 +1948,7 @@ static int uv_tty_write_bufs(uv_tty_t* handle, if (handle->tty.wr.ansi_csi_argc == 1 && handle->tty.wr.ansi_csi_argv[0] == 25) { FLUSH_TEXT(); - uv_tty_set_cursor_visibility(handle, 0, error); + uv__tty_set_cursor_visibility(handle, 0, error); } break; @@ -1956,7 +1957,7 @@ static int uv_tty_write_bufs(uv_tty_t* handle, if (handle->tty.wr.ansi_csi_argc == 1 && handle->tty.wr.ansi_csi_argv[0] == 25) { FLUSH_TEXT(); - uv_tty_set_cursor_visibility(handle, 1, error); + uv__tty_set_cursor_visibility(handle, 1, error); } break; } @@ -1970,7 +1971,7 @@ static int uv_tty_write_bufs(uv_tty_t* handle, FLUSH_TEXT(); y = -(handle->tty.wr.ansi_csi_argc ? handle->tty.wr.ansi_csi_argv[0] : 1); - uv_tty_move_caret(handle, 0, 1, y, 1, error); + uv__tty_move_caret(handle, 0, 1, y, 1, error); break; case 'B': @@ -1978,7 +1979,7 @@ static int uv_tty_write_bufs(uv_tty_t* handle, FLUSH_TEXT(); y = handle->tty.wr.ansi_csi_argc ? handle->tty.wr.ansi_csi_argv[0] : 1; - uv_tty_move_caret(handle, 0, 1, y, 1, error); + uv__tty_move_caret(handle, 0, 1, y, 1, error); break; case 'C': @@ -1986,7 +1987,7 @@ static int uv_tty_write_bufs(uv_tty_t* handle, FLUSH_TEXT(); x = handle->tty.wr.ansi_csi_argc ? handle->tty.wr.ansi_csi_argv[0] : 1; - uv_tty_move_caret(handle, x, 1, 0, 1, error); + uv__tty_move_caret(handle, x, 1, 0, 1, error); break; case 'D': @@ -1994,7 +1995,7 @@ static int uv_tty_write_bufs(uv_tty_t* handle, FLUSH_TEXT(); x = -(handle->tty.wr.ansi_csi_argc ? handle->tty.wr.ansi_csi_argv[0] : 1); - uv_tty_move_caret(handle, x, 1, 0, 1, error); + uv__tty_move_caret(handle, x, 1, 0, 1, error); break; case 'E': @@ -2002,7 +2003,7 @@ static int uv_tty_write_bufs(uv_tty_t* handle, FLUSH_TEXT(); y = handle->tty.wr.ansi_csi_argc ? handle->tty.wr.ansi_csi_argv[0] : 1; - uv_tty_move_caret(handle, 0, 0, y, 1, error); + uv__tty_move_caret(handle, 0, 0, y, 1, error); break; case 'F': @@ -2010,7 +2011,7 @@ static int uv_tty_write_bufs(uv_tty_t* handle, FLUSH_TEXT(); y = -(handle->tty.wr.ansi_csi_argc ? handle->tty.wr.ansi_csi_argv[0] : 1); - uv_tty_move_caret(handle, 0, 0, y, 1, error); + uv__tty_move_caret(handle, 0, 0, y, 1, error); break; case 'G': @@ -2019,7 +2020,7 @@ static int uv_tty_write_bufs(uv_tty_t* handle, x = (handle->tty.wr.ansi_csi_argc >= 1 && handle->tty.wr.ansi_csi_argv[0]) ? handle->tty.wr.ansi_csi_argv[0] - 1 : 0; - uv_tty_move_caret(handle, x, 0, 0, 1, error); + uv__tty_move_caret(handle, x, 0, 0, 1, error); break; case 'H': @@ -2032,7 +2033,7 @@ static int uv_tty_write_bufs(uv_tty_t* handle, x = (handle->tty.wr.ansi_csi_argc >= 2 && handle->tty.wr.ansi_csi_argv[1]) ? handle->tty.wr.ansi_csi_argv[1] - 1 : 0; - uv_tty_move_caret(handle, x, 0, y, 0, error); + uv__tty_move_caret(handle, x, 0, y, 0, error); break; case 'J': @@ -2041,7 +2042,7 @@ static int uv_tty_write_bufs(uv_tty_t* handle, d = handle->tty.wr.ansi_csi_argc ? handle->tty.wr.ansi_csi_argv[0] : 0; if (d >= 0 && d <= 2) { - uv_tty_clear(handle, d, 1, error); + uv__tty_clear(handle, d, 1, error); } break; @@ -2051,26 +2052,26 @@ static int uv_tty_write_bufs(uv_tty_t* handle, d = handle->tty.wr.ansi_csi_argc ? handle->tty.wr.ansi_csi_argv[0] : 0; if (d >= 0 && d <= 2) { - uv_tty_clear(handle, d, 0, error); + uv__tty_clear(handle, d, 0, error); } break; case 'm': /* Set style */ FLUSH_TEXT(); - uv_tty_set_style(handle, error); + uv__tty_set_style(handle, error); break; case 's': /* Save the cursor position. */ FLUSH_TEXT(); - uv_tty_save_state(handle, 0, error); + uv__tty_save_state(handle, 0, error); break; case 'u': /* Restore the cursor position */ FLUSH_TEXT(); - uv_tty_restore_state(handle, 0, error); + uv__tty_restore_state(handle, 0, error); break; } } @@ -2179,7 +2180,7 @@ static int uv_tty_write_bufs(uv_tty_t* handle, } -int uv_tty_write(uv_loop_t* loop, +int uv__tty_write(uv_loop_t* loop, uv_write_t* req, uv_tty_t* handle, const uv_buf_t bufs[], @@ -2197,13 +2198,13 @@ int uv_tty_write(uv_loop_t* loop, req->u.io.queued_bytes = 0; - if (!uv_tty_write_bufs(handle, bufs, nbufs, &error)) { + if (!uv__tty_write_bufs(handle, bufs, nbufs, &error)) { SET_REQ_SUCCESS(req); } else { SET_REQ_ERROR(req, error); } - uv_insert_pending_req(loop, (uv_req_t*) req); + uv__insert_pending_req(loop, (uv_req_t*) req); return 0; } @@ -2217,14 +2218,14 @@ int uv__tty_try_write(uv_tty_t* handle, if (handle->stream.conn.write_reqs_pending > 0) return UV_EAGAIN; - if (uv_tty_write_bufs(handle, bufs, nbufs, &error)) + if (uv__tty_write_bufs(handle, bufs, nbufs, &error)) return uv_translate_sys_error(error); return uv__count_bufs(bufs, nbufs); } -void uv_process_tty_write_req(uv_loop_t* loop, uv_tty_t* handle, +void uv__process_tty_write_req(uv_loop_t* loop, uv_tty_t* handle, uv_write_t* req) { int err; @@ -2236,20 +2237,22 @@ void uv_process_tty_write_req(uv_loop_t* loop, uv_tty_t* handle, req->cb(req, uv_translate_sys_error(err)); } + handle->stream.conn.write_reqs_pending--; - if (handle->stream.conn.shutdown_req != NULL && - handle->stream.conn.write_reqs_pending == 0) { - uv_want_endgame(loop, (uv_handle_t*)handle); - } + if (handle->stream.conn.write_reqs_pending == 0) + if (handle->flags & UV_HANDLE_SHUTTING) + uv__process_tty_shutdown_req(loop, + handle, + handle->stream.conn.shutdown_req); DECREASE_PENDING_REQ_COUNT(handle); } -void uv_tty_close(uv_tty_t* handle) { +void uv__tty_close(uv_tty_t* handle) { assert(handle->u.fd == -1 || handle->u.fd > 2); if (handle->flags & UV_HANDLE_READING) - uv_tty_read_stop(handle); + uv__tty_read_stop(handle); if (handle->u.fd == -1) CloseHandle(handle->handle); @@ -2261,61 +2264,61 @@ void uv_tty_close(uv_tty_t* handle) { handle->flags &= ~(UV_HANDLE_READABLE | UV_HANDLE_WRITABLE); uv__handle_closing(handle); - if (handle->reqs_pending == 0) { - uv_want_endgame(handle->loop, (uv_handle_t*) handle); - } + if (handle->reqs_pending == 0) + uv__want_endgame(handle->loop, (uv_handle_t*) handle); } -void uv_tty_endgame(uv_loop_t* loop, uv_tty_t* handle) { - if (!(handle->flags & UV_HANDLE_TTY_READABLE) && - handle->stream.conn.shutdown_req != NULL && - handle->stream.conn.write_reqs_pending == 0) { - UNREGISTER_HANDLE_REQ(loop, handle, handle->stream.conn.shutdown_req); +void uv__process_tty_shutdown_req(uv_loop_t* loop, uv_tty_t* stream, uv_shutdown_t* req) { + assert(stream->stream.conn.write_reqs_pending == 0); + assert(req); - /* TTY shutdown is really just a no-op */ - if (handle->stream.conn.shutdown_req->cb) { - if (handle->flags & UV_HANDLE_CLOSING) { - handle->stream.conn.shutdown_req->cb(handle->stream.conn.shutdown_req, UV_ECANCELED); - } else { - handle->stream.conn.shutdown_req->cb(handle->stream.conn.shutdown_req, 0); - } + stream->stream.conn.shutdown_req = NULL; + stream->flags &= ~UV_HANDLE_SHUTTING; + UNREGISTER_HANDLE_REQ(loop, stream, req); + + /* TTY shutdown is really just a no-op */ + if (req->cb) { + if (stream->flags & UV_HANDLE_CLOSING) { + req->cb(req, UV_ECANCELED); + } else { + req->cb(req, 0); } + } - handle->stream.conn.shutdown_req = NULL; + DECREASE_PENDING_REQ_COUNT(stream); +} - DECREASE_PENDING_REQ_COUNT(handle); - return; - } - if (handle->flags & UV_HANDLE_CLOSING && - handle->reqs_pending == 0) { - /* The wait handle used for raw reading should be unregistered when the - * wait callback runs. */ - assert(!(handle->flags & UV_HANDLE_TTY_READABLE) || - handle->tty.rd.read_raw_wait == NULL); +void uv__tty_endgame(uv_loop_t* loop, uv_tty_t* handle) { + assert(handle->flags & UV_HANDLE_CLOSING); + assert(handle->reqs_pending == 0); - assert(!(handle->flags & UV_HANDLE_CLOSED)); - uv__handle_close(handle); - } + /* The wait handle used for raw reading should be unregistered when the + * wait callback runs. */ + assert(!(handle->flags & UV_HANDLE_TTY_READABLE) || + handle->tty.rd.read_raw_wait == NULL); + + assert(!(handle->flags & UV_HANDLE_CLOSED)); + uv__handle_close(handle); } /* - * uv_process_tty_accept_req() is a stub to keep DELEGATE_STREAM_REQ working + * uv__process_tty_accept_req() is a stub to keep DELEGATE_STREAM_REQ working * TODO: find a way to remove it */ -void uv_process_tty_accept_req(uv_loop_t* loop, uv_tty_t* handle, +void uv__process_tty_accept_req(uv_loop_t* loop, uv_tty_t* handle, uv_req_t* raw_req) { abort(); } /* - * uv_process_tty_connect_req() is a stub to keep DELEGATE_STREAM_REQ working + * uv__process_tty_connect_req() is a stub to keep DELEGATE_STREAM_REQ working * TODO: find a way to remove it */ -void uv_process_tty_connect_req(uv_loop_t* loop, uv_tty_t* handle, +void uv__process_tty_connect_req(uv_loop_t* loop, uv_tty_t* handle, uv_connect_t* req) { abort(); } |