diff options
| author | venkita <venkita@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-01 16:53:31 +0000 |
|---|---|---|
| committer | venkita <venkita@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-01 16:53:31 +0000 |
| commit | c68211f7fad5b8d9adeb565dce8ff65ca74ed02f (patch) | |
| tree | 25399f584c56d152c0c41141c3134891b1076055 | |
| parent | 5aef22f685f01040a9e155bc4226d8fca454ffe3 (diff) | |
| download | ATCD-c68211f7fad5b8d9adeb565dce8ff65ca74ed02f.tar.gz | |
Sat Nov 1 09:56:10 2003 Venkita Subramonian <venkita@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp | 57 |
2 files changed, 33 insertions, 29 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 8e975428907..695292183f8 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Sat Nov 1 09:56:10 2003 Venkita Subramonian <venkita@cs.wustl.edu> + + * orbsvcs/examples/RtEC/Kokyu/Service.cpp: Added fixes to get rid + of link errors in Debian_NoInterceptor build. + Sat Nov 1 05:40:21 UTC 2003 Don Hinton <dhinton@dresystems.com> * examples/Buffered_Oneways/server.cpp: diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp index c0f6314a1b3..44eea79510d 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp @@ -2,8 +2,8 @@ #include "orbsvcs/Sched/Reconfig_Scheduler.h" #include "orbsvcs/Runtime_Scheduler.h" -#include "orbsvcs/Event/Module_Factory.h" -#include "orbsvcs/Event/Event_Channel.h" +//#include "orbsvcs/Event/Module_Factory.h" +//#include "orbsvcs/Event/Event_Channel.h" #include "orbsvcs/Event_Service_Constants.h" #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Scheduler_Factory.h" @@ -21,7 +21,7 @@ ACE_RCSID(EC_Examples, Service, "$Id$") -namespace +namespace { int config_run = 0; ACE_CString sched_type ="rms"; @@ -171,9 +171,9 @@ main (int argc, char* argv[]) consumer_qos1.insert_type (ACE_ES_EVENT_UNDEFINED, consumer1_rt_info); - RtecEventChannelAdmin::ConsumerQOS qos = - consumer_qos1.get_ConsumerQOS (); -/* + RtecEventChannelAdmin::ConsumerQOS qos = + consumer_qos1.get_ConsumerQOS (); +/* for (int i=0;i<qos.dependencies.length (); ++i) { ACE_DEBUG ((LM_DEBUG, @@ -211,13 +211,13 @@ main (int argc, char* argv[]) ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "connecting consumers\n")); - ACE_DEBUG ((LM_DEBUG, "connecting consumer1\n")); + ACE_DEBUG ((LM_DEBUG, "connecting consumer1\n")); supplier_proxy1->connect_push_consumer (consumer1.in (), consumer_qos1.get_ConsumerQOS () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - ACE_DEBUG ((LM_DEBUG, "connecting consumer2\n")); + ACE_DEBUG ((LM_DEBUG, "connecting consumer2\n")); supplier_proxy2->connect_push_consumer (consumer2.in (), consumer_qos2.get_ConsumerQOS () ACE_ENV_ARG_PARAMETER); @@ -271,7 +271,7 @@ main (int argc, char* argv[]) ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "connecting suppliers\n")); - ACE_DEBUG ((LM_DEBUG, "connecting supplier1\n")); + ACE_DEBUG ((LM_DEBUG, "connecting supplier1\n")); consumer_proxy1->connect_push_supplier (supplier1.in (), supplier_qos1.get_SupplierQOS () ACE_ENV_ARG_PARAMETER); @@ -411,43 +411,43 @@ main (int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG, "Printing intermediate results\n")); ACE_Scheduler_Factory::dump_schedule (infos.in (), dependencies.in (), - configs.in (), - unsafe_anomalies, - "schedule.out"); - + configs.in (), + unsafe_anomalies, + "schedule.out"); + // Obtain the range of valid priorities in the current // platform, the scheduler hard-code this values in the // generated file, but in the future we may just use the // "logical" priorities and define the mapping to OS // priorities at run-time. int min_os_priority = - ACE_Sched_Params::priority_min (ACE_SCHED_FIFO, - ACE_SCOPE_THREAD); + ACE_Sched_Params::priority_min (ACE_SCHED_FIFO, + ACE_SCOPE_THREAD); int max_os_priority = - ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, - ACE_SCOPE_THREAD); + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, + ACE_SCOPE_THREAD); scheduler->compute_scheduling (min_os_priority, - max_os_priority, - infos.out (), + max_os_priority, + infos.out (), dependencies.out (), - configs.out (), - anomalies.out () - ACE_ENV_ARG_PARAMETER); + configs.out (), + anomalies.out () + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + // Dump the schedule to a file.. ACE_Scheduler_Factory::dump_schedule (infos.in (), dependencies.in (), - configs.in (), - anomalies.in (), - "schedule.out"); + configs.in (), + anomalies.in (), + "schedule.out"); // **************************************************************** ACE_DEBUG ((LM_DEBUG, "Pushing events\n")); ACE_hthread_t thr_handle; ACE_Thread::self (thr_handle); - + int prio = ACE_Sched_Params::priority_max (ACE_SCHED_FIFO); ACE_OS::thr_setprio (thr_handle, prio); @@ -480,7 +480,7 @@ main (int argc, char* argv[]) // ACE_Time_Value rate (0, 10000); // ACE_OS::sleep (rate); // } - + ACE_DEBUG ((LM_DEBUG, "(%t) activating EC\n")); ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -652,4 +652,3 @@ template class TAO_RSE_SCC_Visitor<TAO_RMS_FAIR_Reconfig_Sched_Strategy, TAO_SYN #pragma instantiate TAO_RSE_SCC_Visitor<TAO_RMS_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> # endif /* __GNUC__ */ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - |