JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use NtQueryObject to detect closing the last master handle

Browse Source 
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen
2015-05-28 16:06:49 +02:00
parent 3afe8808b9
commit 712811e9bb
2 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,11 @@
2015-05-28 Takashi Yano <takashi.yano@nifty.ne.jp>
Corinna Vinschen <corinna@vinschen.de>
* fhandler_tty.cc (fhandler_pty_common::close): Don't close output_mutex
here. Move into callers.
(fhandler_pty_master::close): Use NtQueryObject instead of PeekNamedPipe
to detect closing the last master handle.
2015-05-27 Takashi Yano <takashi.yano@nifty.ne.jp> 2015-05-27 Takashi Yano <takashi.yano@nifty.ne.jp>
* net.cc: Define _NETIOAPI_H_ to accomodate newer w32api. * net.cc: Define _NETIOAPI_H_ to accomodate newer w32api.

27
winsup/cygwin/fhandler_tty.cc
View File

@@ -552,7 +552,10 @@ fhandler_pty_slave::close ()
get_output_handle_cyg ()); get_output_handle_cyg ());
if ((unsigned) myself->ctty == FHDEV (DEV_PTYS_MAJOR, get_minor ())) if ((unsigned) myself->ctty == FHDEV (DEV_PTYS_MAJOR, get_minor ()))
fhandler_console::free_console (); /* assumes that we are the last pty closer */ fhandler_console::free_console (); /* assumes that we are the last pty closer */
return fhandler_pty_common::close (); fhandler_pty_common::close ();
if (!ForceCloseHandle (output_mutex))
termios_printf ("CloseHandle (output_mutex<%p>), %E", output_mutex);
return 0;
} }
int int
@@ -1201,8 +1204,6 @@ fhandler_pty_common::close ()
termios_printf ("pty%d <%p,%p> closing", get_minor (), get_handle (), get_output_handle ()); termios_printf ("pty%d <%p,%p> closing", get_minor (), get_handle (), get_output_handle ());
if (!ForceCloseHandle (input_mutex)) if (!ForceCloseHandle (input_mutex))
termios_printf ("CloseHandle (input_mutex<%p>), %E", input_mutex); termios_printf ("CloseHandle (input_mutex<%p>), %E", input_mutex);
if (!ForceCloseHandle (output_mutex))
termios_printf ("CloseHandle (output_mutex<%p>), %E", output_mutex);
if (!ForceCloseHandle1 (get_handle (), from_pty)) if (!ForceCloseHandle1 (get_handle (), from_pty))
termios_printf ("CloseHandle (get_handle ()<%p>), %E", get_handle ()); termios_printf ("CloseHandle (get_handle ()<%p>), %E", get_handle ());
if (!ForceCloseHandle1 (get_output_handle (), to_pty)) if (!ForceCloseHandle1 (get_output_handle (), to_pty))
@@ -1223,6 +1224,9 @@ fhandler_pty_master::cleanup ()
int int
fhandler_pty_master::close () fhandler_pty_master::close ()
{ {
OBJECT_BASIC_INFORMATION obi;
NTSTATUS status;
termios_printf ("closing from_master(%p)/to_master(%p)/to_master_cyg(%p) since we own them(%u)", termios_printf ("closing from_master(%p)/to_master(%p)/to_master_cyg(%p) since we own them(%u)",
from_master, to_master, to_master_cyg, dwProcessId); from_master, to_master, to_master_cyg, dwProcessId);
if (cygwin_finished_initializing) if (cygwin_finished_initializing)
@@ -1251,13 +1255,22 @@ fhandler_pty_master::close ()
} }
} }
fhandler_pty_common::close ();
/* Check if the last master handle has been closed. If so, set /* Check if the last master handle has been closed. If so, set
input_available_event to wake up potentially waiting slaves. */ input_available_event to wake up potentially waiting slaves. */
if (!PeekNamedPipe (from_master, NULL, 0, NULL, NULL, NULL) acquire_output_mutex (INFINITE);
&& GetLastError () == ERROR_BROKEN_PIPE) status = NtQueryObject (get_output_handle (), ObjectBasicInformation,
&obi, sizeof obi, NULL);
fhandler_pty_common::close ();
release_output_mutex ();
if (!ForceCloseHandle (output_mutex))
termios_printf ("CloseHandle (output_mutex<%p>), %E", output_mutex);
if (!NT_SUCCESS (status))
debug_printf ("NtQueryObject: %y", status);
else if (obi.HandleCount == 1)
{
termios_printf("Closing last master of pty%d", get_minor ());
SetEvent (input_available_event); SetEvent (input_available_event);
}
if (!ForceCloseHandle (from_master)) if (!ForceCloseHandle (from_master))
termios_printf ("error closing from_master %p, %E", from_master); termios_printf ("error closing from_master %p, %E", from_master);