diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp | 124 |
1 files changed, 62 insertions, 62 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp index c9b727cc3e3..22449341278 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp @@ -88,7 +88,7 @@ TAO_Reconfig_Scheduler (int config_count, this->init (config_count, config_infos, rt_info_count, rt_infos, dependency_count, dependency_infos, - stability_flags, ACE_TRY_ENV); + stability_flags TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, corba_sysex) @@ -109,8 +109,8 @@ init (int config_count, ACE_Scheduler_Factory::POD_RT_Info rt_info[], int dependency_count, ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[], - u_long stability_flags, - CORBA::Environment &ACE_TRY_ENV) + u_long stability_flags + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME, RtecScheduler::UNKNOWN_TASK, @@ -124,7 +124,7 @@ init (int config_count, int result = 0; // Clear out the previous entries, if any. - this->close (ACE_TRY_ENV); + this->close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // (Re)initialize using the new settings. @@ -184,8 +184,8 @@ init (int config_count, for (int num_rt_infos = 0; num_rt_infos < rt_info_count; ++num_rt_infos) { new_rt_info = create_i (rt_info [num_rt_infos].entry_point, - rt_info [num_rt_infos].handle, - ACE_TRY_ENV); + rt_info [num_rt_infos].handle + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Fill in the portions to which the user has access. @@ -217,8 +217,8 @@ init (int config_count, add_dependency_i (dependency_info [dependency_count_].info_that_depends, dependency_info [dependency_count_].info_depended_on, dependency_info [dependency_count_].number_of_calls, - dependency_info [dependency_count_].dependency_type, - ACE_TRY_ENV); + dependency_info [dependency_count_].dependency_type + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -233,7 +233,7 @@ init (int config_count, // Closes the scheduler, releasing all current resources. template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void -TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (CORBA::Environment &ACE_TRY_ENV) +TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE)) @@ -305,8 +305,8 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (CORBA::Environ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> RtecScheduler::handle_t TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -create (const char *entry_point, - CORBA::Environment &ACE_TRY_ENV) +create (const char *entry_point + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME, RtecScheduler::INTERNAL, @@ -317,7 +317,7 @@ create (const char *entry_point, ACE_CHECK_RETURN (0); RtecScheduler::handle_t handle = next_handle_; - create_i (entry_point, handle, ACE_TRY_ENV); + create_i (entry_point, handle TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (handle); // Set affected stability flags. @@ -334,8 +334,8 @@ create (const char *entry_point, template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> RtecScheduler::handle_t TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -lookup (const char * entry_point, - CORBA::Environment &ACE_TRY_ENV) +lookup (const char * entry_point + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE)) @@ -345,7 +345,7 @@ lookup (const char * entry_point, ACE_CHECK_RETURN (0); RtecScheduler::handle_t handle; - handle = this->lookup_i (entry_point, ACE_TRY_ENV); + handle = this->lookup_i (entry_point TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (handle); return handle; @@ -357,8 +357,8 @@ lookup (const char * entry_point, template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> RtecScheduler::RT_Info * TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -get (RtecScheduler::handle_t handle, - CORBA::Environment &ACE_TRY_ENV) +get (RtecScheduler::handle_t handle + TAO_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE)) @@ -401,8 +401,8 @@ set (RtecScheduler::handle_t handle, RtecScheduler::Importance_t importance, RtecScheduler::Quantum_t quantum, CORBA::Long threads, - RtecScheduler::Info_Type_t info_type, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::Info_Type_t info_type + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::INTERNAL, @@ -505,8 +505,8 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: priority (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& subpriority, - RtecScheduler::Preemption_Priority_t& p_priority, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::Preemption_Priority_t& p_priority + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE, @@ -544,8 +544,8 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: entry_point_priority (const char * entry_point, RtecScheduler::OS_Priority& priority, RtecScheduler::Preemption_Subpriority_t& subpriority, - RtecScheduler::Preemption_Priority_t& p_priority, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::Preemption_Priority_t& p_priority + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE, @@ -556,14 +556,14 @@ entry_point_priority (const char * entry_point, ACE_CHECK; RtecScheduler::handle_t handle = - this->lookup_i (entry_point, ACE_TRY_ENV); + this->lookup_i (entry_point TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->priority_i (handle, priority, subpriority, - p_priority, - ACE_TRY_ENV); + p_priority + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -576,8 +576,8 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: add_dependency (RtecScheduler::handle_t handle /* RT_Info that has the dependency */, RtecScheduler::handle_t dependency /* RT_Info on which it depends */, CORBA::Long number_of_calls, - RtecScheduler::Dependency_Type_t dependency_type, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::Dependency_Type_t dependency_type + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::SYNCHRONIZATION_FAILURE, RtecScheduler::UNKNOWN_TASK)) @@ -588,7 +588,7 @@ add_dependency (RtecScheduler::handle_t handle /* RT_Info that has the dependenc // Delegate to the internal method. add_dependency_i (handle, dependency, number_of_calls, - dependency_type, ACE_TRY_ENV); + dependency_type TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Since the call graph topology has changed, set *all* @@ -610,8 +610,8 @@ 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 &ACE_TRY_ENV) + RtecScheduler::Scheduling_Anomaly_Set_out anomalies + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UTILIZATION_BOUND_EXCEEDED, RtecScheduler::SYNCHRONIZATION_FAILURE, @@ -640,16 +640,16 @@ compute_scheduling (CORBA::Long minimum_priority, if (this->stability_flags_ & SCHED_PROPAGATION_NOT_STABLE) { // Traverse dependency graph, assigning a topological ordering and identifying threads. - dfs_traverse_i (ACE_TRY_ENV); + dfs_traverse_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Sort an array of RT_info handles in topological order, check // for loops using the strongly connected components algorithm. - detect_cycles_i (ACE_TRY_ENV); + detect_cycles_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Propagate effective execution time and period, set total frame size. - propagate_characteristics_i (ACE_TRY_ENV); + propagate_characteristics_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -658,14 +658,14 @@ compute_scheduling (CORBA::Long minimum_priority, // Sort operations by urgency (done by strategy), then // assign priorities and subpriorities in one pass. // Sets last scheduled priority. - assign_priorities_i (ACE_TRY_ENV); + assign_priorities_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } if (this->stability_flags_ & SCHED_UTILIZATION_NOT_STABLE) { // Compute utilization, set last feasible priority. - compute_utilization_i (ACE_TRY_ENV); + compute_utilization_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -736,8 +736,8 @@ void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, RtecScheduler::OS_Priority& t_priority, - RtecScheduler::Dispatching_Type_t & d_type, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::Dispatching_Type_t & d_type + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED, RtecScheduler::SYNCHRONIZATION_FAILURE, @@ -773,7 +773,7 @@ dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> RtecScheduler::Preemption_Priority_t TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -last_scheduled_priority (CORBA::Environment &ACE_TRY_ENV) +last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::SYNCHRONIZATION_FAILURE, RtecScheduler::NOT_SCHEDULED)) @@ -802,8 +802,8 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> RtecScheduler::RT_Info * TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: create_i (const char *entry_point, - RtecScheduler::handle_t handle, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::handle_t handle + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME, RtecScheduler::INTERNAL)) @@ -985,8 +985,8 @@ set_i (RtecScheduler::RT_Info *rt_info, template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> RtecScheduler::handle_t TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -lookup_i (const char * entry_point, - CORBA::Environment &ACE_TRY_ENV) +lookup_i (const char * entry_point + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { @@ -1008,8 +1008,8 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: priority_i (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& subpriority, - RtecScheduler::Preemption_Priority_t& p_priority, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::Preemption_Priority_t& p_priority + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)) @@ -1040,8 +1040,8 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the dependency */, RtecScheduler::handle_t dependency /* RT_Info on which it depends */, CORBA::Long number_of_calls, - RtecScheduler::Dependency_Type_t dependency_type, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::Dependency_Type_t dependency_type + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL, RtecScheduler::UNKNOWN_TASK)) @@ -1064,8 +1064,8 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende dependency, // called handle calling_dependency_set_map_, // calling map number_of_calls, - dependency_type, - ACE_TRY_ENV); + dependency_type + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Add the called dependency map entry @@ -1073,8 +1073,8 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende handle, // calling handle called_dependency_set_map_, // called map number_of_calls, - dependency_type, - ACE_TRY_ENV); + dependency_type + TAO_ENV_ARG_PARAMETER); ACE_CHECK; break; @@ -1088,8 +1088,8 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende handle, // called handle calling_dependency_set_map_, // calling map number_of_calls, - dependency_type, - ACE_TRY_ENV); + dependency_type + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Add the called dependency map entry @@ -1097,8 +1097,8 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende dependency, // calling handle called_dependency_set_map_, // called map number_of_calls, - dependency_type, - ACE_TRY_ENV); + dependency_type + TAO_ENV_ARG_PARAMETER); ACE_CHECK; break; @@ -1123,8 +1123,8 @@ map_dependency_i (RtecScheduler::handle_t key, ACE_Equal_To<RtecScheduler::handle_t>, ACE_LOCK> & map, CORBA::Long number_of_calls, - RtecScheduler::Dependency_Type_t dependency_type, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::Dependency_Type_t dependency_type + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { @@ -1162,7 +1162,7 @@ map_dependency_i (RtecScheduler::handle_t key, // has_unresolved_remote_dependencies_, has_unresolved_local_dependencies_, template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -dfs_traverse_i (CORBA::Environment &ACE_TRY_ENV) +dfs_traverse_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL)) { @@ -1197,7 +1197,7 @@ dfs_traverse_i (CORBA::Environment &ACE_TRY_ENV) // checks for loops, marks unresolved remote dependencies. template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -detect_cycles_i (CORBA::Environment &ACE_TRY_ENV) +detect_cycles_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL, RtecScheduler::CYCLIC_DEPENDENCIES)) @@ -1237,7 +1237,7 @@ detect_cycles_i (CORBA::Environment &ACE_TRY_ENV) // Propagates effective execution time and period, sets total frame size. template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -propagate_characteristics_i (CORBA::Environment &ACE_TRY_ENV) +propagate_characteristics_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL, RtecScheduler::UNRESOLVED_LOCAL_DEPENDENCIES, @@ -1275,7 +1275,7 @@ propagate_characteristics_i (CORBA::Environment &ACE_TRY_ENV) // Sets last scheduled priority. template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -assign_priorities_i (CORBA::Environment &ACE_TRY_ENV) +assign_priorities_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL, RtecScheduler::DUPLICATE_NAME)) @@ -1383,7 +1383,7 @@ assign_priorities_i (CORBA::Environment &ACE_TRY_ENV) // Compute utilization, set last feasible priority. template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -compute_utilization_i (CORBA::Environment &ACE_TRY_ENV) +compute_utilization_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL)) { |