diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-02-17 16:59:22 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-02-17 16:59:22 +0000 |
| commit | b8a46caed7f310834fb58f3a4a084dcbbe4521ef (patch) | |
| tree | 4374a1f42e28f1f3683bdeaa70cb63717aa54e70 | |
| parent | de74cadf28e18fe29c9e1de5f37fdb27d876814e (diff) | |
| download | ATCD-b8a46caed7f310834fb58f3a4a084dcbbe4521ef.tar.gz | |
ChangeLogTag:Tue Feb 17 10:43:45 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
30 files changed, 1246 insertions, 252 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 83059e25b8f..e76b3f5c75b 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,42 @@ +Tue Feb 17 10:43:45 1998 Carlos O'Ryan <coryan@cs.wustl.edu> + + * orbsvcs/orbsvcs/CosTimeBase.idl: + * orbsvcs/orbsvcs/Time_Utilities.cpp: + * orbsvcs/orbsvcs/Time_Utilities.h: + * orbsvcs/orbsvcs/Time_Utilities.i: + Added the standard CORBA types for time, also added some helper + routines to convert between BasicTime::TimeT and the common + representations of time in ACE (ACE_Time_Value and ACE_hrtime_t) + + * orbsvcs/orbsvcs/RtecEventComm.idl: + * orbsvcs/orbsvcs/RtecScheduler.idl: + * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp: + * orbsvcs/tests/Event_Latency/Event_Latency.cpp: + * orbsvcs/Event_Service/ReactorTask.cpp: + * orbsvcs/Event_Service/Task_Manager.cpp: + * orbsvcs/Scheduling_Service/Config_Scheduler.cpp: + * orbsvcs/Scheduling_Service/Config_Scheduler.h: + * orbsvcs/Scheduling_Service/Scheduler.cpp: + * orbsvcs/orbsvcs/Channel_Clients_T.i: + * orbsvcs/orbsvcs/Event_Service_Constants.h: + * orbsvcs/orbsvcs/Event_Utilities.i: + * orbsvcs/orbsvcs/Runtime_Scheduler.cpp: + * orbsvcs/orbsvcs/Runtime_Scheduler.h: + * orbsvcs/Event_Service/Dispatching_Modules.cpp: + * orbsvcs/Event_Service/Event_Channel.cpp: + Adapted all the code to use the new time structures. + + * orbsvcs/orbsvcs/Makefile: + * orbsvcs/tests/EC_Multiple/Makefile: + * orbsvcs/tests/Event_Latency/Makefile: + * orbsvcs/tests/Logger/Makefile: + * orbsvcs/tests/Simple_Naming/Makefile: + * orbsvcs/Event_Service/Makefile: + * orbsvcs/Naming_Service/Makefile: + * orbsvcs/Scheduling_Service/Makefile: + * orbsvcs/Dump_Schedule/Makefile: + Updated dependencies. + Tue Feb 17 07:40:49 1998 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * tao/any.cpp: Added a "return *this" to operator= to stop certain diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile b/TAO/orbsvcs/Dump_Schedule/Makefile index bcd5d0037b1..d208d5fdb77 100644 --- a/TAO/orbsvcs/Dump_Schedule/Makefile +++ b/TAO/orbsvcs/Dump_Schedule/Makefile @@ -225,9 +225,12 @@ Dump_Schedule: $(addprefix $(VDIR),$(DUMP_OBJS)) $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i diff --git a/TAO/orbsvcs/Event_Service/Dispatching_Modules.cpp b/TAO/orbsvcs/Event_Service/Dispatching_Modules.cpp index e9a0041044d..521905e3423 100644 --- a/TAO/orbsvcs/Event_Service/Dispatching_Modules.cpp +++ b/TAO/orbsvcs/Event_Service/Dispatching_Modules.cpp @@ -2,6 +2,7 @@ #include "ace/Sched_Params.h" #include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/Time_Utilities.h" #include "Memory_Pools.h" #include "Dispatching_Modules.h" @@ -100,10 +101,16 @@ ACE_ES_Priority_Dispatching::initialize_queues (void) { for (int x=0; x < ACE_Scheduler_MAX_PRIORITIES; x++) { - RtecScheduler::Period tv = ACE_Scheduler_Rates[x]; + // @@ Apparently Period is measured in a different unit that the + // time, beats me. + ACE_hrtime_t nanosecs; + ORBSVCS_Time::TimeT_to_hrtime (nanosecs, ACE_Scheduler_Rates[x]); + + RtecScheduler::Period period = nanosecs; + queues_[x] = new ACE_ES_Dispatch_Queue (this, ¬ification_strategy_); if (queues_[x] == 0 || - queues_[x]->open_queue (tv, threads_per_queue_) == -1) + queues_[x]->open_queue (period, threads_per_queue_) == -1) { ACE_ERROR ((LM_ERROR, "%p.\n", "ACE_ES_Priority_Dispatching::initialize_queues")); return; @@ -468,11 +475,14 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period &period, case 0: TAO_TRY {// @@ TODO: Handle exceptions... - ACE_Scheduler_Factory::server()->set(rt_info_, - 0, 0, 0, 0, - RtecScheduler::VERY_LOW, - RtecScheduler::NO_QUANTUM, - 1, TAO_TRY_ENV); + ACE_Scheduler_Factory::server()->set (rt_info_, + ORBSVCS_Time::zero, + ORBSVCS_Time::zero, + ORBSVCS_Time::zero, + 0, + RtecScheduler::VERY_LOW, + ORBSVCS_Time::zero, + 1, TAO_TRY_ENV); TAO_CHECK_ENV; } TAO_CATCHANY diff --git a/TAO/orbsvcs/Event_Service/Event_Channel.cpp b/TAO/orbsvcs/Event_Service/Event_Channel.cpp index 7d85f77295a..e289cacbf33 100644 --- a/TAO/orbsvcs/Event_Service/Event_Channel.cpp +++ b/TAO/orbsvcs/Event_Service/Event_Channel.cpp @@ -174,8 +174,8 @@ public: int schedule_timer (RtecScheduler::handle_t rt_info, const ACE_ES_Timer_ACT *act, RtecScheduler::OS_Priority preemption_priority, - RtecScheduler::Time delta, - RtecScheduler::Time interval = 0); + const RtecScheduler::Time& delta, + const RtecScheduler::Time& interval = ORBSVCS_Time::zero); // Schedule a timer at the appropriate priority for <preemption_priority>. // Returns the preemption priority used on success, -1 on failure. @@ -239,8 +239,8 @@ ACE_INLINE int ACE_ES_Priority_Timer::schedule_timer (RtecScheduler::handle_t rt_info, const ACE_ES_Timer_ACT *act, RtecScheduler::OS_Priority preemption_priority, - RtecScheduler::Time delta, - RtecScheduler::Time interval) + const RtecScheduler::Time &delta, + const RtecScheduler::Time &interval) { if (rt_info != 0) { @@ -253,10 +253,6 @@ ACE_ES_Priority_Timer::schedule_timer (RtecScheduler::handle_t rt_info, ACE_Scheduler_Factory::server()->add_dependency (rt_info, timer_rtinfo, 1, TAO_TRY_ENV); TAO_CHECK_ENV; - - ACE_DEBUG ((LM_ERROR, "ACE_ES_Priority_Timer::schedule_timer - " - "add_dependency (%d,%d,%d)\n", - rt_info, timer_rtinfo, 1)); } TAO_CATCHANY { @@ -267,17 +263,10 @@ ACE_ES_Priority_Timer::schedule_timer (RtecScheduler::handle_t rt_info, // @@ We're losing resolution here. ACE_Time_Value tv_delta; - tv_delta.usec (int (delta / 10)); - if (tv_delta.usec () == 0) - tv_delta.usec (1); + ORBSVCS_Time::TimeT_to_Time_Value (tv_delta, delta); ACE_Time_Value tv_interval; - if (interval > 0) - { - tv_interval.usec (int (interval / 10)); - if (tv_interval.usec () == 0) - tv_interval.usec (1); - } + ORBSVCS_Time::TimeT_to_Time_Value (tv_interval, interval); return ACE_Task_Manager::instance()-> GetReactorTask (preemption_priority)-> @@ -417,9 +406,9 @@ ACE_Push_Supplier_Proxy::push (const RtecEventComm::EventSet &event, ACE_hrtime_t ec_recv = ACE_OS::gethrtime (); for (CORBA::ULong i = 0; i < event.length (); ++i) { - ACE_OS::memcpy - (ACE_const_cast(void*,&event[i].ec_recv_time_), - &ec_recv, sizeof (RtecEventComm::Time)); + RtecEventComm::Event& ev = + ACE_const_cast(RtecEventComm::Event&,event[i]); + ORBSVCS_Time::hrtime_to_TimeT (ev.ec_recv_time_, ec_recv); } supplier_module_->push (this, event, _env); } @@ -992,11 +981,14 @@ ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer, ACE_DEBUG ((LM_DEBUG, "(%t) initiating consumer disconnect.\n")); // Set a 100ns timer. + TimeBase::TimeT ns100; + ORBSVCS_Time::hrtime_to_TimeT (ns100, 100); if (channel_->timer ()->schedule_timer (0, // no rt_info act, // ::Preemption_Priority (consumer->qos ().rt_info_), ACE_Scheduler_MIN_PREEMPTION_PRIORITY, - 100, 0) == -1) + ns100, + ORBSVCS_Time::zero) == -1) { ACE_ERROR ((LM_ERROR, "%p queue_request failed.\n", "ACE_ES_Consumer_Module")); delete sc; @@ -1020,12 +1012,12 @@ ACE_ES_Consumer_Module::push (const ACE_ES_Dispatch_Request *request, request->make_copy (event_set); // Forward the event set. - // @@ TOTAL HACK ACE_hrtime_t ec_send = ACE_OS::gethrtime (); for (CORBA::ULong i = 0; i < event_set.length (); ++i) { - ACE_OS::memcpy (&event_set[i].ec_send_time_, &ec_send, - sizeof (RtecEventComm::Time)); + RtecEventComm::Event& ev = + ACE_const_cast(RtecEventComm::Event&,event_set[i]); + ORBSVCS_Time::hrtime_to_TimeT (ev.ec_send_time_, ec_send); } request->consumer ()->push (event_set, _env); ACE_TIMEPROBE (" leave ES_Consumer_Module::push"); @@ -1752,8 +1744,8 @@ ACE_ES_Consumer_Rep_Timeout::execute (void) { CORBA::Environment __env; ACE_Time_Value tv = ACE_OS::gettimeofday (); - timeout_event_->creation_time_ = - tv.sec () * 10000000 + tv.usec () * 10; + ORBSVCS_Time::Time_Value_to_TimeT + (timeout_event_->creation_time_, tv); correlation_->correlation_module_->push (this, timeout_event_, __env); if (__env.exception () != 0) ACE_ERROR ((LM_ERROR, "ACE_ES_Consumer_Rep_Timeout::execute: unexpected exception.\n")); @@ -1864,11 +1856,6 @@ ACE_ES_Subscription_Module::connected (ACE_Push_Supplier_Proxy *supplier, new_subscribers->dependency_info_->rt_info, new_subscribers->dependency_info_->number_of_calls, _env); - ACE_DEBUG ((LM_DEBUG, "%s - add_dependency (%d,%d,%d)\n", - "ACE_ES_Priority_Timer::schedule_timer", - (*proxy)->dependency()->rt_info, - new_subscribers->dependency_info_->rt_info, - new_subscribers->dependency_info_->number_of_calls)); if (_env.exception () != 0) return; // @@ TODO use the TAO_TRY macros. @@ -2029,12 +2016,6 @@ ACE_ES_Subscription_Module::subscribe_source (ACE_ES_Consumer_Rep *consumer, TAO_TRY_ENV); TAO_CHECK_ENV; - ACE_DEBUG ((LM_DEBUG, - "%s - add_dependency (%d,%d,%d)\n", - "ACE_ES_Priority_Timer::subscribe_source", - consumer->dependency()->rt_info, - temp->int_id_->dependency_info_->rt_info, - temp->int_id_->dependency_info_->number_of_calls)); } TAO_CATCHANY { @@ -2104,11 +2085,6 @@ ACE_ES_Subscription_Module::subscribe_type (ACE_ES_Consumer_Rep *consumer, dependency_info->rt_info, dependency_info->number_of_calls, TAO_TRY_ENV); - ACE_DEBUG ((LM_ERROR, "%s - add_dependency (%d,%d,%d)\n", - "ACE_ES_Priority_Timer::schedule_timer - ", - consumer->dependency ()->rt_info, - dependency_info->rt_info, - dependency_info->number_of_calls)); TAO_CHECK_ENV; } TAO_CATCHANY @@ -2170,11 +2146,6 @@ ACE_ES_Subscription_Module::subscribe_source_type (ACE_ES_Consumer_Rep *consumer dependency_info->rt_info, dependency_info->number_of_calls, TAO_TRY_ENV); - ACE_DEBUG ((LM_ERROR, "%s - add_dependency (%d,%d,%d)\n", - "ACE_Subscription_Module::subscribe_source_type - ", - consumer->dependency ()->rt_info, - dependency_info->rt_info, - dependency_info->number_of_calls)); TAO_CHECK_ENV; } TAO_CATCHANY @@ -2709,7 +2680,7 @@ dump_event (const RtecEventComm::Event &event) (void*)event.source_, event.type_, // The divide-by-1 is for ACE_U_LongLong support. - event.creation_time_ / 1)); + ORBSVCS_Time::to_hrtime (event.creation_time_) / 1)); } // ************************************************************ diff --git a/TAO/orbsvcs/Event_Service/Makefile b/TAO/orbsvcs/Event_Service/Makefile index 0782cb17117..3d55d02c2fd 100644 --- a/TAO/orbsvcs/Event_Service/Makefile +++ b/TAO/orbsvcs/Event_Service/Makefile @@ -232,9 +232,12 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \ @@ -243,12 +246,16 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \ Event_Channel.h \ $(TAO_ROOT)/tao/Timeprobe.h \ $(TAO_ROOT)/tao/Timeprobe.i \ Local_ESTypes.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ @@ -640,16 +647,23 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ Memory_Pools.h Event_Channel.h \ $(TAO_ROOT)/tao/Timeprobe.h \ $(TAO_ROOT)/tao/Timeprobe.i \ Local_ESTypes.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ @@ -851,8 +865,11 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ Dispatching_Modules.h \ @@ -871,7 +888,11 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(ACE_ROOT)/ace/Timer_List_T.h \ Local_ESTypes.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ @@ -1061,11 +1082,18 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ @@ -1257,11 +1285,18 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ @@ -1463,8 +1498,11 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ RT_Task.h RT_Task.i Debug_Macros.h Event_Channel.h \ @@ -1472,7 +1510,11 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(TAO_ROOT)/tao/Timeprobe.i \ Local_ESTypes.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ @@ -1678,8 +1720,11 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ ReactorTask.h Fast_Reactor.h \ @@ -1695,7 +1740,11 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(ACE_ROOT)/ace/Timer_List_T.h \ Local_ESTypes.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ @@ -1758,35 +1807,8 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ - RT_Task.h $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ @@ -1802,6 +1824,7 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/SOCK_Acceptor.h \ @@ -1809,10 +1832,37 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(ACE_ROOT)/ace/SOCK_Acceptor.i \ $(ACE_ROOT)/ace/SOCK_Connector.h \ $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Connector.h \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Task_T.i \ $(ACE_ROOT)/ace/Dynamic.h \ $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ace/Svc_Handler.i \ @@ -1884,6 +1934,11 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + RT_Task.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ RT_Task.i Task_Manager.i ReactorTask.h Fast_Reactor.h \ $(ACE_ROOT)/ace/Select_Reactor.h \ @@ -1900,6 +1955,8 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ diff --git a/TAO/orbsvcs/Event_Service/ReactorTask.cpp b/TAO/orbsvcs/Event_Service/ReactorTask.cpp index 84892f4f1bc..389ade8491b 100644 --- a/TAO/orbsvcs/Event_Service/ReactorTask.cpp +++ b/TAO/orbsvcs/Event_Service/ReactorTask.cpp @@ -57,9 +57,12 @@ ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period &period) TAO_TRY { ACE_Scheduler_Factory::server()->set(rt_info_, - 0, 0, 0, period, + ORBSVCS_Time::zero, + ORBSVCS_Time::zero, + ORBSVCS_Time::zero, + period, RtecScheduler::VERY_LOW, - RtecScheduler::NO_QUANTUM, + ORBSVCS_Time::zero, 1, TAO_TRY_ENV); TAO_CHECK_ENV; } diff --git a/TAO/orbsvcs/Event_Service/Task_Manager.cpp b/TAO/orbsvcs/Event_Service/Task_Manager.cpp index b96ced6dc56..82bf3c6471c 100644 --- a/TAO/orbsvcs/Event_Service/Task_Manager.cpp +++ b/TAO/orbsvcs/Event_Service/Task_Manager.cpp @@ -19,10 +19,16 @@ void ACE_Task_Manager::initialize() { for (int x=0; x < ACE_Scheduler_MAX_PRIORITIES; x++) { - RtecScheduler::Period tv = ACE_Scheduler_Rates[x]; + // @@ Apparently Period is measured in a different unit that the + // time, beats me. + ACE_hrtime_t nanosecs; + ORBSVCS_Time::TimeT_to_hrtime (nanosecs, ACE_Scheduler_Rates[x]); + + RtecScheduler::Period period = nanosecs; reactorTasks[x] = new ReactorTask; + if (reactorTasks[x] == 0 || - reactorTasks[x]->open_reactor (tv) == -1) + reactorTasks[x]->open_reactor (period) == -1) { ACE_ERROR ((LM_ERROR, "%p.\n", "ACE_ORB::initialize_reactors")); return; diff --git a/TAO/orbsvcs/Naming_Service/Makefile b/TAO/orbsvcs/Naming_Service/Makefile index 0e937e785b9..5e3ee3e4bf7 100644 --- a/TAO/orbsvcs/Naming_Service/Makefile +++ b/TAO/orbsvcs/Naming_Service/Makefile @@ -221,6 +221,7 @@ Naming_Service: $(addprefix $(VDIR),$(SVR_OBJS)) $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i .obj/CosNaming_i.o .obj/CosNaming_i.so .shobj/CosNaming_i.o .shobj/CosNaming_i.so: CosNaming_i.cpp CosNaming_i.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ @@ -400,13 +401,15 @@ Naming_Service: $(addprefix $(VDIR),$(SVR_OBJS)) $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ NS_CosNaming.h .obj/Naming_Service.o .obj/Naming_Service.so .shobj/Naming_Service.o .shobj/Naming_Service.so: Naming_Service.cpp \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h CosNaming_i.h \ + $(ACE_ROOT)/ace/config.h \ + CosNaming_i.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/tao/corba.h \ @@ -581,6 +584,7 @@ Naming_Service: $(addprefix $(VDIR),$(SVR_OBJS)) $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ NS_CosNaming.h Naming_Service.h \ diff --git a/TAO/orbsvcs/Scheduling_Service/Config_Scheduler.cpp b/TAO/orbsvcs/Scheduling_Service/Config_Scheduler.cpp index 4c3e1abfef5..7ac4fff3bc2 100644 --- a/TAO/orbsvcs/Scheduling_Service/Config_Scheduler.cpp +++ b/TAO/orbsvcs/Scheduling_Service/Config_Scheduler.cpp @@ -4,6 +4,7 @@ // // ============================================================================ +#include "orbsvcs/Time_Utilities.h" #include "orbsvcs/Scheduler_Factory.h" #include "Scheduler_Generic.h" @@ -26,12 +27,10 @@ ACE_Config_Scheduler::~ACE_Config_Scheduler (void) RtecScheduler::handle_t ACE_Config_Scheduler::create (const char * entry_point, - CORBA::Environment &_env) + CORBA::Environment &) TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME)) { - ACE_UNUSED_ARG (_env); - typedef RtecScheduler::RT_Info* RT_Info_ptr; RtecScheduler::RT_Info** rt_info; @@ -41,12 +40,12 @@ ACE_Config_Scheduler::create (const char * entry_point, rt_info[0]->entry_point = CORBA::string_dup(entry_point); rt_info[0]->handle = -1; - rt_info[0]->worst_case_execution_time = 0; - rt_info[0]->typical_execution_time = 0; - rt_info[0]->cached_execution_time = 0; + rt_info[0]->worst_case_execution_time = ORBSVCS_Time::zero; + rt_info[0]->typical_execution_time = ORBSVCS_Time::zero; + rt_info[0]->cached_execution_time = ORBSVCS_Time::zero; rt_info[0]->period = 0; rt_info[0]->importance = RtecScheduler::VERY_LOW; - rt_info[0]->quantum = RtecScheduler::NO_QUANTUM; + rt_info[0]->quantum = ORBSVCS_Time::zero; rt_info[0]->threads = 0; rt_info[0]->priority = 0; rt_info[0]->subpriority = 0; @@ -64,7 +63,7 @@ ACE_Config_Scheduler::create (const char * entry_point, delete[] rt_info; ACE_ERROR ((LM_ERROR, "Config_Scheduler::create - register_task failed\n")); - // TODO: throw something. + // @@ TODO: throw something. break; } return handle; @@ -72,11 +71,9 @@ ACE_Config_Scheduler::create (const char * entry_point, RtecScheduler::handle_t ACE_Config_Scheduler::lookup (const char * entry_point, - CORBA::Environment &_env) + CORBA::Environment &) TAO_THROW_SPEC ((CORBA::SystemException)) { - ACE_UNUSED_ARG (_env); - RtecScheduler::RT_Info* rt_info = 0; switch (impl->get_rt_info (entry_point, rt_info)) { @@ -88,7 +85,7 @@ ACE_Config_Scheduler::lookup (const char * entry_point, default: ACE_ERROR ((LM_ERROR, "Config_Scheduler::lookup - get_rt_info failed\n")); - // TODO: throw something. + // @@ TODO: throw something. break; } return -1; @@ -96,12 +93,10 @@ ACE_Config_Scheduler::lookup (const char * entry_point, RtecScheduler::RT_Info* ACE_Config_Scheduler::get (RtecScheduler::handle_t handle, - CORBA::Environment &_env) + CORBA::Environment &) TAO_THROW_SPEC((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { - ACE_UNUSED_ARG (_env); - RtecScheduler::RT_Info* rt_info = 0; switch (impl->lookup_rt_info (handle, rt_info)) { @@ -118,26 +113,24 @@ ACE_Config_Scheduler::get (RtecScheduler::handle_t handle, default: ACE_ERROR ((LM_ERROR, "Config_Scheduler::get - lookup_rt_info failed\n")); - // TODO: throw something. + // @@ TODO: throw something. break; } return 0; } void ACE_Config_Scheduler::set (RtecScheduler::handle_t handle, - RtecScheduler::Time time, - RtecScheduler::Time typical_time, - RtecScheduler::Time cached_time, + const RtecScheduler::Time &time, + const RtecScheduler::Time &typical_time, + const RtecScheduler::Time &cached_time, RtecScheduler::Period period, RtecScheduler::Importance importance, - RtecScheduler::Quantum quantum, + const RtecScheduler::Quantum &quantum, CORBA::Long threads, - CORBA::Environment &_env) + CORBA::Environment &) TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { - ACE_UNUSED_ARG (_env); - RtecScheduler::RT_Info* rt_info = 0; switch (impl->lookup_rt_info (handle, rt_info)) { @@ -155,7 +148,7 @@ void ACE_Config_Scheduler::set (RtecScheduler::handle_t handle, default: ACE_ERROR ((LM_ERROR, "Config_Scheduler::set - lookup_rt_info failed\n")); - // TODO: throw something. + // @@ TODO: throw something. break; } } diff --git a/TAO/orbsvcs/Scheduling_Service/Config_Scheduler.h b/TAO/orbsvcs/Scheduling_Service/Config_Scheduler.h index 3f841a8845f..1f8fda26735 100644 --- a/TAO/orbsvcs/Scheduling_Service/Config_Scheduler.h +++ b/TAO/orbsvcs/Scheduling_Service/Config_Scheduler.h @@ -39,12 +39,12 @@ public: TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); virtual void set (RtecScheduler::handle_t handle, - RtecScheduler::Time time, - RtecScheduler::Time typical_time, - RtecScheduler::Time cached_time, + const RtecScheduler::Time &time, + const RtecScheduler::Time &typical_time, + const RtecScheduler::Time &cached_time, RtecScheduler::Period period, RtecScheduler::Importance importance, - RtecScheduler::Quantum quantum, + const RtecScheduler::Quantum &quantum, CORBA::Long threads, CORBA::Environment &_env) TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile b/TAO/orbsvcs/Scheduling_Service/Makefile index 5475af962be..93599097e1d 100644 --- a/TAO/orbsvcs/Scheduling_Service/Makefile +++ b/TAO/orbsvcs/Scheduling_Service/Makefile @@ -224,16 +224,25 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS)) $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ Config_Scheduler.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ Config_Scheduler.i .obj/Config_Scheduler.o .obj/Config_Scheduler.so .shobj/Config_Scheduler.o .shobj/Config_Scheduler.so: Config_Scheduler.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \ + $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ @@ -249,8 +258,6 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS)) $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/SOCK_Stream.h \ @@ -410,6 +417,11 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS)) $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ @@ -418,6 +430,8 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS)) $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ Scheduler.i Scheduler_Generic.i Config_Scheduler.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ Config_Scheduler.i .obj/Scheduler.o .obj/Scheduler.so .shobj/Scheduler.o .shobj/Scheduler.so: Scheduler.cpp \ @@ -438,45 +452,8 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS)) $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Sched_Params.i \ - Scheduler.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ @@ -492,7 +469,22 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS)) $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ @@ -505,18 +497,30 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS)) $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ @@ -524,6 +528,16 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS)) $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue.i \ $(ACE_ROOT)/ace/Task_T.i \ @@ -600,6 +614,11 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS)) $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + Scheduler.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ Scheduler.i @@ -783,8 +802,13 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS)) $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ Scheduler.i Scheduler_Generic.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduler.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduler.cpp index d353581d86b..cfa1f2c97aa 100644 --- a/TAO/orbsvcs/Scheduling_Service/Scheduler.cpp +++ b/TAO/orbsvcs/Scheduling_Service/Scheduler.cpp @@ -17,6 +17,7 @@ // ============================================================================ #include "ace/Sched_Params.h" +#include "orbsvcs/Time_Utilities.h" #include "Scheduler.h" #if ! defined (__ACE_INLINE__) @@ -217,12 +218,12 @@ void ACE_Scheduler::export(RT_Info& info, FILE* file) "# begin dependencies\n%d\n", (const char*)info.entry_point, info.handle, - info.worst_case_execution_time / 1, - info.typical_execution_time / 1, - info.cached_execution_time / 1, + ORBSVCS_Time::to_hrtime (info.worst_case_execution_time) / 1, + ORBSVCS_Time::to_hrtime (info.typical_execution_time) / 1, + ORBSVCS_Time::to_hrtime (info.cached_execution_time) / 1, info.period, info.importance, - info.quantum / 1, + ORBSVCS_Time::to_hrtime (info.quantum) / 1, info.threads, number_of_dependencies(info)); diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.i b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.i index 8a2c727c083..620b6fd04a8 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.i +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.i @@ -2,13 +2,13 @@ // $Id$ // -template<class TARGET> +template<class TARGET> ACE_INLINE ACE_PushConsumer_Adapter<TARGET>::ACE_PushConsumer_Adapter (TARGET *t) : target_ (t) { } -template<class TARGET> +template<class TARGET> ACE_INLINE ACE_PushSupplier_Adapter<TARGET>::ACE_PushSupplier_Adapter (TARGET *t) : target_ (t) { diff --git a/TAO/orbsvcs/orbsvcs/CosTimeBase.idl b/TAO/orbsvcs/orbsvcs/CosTimeBase.idl new file mode 100644 index 00000000000..59062c432df --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/CosTimeBase.idl @@ -0,0 +1,62 @@ +// +// $Id$ +// + +#ifndef COS_TIME_BASE_IDL +#define COS_TIME_BASE_IDL + +module TimeBase { + // = TITLE + // COS Time Service basic types. + // + // = DESCRIPTION + // The standard CORBA Time Service defines a number of data + // structures to manipulate and express time. + // TAO does not implement this standard service (yet), but we use + // the standard types. + // + +#if 1 + // interim definition of type ulonglong pending the + // adoption of the type extension RFP. + // @@ We also need support for 64-bit integers in TAO IDL compiler. + struct ulonglong { + unsigned long low; + unsigned long high; + }; + typedef ulonglong TimeT; +#else + typedef unsigned long long TimeT; +#endif + // As yet the IDL compiler does not support 64-bit quantities, we + // resort to the original definition of TimeT before long long + // numbers were added to IDL. + // + // Time in TimeT is expressed in units of 100 nano seconds (in + // other words 10^-7 seconds), and are relative to October 15, 1582; + // please read the spec for further details. + + typedef TimeT InaccuracyT; + // To express an error estimate for time. + + typedef short TdfT; + // Minutes of displacement from the Greenwich time. + + struct UtcT { + // = TITLE + // The UTC time structure. + TimeT time; + unsigned long inacclo; + unsigned short inacchi; + TdfT tdf; + }; + + struct IntervalT { + // = TITLE + // A time interval + TimeT lower_bound; + TimeT upper_bound; + }; +}; + +#endif /* COS_TIME_BASE_IDL */ diff --git a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h index d65f865139a..1daed2ec71c 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h +++ b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h @@ -11,6 +11,7 @@ #include "ace/Message_Block.h" #include "ace/Synch.h" +#include "orbsvcs/Time_Utilities.h" const int ACE_ES_MAX_SUBSCRIPTIONS = 32; // This is the number of events a consumer can subscribe to. @@ -46,8 +47,13 @@ const u_long ACE_ES_EVENT_UNDEFINED = 16; // to some variables (and even that is doubtful). const long ACE_Scheduler_MAX_PRIORITIES = 5; -const u_long ACE_Scheduler_Rates[ACE_Scheduler_MAX_PRIORITIES] = { - 250000, 500000, 1000000, 2000000, 10000000 }; +const TimeBase::TimeT ACE_Scheduler_Rates[ACE_Scheduler_MAX_PRIORITIES] = { + { 250000, 0}, // 40 Hz + { 500000, 0}, // 20 Hz + { 1000000, 0}, // 10 Hz + { 2000000, 0}, // 5 Hz + { 10000000, 0} // 1 Hz +}; // The minimum preemption priority. const long ACE_Scheduler_MIN_PREEMPTION_PRIORITY = diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.i b/TAO/orbsvcs/orbsvcs/Event_Utilities.i index 49cc031a517..b63b82e5404 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.i +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.i @@ -8,9 +8,9 @@ ACE_ConsumerQOS_Factory::insert (RtecEventComm::EventSourceID source, RtecEventChannelAdmin::Dependency dependency; dependency.event_.source_ = source; dependency.event_.type_ = type; - dependency.event_.creation_time_ = 0; - dependency.event_.ec_recv_time_ = 0; - dependency.event_.ec_send_time_ = 0; + //dependency.event_.creation_time_ = 0; + //dependency.event_.ec_recv_time_ = 0; + //dependency.event_.ec_send_time_ = 0; dependency.rt_info = rt_info; return this->insert (dependency); } @@ -22,9 +22,9 @@ ACE_ConsumerQOS_Factory::insert_type (RtecEventComm::EventType type, RtecEventChannelAdmin::Dependency dependency; dependency.event_.source_ = 0; dependency.event_.type_ = type; - dependency.event_.creation_time_ = 0; - dependency.event_.ec_recv_time_ = 0; - dependency.event_.ec_send_time_ = 0; + //dependency.event_.creation_time_ = 0; + //dependency.event_.ec_recv_time_ = 0; + //dependency.event_.ec_send_time_ = 0; dependency.rt_info = rt_info; return this->insert (dependency); } @@ -36,9 +36,9 @@ ACE_ConsumerQOS_Factory::insert_source (RtecEventComm::EventSourceID source, RtecEventChannelAdmin::Dependency dependency; dependency.event_.source_ = source; dependency.event_.type_ = ACE_ES_EVENT_ANY; - dependency.event_.creation_time_ = 0; - dependency.event_.ec_recv_time_ = 0; - dependency.event_.ec_send_time_ = 0; + //dependency.event_.creation_time_ = 0; + //dependency.event_.ec_recv_time_ = 0; + //dependency.event_.ec_send_time_ = 0; dependency.rt_info = rt_info; return this->insert (dependency); } @@ -52,8 +52,8 @@ ACE_ConsumerQOS_Factory::insert_time (RtecEventComm::EventType type, dependency.event_.source_ = 0; dependency.event_.type_ = type; dependency.event_.creation_time_ = interval; - dependency.event_.ec_recv_time_ = 0; - dependency.event_.ec_send_time_ = 0; + //dependency.event_.ec_recv_time_ = 0; + //dependency.event_.ec_send_time_ = 0; dependency.rt_info = rt_info; return this->insert (dependency); } @@ -64,9 +64,9 @@ ACE_ConsumerQOS_Factory::insert_act (RtecEventComm::EventData act) RtecEventChannelAdmin::Dependency dependency; dependency.event_.source_ = 0; dependency.event_.type_ = ACE_ES_EVENT_ACT; - dependency.event_.creation_time_ = 0; - dependency.event_.ec_recv_time_ = 0; - dependency.event_.ec_send_time_ = 0; + //dependency.event_.creation_time_ = 0; + //dependency.event_.ec_recv_time_ = 0; + //dependency.event_.ec_send_time_ = 0; dependency.event_.data_ = act; return this->insert (dependency); } diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile index c3821dfb09e..a37129cbb79 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile +++ b/TAO/orbsvcs/orbsvcs/Makefile @@ -20,6 +20,8 @@ TAO_IDLFLAGS = -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_ex IDL_FILES = \ CosNamingC \ CosNamingS \ + CosTimeBaseC \ + CosTimeBaseS \ RtecEventCommC \ RtecEventCommS \ RtecSchedulerC \ @@ -44,6 +46,7 @@ FILES= $(IDL_FILES) \ Scheduler_Factory \ Runtime_Scheduler \ Scheduler_Utilities \ + Time_Utilities \ tmplinst # Compile using av=1 to compile the AVStreams stuff. @@ -277,7 +280,7 @@ realclean: clean $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ - CosNamingC.i CosNamingS.h CosNamingS.i + orbsvcs_export.h CosNamingC.i CosNamingS.h CosNamingS.i .obj/CosNamingS.o .obj/CosNamingS.so .shobj/CosNamingS.o .shobj/CosNamingS.so: CosNamingS.cpp CosNamingS.h CosNamingC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ @@ -454,7 +457,361 @@ realclean: clean $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ - CosNamingC.i CosNamingS.i + orbsvcs_export.h CosNamingC.i CosNamingS.i +.obj/CosTimeBaseC.o .obj/CosTimeBaseC.so .shobj/CosTimeBaseC.o .shobj/CosTimeBaseC.so: CosTimeBaseC.cpp CosTimeBaseC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Version.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.i \ + $(TAO_ROOT)/tao/compat/objbase.h \ + $(TAO_ROOT)/tao/compat/initguid.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(TAO_ROOT)/tao/orb.h \ + $(TAO_ROOT)/tao/align.h \ + $(TAO_ROOT)/tao/corbacom.h \ + $(TAO_ROOT)/tao/sequence.h \ + $(TAO_ROOT)/tao/sequence.i \ + $(TAO_ROOT)/tao/sequence_T.h \ + $(TAO_ROOT)/tao/sequence_T.i \ + $(TAO_ROOT)/tao/objkeyC.h \ + $(TAO_ROOT)/tao/objkeyC.i \ + $(TAO_ROOT)/tao/any.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/client_factory.h \ + $(TAO_ROOT)/tao/server_factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/strategy_T.h \ + $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/except.h \ + $(TAO_ROOT)/tao/orbobj.h \ + $(TAO_ROOT)/tao/nvlist.h \ + $(TAO_ROOT)/tao/object.h \ + $(TAO_ROOT)/tao/principa.h \ + $(TAO_ROOT)/tao/request.h \ + $(TAO_ROOT)/tao/svrrqst.h \ + $(TAO_ROOT)/tao/typecode.h \ + $(TAO_ROOT)/tao/marshal.h \ + $(TAO_ROOT)/tao/cdr.h \ + $(TAO_ROOT)/tao/stub.h \ + $(TAO_ROOT)/tao/poa.h \ + $(TAO_ROOT)/tao/poaC.h \ + $(TAO_ROOT)/tao/poaC.i \ + $(TAO_ROOT)/tao/servant_base.h \ + $(TAO_ROOT)/tao/poaS.h \ + $(TAO_ROOT)/tao/poaS.i \ + $(TAO_ROOT)/tao/objtable.h \ + $(TAO_ROOT)/tao/connect.h \ + $(TAO_ROOT)/tao/orb_core.h \ + $(TAO_ROOT)/tao/optable.h \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/iiopobj.h \ + $(TAO_ROOT)/tao/iioporb.h \ + $(TAO_ROOT)/tao/giop.h \ + $(TAO_ROOT)/tao/orb_core.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(TAO_ROOT)/tao/corbacom.i \ + $(TAO_ROOT)/tao/typecode.i \ + $(TAO_ROOT)/tao/nvlist.i \ + $(TAO_ROOT)/tao/any.i \ + $(TAO_ROOT)/tao/stub.i \ + $(TAO_ROOT)/tao/object.i \ + $(TAO_ROOT)/tao/orbobj.i \ + $(TAO_ROOT)/tao/marshal.i \ + $(TAO_ROOT)/tao/cdr.i \ + $(TAO_ROOT)/tao/giop.i \ + $(TAO_ROOT)/tao/iioporb.i \ + $(TAO_ROOT)/tao/iiopobj.i \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/server_factory.i \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.i \ + $(TAO_ROOT)/tao/connect.i \ + $(TAO_ROOT)/tao/singletons.h \ + orbsvcs_export.h CosTimeBaseC.i CosTimeBaseS.h CosTimeBaseS.i +.obj/CosTimeBaseS.o .obj/CosTimeBaseS.so .shobj/CosTimeBaseS.o .shobj/CosTimeBaseS.so: CosTimeBaseS.cpp CosTimeBaseS.h CosTimeBaseC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Version.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.i \ + $(TAO_ROOT)/tao/compat/objbase.h \ + $(TAO_ROOT)/tao/compat/initguid.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(TAO_ROOT)/tao/orb.h \ + $(TAO_ROOT)/tao/align.h \ + $(TAO_ROOT)/tao/corbacom.h \ + $(TAO_ROOT)/tao/sequence.h \ + $(TAO_ROOT)/tao/sequence.i \ + $(TAO_ROOT)/tao/sequence_T.h \ + $(TAO_ROOT)/tao/sequence_T.i \ + $(TAO_ROOT)/tao/objkeyC.h \ + $(TAO_ROOT)/tao/objkeyC.i \ + $(TAO_ROOT)/tao/any.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/client_factory.h \ + $(TAO_ROOT)/tao/server_factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/strategy_T.h \ + $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/except.h \ + $(TAO_ROOT)/tao/orbobj.h \ + $(TAO_ROOT)/tao/nvlist.h \ + $(TAO_ROOT)/tao/object.h \ + $(TAO_ROOT)/tao/principa.h \ + $(TAO_ROOT)/tao/request.h \ + $(TAO_ROOT)/tao/svrrqst.h \ + $(TAO_ROOT)/tao/typecode.h \ + $(TAO_ROOT)/tao/marshal.h \ + $(TAO_ROOT)/tao/cdr.h \ + $(TAO_ROOT)/tao/stub.h \ + $(TAO_ROOT)/tao/poa.h \ + $(TAO_ROOT)/tao/poaC.h \ + $(TAO_ROOT)/tao/poaC.i \ + $(TAO_ROOT)/tao/servant_base.h \ + $(TAO_ROOT)/tao/poaS.h \ + $(TAO_ROOT)/tao/poaS.i \ + $(TAO_ROOT)/tao/objtable.h \ + $(TAO_ROOT)/tao/connect.h \ + $(TAO_ROOT)/tao/orb_core.h \ + $(TAO_ROOT)/tao/optable.h \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/iiopobj.h \ + $(TAO_ROOT)/tao/iioporb.h \ + $(TAO_ROOT)/tao/giop.h \ + $(TAO_ROOT)/tao/orb_core.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(TAO_ROOT)/tao/corbacom.i \ + $(TAO_ROOT)/tao/typecode.i \ + $(TAO_ROOT)/tao/nvlist.i \ + $(TAO_ROOT)/tao/any.i \ + $(TAO_ROOT)/tao/stub.i \ + $(TAO_ROOT)/tao/object.i \ + $(TAO_ROOT)/tao/orbobj.i \ + $(TAO_ROOT)/tao/marshal.i \ + $(TAO_ROOT)/tao/cdr.i \ + $(TAO_ROOT)/tao/giop.i \ + $(TAO_ROOT)/tao/iioporb.i \ + $(TAO_ROOT)/tao/iiopobj.i \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/server_factory.i \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.i \ + $(TAO_ROOT)/tao/connect.i \ + $(TAO_ROOT)/tao/singletons.h \ + orbsvcs_export.h CosTimeBaseC.i CosTimeBaseS.i .obj/RtecEventCommC.o .obj/RtecEventCommC.so .shobj/RtecEventCommC.o .shobj/RtecEventCommC.so: RtecEventCommC.cpp RtecEventCommC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ @@ -631,8 +988,10 @@ realclean: clean $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ - RtecEventCommC.i RtecEventCommS.h RtecEventCommS.i -.obj/RtecEventCommS.o .obj/RtecEventCommS.so .shobj/RtecEventCommS.o .shobj/RtecEventCommS.so: RtecEventCommS.cpp RtecEventCommS.h RtecEventCommC.h \ + orbsvcs_export.h CosTimeBaseC.h CosTimeBaseC.i RtecEventCommC.i \ + RtecEventCommS.h CosTimeBaseS.h CosTimeBaseS.i RtecEventCommS.i +.obj/RtecEventCommS.o .obj/RtecEventCommS.so .shobj/RtecEventCommS.o .shobj/RtecEventCommS.so: RtecEventCommS.cpp RtecEventCommS.h CosTimeBaseS.h \ + CosTimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ @@ -808,6 +1167,7 @@ realclean: clean $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ + orbsvcs_export.h CosTimeBaseC.i CosTimeBaseS.i RtecEventCommC.h \ RtecEventCommC.i RtecEventCommS.i .obj/RtecSchedulerC.o .obj/RtecSchedulerC.so .shobj/RtecSchedulerC.o .shobj/RtecSchedulerC.so: RtecSchedulerC.cpp RtecSchedulerC.h \ $(TAO_ROOT)/tao/corba.h \ @@ -985,8 +1345,10 @@ realclean: clean $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ - RtecSchedulerC.i RtecSchedulerS.h RtecSchedulerS.i -.obj/RtecSchedulerS.o .obj/RtecSchedulerS.so .shobj/RtecSchedulerS.o .shobj/RtecSchedulerS.so: RtecSchedulerS.cpp RtecSchedulerS.h RtecSchedulerC.h \ + orbsvcs_export.h CosTimeBaseC.h CosTimeBaseC.i RtecSchedulerC.i \ + RtecSchedulerS.h CosTimeBaseS.h CosTimeBaseS.i RtecSchedulerS.i +.obj/RtecSchedulerS.o .obj/RtecSchedulerS.so .shobj/RtecSchedulerS.o .shobj/RtecSchedulerS.so: RtecSchedulerS.cpp RtecSchedulerS.h CosTimeBaseS.h \ + CosTimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ @@ -1162,6 +1524,7 @@ realclean: clean $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ + orbsvcs_export.h CosTimeBaseC.i CosTimeBaseS.i RtecSchedulerC.h \ RtecSchedulerC.i RtecSchedulerS.i .obj/RtecEventChannelAdminC.o .obj/RtecEventChannelAdminC.so .shobj/RtecEventChannelAdminC.o .shobj/RtecEventChannelAdminC.so: RtecEventChannelAdminC.cpp \ RtecEventChannelAdminC.h \ @@ -1340,12 +1703,13 @@ realclean: clean $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ - RtecEventCommC.h RtecEventCommC.i RtecSchedulerC.h RtecSchedulerC.i \ - RtecEventChannelAdminC.i RtecEventChannelAdminS.h RtecEventCommS.h \ - RtecEventCommS.i RtecSchedulerS.h RtecSchedulerS.i \ - RtecEventChannelAdminS.i + orbsvcs_export.h CosTimeBaseC.h CosTimeBaseC.i RtecEventCommC.h \ + RtecEventCommC.i RtecSchedulerC.h RtecSchedulerC.i \ + RtecEventChannelAdminC.i RtecEventChannelAdminS.h CosTimeBaseS.h \ + CosTimeBaseS.i RtecEventCommS.h RtecEventCommS.i RtecSchedulerS.h \ + RtecSchedulerS.i RtecEventChannelAdminS.i .obj/RtecEventChannelAdminS.o .obj/RtecEventChannelAdminS.so .shobj/RtecEventChannelAdminS.o .shobj/RtecEventChannelAdminS.so: RtecEventChannelAdminS.cpp \ - RtecEventChannelAdminS.h RtecEventCommS.h RtecEventCommC.h \ + RtecEventChannelAdminS.h CosTimeBaseS.h CosTimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ @@ -1521,9 +1885,11 @@ realclean: clean $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ - RtecEventCommC.i RtecEventCommS.i RtecSchedulerS.h RtecSchedulerC.h \ - RtecSchedulerC.i RtecSchedulerS.i RtecEventChannelAdminC.h \ - RtecEventChannelAdminC.i RtecEventChannelAdminS.i + orbsvcs_export.h CosTimeBaseC.i CosTimeBaseS.i RtecEventCommS.h \ + RtecEventCommC.h RtecEventCommC.i RtecEventCommS.i RtecSchedulerS.h \ + RtecSchedulerC.h RtecSchedulerC.i RtecSchedulerS.i \ + RtecEventChannelAdminC.h RtecEventChannelAdminC.i \ + RtecEventChannelAdminS.i .obj/LoggerC.o .obj/LoggerC.so .shobj/LoggerC.o .shobj/LoggerC.so: LoggerC.cpp LoggerC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ @@ -1700,7 +2066,7 @@ realclean: clean $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ - LoggerC.i LoggerS.h LoggerS.i + orbsvcs_export.h LoggerC.i LoggerS.h LoggerS.i .obj/LoggerS.o .obj/LoggerS.so .shobj/LoggerS.o .shobj/LoggerS.so: LoggerS.cpp LoggerS.h LoggerC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ @@ -1877,7 +2243,7 @@ realclean: clean $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ - LoggerC.i LoggerS.i + orbsvcs_export.h LoggerC.i LoggerS.i .obj/Event_Utilities.o .obj/Event_Utilities.so .shobj/Event_Utilities.o .shobj/Event_Utilities.so: Event_Utilities.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ @@ -2056,12 +2422,17 @@ realclean: clean $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i .obj/Scheduler_Factory.o .obj/Scheduler_Factory.so .shobj/Scheduler_Factory.o .shobj/Scheduler_Factory.so: Scheduler_Factory.cpp \ $(ACE_ROOT)/ace/OS.h \ @@ -2081,7 +2452,8 @@ realclean: clean $(ACE_ROOT)/ace/Log_Record.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ @@ -2242,6 +2614,10 @@ realclean: clean $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.i \ @@ -2250,7 +2626,9 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i .obj/Runtime_Scheduler.o .obj/Runtime_Scheduler.so .shobj/Runtime_Scheduler.o .shobj/Runtime_Scheduler.so: Runtime_Scheduler.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \ + $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ @@ -2266,9 +2644,6 @@ realclean: clean $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/SOCK_Stream.h \ @@ -2428,6 +2803,14 @@ realclean: clean $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.i @@ -2609,8 +2992,192 @@ realclean: clean $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Utilities.i +.obj/Time_Utilities.o .obj/Time_Utilities.so .shobj/Time_Utilities.o .shobj/Time_Utilities.so: Time_Utilities.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Version.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.i \ + $(TAO_ROOT)/tao/compat/objbase.h \ + $(TAO_ROOT)/tao/compat/initguid.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(TAO_ROOT)/tao/orb.h \ + $(TAO_ROOT)/tao/align.h \ + $(TAO_ROOT)/tao/corbacom.h \ + $(TAO_ROOT)/tao/sequence.h \ + $(TAO_ROOT)/tao/sequence.i \ + $(TAO_ROOT)/tao/sequence_T.h \ + $(TAO_ROOT)/tao/sequence_T.i \ + $(TAO_ROOT)/tao/objkeyC.h \ + $(TAO_ROOT)/tao/objkeyC.i \ + $(TAO_ROOT)/tao/any.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/client_factory.h \ + $(TAO_ROOT)/tao/server_factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/strategy_T.h \ + $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/except.h \ + $(TAO_ROOT)/tao/orbobj.h \ + $(TAO_ROOT)/tao/nvlist.h \ + $(TAO_ROOT)/tao/object.h \ + $(TAO_ROOT)/tao/principa.h \ + $(TAO_ROOT)/tao/request.h \ + $(TAO_ROOT)/tao/svrrqst.h \ + $(TAO_ROOT)/tao/typecode.h \ + $(TAO_ROOT)/tao/marshal.h \ + $(TAO_ROOT)/tao/cdr.h \ + $(TAO_ROOT)/tao/stub.h \ + $(TAO_ROOT)/tao/poa.h \ + $(TAO_ROOT)/tao/poaC.h \ + $(TAO_ROOT)/tao/poaC.i \ + $(TAO_ROOT)/tao/servant_base.h \ + $(TAO_ROOT)/tao/poaS.h \ + $(TAO_ROOT)/tao/poaS.i \ + $(TAO_ROOT)/tao/objtable.h \ + $(TAO_ROOT)/tao/connect.h \ + $(TAO_ROOT)/tao/orb_core.h \ + $(TAO_ROOT)/tao/optable.h \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/iiopobj.h \ + $(TAO_ROOT)/tao/iioporb.h \ + $(TAO_ROOT)/tao/giop.h \ + $(TAO_ROOT)/tao/orb_core.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(TAO_ROOT)/tao/corbacom.i \ + $(TAO_ROOT)/tao/typecode.i \ + $(TAO_ROOT)/tao/nvlist.i \ + $(TAO_ROOT)/tao/any.i \ + $(TAO_ROOT)/tao/stub.i \ + $(TAO_ROOT)/tao/object.i \ + $(TAO_ROOT)/tao/orbobj.i \ + $(TAO_ROOT)/tao/marshal.i \ + $(TAO_ROOT)/tao/cdr.i \ + $(TAO_ROOT)/tao/giop.i \ + $(TAO_ROOT)/tao/iioporb.i \ + $(TAO_ROOT)/tao/iiopobj.i \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/server_factory.i \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.i \ + $(TAO_ROOT)/tao/connect.i \ + $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i .obj/tmplinst.o .obj/tmplinst.so .shobj/tmplinst.o .shobj/tmplinst.so: tmplinst.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/tao/corba.h \ @@ -2788,8 +3355,11 @@ realclean: clean $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ diff --git a/TAO/orbsvcs/orbsvcs/RtecEventComm.idl b/TAO/orbsvcs/orbsvcs/RtecEventComm.idl index 4b060aad8c2..732a0cfb6ed 100644 --- a/TAO/orbsvcs/orbsvcs/RtecEventComm.idl +++ b/TAO/orbsvcs/orbsvcs/RtecEventComm.idl @@ -2,6 +2,8 @@ // $Id$ // +#include "CosTimeBase.idl" + module RtecEventComm { // = TITLE @@ -30,11 +32,7 @@ module RtecEventComm { }; #endif - // @@ TODO: Use CosTimeService? - // The current definition (double) is a TOTAL HACK, we store a - // <long long> here just because it fits; unfortunately <long long> - // is not fully supported in the IDL compiler (yet). - typedef double Time; + typedef TimeBase::TimeT Time; typedef long EventSourceID; typedef long EventType; diff --git a/TAO/orbsvcs/orbsvcs/RtecScheduler.idl b/TAO/orbsvcs/orbsvcs/RtecScheduler.idl index e0d2ea9fa0f..fe7edec0234 100644 --- a/TAO/orbsvcs/orbsvcs/RtecScheduler.idl +++ b/TAO/orbsvcs/orbsvcs/RtecScheduler.idl @@ -2,14 +2,15 @@ // $Id$ // +#include "CosTimeBase.idl" + module RtecScheduler { - // TODO: Use the COS Time Service TimeT type. - typedef double Time; - typedef long Period; + typedef TimeBase::TimeT Time; typedef Time Quantum; - const long NO_QUANTUM = 0; + typedef long Period; + // @@ What are the units for this? // // TODO: This differ from the ones documented in the TAO paper, diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp index 190927faa5b..1994a1769ea 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp @@ -4,6 +4,7 @@ // // ============================================================================ +#include "orbsvcs/Time_Utilities.h" #include "orbsvcs/Runtime_Scheduler.h" #if defined (__ACE_INLINE__) @@ -59,12 +60,12 @@ ACE_Runtime_Scheduler::get (RtecScheduler::handle_t handle, } void ACE_Runtime_Scheduler::set (RtecScheduler::handle_t handle, - RtecScheduler::Time time, - RtecScheduler::Time typical_time, - RtecScheduler::Time cached_time, + const RtecScheduler::Time &time, + const RtecScheduler::Time &typical_time, + const RtecScheduler::Time &cached_time, RtecScheduler::Period period, RtecScheduler::Importance importance, - RtecScheduler::Quantum quantum, + const RtecScheduler::Quantum &quantum, CORBA::Long threads, CORBA::Environment &_env) TAO_THROW_SPEC ((CORBA::SystemException, diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h index 698393880a8..cf2e642d029 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h @@ -40,12 +40,12 @@ public: TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); virtual void set (RtecScheduler::handle_t handle, - RtecScheduler::Time time, - RtecScheduler::Time typical_time, - RtecScheduler::Time cached_time, + const RtecScheduler::Time &time, + const RtecScheduler::Time &typical_time, + const RtecScheduler::Time &cached_time, RtecScheduler::Period period, RtecScheduler::Importance importance, - RtecScheduler::Quantum quantum, + const RtecScheduler::Quantum &quantum, CORBA::Long threads, CORBA::Environment &_env) TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp new file mode 100644 index 00000000000..485435edfb1 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp @@ -0,0 +1,10 @@ +// +// $Id$ +// +#include "orbsvcs/Time_Utilities.h" + +#if !defined (__ACE_INLINE__) +#include "orbsvcs/Time_Utilities.i" +#endif /* __ACE_INLINE__ */ + +TimeBase::TimeT ORBSVCS_Time::zero = {0, 0}; diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.h b/TAO/orbsvcs/orbsvcs/Time_Utilities.h new file mode 100644 index 00000000000..f11d58675d3 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.h @@ -0,0 +1,74 @@ +/* -*- C++ -*- */ +// +// $Id$ +// + +#ifndef ORBSVCS_TIME_UTILITIES_H +#define ORBSVCS_TIME_UTILITIES_H + +#include "orbsvcs/CosTimeBaseC.h" + +class ORBSVCS_Time +{ + // = TITLE + // Time conversion utilities. + // + // = DESCRIPTION + // This class define several static methods to convert between + // several time structures and the CORBA TimeT structure. + // + // Recall that TimeT stores time in a 64-bit long long (or + // structure when that is not available) and uses hundreds of + // nanoseconds as time units (i.e. 1 second is 10^7 TimeT units). + // +public: + + // = A helper constant, IDL does not have constant for structures. + static TimeBase::TimeT zero; + + // = ACE_hrtime_t conversion routines, we interpret an ACE_hrtime_t + // as nanoseconds. + static void + hrtime_to_TimeT (TimeBase::TimeT& lhs, + ACE_hrtime_t rhs); + static void + TimeT_to_hrtime (ACE_hrtime_t &lhs, + const TimeBase::TimeT& rhs); + static ACE_hrtime_t + to_hrtime (const TimeBase::TimeT& t); + + // = ACE_Time_Value conversion routines, recall that they are + // <seconds,useconds> pairs. + static void + Time_Value_to_TimeT (TimeBase::TimeT& lhs, + const ACE_Time_Value& rhs); + static void + TimeT_to_Time_Value (ACE_Time_Value& lrs, + const TimeBase::TimeT& rhs); + static ACE_Time_Value + to_Time_Value (const TimeBase::TimeT& rhs); +}; + +#if !defined (__ACE_INLINE__) + +extern int operator== (const TimeBase::TimeT &lhs, + const TimeBase::TimeT &rhs); +extern int operator!= (const TimeBase::TimeT &lhs, + const TimeBase::TimeT &rhs); +extern int operator< (const TimeBase::TimeT &lhs, + const TimeBase::TimeT &rhs); +extern int operator<= (const TimeBase::TimeT &lhs, + const TimeBase::TimeT &rhs); +extern int operator< (const TimeBase::TimeT &lhs, + const TimeBase::TimeT &rhs); +extern int operator> (const TimeBase::TimeT &lhs, + const TimeBase::TimeT &rhs); +extern int operator>= (const TimeBase::TimeT &lhs, + const TimeBase::TimeT &rhs); + +#else /* defined (__ACE_INLINE__) */ +#include "orbsvcs/Time_Utilities.i" +#endif /* __ACE_INLINE__ */ + +#endif /* ORBSVCS_TIME_UTILITIES_H */ + diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.i b/TAO/orbsvcs/orbsvcs/Time_Utilities.i new file mode 100644 index 00000000000..9422a405bbf --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.i @@ -0,0 +1,105 @@ +// +// $Id$ +// + +ACE_INLINE void +ORBSVCS_Time::TimeT_to_hrtime (ACE_hrtime_t &lhs, + const TimeBase::TimeT& rhs) +{ + lhs = rhs.high; + lhs <<= 32; + lhs |= rhs.low; + lhs *= 100; +} + +ACE_INLINE void +ORBSVCS_Time::hrtime_to_TimeT (TimeBase::TimeT& lhs, + ACE_hrtime_t rhs) +{ + ACE_UINT64 t = rhs / 100; // convert to 100ns + ACE_UINT32 mask = ~0L; + lhs.low = t & mask; + lhs.high = t >> 32; +} + +ACE_INLINE ACE_hrtime_t +ORBSVCS_Time::to_hrtime (const TimeBase::TimeT& t) +{ + ACE_hrtime_t r; + ORBSVCS_Time::TimeT_to_hrtime (r, t); + return r; +} + +ACE_INLINE void +ORBSVCS_Time::Time_Value_to_TimeT (TimeBase::TimeT& lhs, + const ACE_Time_Value& rhs) +{ + ACE_hrtime_t t = rhs.sec () * ACE_ONE_SECOND_IN_NSECS + rhs.usec () * 1000; + ORBSVCS_Time::hrtime_to_TimeT (lhs, t); +} + +ACE_INLINE void +ORBSVCS_Time::TimeT_to_Time_Value (ACE_Time_Value& lhs, + const TimeBase::TimeT& rhs) +{ + ACE_hrtime_t t; + + ORBSVCS_Time::TimeT_to_hrtime (t, rhs); + + lhs.set ((t / ACE_ONE_SECOND_IN_NSECS), + (t % ACE_ONE_SECOND_IN_NSECS) / 1000); +} + +ACE_INLINE ACE_Time_Value +ORBSVCS_Time::to_Time_Value (const TimeBase::TimeT& t) +{ + ACE_Time_Value r; + ORBSVCS_Time::TimeT_to_Time_Value (r, t); + return r; +} + +ACE_INLINE int +operator== (const TimeBase::TimeT &lhs, + const TimeBase::TimeT &rhs) +{ + return (lhs.low == rhs.low + && lhs.high == rhs.high); +} + +ACE_INLINE int +operator!= (const TimeBase::TimeT &lhs, + const TimeBase::TimeT &rhs) +{ + return !(lhs == rhs); +} + +ACE_INLINE int +operator< (const TimeBase::TimeT &lhs, + const TimeBase::TimeT &rhs) +{ + return (lhs.high < rhs.high + || (lhs.high == rhs.high && lhs.low < rhs.low)); +} + +ACE_INLINE int +operator<= (const TimeBase::TimeT &lhs, + const TimeBase::TimeT &rhs) +{ + return (lhs.high < rhs.high + || (lhs.high == rhs.high && lhs.low <= rhs.low)); +} + +ACE_INLINE int +operator> (const TimeBase::TimeT &lhs, + const TimeBase::TimeT &rhs) +{ + return !(rhs <= lhs); +} + +ACE_INLINE int +operator>= (const TimeBase::TimeT &lhs, + const TimeBase::TimeT &rhs) +{ + return !(rhs < lhs); +} + diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index 42b448ca861..141ffb0845a 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -8,6 +8,7 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event_Service_Constants.h" #include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/Time_Utilities.h" #include "orbsvcs/RtecEventChannelAdminC.h" #include "EC_Multiple.h" @@ -249,10 +250,14 @@ Test_ECP::connect_supplier (RtecEventChannelAdmin::EventChannel_ptr local_ec, server->create (buf, TAO_TRY_ENV); TAO_CHECK_ENV; - server->set (rt_info, 1, 1, 1, + server->set (rt_info, + ORBSVCS_Time::zero, + ORBSVCS_Time::zero, + ORBSVCS_Time::zero, this->interval_ * 10000, // @@ Make it parametric RtecScheduler::VERY_LOW, - RtecScheduler::NO_QUANTUM, 1, + ORBSVCS_Time::zero, + 1, TAO_TRY_ENV); TAO_CHECK_ENV; @@ -311,19 +316,27 @@ Test_ECP::connect_consumer (RtecEventChannelAdmin::EventChannel_ptr local_ec, server->create (buf, TAO_TRY_ENV); TAO_CHECK_ENV; - server->set (rt_info, 1, 1, 1, + server->set (rt_info, + ORBSVCS_Time::zero, + ORBSVCS_Time::zero, + ORBSVCS_Time::zero, this->interval_ * 10000, // @@ Make it parametric RtecScheduler::VERY_LOW, - RtecScheduler::NO_QUANTUM, 1, + ORBSVCS_Time::zero, + 1, TAO_TRY_ENV); TAO_CHECK_ENV; + ACE_Time_Value tv_timeout (0, this->interval_ * 1000); + TimeBase::TimeT timeout; + ORBSVCS_Time::Time_Value_to_TimeT (timeout, tv_timeout); + ACE_ConsumerQOS_Factory qos; qos.start_disjunction_group (); qos.insert_type (ACE_ES_EVENT_SHUTDOWN, rt_info); qos.insert_time (ACE_ES_EVENT_INTERVAL_TIMEOUT, - this->interval_ * 10000, + timeout, rt_info); qos.insert_type (ACE_ES_EVENT_UNDEFINED + this->event_a_, rt_info); @@ -376,10 +389,14 @@ Test_ECP::connect_ecp (RtecEventChannelAdmin::EventChannel_ptr local_ec, server->create (rmt, TAO_TRY_ENV); TAO_CHECK_ENV; - server->set (rmt_info, 1, 1, 1, + server->set (rmt_info, + ORBSVCS_Time::zero, + ORBSVCS_Time::zero, + ORBSVCS_Time::zero, this->interval_ * 10000, RtecScheduler::VERY_LOW, - RtecScheduler::NO_QUANTUM, 1, + ORBSVCS_Time::zero, + 1, TAO_TRY_ENV); TAO_CHECK_ENV; @@ -400,10 +417,14 @@ Test_ECP::connect_ecp (RtecEventChannelAdmin::EventChannel_ptr local_ec, server->create (lcl, TAO_TRY_ENV); TAO_CHECK_ENV; - server->set (lcl_info, 1, 1, 1, + server->set (lcl_info, + ORBSVCS_Time::zero, + ORBSVCS_Time::zero, + ORBSVCS_Time::zero, this->interval_ * 10000, RtecScheduler::VERY_LOW, - RtecScheduler::NO_QUANTUM, 1, + ORBSVCS_Time::zero, + 1, TAO_TRY_ENV); TAO_CHECK_ENV; @@ -478,10 +499,9 @@ Test_ECP::push (const RtecEventComm::EventSet &events, // @@ TOTAL HACK ACE_hrtime_t t = ACE_OS::gethrtime (); - ACE_OS::memcpy (&s.creation_time_, &t, - sizeof (s.creation_time_)); - s.ec_recv_time_ = 0; - s.ec_send_time_ = 0; + ORBSVCS_Time::hrtime_to_TimeT (s.creation_time_, t); + s.ec_recv_time_ = ORBSVCS_Time::zero; + s.ec_send_time_ = ORBSVCS_Time::zero; s.data_.x = 0; s.data_.y = 0; diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile b/TAO/orbsvcs/tests/EC_Multiple/Makefile index 6b37bf1a0b1..6092f1e28ce 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/Makefile +++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile @@ -249,12 +249,16 @@ EC_Multiple: $(addprefix $(VDIR),$(EC_MULTIPLE_OBJS) $(EC_MULTIPLE_CONFIG_OBJS)) $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ @@ -262,6 +266,8 @@ EC_Multiple: $(addprefix $(VDIR),$(EC_MULTIPLE_OBJS) $(EC_MULTIPLE_CONFIG_OBJS)) $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ EC_Multiple.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.i diff --git a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp index 0a60d93ddc8..0e0fffa3e24 100644 --- a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp +++ b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp @@ -13,6 +13,7 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Event_Service_Constants.h" #include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/Time_Utilities.h" #include "orbsvcs/RtecEventChannelAdminC.h" #include "Event_Latency.h" @@ -27,7 +28,7 @@ static const char usage [] = "[-? |\n" // Configuration parameters. static u_int consumers = 1; static u_int suppliers = 1; -static u_int total_messages = 1000; +static u_int total_messages = 10; static int measure_jitter = 0; static u_int timeout_interval = 250; // msec @@ -71,9 +72,13 @@ Latency_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, rt_info_ = server->create (my_name, TAO_TRY_ENV); server->set (rt_info_, - 1, 1, 1, 0, + ORBSVCS_Time::zero, + ORBSVCS_Time::zero, + ORBSVCS_Time::zero, + 0, RtecScheduler::VERY_LOW, - RtecScheduler::NO_QUANTUM, 1, + ORBSVCS_Time::zero, + 1, TAO_TRY_ENV); // Create the event that we're registering for. @@ -158,18 +163,17 @@ Latency_Consumer::push (const RtecEventComm::EventSet &events, { if (measure_jitter_) { - // @@ TOTAL HACK ACE_hrtime_t creation; - ACE_OS::memcpy (&creation, &events[i].creation_time_, - sizeof (creation)); + ORBSVCS_Time::TimeT_to_hrtime (creation, + events[i].creation_time_); ACE_hrtime_t ec_recv; - ACE_OS::memcpy (&ec_recv, &events[i].ec_recv_time_, - sizeof (ec_recv)); + ORBSVCS_Time::TimeT_to_hrtime (ec_recv, + events[i].ec_recv_time_); ACE_hrtime_t ec_send; - ACE_OS::memcpy (&ec_send, &events[i].ec_send_time_, - sizeof (ec_send)); + ORBSVCS_Time::TimeT_to_hrtime (ec_send, + events[i].ec_send_time_); const ACE_hrtime_t now = ACE_OS::gethrtime (); const ACE_hrtime_t elapsed = now - creation; @@ -357,9 +361,14 @@ Latency_Supplier::open_supplier (RtecEventChannelAdmin::EventChannel_ptr ec, this->rt_info_ = server->create (name, TAO_TRY_ENV); - server->set (rt_info_, 1, 1, 1, timeout_interval * 10000, + server->set (rt_info_, + ORBSVCS_Time::zero, + ORBSVCS_Time::zero, + ORBSVCS_Time::zero, + timeout_interval * 10000, RtecScheduler::VERY_LOW, - RtecScheduler::NO_QUANTUM, 1, + ORBSVCS_Time::zero, + 1, TAO_TRY_ENV); TAO_CHECK_ENV; @@ -419,10 +428,25 @@ Latency_Supplier::start_generating_events (void) TAO_TRY { + ACE_Time_Value tv_timeout (0, timeout_interval * 1000); + TimeBase::TimeT timeout; + ORBSVCS_Time::Time_Value_to_TimeT (timeout, tv_timeout); + + ACE_DEBUG ((LM_DEBUG, + "start generating events: " + "timeout.low = %d " + "timeout.high = %d " + "interval = %d " + "tv.msec () = %d\n", + timeout.low, + timeout.high, + timeout_interval, + tv_timeout.msec ())); + ACE_ConsumerQOS_Factory dependencies; dependencies.start_disjunction_group (); dependencies.insert_time (ACE_ES_EVENT_INTERVAL_TIMEOUT, - timeout_interval * 10000, + timeout, rt_info_); if (!master_) dependencies.insert_type (ACE_ES_EVENT_SHUTDOWN, rt_info_); @@ -493,11 +517,8 @@ Latency_Supplier::push (const RtecEventComm::EventSet &events, // event.time_.set (now / ACE_ONE_SECOND_IN_NSECS, // (now % ACE_ONE_SECOND_IN_NSECS) / 1000); - // @@ TOTAL HACK - // event_push_time = ACE_OS::gethrtime (); ACE_hrtime_t t = ACE_OS::gethrtime (); - ACE_OS::memcpy (&event.creation_time_, &t, - sizeof (event.creation_time_)); + ORBSVCS_Time::hrtime_to_TimeT (event.creation_time_, t); } // @@ ACE_TIMEPROBE_RESET; diff --git a/TAO/orbsvcs/tests/Event_Latency/Makefile b/TAO/orbsvcs/tests/Event_Latency/Makefile index aa0fba18ca5..2e864ea8f04 100644 --- a/TAO/orbsvcs/tests/Event_Latency/Makefile +++ b/TAO/orbsvcs/tests/Event_Latency/Makefile @@ -254,12 +254,17 @@ Event_Latency: $(addprefix $(VDIR),$(EVENT_LATENCY_OBJS) $(EVENT_LATENCY_CONFIG_ $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ @@ -267,6 +272,8 @@ Event_Latency: $(addprefix $(VDIR),$(EVENT_LATENCY_OBJS) $(EVENT_LATENCY_CONFIG_ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ Event_Latency.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/orbsvcs/tests/Logger/Makefile b/TAO/orbsvcs/tests/Logger/Makefile index b1b450e350e..dc1944d37a8 100644 --- a/TAO/orbsvcs/tests/Logger/Makefile +++ b/TAO/orbsvcs/tests/Logger/Makefile @@ -86,11 +86,11 @@ realclean: clean # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. .obj/logger_i.o .obj/logger_i.so .shobj/logger_i.o .shobj/logger_i.so: logger_i.cpp \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS.i \ @@ -262,6 +262,7 @@ realclean: clean $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerC.i \ logger_i.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS.h \ diff --git a/TAO/orbsvcs/tests/Simple_Naming/Makefile b/TAO/orbsvcs/tests/Simple_Naming/Makefile index 60cf834d7c6..b24fafcb44b 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/Makefile +++ b/TAO/orbsvcs/tests/Simple_Naming/Makefile @@ -219,6 +219,7 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_O $(TAO_ROOT)/tao/connect.i \ $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY |