summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog-97a5
-rw-r--r--ace/OS.h6
-rw-r--r--ace/config-sunos4-g++.h5
-rw-r--r--ace/config-sunos4-lucid3.2.h5
-rw-r--r--ace/config-sunos4-sun3.x.h5
-rw-r--r--ace/config-sunos4-sun4.1.4.h5
-rw-r--r--ace/config-sunos4-sun4.x-orbix.h5
-rw-r--r--ace/config-sunos4-sun4.x.h5
-rw-r--r--ace/config-sunos5.4-centerline-2.x.h5
-rw-r--r--ace/config-sunos5.4-g++.h5
-rw-r--r--ace/config-sunos5.4-sunc++-4.x-orbix.h5
-rw-r--r--ace/config-sunos5.4-sunc++-4.x.h5
-rw-r--r--ace/config-sunos5.5-g++.h5
-rw-r--r--ace/config-sunos5.5-sunc++-4.1.h5
-rw-r--r--ace/config-sunos5.5-sunc++-4.x-orbix.h5
-rw-r--r--ace/config-sunos5.5-sunc++-4.x.h5
-rw-r--r--ace/config-sunx86-sunc++-4.x.h5
-rw-r--r--ace/config-vxworks-ghs-1.8.h3
-rw-r--r--ace/config-vxworks5.2-g++.h3
-rw-r--r--ace/config-winnt-4.0-msvc4.x.h3
20 files changed, 86 insertions, 9 deletions
diff --git a/ChangeLog-97a b/ChangeLog-97a
index f54389d7097..1bc507f21cf 100644
--- a/ChangeLog-97a
+++ b/ChangeLog-97a
@@ -1,3 +1,8 @@
+Tue Feb 25 21:19:57 1997 David L. Levine <levine@cs.wustl.edu>
+
+ * ace/OS.h,config-sunos*.h: default ACE_TIMER_QUEUE to 0,
+ and override to 10 ms in all Solaris config files.
+
Tue Feb 25 19:57:54 1997 <harrison@samba.cs.wustl.edu>
* ace/Timer_Queue.cpp (gettimeofday): Added gettimeofday accessors
diff --git a/ace/OS.h b/ace/OS.h
index 90c2720b7a9..41d29539a06 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -205,6 +205,12 @@ typedef int key_t;
#define ACE_DEFAULT_BASE_ADDR ((char *) (64 * 1024 * 1024))
#endif /* ACE_DEFAULT_BASE_ADDR */
+// Fudge factor for timers that need it, such as on Solaris.
+// This symbol should be defined in the appropriate config header.
+#if !defined (ACE_TIMER_SKEW)
+#define 0
+#endif /* ACE_TIMER_SKEW */
+
// 10 millisecond fudge factor to account for Solaris timers...
#if !defined (ACE_TIMER_SKEW)
#define ACE_TIMER_SKEW 1000 * 10
diff --git a/ace/config-sunos4-g++.h b/ace/config-sunos4-g++.h
index ef991a7d125..0e825963bd5 100644
--- a/ace/config-sunos4-g++.h
+++ b/ace/config-sunos4-g++.h
@@ -72,6 +72,11 @@
// Platform has ACE_TLI.
// #define ACE_HAS_TLI
+// 10 millisecond fudge factor to account for Solaris timers...
+#if !defined (ACE_TIMER_SKEW)
+#define ACE_TIMER_SKEW 1000 * 10
+#endif /* ACE_TIMER_SKEW */
+
#define ACE_HAS_SUNOS4_SIGNAL_T
#define ACE_HAS_CPLUSPLUS_HEADERS
#define ACE_HAS_RTLD_LAZY_V
diff --git a/ace/config-sunos4-lucid3.2.h b/ace/config-sunos4-lucid3.2.h
index 92438ea3c7d..fb8dcf90207 100644
--- a/ace/config-sunos4-lucid3.2.h
+++ b/ace/config-sunos4-lucid3.2.h
@@ -75,6 +75,11 @@
// Platform has ACE_TLI.
// #define ACE_HAS_TLI
+// 10 millisecond fudge factor to account for Solaris timers...
+#if !defined (ACE_TIMER_SKEW)
+#define ACE_TIMER_SKEW 1000 * 10
+#endif /* ACE_TIMER_SKEW */
+
// Turns off the tracing feature.
#if !defined (ACE_NTRACE)
#define ACE_NTRACE 1
diff --git a/ace/config-sunos4-sun3.x.h b/ace/config-sunos4-sun3.x.h
index 85eec5d9140..76979b4c7c0 100644
--- a/ace/config-sunos4-sun3.x.h
+++ b/ace/config-sunos4-sun3.x.h
@@ -71,6 +71,11 @@
#define ACE_LACKS_LINEBUFFERED_STREAMBUF
#define ACE_LACKS_SIGNED_CHAR
+// 10 millisecond fudge factor to account for Solaris timers...
+#if !defined (ACE_TIMER_SKEW)
+#define ACE_TIMER_SKEW 1000 * 10
+#endif /* ACE_TIMER_SKEW */
+
// Turns off the tracing feature.
#if !defined (ACE_NTRACE)
#define ACE_NTRACE 1
diff --git a/ace/config-sunos4-sun4.1.4.h b/ace/config-sunos4-sun4.1.4.h
index c5cbb5bc7b2..2a27eff54ce 100644
--- a/ace/config-sunos4-sun4.1.4.h
+++ b/ace/config-sunos4-sun4.1.4.h
@@ -77,6 +77,11 @@
#define ACE_LACKS_LINEBUFFERED_STREAMBUF
#define ACE_LACKS_SIGNED_CHAR
+// 10 millisecond fudge factor to account for Solaris timers...
+#if !defined (ACE_TIMER_SKEW)
+#define ACE_TIMER_SKEW 1000 * 10
+#endif /* ACE_TIMER_SKEW */
+
// Turns off the tracing feature.
#if !defined (ACE_NTRACE)
#define ACE_NTRACE 1
diff --git a/ace/config-sunos4-sun4.x-orbix.h b/ace/config-sunos4-sun4.x-orbix.h
index 946fa1bb70e..5b3dff64382 100644
--- a/ace/config-sunos4-sun4.x-orbix.h
+++ b/ace/config-sunos4-sun4.x-orbix.h
@@ -77,6 +77,11 @@
#define ACE_LACKS_LINEBUFFERED_STREAMBUF
#define ACE_LACKS_SIGNED_CHAR
+// 10 millisecond fudge factor to account for Solaris timers...
+#if !defined (ACE_TIMER_SKEW)
+#define ACE_TIMER_SKEW 1000 * 10
+#endif /* ACE_TIMER_SKEW */
+
// Turns off the tracing feature.
#if !defined (ACE_NTRACE)
#define ACE_NTRACE 1
diff --git a/ace/config-sunos4-sun4.x.h b/ace/config-sunos4-sun4.x.h
index 4ceaea902f5..a901f01f35b 100644
--- a/ace/config-sunos4-sun4.x.h
+++ b/ace/config-sunos4-sun4.x.h
@@ -71,6 +71,11 @@
#define ACE_LACKS_LINEBUFFERED_STREAMBUF
#define ACE_LACKS_SIGNED_CHAR
+// 10 millisecond fudge factor to account for Solaris timers...
+#if !defined (ACE_TIMER_SKEW)
+#define ACE_TIMER_SKEW 1000 * 10
+#endif /* ACE_TIMER_SKEW */
+
// Turns off the tracing feature.
#if !defined (ACE_NTRACE)
#define ACE_NTRACE 1
diff --git a/ace/config-sunos5.4-centerline-2.x.h b/ace/config-sunos5.4-centerline-2.x.h
index 9c7aa2debb3..5493236fcc9 100644
--- a/ace/config-sunos5.4-centerline-2.x.h
+++ b/ace/config-sunos5.4-centerline-2.x.h
@@ -141,6 +141,11 @@
// Platform supports ACE_TLI.
#define ACE_HAS_TLI
+// 10 millisecond fudge factor to account for Solaris timers...
+#if !defined (ACE_TIMER_SKEW)
+#define ACE_TIMER_SKEW 1000 * 10
+#endif /* ACE_TIMER_SKEW */
+
// Turns off the tracing feature.
#if !defined (ACE_NTRACE)
#define ACE_NTRACE 1
diff --git a/ace/config-sunos5.4-g++.h b/ace/config-sunos5.4-g++.h
index 8a02bfc5125..d5d8f7aac77 100644
--- a/ace/config-sunos5.4-g++.h
+++ b/ace/config-sunos5.4-g++.h
@@ -169,6 +169,11 @@
// Use the poll() event demultiplexor rather than select().
//#define ACE_USE_POLL
+// 10 millisecond fudge factor to account for Solaris timers...
+#if !defined (ACE_TIMER_SKEW)
+#define ACE_TIMER_SKEW 1000 * 10
+#endif /* ACE_TIMER_SKEW */
+
// Turns off the tracing feature.
#if !defined (ACE_NTRACE)
#define ACE_NTRACE 1
diff --git a/ace/config-sunos5.4-sunc++-4.x-orbix.h b/ace/config-sunos5.4-sunc++-4.x-orbix.h
index 172824ddfbc..8885f710d9f 100644
--- a/ace/config-sunos5.4-sunc++-4.x-orbix.h
+++ b/ace/config-sunos5.4-sunc++-4.x-orbix.h
@@ -160,6 +160,11 @@
// Use the poll() event demultiplexor rather than select().
//#define ACE_USE_POLL
+// 10 millisecond fudge factor to account for Solaris timers...
+#if !defined (ACE_TIMER_SKEW)
+#define ACE_TIMER_SKEW 1000 * 10
+#endif /* ACE_TIMER_SKEW */
+
// Turns off the tracing feature.
#if !defined (ACE_NTRACE)
#define ACE_NTRACE 1
diff --git a/ace/config-sunos5.4-sunc++-4.x.h b/ace/config-sunos5.4-sunc++-4.x.h
index cea20fd64cc..2020f1984d8 100644
--- a/ace/config-sunos5.4-sunc++-4.x.h
+++ b/ace/config-sunos5.4-sunc++-4.x.h
@@ -156,6 +156,11 @@
// Use the poll() event demultiplexor rather than select().
//#define ACE_USE_POLL
+// 10 millisecond fudge factor to account for Solaris timers...
+#if !defined (ACE_TIMER_SKEW)
+#define ACE_TIMER_SKEW 1000 * 10
+#endif /* ACE_TIMER_SKEW */
+
// Turns off the tracing feature.
// #define ACE_NTRACE 0
#if !defined (ACE_NTRACE)
diff --git a/ace/config-sunos5.5-g++.h b/ace/config-sunos5.5-g++.h
index 7bdc430754a..25ef3de5c2c 100644
--- a/ace/config-sunos5.5-g++.h
+++ b/ace/config-sunos5.5-g++.h
@@ -178,6 +178,11 @@
// Use the poll() event demultiplexor rather than select().
//#define ACE_USE_POLL
+// 10 millisecond fudge factor to account for Solaris timers...
+#if !defined (ACE_TIMER_SKEW)
+#define ACE_TIMER_SKEW 1000 * 10
+#endif /* ACE_TIMER_SKEW */
+
// Turns off the tracing feature.
#if !defined (ACE_NTRACE)
#define ACE_NTRACE 1
diff --git a/ace/config-sunos5.5-sunc++-4.1.h b/ace/config-sunos5.5-sunc++-4.1.h
index f1dacfda7ff..8a0ab62e940 100644
--- a/ace/config-sunos5.5-sunc++-4.1.h
+++ b/ace/config-sunos5.5-sunc++-4.1.h
@@ -176,6 +176,11 @@
// Use the poll() event demultiplexor rather than select().
//#define ACE_USE_POLL
+// 10 millisecond fudge factor to account for Solaris timers...
+#if !defined (ACE_TIMER_SKEW)
+#define ACE_TIMER_SKEW 1000 * 10
+#endif /* ACE_TIMER_SKEW */
+
// Turns off the tracing feature.
#if !defined (ACE_NTRACE)
#define ACE_NTRACE 1
diff --git a/ace/config-sunos5.5-sunc++-4.x-orbix.h b/ace/config-sunos5.5-sunc++-4.x-orbix.h
index 5f8a658b667..7979bb8c88a 100644
--- a/ace/config-sunos5.5-sunc++-4.x-orbix.h
+++ b/ace/config-sunos5.5-sunc++-4.x-orbix.h
@@ -165,6 +165,11 @@
// Use the poll() event demultiplexor rather than select().
//#define ACE_USE_POLL
+// 10 millisecond fudge factor to account for Solaris timers...
+#if !defined (ACE_TIMER_SKEW)
+#define ACE_TIMER_SKEW 1000 * 10
+#endif /* ACE_TIMER_SKEW */
+
// Turns off the tracing feature.
#if !defined (ACE_NTRACE)
#define ACE_NTRACE 1
diff --git a/ace/config-sunos5.5-sunc++-4.x.h b/ace/config-sunos5.5-sunc++-4.x.h
index 21895514e4d..ba7d2e0798d 100644
--- a/ace/config-sunos5.5-sunc++-4.x.h
+++ b/ace/config-sunos5.5-sunc++-4.x.h
@@ -160,6 +160,11 @@
// Use the poll() event demultiplexor rather than select().
//#define ACE_USE_POLL
+// 10 millisecond fudge factor to account for Solaris timers...
+#if !defined (ACE_TIMER_SKEW)
+#define ACE_TIMER_SKEW 1000 * 10
+#endif /* ACE_TIMER_SKEW */
+
// Turns off the tracing feature.
#if !defined (ACE_NTRACE)
#define ACE_NTRACE 1
diff --git a/ace/config-sunx86-sunc++-4.x.h b/ace/config-sunx86-sunc++-4.x.h
index b4df1689da5..536880d789c 100644
--- a/ace/config-sunx86-sunc++-4.x.h
+++ b/ace/config-sunx86-sunc++-4.x.h
@@ -131,6 +131,11 @@
// Use the poll() event demultiplexor rather than select().
//#define ACE_USE_POLL
+// 10 millisecond fudge factor to account for Solaris timers...
+#if !defined (ACE_TIMER_SKEW)
+#define ACE_TIMER_SKEW 1000 * 10
+#endif /* ACE_TIMER_SKEW */
+
// Turns off the tracing feature.
#if !defined (ACE_NTRACE)
#define ACE_NTRACE 1
diff --git a/ace/config-vxworks-ghs-1.8.h b/ace/config-vxworks-ghs-1.8.h
index b8f7af582af..4c9fa3ab40a 100644
--- a/ace/config-vxworks-ghs-1.8.h
+++ b/ace/config-vxworks-ghs-1.8.h
@@ -7,9 +7,6 @@
#if !defined (ACE_CONFIG_H)
#define ACE_CONFIG_H
-// No timer skew for Reactors and Timer Queues.
-#define ACE_TIMER_SKEW 0
-
#define ACE_LACKS_STRCASECMP
#define ACE_LACKS_COND_T
#define ACE_LACKS_RWLOCK_T
diff --git a/ace/config-vxworks5.2-g++.h b/ace/config-vxworks5.2-g++.h
index 4046973a9cf..f31b6b9ba20 100644
--- a/ace/config-vxworks5.2-g++.h
+++ b/ace/config-vxworks5.2-g++.h
@@ -7,9 +7,6 @@
#if !defined (ACE_CONFIG_H)
#define ACE_CONFIG_H
-// No timer skew for Reactors and Timer Queues.
-#define ACE_TIMER_SKEW 0
-
#define ACE_LACKS_STRCASECMP
#define ACE_LACKS_SYS_NERR
#define ACE_LACKS_COND_T
diff --git a/ace/config-winnt-4.0-msvc4.x.h b/ace/config-winnt-4.0-msvc4.x.h
index 1298ac4ed0f..9b03e2c3827 100644
--- a/ace/config-winnt-4.0-msvc4.x.h
+++ b/ace/config-winnt-4.0-msvc4.x.h
@@ -7,9 +7,6 @@
#if !defined (ACE_CONFIG_H)
#define ACE_CONFIG_H
-// Set the timer skew used in the Reactors and Timer_Queues to zero.
-#define ACE_TIMER_SKEW 0
-
#define ACE_HAS_EXCEPTIONS
#define ACE_HAS_MFC
View Lorry Controller Status