summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-21 01:31:02 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-21 01:31:02 +0000
commit45aea55bed457db582ac7d728a94e7cd8103aa0d (patch)
tree8b25742fbbfc280dc77c5d3677d2e6d57089f095
parentd26ef43f8efd8e8b92fa34269014952b3cc2db80 (diff)
downloadATCD-45aea55bed457db582ac7d728a94e7cd8103aa0d.tar.gz
ChangeLogTag:Tue Jul 20 19:32:39 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
-rw-r--r--TAO/ChangeLog-99c4
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp14
2 files changed, 15 insertions, 3 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index d7d51a7973b..05f3529b39c 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -10,6 +10,10 @@ Tue Jul 20 19:32:39 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
configuration so experiments can still be executed using a well
known configuration.
+ * performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp:
+ The low priority thread was trying to use priorities in the RT
+ class, event though we were not allowed to do that.
+
Tue Jul 20 19:16:00 1999 Ossama Othman <othman@cs.wustl.edu>
* tao/ObjectIDList.{h,i}:
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
index 98968dcf637..4ca127c1b53 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
@@ -139,6 +139,14 @@ MT_Priority::get_low_priority (u_int num_low_priority,
return -1;
#else
ACE_Sched_Priority low_priority = ACE_THR_PRI_FIFO_DEF;
+ int policy = ACE_SCHED_FIFO;
+
+ if (!ACE_BIT_ENABLED (GLOBALS::instance ()->thr_create_flags,
+ THR_SCHED_FIFO))
+ {
+ low_priority = ACE_THR_PRI_OTHER_DEF;
+ policy = ACE_SCHED_OTHER;
+ }
// Drop the priority.
if (use_multiple_priority)
@@ -146,7 +154,7 @@ MT_Priority::get_low_priority (u_int num_low_priority,
this->num_priorities_ = 0;
for (ACE_Sched_Priority_Iterator priority_iterator
- (ACE_SCHED_FIFO, ACE_SCOPE_THREAD);
+ (policy, ACE_SCOPE_THREAD);
priority_iterator.more ();
priority_iterator.next ())
this->num_priorities_++;
@@ -161,7 +169,7 @@ MT_Priority::get_low_priority (u_int num_low_priority,
j++)
{
low_priority =
- ACE_Sched_Params::previous_priority (ACE_SCHED_FIFO,
+ ACE_Sched_Params::previous_priority (policy,
prev_priority,
ACE_SCOPE_THREAD);
prev_priority = low_priority;
@@ -177,7 +185,7 @@ MT_Priority::get_low_priority (u_int num_low_priority,
}
else
low_priority =
- ACE_Sched_Params::previous_priority (ACE_SCHED_FIFO,
+ ACE_Sched_Params::previous_priority (policy,
prev_priority,
ACE_SCOPE_THREAD);
return low_priority;