mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-09 23:30:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'update-kwsys'

Browse Source 
30487770 Merge branch 'upstream-KWSys' into update-kwsys
5464e23f KWSys 2017-11-02 (54f0901a)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1440
This commit is contained in:
Brad King
2017-11-06 13:54:39 +00:00
committed by Kitware Robot
parent 3d6e45af61 3048777006
commit 2dabcebf3c
3 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/kwsys/Process.h.in
View File

@@ -77,6 +77,7 @@
#define kwsysProcess_WaitForExit kwsys_ns(Process_WaitForExit)
#define kwsysProcess_Interrupt kwsys_ns(Process_Interrupt)
#define kwsysProcess_Kill kwsys_ns(Process_Kill)
#define kwsysProcess_KillPID kwsys_ns(Process_KillPID)
#define kwsysProcess_ResetStartTime kwsys_ns(Process_ResetStartTime)
#endif
@@ -456,6 +457,13 @@ kwsysEXPORT void kwsysProcess_Interrupt(kwsysProcess* cp);
*/
kwsysEXPORT void kwsysProcess_Kill(kwsysProcess* cp);
/**
* Same as kwsysProcess_Kill using process ID to locate process to
* terminate.
* @see kwsysProcess_Kill(kwsysProcess* cp)
*/
kwsysEXPORT void kwsysProcess_KillPID(unsigned long);
/**
* Reset the start time of the child process to the current time.
*/

5
Source/kwsys/ProcessUNIX.c
View File

@@ -2485,6 +2485,11 @@ static pid_t kwsysProcessFork(kwsysProcess* cp,
#define KWSYSPE_PS_FORMAT "%d %d %*[^\n]\n"
#endif
void kwsysProcess_KillPID(unsigned long process_id)
{
kwsysProcessKill((pid_t)process_id);
}
static void kwsysProcessKill(pid_t process_id)
{
#if defined(__linux__) || defined(__CYGWIN__)

5
Source/kwsys/ProcessWin32.c
View File

@@ -1466,6 +1466,11 @@ void kwsysProcess_Kill(kwsysProcess* cp)
for them to exit. */
}
void kwsysProcess_KillPID(unsigned long process_id)
{
kwsysProcessKillTree((DWORD)process_id);
}
/*
Function executed for each pipe's thread. Argument is a pointer to
the kwsysProcessPipeData instance for this thread.