diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp | 78 |
1 files changed, 47 insertions, 31 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp index cfc7cfd332a..8f8e5497ece 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp @@ -15,10 +15,10 @@ // // ============================================================================ -#ifndef TAO_RECONFIG_SCHED_UTILS_T_CPP -#define TAO_RECONFIG_SCHED_UTILS_T_CPP +#ifndef TAO_RECONFIG_SCHED_UTILS_T_C +#define TAO_RECONFIG_SCHED_UTILS_T_C -#include "orbsvcs/Sched/Reconfig_Sched_Utils_T.h" +#include "Reconfig_Sched_Utils_T.h" #include "ace/Sched_Params.h" #include "ace/ACE.h" @@ -26,7 +26,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(Sched, Reconfig_Sched_Utils_T, "$Id$") //////////////////////////////// // TAO_RSE_Dependency_Visitor // @@ -122,7 +122,8 @@ visit (TAO_Reconfig_Scheduler_Entry &rse) // Reference the associated scheduling entry: the double cast is // needed to ensure that the size of the pointer and the size of the - // stored magic cookie are the same + // stored magic cookie are the same (see the definition of + // ptr_arith_t in ACE to grok how this works portably). next_rse = ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *, next_rt_info->volatile_token); @@ -167,18 +168,19 @@ visit (TAO_Reconfig_Scheduler_Entry &rse) return 0; } -// WSOA merge - commented out -// // Performs an unconditional action when the entry is first reached. -// // Returns 0 for success, and -1 if an error occurred. - -// template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int -// TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -// unconditional_action (TAO_Reconfig_Scheduler_Entry & /* rse */) -// { -// // Default behavior: just return success. -// return 0; -// } -// +/* WSOA merge - commented out +// Performs an unconditional action when the entry is first reached. +// Returns 0 for success, and -1 if an error occurred. + +template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int +TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: +unconditional_action (TAO_Reconfig_Scheduler_Entry &rse) +{ + // Default behavior: just return success. + ACE_UNUSED_ARG (rse); + return 0; +} +*/ // Tests whether or not any conditional actions should be taken for // the entry. Returns 0 if the actions should be applied, 1 if the @@ -200,9 +202,10 @@ precondition (TAO_Reconfig_Scheduler_Entry &rse) template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -prefix_action (TAO_Reconfig_Scheduler_Entry & /* rse */) +prefix_action (TAO_Reconfig_Scheduler_Entry &rse) { // Default behavior: just return success. + ACE_UNUSED_ARG (rse); return 0; } @@ -212,11 +215,14 @@ prefix_action (TAO_Reconfig_Scheduler_Entry & /* rse */) template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -pre_recurse_action (TAO_Reconfig_Scheduler_Entry & /* entry */, - TAO_Reconfig_Scheduler_Entry & /* successor */, - const RtecScheduler::Dependency_Info & /* di */) +pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, + TAO_Reconfig_Scheduler_Entry &successor, + const RtecScheduler::Dependency_Info &di) { // Default behavior: just return success. + ACE_UNUSED_ARG (entry); + ACE_UNUSED_ARG (successor); + ACE_UNUSED_ARG (di); return 0; } @@ -226,9 +232,10 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry & /* entry */, template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -postfix_action (TAO_Reconfig_Scheduler_Entry & /* rse */) +postfix_action (TAO_Reconfig_Scheduler_Entry &rse) { // Default behavior: just return success. + ACE_UNUSED_ARG (rse); return 0; } @@ -290,10 +297,13 @@ prefix_action (TAO_Reconfig_Scheduler_Entry &rse) template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int TAO_RSE_DFS_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -pre_recurse_action (TAO_Reconfig_Scheduler_Entry & /* entry */, - TAO_Reconfig_Scheduler_Entry & successor, - const RtecScheduler::Dependency_Info & /* di */) +pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, + TAO_Reconfig_Scheduler_Entry &successor, + const RtecScheduler::Dependency_Info &di) { + ACE_UNUSED_ARG (entry); + ACE_UNUSED_ARG (di); + // Enabled operations we reached via a dependency and that do not // specify a period are not thread delineators. if (successor.enabled_state () != RtecScheduler::RT_INFO_DISABLED @@ -435,8 +445,10 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int TAO_RSE_SCC_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, TAO_Reconfig_Scheduler_Entry &successor, - const RtecScheduler::Dependency_Info & /* di */) + const RtecScheduler::Dependency_Info &di) { + ACE_UNUSED_ARG (di); + if (successor.enabled_state () != RtecScheduler::RT_INFO_DISABLED && successor.rev_dfs_status () == @@ -492,8 +504,10 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int TAO_RSE_Reverse_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, TAO_Reconfig_Scheduler_Entry &successor, - const RtecScheduler::Dependency_Info & /* di */) + const RtecScheduler::Dependency_Info &di) { + ACE_UNUSED_ARG (di); + // @TODO - check for conjunction nodes here and perform conjunctive // function on existing rate tuples. Idea: treat conjunctive tuples // as skolem functions over the possible rates of their incedent @@ -683,13 +697,14 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int TAO_RSE_Forward_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, TAO_Reconfig_Scheduler_Entry &successor, - const RtecScheduler::Dependency_Info & /* di */) + const RtecScheduler::Dependency_Info &di) { if (successor.enabled_state () == RtecScheduler::RT_INFO_DISABLED) { return 1; } + ACE_UNUSED_ARG (di); TAO_RT_Info_Tuple **tuple_ptr_ptr; TUPLE_SET_ITERATOR orig_tuple_iter (entry.orig_tuple_subset ()); @@ -1045,8 +1060,10 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int TAO_RSE_Criticality_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, TAO_Reconfig_Scheduler_Entry &successor, - const RtecScheduler::Dependency_Info & /* di */) + const RtecScheduler::Dependency_Info &di) { + ACE_UNUSED_ARG (di); + #ifdef SCHEDULER_LOGGING ACE_DEBUG ((LM_DEBUG, "Crit Prop_Visitor visiting %s[%d], successor is %s[%d]\n", @@ -1080,6 +1097,5 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL -#endif /* TAO_RECONFIG_SCHED_UTILS_T_CPP */ +#endif /* TAO_RECONFIG_SCHED_UTILS_T_C */ |