diff options
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp | 16 |
2 files changed, 16 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 7cf6a5e1bb3..b84ce2ef7a7 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Sun Aug 24 21:38:48 2003 Venkita Subramonian <venkita@cs.wustl.edu> + + * orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp: + Fixed a bug where the preemption priority was wrongly set before + dispatching a event to the Kokyu dispatcher. + Sun Aug 24 20:14:52 2003 Venkita Subramonian <venkita@cs.wustl.edu> * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp: Fixed compile warnings regarding usage of ace_max in Debian_Core build. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp index 149dc98cc49..aa6a8f38a0a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp @@ -119,16 +119,20 @@ TAO_EC_Kokyu_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, new TAO_EC_Kokyu_Push_Command(proxy,consumer,event); // Convert TAO_EC_QOS_Info to QoSDescriptor - RtecScheduler::RT_Info *rt_info = this->scheduler_->get(qos_info.rt_info); + RtecScheduler::RT_Info *rt_info = + this->scheduler_->get(qos_info.rt_info); + Kokyu::QoSDescriptor qosd; - qosd.preemption_priority_ = qos_info.preemption_priority; + qosd.preemption_priority_ = rt_info->preemption_priority; qosd.deadline_ = rt_info->period; ORBSVCS_Time::TimeT_to_Time_Value (qosd.execution_time_, rt_info->worst_case_execution_time); - - //ACE_DEBUG ((LM_DEBUG, - // "(%t) About to drop event into queue.\n")); - + /* + ACE_DEBUG ((LM_DEBUG, + "(%t) About to drop event into queue. " + "rt_info = %d, pre_prio = %d\n", + rt_info->handle, qosd.preemption_priority_)); + */ this->dispatcher_->dispatch(cmd,qosd); } |