diff options
| author | venkita <venkita@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-07-27 22:43:51 +0000 |
|---|---|---|
| committer | venkita <venkita@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-07-27 22:43:51 +0000 |
| commit | 6a9980d1d2be1a7f5e2847995236e17fbe2ebc8d (patch) | |
| tree | d0115dc06801de16368ae0e96dd7a66f527c582e | |
| parent | 1f91ef90072d1703e75e519eb40678c55f71f2e4 (diff) | |
| download | ATCD-6a9980d1d2be1a7f5e2847995236e17fbe2ebc8d.tar.gz | |
ChangeLogTag: Sun Jul 27 17:30:14 2003 Venkita Subramonian <venkita@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog | 12 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp | 14 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp | 3 |
3 files changed, 24 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 61ea42351c0..14e5e5536d0 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,15 @@ +Sun Jul 27 17:30:14 2003 Venkita Subramonian <venkita@cs.wustl.edu> + + * orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp: Converted period + argument for scheduler->set from ACE_Time_Value to + RtecScheduler::Period_t to clear warnings in + WinXP_MSVC_Warning_Level_4_Debug build. + + * orbsvcs/examples/RtEC/Kokyu/Service.cpp: Used ORBSVCS_Time + utility function to convert between ACE_Time_Value and + TimeBase::TimeT to clear warnings in + WinXP_MSVC_Warning_Level_4_Debug build. + Sun Jul 27 09:06:02 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * tao/Stub.cpp (get_policy): Removed the check for this->policies_ diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp index e96a3a28f26..dee85a15df1 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp @@ -21,6 +21,12 @@ ACE_RCSID(EC_Examples, Service, "$Id$") int config_run = 0; +inline RtecScheduler::Period_t time_val_to_period (const ACE_Time_Value &tv) +{ + //100s of nanoseconds + return (tv.sec () * 1000000 + tv.usec ())*10; +} + int parse_args (int argc, char *argv[]); typedef TAO_Reconfig_Scheduler<TAO_MUF_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> RECONFIG_SCHED_TYPE; @@ -149,7 +155,7 @@ main (int argc, char* argv[]) scheduler->set (consumer_rt_info1, RtecScheduler::VERY_HIGH_CRITICALITY, time, time, time, - time, + time_val_to_period (tv), RtecScheduler::VERY_LOW_IMPORTANCE, time, 0, @@ -168,7 +174,7 @@ main (int argc, char* argv[]) scheduler->set (consumer_rt_info2, RtecScheduler::VERY_LOW_CRITICALITY, time, time, time, - time, + time_val_to_period (tv), RtecScheduler::VERY_LOW_IMPORTANCE, time, 0, @@ -239,7 +245,7 @@ main (int argc, char* argv[]) scheduler->set (supplier_rt_info1, RtecScheduler::VERY_HIGH_CRITICALITY, tmp, tmp, tmp, - tmp, + time_val_to_period (tv), RtecScheduler::VERY_LOW_IMPORTANCE, tmp, 0, @@ -262,7 +268,7 @@ main (int argc, char* argv[]) scheduler->set (supplier_rt_info2, RtecScheduler::VERY_LOW_CRITICALITY, tmp, tmp, tmp, - tmp, + time_val_to_period (tv), RtecScheduler::VERY_LOW_IMPORTANCE, tmp, 0, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp index b3d746a41a8..1495b302278 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp @@ -105,7 +105,8 @@ TAO_EC_Kokyu_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, Kokyu::QoSDescriptor qosd; qosd.preemption_priority_ = qos_info.preemption_priority; qosd.deadline_ = rt_info->period; - qosd.execution_time_ = rt_info->worst_case_execution_time; + qosd.execution_time_ = + ORBSVCS_Time::TimeT_to_Time_Value (rt_info->worst_case_execution_time); this->dispatcher_->dispatch(cmd,qosd); } |