summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--ChangeLogs/ChangeLog-02a8
-rw-r--r--ChangeLogs/ChangeLog-03a8
-rw-r--r--ace/Malloc_T.h1
-rw-r--r--ace/OS.i6
5 files changed, 24 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 63e7194ce8b..15bd619bd6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,13 @@ Fri Apr 13 11:58:58 2001 Carlos O'Ryan <coryan@uci.edu>
* ace/OS.i (gethrtime):
Add support for the the clock tick register as a high resolution
- timer under KCC/Linux.
+ timer under KCC/Linux. Thanks to David Levine for help on this.
+
+Fri Apr 13 05:30:04 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
+
+ * ace/OS.i: Make sure that the PTHREADS version of ACE_OS::thr_yield()
+ gets top priority over the STHREADS version. Thanks to Munagala
+ Ramanath <amberarrow@yahoo.com> for reporting this.
Fri Apr 13 12:21:01 2001 Nanbor Wang <nanbor@cs.wustl.edu>
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 63e7194ce8b..15bd619bd6e 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -2,7 +2,13 @@ Fri Apr 13 11:58:58 2001 Carlos O'Ryan <coryan@uci.edu>
* ace/OS.i (gethrtime):
Add support for the the clock tick register as a high resolution
- timer under KCC/Linux.
+ timer under KCC/Linux. Thanks to David Levine for help on this.
+
+Fri Apr 13 05:30:04 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
+
+ * ace/OS.i: Make sure that the PTHREADS version of ACE_OS::thr_yield()
+ gets top priority over the STHREADS version. Thanks to Munagala
+ Ramanath <amberarrow@yahoo.com> for reporting this.
Fri Apr 13 12:21:01 2001 Nanbor Wang <nanbor@cs.wustl.edu>
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 63e7194ce8b..15bd619bd6e 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -2,7 +2,13 @@ Fri Apr 13 11:58:58 2001 Carlos O'Ryan <coryan@uci.edu>
* ace/OS.i (gethrtime):
Add support for the the clock tick register as a high resolution
- timer under KCC/Linux.
+ timer under KCC/Linux. Thanks to David Levine for help on this.
+
+Fri Apr 13 05:30:04 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
+
+ * ace/OS.i: Make sure that the PTHREADS version of ACE_OS::thr_yield()
+ gets top priority over the STHREADS version. Thanks to Munagala
+ Ramanath <amberarrow@yahoo.com> for reporting this.
Fri Apr 13 12:21:01 2001 Nanbor Wang <nanbor@cs.wustl.edu>
diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h
index aff5f897f8d..f1d398e7b2c 100644
--- a/ace/Malloc_T.h
+++ b/ace/Malloc_T.h
@@ -10,7 +10,6 @@
*/
//=============================================================================
-
#ifndef ACE_MALLOC_T_H
#define ACE_MALLOC_T_H
#include "ace/pre.h"
diff --git a/ace/OS.i b/ace/OS.i
index 128cf72b141..f9f5e9a01cc 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -8418,9 +8418,7 @@ ACE_OS::thr_yield (void)
#if defined (ACE_HAS_PACE) && !defined (ACE_WIN32)
::pace_sched_yield ();
#elif defined (ACE_HAS_THREADS)
-# if defined (ACE_HAS_STHREADS)
- ::thr_yield ();
-# elif defined (ACE_HAS_PTHREADS)
+# if defined (ACE_HAS_PTHREADS)
# if defined (ACE_HAS_PTHREADS_STD)
// Note - this is a POSIX.4 function - not a POSIX.1c function...
::sched_yield ();
@@ -8429,6 +8427,8 @@ ACE_OS::thr_yield (void)
# else /* Draft 4 and 7 */
::pthread_yield ();
# endif /* ACE_HAS_PTHREADS_STD */
+# elif defined (ACE_HAS_STHREADS)
+ ::thr_yield ();
# elif defined (ACE_HAS_WTHREADS)
::Sleep (0);
# elif defined (VXWORKS)