drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cygwin: pty: Rename nat_pipe_owner_alive() to process_alive(). 

- The function nat_pipe_owner_alive() is used even for the process
  which is not a nat pipe owner, so, it is renamed to process_alive().
This commit is contained in:
Takashi Yano 2022-03-03 10:38:05 +09:00
parent 35ba7d147d
commit d6b778617d
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
winsup/cygwin/fhandler_tty.cc
View File

@ -74,7 +74,7 @@ void release_attach_mutex (void)
ReleaseMutex (attach_mutex); ReleaseMutex (attach_mutex);
} }
inline static bool nat_pipe_owner_alive (DWORD pid); inline static bool process_alive (DWORD pid);
DWORD DWORD
fhandler_pty_common::get_console_process_id (DWORD pid, bool match, fhandler_pty_common::get_console_process_id (DWORD pid, bool match,
@ -107,7 +107,7 @@ fhandler_pty_common::get_console_process_id (DWORD pid, bool match,
res_pri = stub_only ? p->exec_dwProcessId : list[i]; res_pri = stub_only ? p->exec_dwProcessId : list[i];
break; break;
} }
if (!p && !res && nat_pipe_owner_alive (list[i]) && stub_only) if (!p && !res && process_alive (list[i]) && stub_only)
res = list[i]; res = list[i];
if (!!p && !res && !stub_only) if (!!p && !res && !stub_only)
res = list[i]; res = list[i];
@ -1086,8 +1086,11 @@ fhandler_pty_slave::set_switch_to_nat_pipe (void)
} }
inline static bool inline static bool
nat_pipe_owner_alive (DWORD pid) process_alive (DWORD pid)
{ {
/* This function is very similar to _pinfo::alive(), however, this
can be used for non-cygwin process which is started from non-cygwin
shell. In addition, this checks exit code as well. */
if (pid == 0) if (pid == 0)
return false; return false;
HANDLE h = OpenProcess (PROCESS_QUERY_LIMITED_INFORMATION, FALSE, pid); HANDLE h = OpenProcess (PROCESS_QUERY_LIMITED_INFORMATION, FALSE, pid);
@ -1208,7 +1211,7 @@ fhandler_pty_slave::reset_switch_to_nat_pipe (void)
if (wait_ret == WAIT_TIMEOUT) if (wait_ret == WAIT_TIMEOUT)
return; return;
if (!nat_pipe_owner_self (get_ttyp ()->nat_pipe_owner_pid) if (!nat_pipe_owner_self (get_ttyp ()->nat_pipe_owner_pid)
&& nat_pipe_owner_alive (get_ttyp ()->nat_pipe_owner_pid)) && process_alive (get_ttyp ()->nat_pipe_owner_pid))
{ {
/* There is a process which owns nat pipe. */ /* There is a process which owns nat pipe. */
if (!to_be_read_from_nat_pipe () if (!to_be_read_from_nat_pipe ()
@ -3421,7 +3424,7 @@ skip_create:
} }
while (false); while (false);
if (!nat_pipe_owner_alive (get_ttyp ()->nat_pipe_owner_pid)) if (!process_alive (get_ttyp ()->nat_pipe_owner_pid))
get_ttyp ()->nat_pipe_owner_pid = myself->exec_dwProcessId; get_ttyp ()->nat_pipe_owner_pid = myself->exec_dwProcessId;
if (hpcon && nat_pipe_owner_self (get_ttyp ()->nat_pipe_owner_pid)) if (hpcon && nat_pipe_owner_self (get_ttyp ()->nat_pipe_owner_pid))
@ -4044,7 +4047,7 @@ fhandler_pty_slave::setup_for_non_cygwin_app (bool nopcon, PWCHAR envblock,
{ {
fhandler_pty_slave *ptys = (fhandler_pty_slave *) fh; fhandler_pty_slave *ptys = (fhandler_pty_slave *) fh;
ptys->get_ttyp ()->switch_to_nat_pipe = true; ptys->get_ttyp ()->switch_to_nat_pipe = true;
if (!nat_pipe_owner_alive (ptys->get_ttyp ()->nat_pipe_owner_pid)) if (!process_alive (ptys->get_ttyp ()->nat_pipe_owner_pid))
ptys->get_ttyp ()->nat_pipe_owner_pid = myself->exec_dwProcessId; ptys->get_ttyp ()->nat_pipe_owner_pid = myself->exec_dwProcessId;
} }
bool pcon_enabled = false; bool pcon_enabled = false;