kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'upstream-KWSys' into update-kwsys 

* upstream-KWSys:
  KWSys 2016-03-09 (36d8666f)
This commit is contained in:
Brad King 2016-03-09 09:10:55 -05:00
parent b19bc31277 cd4fef3041
commit fd466fe657
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,6 +77,7 @@
# define kwsysProcess_WaitForExit kwsys_ns(Process_WaitForExit) # define kwsysProcess_WaitForExit kwsys_ns(Process_WaitForExit)
# define kwsysProcess_Interrupt kwsys_ns(Process_Interrupt) # define kwsysProcess_Interrupt kwsys_ns(Process_Interrupt)
# define kwsysProcess_Kill kwsys_ns(Process_Kill) # define kwsysProcess_Kill kwsys_ns(Process_Kill)
# define kwsysProcess_ResetStartTime kwsys_ns(Process_ResetStartTime)
#endif #endif
#if defined(__cplusplus) #if defined(__cplusplus)
@ -392,6 +393,11 @@ kwsysEXPORT void kwsysProcess_Interrupt(kwsysProcess* cp);
*/ */
kwsysEXPORT void kwsysProcess_Kill(kwsysProcess* cp); kwsysEXPORT void kwsysProcess_Kill(kwsysProcess* cp);
/**
* Reset the start time of the child process to the current time.
*/
kwsysEXPORT void kwsysProcess_ResetStartTime(kwsysProcess* cp);
#if defined(__cplusplus) #if defined(__cplusplus)
} /* extern "C" */ } /* extern "C" */
#endif #endif
@ -456,6 +462,7 @@ kwsysEXPORT void kwsysProcess_Kill(kwsysProcess* cp);
# undef kwsysProcess_WaitForExit # undef kwsysProcess_WaitForExit
# undef kwsysProcess_Interrupt # undef kwsysProcess_Interrupt
# undef kwsysProcess_Kill # undef kwsysProcess_Kill
# undef kwsysProcess_ResetStartTime
# endif # endif
#endif #endif

11
Source/kwsys/ProcessUNIX.c
View File

@ -3058,3 +3058,14 @@ static void kwsysProcessesSignalHandler(int signum
errno = old_errno; errno = old_errno;
} }
/*--------------------------------------------------------------------------*/
void kwsysProcess_ResetStartTime(kwsysProcess* cp)
{
if(!cp)
{
return;
}
/* Reset start time. */
cp->StartTime = kwsysProcessTimeGetCurrent();
}

11
Source/kwsys/ProcessWin32.c
View File

@ -3017,3 +3017,14 @@ static BOOL WINAPI kwsysCtrlHandler(DWORD dwCtrlType)
/* Continue on to default Ctrl handler (which calls ExitProcess). */ /* Continue on to default Ctrl handler (which calls ExitProcess). */
return FALSE; return FALSE;
} }
/*--------------------------------------------------------------------------*/
void kwsysProcess_ResetStartTime(kwsysProcess* cp)
{
if(!cp)
{
return;
}
/* Reset start time. */
cp->StartTime = kwsysProcessTimeGetCurrent();
}