diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp | 54 |
1 files changed, 22 insertions, 32 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp index bafa3df4aaa..8fdf9cde9ee 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp @@ -33,8 +33,8 @@ ACE_Config_Scheduler::~ACE_Config_Scheduler (void) } RtecScheduler::handle_t -ACE_Config_Scheduler::create (const char * entry_point, - CORBA::Environment &) +ACE_Config_Scheduler::create (const char * entry_point + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME)) { @@ -85,8 +85,8 @@ ACE_Config_Scheduler::create (const char * entry_point, } RtecScheduler::handle_t -ACE_Config_Scheduler::lookup (const char * entry_point, - CORBA::Environment &) +ACE_Config_Scheduler::lookup (const char * entry_point + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecScheduler::RT_Info* rt_info = 0; @@ -107,8 +107,8 @@ ACE_Config_Scheduler::lookup (const char * entry_point, } RtecScheduler::RT_Info* -ACE_Config_Scheduler::get (RtecScheduler::handle_t handle, - CORBA::Environment &) +ACE_Config_Scheduler::get (RtecScheduler::handle_t handle + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { @@ -143,8 +143,8 @@ void ACE_Config_Scheduler::set (RtecScheduler::handle_t handle, RtecScheduler::Importance_t importance, RtecScheduler::Quantum_t quantum, CORBA::Long threads, - RtecScheduler::Info_Type_t info_type, - CORBA::Environment &) + RtecScheduler::Info_Type_t info_type + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { @@ -175,14 +175,12 @@ void ACE_Config_Scheduler::set (RtecScheduler::handle_t handle, void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, - RtecScheduler::Preemption_Priority_t& p_priority, - CORBA::Environment &TAO_IN_ENV) + RtecScheduler::Preemption_Priority_t& p_priority + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)) { - ACE_UNUSED_ARG (TAO_IN_ENV); - if (impl->priority (handle, priority, p_subpriority, p_priority) == -1) { ACE_ERROR ((LM_ERROR, @@ -194,28 +192,26 @@ void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle, void ACE_Config_Scheduler::entry_point_priority (const char * entry_point, RtecScheduler::OS_Priority& priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, - RtecScheduler::Preemption_Priority_t& p_priority, - CORBA::Environment &TAO_IN_ENV) + RtecScheduler::Preemption_Priority_t& p_priority + TAO_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)) { - this->priority (lookup (entry_point, TAO_IN_ENV), - priority, p_subpriority, p_priority, - TAO_IN_ENV); + this->priority (lookup (entry_point TAO_ENV_ARG_PARAMETER), + priority, p_subpriority, p_priority + TAO_ENV_ARG_PARAMETER); } void ACE_Config_Scheduler::add_dependency (RtecScheduler::handle_t handle, RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t - dependency_type, - CORBA::Environment &TAO_IN_ENV) + dependency_type + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { - ACE_UNUSED_ARG (TAO_IN_ENV); - RtecScheduler::RT_Info* rt_info = 0; switch (impl->lookup_rt_info (handle, rt_info)) { @@ -247,15 +243,13 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority, CORBA::Long maximum_priority, RtecScheduler::RT_Info_Set_out infos, RtecScheduler::Config_Info_Set_out configs, - RtecScheduler::Scheduling_Anomaly_Set_out anomalies, - CORBA::Environment &TAO_IN_ENV) + RtecScheduler::Scheduling_Anomaly_Set_out anomalies + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UTILIZATION_BOUND_EXCEEDED, RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS, RtecScheduler::TASK_COUNT_MISMATCH)) { - ACE_UNUSED_ARG (TAO_IN_ENV); - // Initialize the scheduler implementation. impl->init (minimum_priority, maximum_priority); @@ -450,14 +444,12 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority, void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, RtecScheduler::OS_Priority& priority, - RtecScheduler::Dispatching_Type_t & d_type, - CORBA::Environment &TAO_IN_ENV) + RtecScheduler::Dispatching_Type_t & d_type + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED, RtecScheduler::UNKNOWN_PRIORITY_LEVEL)) { - ACE_UNUSED_ARG (TAO_IN_ENV); - if (impl->dispatch_configuration (p_priority, priority, d_type) == -1) { ACE_ERROR ((LM_ERROR, @@ -470,12 +462,10 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri RtecScheduler::Preemption_Priority_t -ACE_Config_Scheduler::last_scheduled_priority (CORBA::Environment &TAO_IN_ENV) +ACE_Config_Scheduler::last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED)) { - ACE_UNUSED_ARG (TAO_IN_ENV); - RtecScheduler::Preemption_Priority_t priority = impl->minimum_priority_queue (); if (priority < 0) |