diff options
Diffstat (limited to 'ACE/Kokyu')
-rw-r--r-- | ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.cpp | 2 | ||||
-rw-r--r-- | ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp | 2 | ||||
-rw-r--r-- | ACE/Kokyu/DSRT_Dispatch_Item_T.cpp | 2 | ||||
-rw-r--r-- | ACE/Kokyu/DSRT_Dispatcher_Impl_T.cpp | 4 | ||||
-rw-r--r-- | ACE/Kokyu/DSRT_Sched_Queue_T.cpp | 34 | ||||
-rw-r--r-- | ACE/Kokyu/Default_Dispatcher_Impl.cpp | 18 | ||||
-rw-r--r-- | ACE/Kokyu/Dispatch_Deferrer.cpp | 3 | ||||
-rw-r--r-- | ACE/Kokyu/Dispatcher_Impl.cpp | 2 | ||||
-rw-r--r-- | ACE/Kokyu/Dispatcher_Task.cpp | 4 | ||||
-rw-r--r-- | ACE/Kokyu/Kokyu.cpp | 2 | ||||
-rw-r--r-- | ACE/Kokyu/Kokyu_defs.cpp | 2 | ||||
-rw-r--r-- | ACE/Kokyu/Kokyu_dsrt.cpp | 20 |
12 files changed, 34 insertions, 61 deletions
diff --git a/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.cpp b/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.cpp index d9a2eebab59..e875b8fead1 100644 --- a/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.cpp +++ b/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.cpp @@ -9,8 +9,6 @@ //#include "DSRT_CV_Dispatcher_Impl_T.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Kokyu, DSRT_CV_Dispatcher_Impl_T, "$Id$") - namespace Kokyu { diff --git a/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp b/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp index 8f368beae9b..b27f9fd96a3 100644 --- a/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp +++ b/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp @@ -9,8 +9,6 @@ //#include "DSRT_Direct_Dispatcher_Impl_T.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Kokyu, DSRT_Direct_Dispatcher_Impl_T, "$Id$") - namespace Kokyu { diff --git a/ACE/Kokyu/DSRT_Dispatch_Item_T.cpp b/ACE/Kokyu/DSRT_Dispatch_Item_T.cpp index 123b4a47e2c..b1a29c74c60 100644 --- a/ACE/Kokyu/DSRT_Dispatch_Item_T.cpp +++ b/ACE/Kokyu/DSRT_Dispatch_Item_T.cpp @@ -9,8 +9,6 @@ #include "DSRT_Dispatch_Item_T.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Kokyu, DSRT_Dispatch_Item, "$Id$") - namespace Kokyu { diff --git a/ACE/Kokyu/DSRT_Dispatcher_Impl_T.cpp b/ACE/Kokyu/DSRT_Dispatcher_Impl_T.cpp index 3d3ac5ed8f2..94eadc2c09c 100644 --- a/ACE/Kokyu/DSRT_Dispatcher_Impl_T.cpp +++ b/ACE/Kokyu/DSRT_Dispatcher_Impl_T.cpp @@ -9,14 +9,12 @@ #include "DSRT_Dispatcher_Impl_T.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Kokyu, DSRT_Dispatcher_Impl, "$Id$") - namespace Kokyu { template <class DSRT_Scheduler_Traits> DSRT_Dispatcher_Impl<DSRT_Scheduler_Traits>:: -DSRT_Dispatcher_Impl (ACE_Sched_Params::Policy sched_policy, +DSRT_Dispatcher_Impl (ACE_Sched_Params::Policy sched_policy, int sched_scope) : sched_policy_ (sched_policy), sched_scope_ (sched_scope), diff --git a/ACE/Kokyu/DSRT_Sched_Queue_T.cpp b/ACE/Kokyu/DSRT_Sched_Queue_T.cpp index e9888f7bc32..d77b6aebf01 100644 --- a/ACE/Kokyu/DSRT_Sched_Queue_T.cpp +++ b/ACE/Kokyu/DSRT_Sched_Queue_T.cpp @@ -19,10 +19,6 @@ //#include "DSRT_Sched_Queue_T.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Kokyu, - DSRT_Sched_Queue_T, - "$Id$") - namespace Kokyu { /* @@ -115,15 +111,15 @@ insert (DSRT_Dispatch_Item<DSRT_Scheduler_Traits>* item) #ifdef KOKYU_DSRT_LOGGING ACE_hthread_t thr_handle = item->thread_handle (); - ACE_DEBUG ((LM_DEBUG, - "(%t|%T) about to insert %d in sched queue\n", + ACE_DEBUG ((LM_DEBUG, + "(%t|%T) about to insert %d in sched queue\n", thr_handle)); #endif if (dispatch_items_hash_map_.find (guid, rb_tree_node) == -1) { #ifdef KOKYU_DSRT_LOGGING - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "(%t|%T) %d not found in hashmap\n", thr_handle)); #endif if (dispatch_items_prio_queue_.bind (item_var, @@ -142,7 +138,7 @@ insert (DSRT_Dispatch_Item<DSRT_Scheduler_Traits>* item) dispatch_items_hash_map_.dump (); ACE_DEBUG ((LM_DEBUG, "<===Hash Table contents End=====>\n")); -#endif +#endif return 0; } } @@ -150,35 +146,35 @@ insert (DSRT_Dispatch_Item<DSRT_Scheduler_Traits>* item) else { #ifdef KOKYU_DSRT_LOGGING - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "(%t|%T) %d found in hashmap\n", thr_handle)); #endif dispatch_items_hash_map_.unbind (guid); dispatch_items_prio_queue_.unbind (rb_tree_node); #ifdef KOKYU_DSRT_LOGGING - ACE_DEBUG ((LM_DEBUG, - "(%t|%T) %d removed from hashmap and rbtree\n", thr_handle)); + ACE_DEBUG ((LM_DEBUG, + "(%t|%T) %d removed from hashmap and rbtree\n", thr_handle)); #endif if (dispatch_items_prio_queue_.bind (item_var, item_var, rb_tree_node) == 0) { #ifdef KOKYU_DSRT_LOGGING - ACE_DEBUG ((LM_DEBUG, - "(%t|%T) %d bound to rbtree\n", thr_handle)); + ACE_DEBUG ((LM_DEBUG, + "(%t|%T) %d bound to rbtree\n", thr_handle)); #endif if (dispatch_items_hash_map_.bind (guid, rb_tree_node) == 0) { #ifdef KOKYU_DSRT_LOGGING - ACE_DEBUG ((LM_DEBUG, - "(%t|%T) %d bound to hashmap\n", thr_handle)); + ACE_DEBUG ((LM_DEBUG, + "(%t|%T) %d bound to hashmap\n", thr_handle)); ACE_DEBUG ((LM_DEBUG, "<===Hash Table contents Begin===>\n")); dispatch_items_hash_map_.dump (); ACE_DEBUG ((LM_DEBUG, "<===Hash Table contents End===>\n")); -#endif +#endif return 0; } } @@ -207,7 +203,7 @@ remove (Guid_t guid) ACE_DEBUG ((LM_DEBUG, "<===Hash Table contents End===>\n")); #endif - + return 0; } @@ -235,13 +231,13 @@ dump () PRIO_QUEUE_ENTRY &ent = (*iter); DSRT_Dispatch_Item_var<DSRT_Scheduler_Traits> item_var = ent.item (); - /* + /* int guid; ACE_OS::memcpy (&guid, item_var->guid ().get_buffer (), item_var->guid ().length ()); - ACE_DEBUG ((LM_DEBUG, "(%t|%T):guid %d, thr_handle = %d\n", + ACE_DEBUG ((LM_DEBUG, "(%t|%T):guid %d, thr_handle = %d\n", guid, item_var->thread_handle ())); */ ++iter; diff --git a/ACE/Kokyu/Default_Dispatcher_Impl.cpp b/ACE/Kokyu/Default_Dispatcher_Impl.cpp index 8261486521c..f9971ecefcf 100644 --- a/ACE/Kokyu/Default_Dispatcher_Impl.cpp +++ b/ACE/Kokyu/Default_Dispatcher_Impl.cpp @@ -7,10 +7,6 @@ #include "Default_Dispatcher_Impl.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (Kokyu, - Default_Dispatcher_Impl, - "$Id$") - namespace Kokyu { @@ -42,7 +38,7 @@ Default_Dispatcher_Impl::init_i (const Dispatcher_Attributes& attrs) //ACE_DEBUG ((LM_DEBUG, "task array auto_ptr set\n" )); - ConfigInfoSet& config_set = + ConfigInfoSet& config_set = const_cast<ConfigInfoSet&> (attrs.config_info_set_); ConfigInfoSet::ITERATOR iter(config_set); int i=0; @@ -52,8 +48,8 @@ Default_Dispatcher_Impl::init_i (const Dispatcher_Attributes& attrs) { //ACE_DEBUG ((LM_DEBUG, "iter = %d\n", i)); Dispatcher_Task* task=0; - ACE_NEW_RETURN (task, - Dispatcher_Task (*config, + ACE_NEW_RETURN (task, + Dispatcher_Task (*config, ACE_Thread_Manager::instance()), -1); auto_ptr<Dispatcher_Task> tmp_task_auto_ptr (task); @@ -88,12 +84,12 @@ Default_Dispatcher_Impl::activate_i () Priority_t priority = tasks_[i]->get_curr_config_info ().thread_priority_; - if (this->tasks_[i]->activate (this->thr_creation_flags_, + if (this->tasks_[i]->activate (this->thr_creation_flags_, 1, 1, priority) == -1) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("EC (%P|%t) cannot activate queue.") - ACE_TEXT ("Need superuser privilege to run in RT class\n")), + ACE_TEXT ("Need superuser privilege to run in RT class\n")), -1); } } @@ -130,7 +126,7 @@ Default_Dispatcher_Impl::dispatch_i (const Dispatch_Command* cmd, Dispatcher_Task* task = find_task_with_preemption_prio (qos_info.preemption_priority_); - //@@VS - We should insert this into the lowest prio queue. + //@@VS - We should insert this into the lowest prio queue. //How do we know that the last queue is the lowest prio queue. if (task == 0) task = tasks_[ntasks_-1].get (); @@ -141,7 +137,7 @@ Default_Dispatcher_Impl::dispatch_i (const Dispatch_Command* cmd, int Default_Dispatcher_Impl::shutdown_i () { - //This needs to be revisited based on mode transition and + //This needs to be revisited based on mode transition and //consistent cut through the queues //post shutdown command to all tasks diff --git a/ACE/Kokyu/Dispatch_Deferrer.cpp b/ACE/Kokyu/Dispatch_Deferrer.cpp index 6db734c8205..0716d5be243 100644 --- a/ACE/Kokyu/Dispatch_Deferrer.cpp +++ b/ACE/Kokyu/Dispatch_Deferrer.cpp @@ -11,7 +11,6 @@ #include "kokyu_config.h" #include "kokyu_dsui_families.h" #include <dsui.h> -ACE_RCSID(Kokyu, Dispatch_Deferrer, "$Id$") namespace Kokyu { @@ -68,7 +67,7 @@ Dispatch_Deferrer::handle_timeout (const ACE_Time_Value &, //get all expired Dispatch_Queue_Items ACE_Message_Block *begin,*end; this->rgq_.remove_messages(begin,end, - (u_int) (ACE_Dynamic_Message_Strategy::LATE | + (u_int) (ACE_Dynamic_Message_Strategy::LATE | ACE_Dynamic_Message_Strategy::BEYOND_LATE)); //dispatch them back to Dispatcher_Impl diff --git a/ACE/Kokyu/Dispatcher_Impl.cpp b/ACE/Kokyu/Dispatcher_Impl.cpp index 884cf2dceb2..1c21849004b 100644 --- a/ACE/Kokyu/Dispatcher_Impl.cpp +++ b/ACE/Kokyu/Dispatcher_Impl.cpp @@ -6,8 +6,6 @@ #include "Dispatcher_Impl.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Kokyu, Dispatcher_Impl, "$Id$") - namespace Kokyu { diff --git a/ACE/Kokyu/Dispatcher_Task.cpp b/ACE/Kokyu/Dispatcher_Task.cpp index 12d7885ba90..c3df4c58466 100644 --- a/ACE/Kokyu/Dispatcher_Task.cpp +++ b/ACE/Kokyu/Dispatcher_Task.cpp @@ -9,8 +9,6 @@ #include "Dispatcher_Task.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Kokyu, Dispatcher_Task, "$Id$") - namespace //anonymous namespace - use this to avoid polluting the global namespace { @@ -98,7 +96,7 @@ Dispatcher_Task::svc (void) while (!done) { ACE_Message_Block *mb = 0; - + if (this->getq (mb) == -1) { if (ACE_OS::last_error () == ESHUTDOWN) diff --git a/ACE/Kokyu/Kokyu.cpp b/ACE/Kokyu/Kokyu.cpp index 999004dafc5..ff2a6605276 100644 --- a/ACE/Kokyu/Kokyu.cpp +++ b/ACE/Kokyu/Kokyu.cpp @@ -8,8 +8,6 @@ #include "Kokyu.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Kokyu, Kokyu, "$Id$") - namespace Kokyu { diff --git a/ACE/Kokyu/Kokyu_defs.cpp b/ACE/Kokyu/Kokyu_defs.cpp index 8ba5c907429..4d2e59c54b9 100644 --- a/ACE/Kokyu/Kokyu_defs.cpp +++ b/ACE/Kokyu/Kokyu_defs.cpp @@ -6,8 +6,6 @@ #include "Kokyu_defs.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Kokyu, Kokyu_defs, "$Id$") - namespace Kokyu { Dispatch_Command::~Dispatch_Command (void) diff --git a/ACE/Kokyu/Kokyu_dsrt.cpp b/ACE/Kokyu/Kokyu_dsrt.cpp index 31b3beec2a4..1965fffba6a 100644 --- a/ACE/Kokyu/Kokyu_dsrt.cpp +++ b/ACE/Kokyu/Kokyu_dsrt.cpp @@ -10,8 +10,6 @@ #include "Kokyu_dsrt.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Kokyu, Kokyu, "$Id$") - namespace Kokyu { @@ -70,23 +68,23 @@ create_DSRT_dispatcher (const DSRT_ConfigInfo& config_info) switch (config_info.impl_type_) { case DSRT_OS_BASED: - ACE_NEW_RETURN (tmp, + ACE_NEW_RETURN (tmp, DSRT_Direct_Dispatcher_Impl<DSRT_Scheduler_Traits> ( - config_info.sched_policy_, - config_info.sched_scope_), + config_info.sched_policy_, + config_info.sched_scope_), 0); break; case DSRT_CV_BASED: default: - ACE_NEW_RETURN (tmp, + ACE_NEW_RETURN (tmp, DSRT_CV_Dispatcher_Impl<DSRT_Scheduler_Traits>( - config_info.sched_policy_, - config_info.sched_scope_), + config_info.sched_policy_, + config_info.sched_scope_), 0); break; } - + ACE_ASSERT (tmp != 0); ACE_NEW_RETURN (disp, DSRT_Dispatcher<DSRT_Scheduler_Traits>, 0); disp->implementation (tmp); @@ -138,10 +136,10 @@ operator ()(const QoSDescriptor& qos1, const QoSDescriptor& qos2) { #ifdef KOKYU_DSRT_LOGGING - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "(%t|%T):qos1.importance = %d, qos2.importance = %d\n", qos1.importance_, qos2.importance_)); -#endif +#endif if (qos1.importance_ > qos2.importance_) { |