summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2006-01-12 20:29:23 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2006-01-12 20:29:23 +0000
commitaec5409691da9124cf18e56f716448483eeeaf08 (patch)
treec98a5540feb436ec6596d98fcb8448cce2dfa77e
parent47254b1083cfbdd3d854a880035cde38799c96cd (diff)
downloadATCD-aec5409691da9124cf18e56f716448483eeeaf08.tar.gz
ChangeLogTag: Thu Jan 12 19:50:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ace/OS_NS_time.inl7
-rw-r--r--ace/README4
2 files changed, 9 insertions, 2 deletions
diff --git a/ace/OS_NS_time.inl b/ace/OS_NS_time.inl
index 93b761d43ba..99ca079478c 100644
--- a/ace/OS_NS_time.inl
+++ b/ace/OS_NS_time.inl
@@ -360,7 +360,12 @@ ACE_OS::gethrtime (const ACE_HRTimer_Op op)
ACE_UNUSED_ARG (op);
struct timespec ts;
- ACE_OS::clock_gettime (CLOCK_REALTIME, &ts);
+ ACE_OS::clock_gettime (
+#if defined (ACE_HAS_CLOCK_GETTIME_MONOTONIC)
+ CLOCK_MONOTONIC,
+#endif /* !ACE_HAS_CLOCK_GETTIME_MONOTONIC */
+ CLOCK_REALTIME,
+ &ts);
// Carefully create the return value to avoid arithmetic overflow
// if ACE_hrtime_t is ACE_U_LongLong.
diff --git a/ace/README b/ace/README
index 6c600bc79f8..15bbd0fb3ea 100644
--- a/ace/README
+++ b/ace/README
@@ -278,7 +278,9 @@ ACE_HAS_CHARPTR_SPRINTF sprintf() returns char *
rather than int (e.g., SunOS
4.x)
ACE_HAS_CLOCK_GETTIME Platform supports POSIX.1b
- clock_gettime ()
+ clock_gettime () at least for clock-id CLOCK_REALTIME
+ACE_HAS_CLOCK_GETTIME_MONOTONIC Platform supports POSIX.1b
+ clock_gettime () with the clock-id CLOCK_MONOTONIC
ACE_HAS_CLOCK_SETTIME Platform supports POSIX.1b
clock_settime ()
ACE_HAS_CONFLICTING_XTI_MACROS OS's XTI header file defines some