summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/Sched
diff options
context:
space:
mode:
authorvenkita <venkita@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-08-25 01:17:06 +0000
committervenkita <venkita@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-08-25 01:17:06 +0000
commit27b9ec1f04e1ce5023ef65748ec967e7776a3461 (patch)
tree00580829e482163c653031aa74459e1ecbe82a86 /TAO/orbsvcs/orbsvcs/Sched
parent403cea40bf7247b37fa84d4d8299f8ff3d8f125e (diff)
downloadATCD-27b9ec1f04e1ce5023ef65748ec967e7776a3461.tar.gz
ChangeLogTag: Sun Aug 24 20:14:52 2003 Venkita Subramonian <venkita@cs.wustl.edu>
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Sched')
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
index ecc489d895a..85fa09e4262 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
@@ -1060,9 +1060,12 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
entry.actual_rt_info ()->criticality;
RtecScheduler::Criticality_t succ_crit =
successor.actual_rt_info ()->criticality;
+ RtecScheduler::Criticality_t max_crit = entry_crit;
+
+ if (max_crit < succ_crit)
+ max_crit = succ_crit;
- successor.actual_rt_info ()->criticality =
- ace_max (entry_crit, succ_crit);
+ successor.actual_rt_info ()->criticality = max_crit;
ACE_DEBUG ((LM_DEBUG,
"Successor's new criticality is %d\n",