12 files changed, 65 insertions, 17 deletions
diff --git a/ace/README b/ace/README
index 396e16b9e71..3394870058a 100644
--- a/ace/README
+++ b/ace/README
@@ -64,6 +64,11 @@ ACE_TEMPLATES_REQUIRE_SOURCE            Compiler's template mechanim
                                         must see source code (i.e.,
                                         .cpp files).  This is used for
                                         GNU G++.
+ACE_TIMER_SKEW                          If a timed ::select () can return
+                                        early, then ACE_TIMER_SKEW is the
+                                        maximum adjustment, in microseconds,
+                                        that ACE_Timer_Queue uses to
+                                        compensate for the early return.
 ACE_TLI_TCP_DEVICE                      Device the platform uses for TCP on
                                         TLI.  Only needed if not /dev/tcp.
 ACE_USE_POLL                            The OS platform supports the
diff --git a/ace/config-sunos4-g++.h b/ace/config-sunos4-g++.h
index 96678db4d3a..637bf170d1c 100644
--- a/ace/config-sunos4-g++.h
+++ b/ace/config-sunos4-g++.h
@@ -15,7 +15,11 @@
 // Maybe it will work?
 #undef ACE_HAS_TEMPLATE_SPECIALIZATION
 
-// Optimize ACE_Handle_Set for select().
+// Maximum compensation (10 ms) for early return from timed ::select ().
+#if !defined (ACE_TIMER_SKEW)
+# define ACE_TIMER_SKEW 10 * 1000
+#endif /* ACE_TIMER_SKEW */
+
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
 #define ACE_HAS_STRING_CLASS
diff --git a/ace/config-sunos4-lucid3.2.h b/ace/config-sunos4-lucid3.2.h
index 01b0ce1684f..2c4317b8722 100644
--- a/ace/config-sunos4-lucid3.2.h
+++ b/ace/config-sunos4-lucid3.2.h
@@ -8,7 +8,12 @@
 #define ACE_CONFIG_H
 
 #define ACE_LACKS_GETPGID
-// Optimize ACE_Handle_Set for select().
+
+// Maximum compensation (10 ms) for early return from timed ::select ().
+#if !defined (ACE_TIMER_SKEW)
+# define ACE_TIMER_SKEW 10 * 1000
+#endif /* ACE_TIMER_SKEW */
+
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
 #define ACE_HAS_SYS_ERRLIST
diff --git a/ace/config-sunos4-sun3.x.h b/ace/config-sunos4-sun3.x.h
index f57c51e447c..4c91d18de30 100644
--- a/ace/config-sunos4-sun3.x.h
+++ b/ace/config-sunos4-sun3.x.h
@@ -7,7 +7,12 @@
 #ifndef ACE_CONFIG_H
 
 #define ACE_LACKS_GETPGID
-// Optimize ACE_Handle_Set for select().
+
+// Maximum compensation (10 ms) for early return from timed ::select ().
+#if !defined (ACE_TIMER_SKEW)
+# define ACE_TIMER_SKEW 10 * 1000
+#endif /* ACE_TIMER_SKEW */
+
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
 #define ACE_LACKS_POSIX_PROTOTYPES
diff --git a/ace/config-sunos4-sun4.1.4.h b/ace/config-sunos4-sun4.1.4.h
index 1ba6a60fe44..c9775e4fd9c 100644
--- a/ace/config-sunos4-sun4.1.4.h
+++ b/ace/config-sunos4-sun4.1.4.h
@@ -8,7 +8,12 @@
 #define ACE_CONFIG_H
 
 #define ACE_LACKS_GETPGID
-// Optimize ACE_Handle_Set for select().
+
+// Maximum compensation (10 ms) for early return from timed ::select ().
+#if !defined (ACE_TIMER_SKEW)
+# define ACE_TIMER_SKEW 10 * 1000
+#endif /* ACE_TIMER_SKEW */
+
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
 #define ACE_HAS_CHARPTR_SPRINTF
diff --git a/ace/config-sunos4-sun4.x-orbix.h b/ace/config-sunos4-sun4.x-orbix.h
index eb060c6902c..c429a951c72 100644
--- a/ace/config-sunos4-sun4.x-orbix.h
+++ b/ace/config-sunos4-sun4.x-orbix.h
@@ -8,7 +8,12 @@
 #define ACE_CONFIG_H
 
 #define ACE_LACKS_GETPGID
-// Optimize ACE_Handle_Set for select().
+
+// Maximum compensation (10 ms) for early return from timed ::select ().
+#if !defined (ACE_TIMER_SKEW)
+# define ACE_TIMER_SKEW 10 * 1000
+#endif /* ACE_TIMER_SKEW */
+
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
 #define ACE_HAS_CHARPTR_SPRINTF
diff --git a/ace/config-sunos4-sun4.x.h b/ace/config-sunos4-sun4.x.h
index e21b08bb893..701599ab480 100644
--- a/ace/config-sunos4-sun4.x.h
+++ b/ace/config-sunos4-sun4.x.h
@@ -14,7 +14,11 @@
 #define ACE_LACKS_POSIX_PROTOTYPES
 // #define ACE_HAS_UNION_WAIT
 
-// Optimize ACE_Handle_Set for select().
+// Maximum compensation (10 ms) for early return from timed ::select ().
+#if !defined (ACE_TIMER_SKEW)
+# define ACE_TIMER_SKEW 10 * 1000
+#endif /* ACE_TIMER_SKEW */
+
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
 // Platform supports System V IPC (most versions of UNIX, but not Win32)
diff --git a/ace/config-sunos5.4-centerline-2.x.h b/ace/config-sunos5.4-centerline-2.x.h
index 3144a415f6f..4044217f114 100644
--- a/ace/config-sunos5.4-centerline-2.x.h
+++ b/ace/config-sunos5.4-centerline-2.x.h
@@ -12,7 +12,11 @@
 // Platform supports pread() and pwrite()
 #define ACE_HAS_P_READ_WRITE
 
-// Optimize ACE_Handle_Set for select().
+// Maximum compensation (10 ms) for early return from timed ::select ().
+#if !defined (ACE_TIMER_SKEW)
+# define ACE_TIMER_SKEW 10 * 1000
+#endif /* ACE_TIMER_SKEW */
+
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
 #define ACE_HAS_XPG4_MULTIBYTE_CHAR
diff --git a/ace/config-sunos5.4-g++.h b/ace/config-sunos5.4-g++.h
index 7e4ae386e61..54e7d32216c 100644
--- a/ace/config-sunos5.4-g++.h
+++ b/ace/config-sunos5.4-g++.h
@@ -14,7 +14,11 @@
 #include "ace/config-g++-common.h"
 #define ACE_HAS_GNU_CSTRING_H
 
-// Optimize ACE_Handle_Set for select().
+// Maximum compensation (10 ms) for early return from timed ::select ().
+#if !defined (ACE_TIMER_SKEW)
+# define ACE_TIMER_SKEW 10 * 1000
+#endif /* ACE_TIMER_SKEW */
+
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
 #define ACE_HAS_STRING_CLASS
diff --git a/ace/config-sunos5.4-sunc++-4.x-orbix.h b/ace/config-sunos5.4-sunc++-4.x-orbix.h
index 88cfc6279b2..d5e13ad57e2 100644
--- a/ace/config-sunos5.4-sunc++-4.x-orbix.h
+++ b/ace/config-sunos5.4-sunc++-4.x-orbix.h
@@ -13,7 +13,12 @@
 #endif /* ! __ACE_INLINE__ */
 
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
-// Optimize ACE_Handle_Set for select().
+
+// Maximum compensation (10 ms) for early return from timed ::select ().
+#if !defined (ACE_TIMER_SKEW)
+# define ACE_TIMER_SKEW 10 * 1000
+#endif /* ACE_TIMER_SKEW */
+
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
 // Platform supports pread() and pwrite()
diff --git a/ace/config-sunos5.4-sunc++-4.x.h b/ace/config-sunos5.4-sunc++-4.x.h
index c4b0f0f9e49..478310d0136 100644
--- a/ace/config-sunos5.4-sunc++-4.x.h
+++ b/ace/config-sunos5.4-sunc++-4.x.h
@@ -13,6 +13,11 @@
 
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
 
+// Maximum compensation (10 ms) for early return from timed ::select ().
+#if !defined (ACE_TIMER_SKEW)
+# define ACE_TIMER_SKEW 10 * 1000
+#endif /* ACE_TIMER_SKEW */
+
 // Optimize ACE_Handle_Set for select().
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h
index 6c4665f5e4c..131c5e4e221 100644
--- a/ace/config-sunos5.5.h
+++ b/ace/config-sunos5.5.h
@@ -108,17 +108,14 @@
 // have link problems with g++ or egcs on SunOS 5.5.
 #define ACE_HAS_REGEX
 
-// Optimize ACE_Handle_Set for select().
-#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
-
-// 10 millisecond fudge factor to account for Solaris timers...
-//
-// Believe me, this timer skew is necessary ;-)
-//
+// Maximum compensation (10 ms) for early return from timed ::select ().
 #if !defined (ACE_TIMER_SKEW)
-# define ACE_TIMER_SKEW 1000 * 10
+# define ACE_TIMER_SKEW 10 * 1000
 #endif /* ACE_TIMER_SKEW */
 
+// Optimize ACE_Handle_Set for select().
+#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
+
 // Platform supports pread() and pwrite()
 #define ACE_HAS_P_READ_WRITE
 #define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS