This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via ed3c228dc0ae7145a581c16278ffb2a534299403 (commit)
via fd466fe657da176e3fa46803a11dfcb662d7395d (commit)
via cd4fef3041be85e1ec9139a91efa8a96f74707c5 (commit)
from 6ff0e39f41989d845d9a76511181791966eab28c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed3c228dc0ae7145a581c16278ffb2a534299403
commit ed3c228dc0ae7145a581c16278ffb2a534299403
Merge: 6ff0e39 fd466fe
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Mar 9 09:13:54 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Mar 9 09:13:54 2016 -0500
Merge topic 'update-kwsys' into next
fd466fe6 Merge branch 'upstream-KWSys' into update-kwsys
cd4fef30 KWSys 2016-03-09 (36d8666f)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd466fe657da176e3fa46803a11dfcb662d7395d
commit fd466fe657da176e3fa46803a11dfcb662d7395d
Merge: b19bc31 cd4fef3
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Mar 9 09:10:55 2016 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Mar 9 09:10:55 2016 -0500
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2016-03-09 (36d8666f)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cd4fef3041be85e1ec9139a91efa8a96f74707c5
commit cd4fef3041be85e1ec9139a91efa8a96f74707c5
Author: KWSys Upstream <kwro...@kitware.com>
AuthorDate: Wed Mar 9 09:09:41 2016 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Mar 9 09:10:55 2016 -0500
KWSys 2016-03-09 (36d8666f)
Code extracted from:
http://public.kitware.com/KWSys.git
at commit 36d8666f44a75a6debb92c86c20f25d929d79cd1 (master).
Upstream Shortlog
-----------------
Zack Galbreath (1):
36d8666f Process: Add function to reset the start time of a process
diff --git a/Process.h.in b/Process.h.in
index c5ebc97..96563a2 100644
--- a/Process.h.in
+++ b/Process.h.in
@@ -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_ResetStartTime
kwsys_ns(Process_ResetStartTime)
#endif
#if defined(__cplusplus)
@@ -392,6 +393,11 @@ kwsysEXPORT void kwsysProcess_Interrupt(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)
} /* extern "C" */
#endif
@@ -456,6 +462,7 @@ kwsysEXPORT void kwsysProcess_Kill(kwsysProcess* cp);
# undef kwsysProcess_WaitForExit
# undef kwsysProcess_Interrupt
# undef kwsysProcess_Kill
+# undef kwsysProcess_ResetStartTime
# endif
#endif
diff --git a/ProcessUNIX.c b/ProcessUNIX.c
index 7402955..b577982 100644
--- a/ProcessUNIX.c
+++ b/ProcessUNIX.c
@@ -3058,3 +3058,14 @@ static void kwsysProcessesSignalHandler(int signum
errno = old_errno;
}
+
+/*--------------------------------------------------------------------------*/
+void kwsysProcess_ResetStartTime(kwsysProcess* cp)
+{
+ if(!cp)
+ {
+ return;
+ }
+ /* Reset start time. */
+ cp->StartTime = kwsysProcessTimeGetCurrent();
+}
diff --git a/ProcessWin32.c b/ProcessWin32.c
index a18ea27..2b93e69 100644
--- a/ProcessWin32.c
+++ b/ProcessWin32.c
@@ -3017,3 +3017,14 @@ static BOOL WINAPI kwsysCtrlHandler(DWORD dwCtrlType)
/* Continue on to default Ctrl handler (which calls ExitProcess). */
return FALSE;
}
+
+/*--------------------------------------------------------------------------*/
+void kwsysProcess_ResetStartTime(kwsysProcess* cp)
+{
+ if(!cp)
+ {
+ return;
+ }
+ /* Reset start time. */
+ cp->StartTime = kwsysProcessTimeGetCurrent();
+}
-----------------------------------------------------------------------
Summary of changes:
Source/kwsys/Process.h.in | 7 +++++++
Source/kwsys/ProcessUNIX.c | 11 +++++++++++
Source/kwsys/ProcessWin32.c | 11 +++++++++++
3 files changed, 29 insertions(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
