diff options
author | storri <storri@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-24 21:17:24 +0000 |
---|---|---|
committer | storri <storri@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-24 21:17:24 +0000 |
commit | 15cd191695e672977138aaf014f8ad785c074860 (patch) | |
tree | 0fe3f0ca95a368d0c55449b9ccc894766f1bb07a | |
parent | a4f0732cc721a6a9a930654ab376bc13148b972a (diff) | |
download | ATCD-15cd191695e672977138aaf014f8ad785c074860.tar.gz |
Instrumented Kokyu Dispatcher and DT oneway examples
-rw-r--r-- | Kokyu/DSRT_CV_Dispatcher_Impl_T.cpp | 38 | ||||
-rw-r--r-- | Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp | 49 | ||||
-rw-r--r-- | Kokyu/Dispatcher_Impl.cpp | 4 | ||||
-rw-r--r-- | Kokyu/Kokyu_dsrt.cpp | 21 | ||||
-rw-r--r-- | Kokyu/Makefile.Kokyu | 527 | ||||
-rw-r--r-- | TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp | 180 | ||||
-rw-r--r-- | TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.dsui | 14 | ||||
-rw-r--r-- | TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h | 2 | ||||
-rw-r--r-- | TAO/examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.h | 98 | ||||
-rw-r--r-- | TAO/examples/Kokyu_dsrt_schedulers/Makefile.Kokyu_DSRT_Schedulers | 18 | ||||
-rw-r--r-- | TAO/examples/Kokyu_dsrt_schedulers/edf_example/Makefile.dt_oneway_client | 3 | ||||
-rw-r--r-- | TAO/examples/Kokyu_dsrt_schedulers/edf_example/dt_oneway_client.cpp | 31 | ||||
-rw-r--r-- | TAO/examples/Kokyu_dsrt_schedulers/edf_example/dt_oneway_enable.dsui | 18 | ||||
-rw-r--r-- | TAO/examples/Kokyu_dsrt_schedulers/edf_example/dt_oneway_server.cpp | 5 |
14 files changed, 485 insertions, 523 deletions
diff --git a/Kokyu/DSRT_CV_Dispatcher_Impl_T.cpp b/Kokyu/DSRT_CV_Dispatcher_Impl_T.cpp index a5d28115fac..6c8133b3e24 100644 --- a/Kokyu/DSRT_CV_Dispatcher_Impl_T.cpp +++ b/Kokyu/DSRT_CV_Dispatcher_Impl_T.cpp @@ -9,11 +9,15 @@ //#include "DSRT_CV_Dispatcher_Impl_T.i" #endif /* __ACE_INLINE__ */ +#include "kokyu_config.h" +#include "kokyu_dsui_families.h" +#include <dsui.h> + ACE_RCSID(Kokyu, DSRT_CV_Dispatcher_Impl_T, "$Id$") namespace Kokyu { - + /* //@@VS: This is somehow not being recognized by MSVC, which results //in a link error. For now, the definition has been moved to the .h @@ -41,7 +45,7 @@ operator ()(const DSRT_Dispatch_Item_var<DSRT_Scheduler_Traits>& item1, template <class DSRT_Scheduler_Traits> DSRT_CV_Dispatcher_Impl<DSRT_Scheduler_Traits>:: -DSRT_CV_Dispatcher_Impl (ACE_Sched_Params::Policy sched_policy, +DSRT_CV_Dispatcher_Impl (ACE_Sched_Params::Policy sched_policy, int sched_scope) :DSRT_Dispatcher_Impl<DSRT_Scheduler_Traits> (sched_policy, sched_scope), run_cond_ (run_cond_lock_) @@ -61,16 +65,16 @@ schedule_i (Guid_t id, const DSRT_QoSDescriptor& qos) { #ifdef KOKYU_DSRT_LOGGING - ACE_DEBUG ((LM_DEBUG, - "(%t|%T):schedule_i enter\n")); + ACE_DEBUG ((LM_DEBUG, + "(%t|%T):schedule_i enter\n")); #endif - + DSUI_EVENT_LOG (DSRT_CV_DISPATCH_FAM, SCHEDULE_ENTER, 0,0,NULL); DSRT_Dispatch_Item<DSRT_Scheduler_Traits>* item; ACE_hthread_t thr_handle; ACE_Thread::self (thr_handle); - if (ACE_OS::thr_setprio (thr_handle, - this->blocked_prio_, + if (ACE_OS::thr_setprio (thr_handle, + this->blocked_prio_, this->sched_policy_) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -90,10 +94,10 @@ schedule_i (Guid_t id, const DSRT_QoSDescriptor& qos) #ifdef KOKYU_DSRT_LOGGING this->ready_queue_.dump (); - ACE_DEBUG ((LM_DEBUG, - "(%t|%T):schedule_i after ready_q.insert\n")); + ACE_DEBUG ((LM_DEBUG, + "(%t|%T):schedule_i after ready_q.insert\n")); #endif - + DSRT_Dispatch_Item_var<DSRT_Scheduler_Traits> item_var; ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, cond_guard, run_cond_lock_, -1); @@ -161,27 +165,27 @@ schedule_i (Guid_t id, const DSRT_QoSDescriptor& qos) thr_handle)); #endif - if (ACE_OS::thr_setprio (thr_handle, - this->active_prio_, + if (ACE_OS::thr_setprio (thr_handle, + this->active_prio_, this->sched_policy_) == -1) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("thr_setprio failed"))); } - + #ifdef KOKYU_DSRT_LOGGING - ACE_DEBUG ((LM_DEBUG, - "(%t|%T):schedule_i exit\n")); + ACE_DEBUG ((LM_DEBUG, + "(%t|%T):schedule_i exit\n")); #endif - + DSUI_EVENT_LOG (DSRT_CV_DISPATCH_FAM, SCHEDULE_EXIT, 0,0,NULL); return 0; } template <class DSRT_Scheduler_Traits> int DSRT_CV_Dispatcher_Impl<DSRT_Scheduler_Traits>:: update_schedule_i (Guid_t guid, const DSRT_QoSDescriptor& qos) -{ +{ return this->schedule_i (guid, qos); } diff --git a/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp b/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp index 20f61222b11..f51113d0ba1 100644 --- a/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp +++ b/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp @@ -9,6 +9,10 @@ //#include "DSRT_Direct_Dispatcher_Impl_T.i" #endif /* __ACE_INLINE__ */ +#include "kokyu_config.h" +#include "kokyu_dsui_families.h" +#include <dsui.h> + ACE_RCSID(Kokyu, DSRT_Direct_Dispatcher_Impl_T, "$Id$") namespace Kokyu @@ -115,7 +119,7 @@ DSRT_Direct_Dispatcher_Impl<DSRT_Scheduler_Traits>::svc (void) #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, "(%t): sched thread about to wait on cv\n")); -#endif +#endif sched_queue_modified_cond_.wait (); } @@ -139,12 +143,12 @@ DSRT_Direct_Dispatcher_Impl<DSRT_Scheduler_Traits>::svc (void) ACE_hthread_t most_eligible_thr_handle = item_var->thread_handle (); #ifdef KOKYU_DSRT_LOGGING - ACE_DEBUG ((LM_DEBUG, - "(%t|%T):curr scheduled thr handle = %d\n", - this->curr_scheduled_thr_handle_)); - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, + "(%t|%T):curr scheduled thr handle = %d\n", + this->curr_scheduled_thr_handle_)); + ACE_DEBUG ((LM_DEBUG, "(%t|%T):most eligible thr handle = %d \n", - most_eligible_thr_handle)); + most_eligible_thr_handle)); #endif if (this->curr_scheduled_thr_handle_ != most_eligible_thr_handle) @@ -152,14 +156,14 @@ DSRT_Direct_Dispatcher_Impl<DSRT_Scheduler_Traits>::svc (void) if (this->curr_scheduled_thr_handle_ != 0) { if (ACE_OS::thr_setprio (this->curr_scheduled_thr_handle_, - this->inactive_prio_, + this->inactive_prio_, this->sched_policy_) == -1) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("thr_setprio on curr_scheduled_thr_handle_ failed."))); ACE_DEBUG ((LM_DEBUG, "thr_handle = %d, prio = %d\n", - this->curr_scheduled_thr_handle_, + this->curr_scheduled_thr_handle_, this->inactive_prio_)); } } @@ -188,11 +192,12 @@ template <class DSRT_Scheduler_Traits> int DSRT_Direct_Dispatcher_Impl<DSRT_Scheduler_Traits>:: schedule_i (Guid_t id, const DSRT_QoSDescriptor& qos) { + DSUI_EVENT_LOG (DSTRM_DIRECT_DISPATCH_FAM, SCHEDULE_ENTER, 0,0,NULL); ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->synch_lock_, -1); #ifdef KOKYU_DSRT_LOGGING - ACE_DEBUG ((LM_DEBUG, - "(%t|%T):schedule_i enter\n")); + ACE_DEBUG ((LM_DEBUG, + "(%t|%T):schedule_i enter\n")); #endif DSRT_Dispatch_Item<DSRT_Scheduler_Traits>* item; @@ -208,12 +213,12 @@ schedule_i (Guid_t id, const DSRT_QoSDescriptor& qos) return -1; #ifdef KOKYU_DSRT_LOGGING - ACE_DEBUG ((LM_DEBUG, - "(%t|%T):schedule_i after ready_q.insert\n")); + ACE_DEBUG ((LM_DEBUG, + "(%t|%T):schedule_i after ready_q.insert\n")); #endif - - if (ACE_OS::thr_setprio (thr_handle, - this->blocked_prio_, + + if (ACE_OS::thr_setprio (thr_handle, + this->blocked_prio_, this->sched_policy_) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -222,8 +227,8 @@ schedule_i (Guid_t id, const DSRT_QoSDescriptor& qos) } #ifdef KOKYU_DSRT_LOGGING - ACE_DEBUG ((LM_DEBUG, - "(%t|%T):schedule_i after thr_setprio\n")); + ACE_DEBUG ((LM_DEBUG, + "(%t|%T):schedule_i after thr_setprio\n")); #endif //ready_queue_.dump (); @@ -234,18 +239,18 @@ schedule_i (Guid_t id, const DSRT_QoSDescriptor& qos) mon, this->sched_queue_modified_cond_lock_, 0); #ifdef KOKYU_DSRT_LOGGING - ACE_DEBUG ((LM_DEBUG, - "(%t|%T):schedule_i after acquiring cond lock\n")); + ACE_DEBUG ((LM_DEBUG, + "(%t|%T):schedule_i after acquiring cond lock\n")); #endif this->sched_queue_modified_ = 1; this->sched_queue_modified_cond_.signal (); #ifdef KOKYU_DSRT_LOGGING - ACE_DEBUG ((LM_DEBUG, - "(%t|%T):schedule_i exit\n")); + ACE_DEBUG ((LM_DEBUG, + "(%t|%T):schedule_i exit\n")); #endif - + DSUI_EVENT_LOG (DSRT_DIRECT_DISPATCH, SCHEDULE_EXIT, 0,0,NULL); return 0; } diff --git a/Kokyu/Dispatcher_Impl.cpp b/Kokyu/Dispatcher_Impl.cpp index 9ad5994eb63..d6a0bd844ca 100644 --- a/Kokyu/Dispatcher_Impl.cpp +++ b/Kokyu/Dispatcher_Impl.cpp @@ -6,6 +6,10 @@ #include "Dispatcher_Impl.i" #endif /* __ACE_INLINE__ */ +#include "kokyu_config.h" +#include "kokyu_dsui_families.h" +#include <dsui.h> + ACE_RCSID(Kokyu, Dispatcher_Impl, "$Id$") namespace Kokyu diff --git a/Kokyu/Kokyu_dsrt.cpp b/Kokyu/Kokyu_dsrt.cpp index d780f782381..ffc058aacc4 100644 --- a/Kokyu/Kokyu_dsrt.cpp +++ b/Kokyu/Kokyu_dsrt.cpp @@ -1,4 +1,4 @@ -/* $Id$ */ +//* $Id$ */ // Kokyu_dsrt.cpp,v 1.3 2003/10/08 02:23:39 venkita Exp #include "Kokyu_dsrt.h" @@ -11,6 +11,10 @@ #include "Kokyu_dsrt.i" #endif /* __ACE_INLINE__ */ +#include "kokyu_config.h" +#include "kokyu_dsui_families.h" +#include <dsui.h> + ACE_RCSID(Kokyu, Kokyu, "Kokyu_dsrt.cpp,v 1.3 2003/10/08 02:23:39 venkita Exp") namespace Kokyu @@ -28,6 +32,7 @@ template <class DSRT_Scheduler_Traits> int DSRT_Dispatcher<DSRT_Scheduler_Traits>::schedule (Guid_t guid, const DSRT_QoSDescriptor& qos) { + DSUI_EVENT_LOG (DSRT_DISPATCH_FAM, SCHEDULE, 0, 0, NULL); return dispatcher_impl_->schedule (guid, qos); } @@ -79,23 +84,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_), nil_ptr); 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_), nil_ptr); break; } - + ACE_ASSERT (tmp != 0); ACE_NEW_RETURN (disp, DSRT_Dispatcher<DSRT_Scheduler_Traits>, nil_ptr); DSRT_Dispatcher_Auto_Ptr disp_auto_ptr(disp); diff --git a/Kokyu/Makefile.Kokyu b/Kokyu/Makefile.Kokyu index 9d9c394cbec..b2a26f07d68 100644 --- a/Kokyu/Makefile.Kokyu +++ b/Kokyu/Makefile.Kokyu @@ -34,14 +34,22 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU -CPPFLAGS += -I.. -LDFLAGS += -L../ace +CPPFLAGS += -I.. -I$(DATASTREAM_ROOT)/include +LDFLAGS += -L../ace -L$(DATASTREAM_ROOT)/lib #---------------------------------------------------------------------------- # Local targets #---------------------------------------------------------------------------- +DSUI_FILES = kokyu_dsui_families.h kokyu_dsui_table.h kokyu_dsui_info.h +DSUI_PARSE = $(DATASTREAM_ROOT)/bin/dsui-parse +kokyu_dsui_families.h: Kokyu.dsui + $(DSUI_PARSE) -n Kokyu.dsui -t kokyu + +realclean: + -$(RM) $(DSUI_FILES) + #---------------------------------------------------------------------------- # Dependencies #---------------------------------------------------------------------------- @@ -50,22 +58,15 @@ LDFLAGS += -L../ace .obj/Dispatcher_Impl.o .obj/Dispatcher_Impl.so .shobj/Dispatcher_Impl.o .shobj/Dispatcher_Impl.so: Dispatcher_Impl.cpp Dispatcher_Impl.h \ - $(ACE_ROOT)/ace/pre.h \ - Kokyu_defs.h \ - $(ACE_ROOT)/ace/Array.h \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/pre.h Kokyu_defs.h \ + $(ACE_ROOT)/ace/Array.h $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/post.h $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Containers.h $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/Containers.i $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/OS_Export.h $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/os_include/sys/os_types.h \ $(ACE_ROOT)/ace/os_include/os_stddef.h \ $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ @@ -92,8 +93,7 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Memory.h $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/os_include/os_stdlib.h \ @@ -103,11 +103,9 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/os_include/sys/os_select.h \ $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ + $(ACE_ROOT)/ace/Cleanup.h $(ACE_ROOT)/ace/Cleanup.inl \ $(ACE_ROOT)/ace/Object_Manager_Base.inl \ $(ACE_ROOT)/ace/OS_NS_string.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -124,8 +122,7 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/Time_Value.inl \ $(ACE_ROOT)/ace/OS_NS_sys_time.h \ $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/Auto_Ptr.h $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ @@ -151,29 +148,40 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ + $(ACE_ROOT)/ace/OS_NS_fcntl.h \ + $(ACE_ROOT)/ace/os_include/os_fcntl.h \ + $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ + $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ + $(ACE_ROOT)/ace/OS_NS_stdio.h \ + $(ACE_ROOT)/ace/OS_NS_stdio.inl \ + $(ACE_ROOT)/ace/OS_NS_pwd.h \ + $(ACE_ROOT)/ace/os_include/os_pwd.h \ + $(ACE_ROOT)/ace/OS_NS_pwd.inl \ $(ACE_ROOT)/ace/Sched_Params.i \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - kokyu_export.h Kokyu_defs.i Dispatcher_Impl.i + $(ACE_ROOT)/ace/Malloc_Allocator.i kokyu_export.h Kokyu_defs.i \ + Dispatcher_Impl.i kokyu_config.h kokyu_dsui_families.h \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + -.obj/Kokyu.o .obj/Kokyu.so .shobj/Kokyu.o .shobj/Kokyu.so: Kokyu.cpp Kokyu.h \ - $(ACE_ROOT)/ace/pre.h \ +.obj/Kokyu.o .obj/Kokyu.so .shobj/Kokyu.o .shobj/Kokyu.so: Kokyu.cpp Kokyu.h $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Copy_Disabled.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - kokyu_export.h Kokyu_defs.h \ - $(ACE_ROOT)/ace/Array.h \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/post.h $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl kokyu_export.h Kokyu_defs.h \ + $(ACE_ROOT)/ace/Array.h $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers.h $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/OS_Export.h $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/os_include/sys/os_types.h \ $(ACE_ROOT)/ace/os_include/os_stddef.h \ $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ @@ -200,8 +208,7 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Memory.h $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/os_include/os_stdlib.h \ @@ -211,11 +218,9 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/os_include/sys/os_select.h \ $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ + $(ACE_ROOT)/ace/Cleanup.h $(ACE_ROOT)/ace/Cleanup.inl \ $(ACE_ROOT)/ace/Object_Manager_Base.inl \ $(ACE_ROOT)/ace/OS_NS_string.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -232,8 +237,7 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/Time_Value.inl \ $(ACE_ROOT)/ace/OS_NS_sys_time.h \ $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/Auto_Ptr.h $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ @@ -259,13 +263,20 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ + $(ACE_ROOT)/ace/OS_NS_fcntl.h \ + $(ACE_ROOT)/ace/os_include/os_fcntl.h \ + $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ + $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ + $(ACE_ROOT)/ace/OS_NS_stdio.h \ + $(ACE_ROOT)/ace/OS_NS_stdio.inl \ + $(ACE_ROOT)/ace/OS_NS_pwd.h \ + $(ACE_ROOT)/ace/os_include/os_pwd.h \ + $(ACE_ROOT)/ace/OS_NS_pwd.inl \ $(ACE_ROOT)/ace/Sched_Params.i \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - Kokyu_defs.i Dispatcher_Impl.h Dispatcher_Impl.i Kokyu.i \ - Default_Dispatcher_Impl.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i Kokyu_defs.i \ + Dispatcher_Impl.h Dispatcher_Impl.i Kokyu.i Default_Dispatcher_Impl.h \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -274,50 +285,31 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/Thread_Mutex.h \ $(ACE_ROOT)/ace/Thread_Mutex.inl \ $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ - $(ACE_ROOT)/ace/Guard_T.h \ - $(ACE_ROOT)/ace/Lock.h \ - $(ACE_ROOT)/ace/Lock.inl \ + $(ACE_ROOT)/ace/Atomic_Op_T.i $(ACE_ROOT)/ace/Guard_T.h \ + $(ACE_ROOT)/ace/Lock.h $(ACE_ROOT)/ace/Lock.inl \ $(ACE_ROOT)/ace/Guard_T.inl \ $(ACE_ROOT)/ace/RW_Thread_Mutex.h \ - $(ACE_ROOT)/ace/RW_Mutex.h \ - $(ACE_ROOT)/ace/RW_Mutex.inl \ + $(ACE_ROOT)/ace/RW_Mutex.h $(ACE_ROOT)/ace/RW_Mutex.inl \ $(ACE_ROOT)/ace/RW_Thread_Mutex.inl \ $(ACE_ROOT)/ace/Guard_T.cpp \ $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_Traits.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/DLL.h \ + $(ACE_ROOT)/ace/Event_Handler.i $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/os_include/os_dlfcn.h \ $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Manager.h $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Thread_Exit.h \ + $(ACE_ROOT)/ace/Thread.i $(ACE_ROOT)/ace/Thread_Exit.h \ $(ACE_ROOT)/ace/Thread_Control.h \ $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Condition_Thread_Mutex.h \ $(ACE_ROOT)/ace/Condition_Thread_Mutex.inl \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/TSS_T.h \ - $(ACE_ROOT)/ace/TSS_T.inl \ - $(ACE_ROOT)/ace/TSS_T.cpp \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/os_include/os_fcntl.h \ - $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_fcntl.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ - $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Free_List.h $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/TSS_T.h $(ACE_ROOT)/ace/TSS_T.inl \ + $(ACE_ROOT)/ace/TSS_T.cpp $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/Recursive_Thread_Mutex.h \ @@ -328,68 +320,53 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Framework_Component.h \ $(ACE_ROOT)/ace/Framework_Component.inl \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/os_include/netinet/os_in.h \ $(ACE_ROOT)/ace/os_include/sys/os_socket.h \ $(ACE_ROOT)/ace/os_include/sys/os_uio.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.i $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ $(ACE_ROOT)/ace/OS_NS_stropts.inl \ + $(ACE_ROOT)/ace/OS_QoS.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ $(ACE_ROOT)/ace/Framework_Component_T.h \ $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Thread_Manager.i $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ $(ACE_ROOT)/ace/Message_Queue_T.i \ $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Notification_Strategy.h \ $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Message_Queue.i $(ACE_ROOT)/ace/Task_T.i \ $(ACE_ROOT)/ace/os_include/os_assert.h \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Task_T.cpp $(ACE_ROOT)/ace/Module.h \ $(ACE_ROOT)/ace/os_include/os_dirent.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Module.i $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Null_Condition.h \ - $(ACE_ROOT)/ace/Null_Mutex.h \ - Dispatcher_Task.h \ + $(ACE_ROOT)/ace/Null_Mutex.h Dispatcher_Task.h \ $(ACE_ROOT)/ace/Lock_Adapter_T.h \ $(ACE_ROOT)/ace/Lock_Adapter_T.inl \ - $(ACE_ROOT)/ace/Lock_Adapter_T.cpp \ - Dispatcher_Task.i Default_Dispatcher_Impl.i + $(ACE_ROOT)/ace/Lock_Adapter_T.cpp Dispatcher_Task.i \ + Default_Dispatcher_Impl.i .obj/Default_Dispatcher_Impl.o .obj/Default_Dispatcher_Impl.so .shobj/Default_Dispatcher_Impl.o .shobj/Default_Dispatcher_Impl.so: Default_Dispatcher_Impl.cpp \ - Default_Dispatcher_Impl.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Service_Object.h \ + Default_Dispatcher_Impl.h $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/post.h $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/os_include/sys/os_types.h \ $(ACE_ROOT)/ace/os_include/os_stddef.h \ @@ -403,8 +380,7 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/Thread_Mutex.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/OS_Export.h $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/os_include/os_limits.h \ $(ACE_ROOT)/ace/os_include/os_unistd.h \ $(ACE_ROOT)/ace/os_include/os_inttypes.h \ @@ -416,7 +392,6 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/os_include/sys/os_wait.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/os_include/sys/os_select.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Default_Constants.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ @@ -428,15 +403,13 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Memory.h $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ + $(ACE_ROOT)/ace/Cleanup.h $(ACE_ROOT)/ace/Cleanup.inl \ $(ACE_ROOT)/ace/Object_Manager_Base.inl \ $(ACE_ROOT)/ace/OS_NS_string.h \ $(ACE_ROOT)/ace/OS_NS_string.inl \ @@ -461,46 +434,46 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ + $(ACE_ROOT)/ace/OS_NS_fcntl.h \ + $(ACE_ROOT)/ace/os_include/os_fcntl.h \ + $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ + $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ + $(ACE_ROOT)/ace/OS_NS_stdio.h \ + $(ACE_ROOT)/ace/OS_NS_stdio.inl \ + $(ACE_ROOT)/ace/OS_NS_pwd.h \ + $(ACE_ROOT)/ace/os_include/os_pwd.h \ + $(ACE_ROOT)/ace/OS_NS_pwd.inl \ $(ACE_ROOT)/ace/Thread_Mutex.inl \ $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ - $(ACE_ROOT)/ace/Guard_T.h \ - $(ACE_ROOT)/ace/Lock.h \ - $(ACE_ROOT)/ace/Lock.inl \ + $(ACE_ROOT)/ace/Atomic_Op_T.i $(ACE_ROOT)/ace/Guard_T.h \ + $(ACE_ROOT)/ace/Lock.h $(ACE_ROOT)/ace/Lock.inl \ $(ACE_ROOT)/ace/Guard_T.inl \ $(ACE_ROOT)/ace/RW_Thread_Mutex.h \ - $(ACE_ROOT)/ace/RW_Mutex.h \ - $(ACE_ROOT)/ace/RW_Mutex.inl \ + $(ACE_ROOT)/ace/RW_Mutex.h $(ACE_ROOT)/ace/RW_Mutex.inl \ $(ACE_ROOT)/ace/RW_Thread_Mutex.inl \ $(ACE_ROOT)/ace/Guard_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Atomic_Op_T.cpp $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_Traits.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/DLL.h \ + $(ACE_ROOT)/ace/Event_Handler.i $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/os_include/os_dlfcn.h \ $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Manager.h $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Thread_Exit.h \ + $(ACE_ROOT)/ace/Thread.i $(ACE_ROOT)/ace/Thread_Exit.h \ $(ACE_ROOT)/ace/Thread_Control.h \ $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Condition_Thread_Mutex.h \ $(ACE_ROOT)/ace/Condition_Thread_Mutex.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.h $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ @@ -510,23 +483,10 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/Unbounded_Set.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/TSS_T.h \ - $(ACE_ROOT)/ace/TSS_T.inl \ - $(ACE_ROOT)/ace/TSS_T.cpp \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/os_include/os_fcntl.h \ - $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_fcntl.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ - $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Free_List.h $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/TSS_T.h $(ACE_ROOT)/ace/TSS_T.inl \ + $(ACE_ROOT)/ace/TSS_T.cpp $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/Recursive_Thread_Mutex.h \ @@ -537,35 +497,28 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Framework_Component.h \ $(ACE_ROOT)/ace/Framework_Component.inl \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/os_include/netinet/os_in.h \ $(ACE_ROOT)/ace/os_include/sys/os_socket.h \ $(ACE_ROOT)/ace/os_include/sys/os_uio.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.i $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ $(ACE_ROOT)/ace/OS_NS_stropts.inl \ + $(ACE_ROOT)/ace/OS_QoS.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ $(ACE_ROOT)/ace/Framework_Component_T.h \ $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Thread_Manager.i $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ @@ -577,41 +530,32 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Notification_Strategy.h \ $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Message_Queue.i $(ACE_ROOT)/ace/Task_T.i \ $(ACE_ROOT)/ace/os_include/os_assert.h \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Task_T.cpp $(ACE_ROOT)/ace/Module.h \ $(ACE_ROOT)/ace/os_include/os_dirent.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Module.i $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Null_Condition.h \ - $(ACE_ROOT)/ace/Null_Mutex.h \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - kokyu_export.h Kokyu_defs.h \ - $(ACE_ROOT)/ace/Array.h \ + $(ACE_ROOT)/ace/Null_Mutex.h $(ACE_ROOT)/ace/Auto_Ptr.h \ + $(ACE_ROOT)/ace/Auto_Ptr.i $(ACE_ROOT)/ace/Auto_Ptr.cpp \ + kokyu_export.h Kokyu_defs.h $(ACE_ROOT)/ace/Array.h \ $(ACE_ROOT)/ace/Sched_Params.h \ $(ACE_ROOT)/ace/Sched_Params.i \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - Kokyu_defs.i Dispatcher_Impl.h Dispatcher_Impl.i Dispatcher_Task.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i Kokyu_defs.i \ + Dispatcher_Impl.h Dispatcher_Impl.i Dispatcher_Task.h \ $(ACE_ROOT)/ace/Lock_Adapter_T.h \ $(ACE_ROOT)/ace/Lock_Adapter_T.inl \ - $(ACE_ROOT)/ace/Lock_Adapter_T.cpp \ - Dispatcher_Task.i Default_Dispatcher_Impl.i + $(ACE_ROOT)/ace/Lock_Adapter_T.cpp Dispatcher_Task.i \ + Default_Dispatcher_Impl.i .obj/Dispatcher_Task.o .obj/Dispatcher_Task.so .shobj/Dispatcher_Task.o .shobj/Dispatcher_Task.so: Dispatcher_Task.cpp Dispatcher_Task.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/post.h $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/os_include/sys/os_types.h \ $(ACE_ROOT)/ace/os_include/os_stddef.h \ @@ -625,8 +569,7 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/Thread_Mutex.h \ $(ACE_ROOT)/ace/OS_NS_Thread.h \ $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/OS_Export.h $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/os_include/os_limits.h \ $(ACE_ROOT)/ace/os_include/os_unistd.h \ $(ACE_ROOT)/ace/os_include/os_inttypes.h \ @@ -638,7 +581,6 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/os_include/sys/os_wait.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/os_include/sys/os_select.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Default_Constants.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ @@ -650,15 +592,13 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/os_include/sys/os_sem.h \ $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \ $(ACE_ROOT)/ace/os_include/os_semaphore.h \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Memory.h $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/os_include/os_errno.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ + $(ACE_ROOT)/ace/Cleanup.h $(ACE_ROOT)/ace/Cleanup.inl \ $(ACE_ROOT)/ace/Object_Manager_Base.inl \ $(ACE_ROOT)/ace/OS_NS_string.h \ $(ACE_ROOT)/ace/OS_NS_string.inl \ @@ -683,46 +623,46 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ + $(ACE_ROOT)/ace/OS_NS_fcntl.h \ + $(ACE_ROOT)/ace/os_include/os_fcntl.h \ + $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ + $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ + $(ACE_ROOT)/ace/OS_NS_stdio.h \ + $(ACE_ROOT)/ace/OS_NS_stdio.inl \ + $(ACE_ROOT)/ace/OS_NS_pwd.h \ + $(ACE_ROOT)/ace/os_include/os_pwd.h \ + $(ACE_ROOT)/ace/OS_NS_pwd.inl \ $(ACE_ROOT)/ace/Thread_Mutex.inl \ $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ - $(ACE_ROOT)/ace/Guard_T.h \ - $(ACE_ROOT)/ace/Lock.h \ - $(ACE_ROOT)/ace/Lock.inl \ + $(ACE_ROOT)/ace/Atomic_Op_T.i $(ACE_ROOT)/ace/Guard_T.h \ + $(ACE_ROOT)/ace/Lock.h $(ACE_ROOT)/ace/Lock.inl \ $(ACE_ROOT)/ace/Guard_T.inl \ $(ACE_ROOT)/ace/RW_Thread_Mutex.h \ - $(ACE_ROOT)/ace/RW_Mutex.h \ - $(ACE_ROOT)/ace/RW_Mutex.inl \ + $(ACE_ROOT)/ace/RW_Mutex.h $(ACE_ROOT)/ace/RW_Mutex.inl \ $(ACE_ROOT)/ace/RW_Thread_Mutex.inl \ $(ACE_ROOT)/ace/Guard_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Atomic_Op_T.cpp $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_Traits.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/DLL.h \ + $(ACE_ROOT)/ace/Event_Handler.i $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/os_include/os_dlfcn.h \ $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Manager.h $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Thread_Exit.h \ + $(ACE_ROOT)/ace/Thread.i $(ACE_ROOT)/ace/Thread_Exit.h \ $(ACE_ROOT)/ace/Thread_Control.h \ $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Condition_Thread_Mutex.h \ $(ACE_ROOT)/ace/Condition_Thread_Mutex.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.h $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ @@ -732,23 +672,10 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/Unbounded_Set.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/TSS_T.h \ - $(ACE_ROOT)/ace/TSS_T.inl \ - $(ACE_ROOT)/ace/TSS_T.cpp \ - $(ACE_ROOT)/ace/OS_NS_stdio.h \ - $(ACE_ROOT)/ace/os_include/os_fcntl.h \ - $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ - $(ACE_ROOT)/ace/OS_NS_stdio.inl \ - $(ACE_ROOT)/ace/OS_NS_fcntl.h \ - $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ - $(ACE_ROOT)/ace/OS_NS_pwd.h \ - $(ACE_ROOT)/ace/os_include/os_pwd.h \ - $(ACE_ROOT)/ace/OS_NS_pwd.inl \ - $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Free_List.h $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/TSS_T.h $(ACE_ROOT)/ace/TSS_T.inl \ + $(ACE_ROOT)/ace/TSS_T.cpp $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/Recursive_Thread_Mutex.h \ @@ -759,35 +686,28 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Framework_Component.h \ $(ACE_ROOT)/ace/Framework_Component.inl \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/os_include/netinet/os_in.h \ $(ACE_ROOT)/ace/os_include/sys/os_socket.h \ $(ACE_ROOT)/ace/os_include/sys/os_uio.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.i $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/OS_NS_sys_socket.h \ $(ACE_ROOT)/ace/OS_NS_stropts.h \ $(ACE_ROOT)/ace/os_include/os_stropts.h \ $(ACE_ROOT)/ace/OS_NS_stropts.inl \ + $(ACE_ROOT)/ace/OS_QoS.h \ $(ACE_ROOT)/ace/OS_NS_sys_socket.inl \ $(ACE_ROOT)/ace/OS_NS_sys_uio.h \ $(ACE_ROOT)/ace/OS_NS_sys_uio.inl \ $(ACE_ROOT)/ace/Framework_Component_T.h \ $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Thread_Manager.i $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ @@ -799,38 +719,28 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Notification_Strategy.h \ $(ACE_ROOT)/ace/Notification_Strategy.inl \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Message_Queue.i $(ACE_ROOT)/ace/Task_T.i \ $(ACE_ROOT)/ace/os_include/os_assert.h \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Task_T.cpp $(ACE_ROOT)/ace/Module.h \ $(ACE_ROOT)/ace/os_include/os_dirent.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Module.i $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Null_Condition.h \ $(ACE_ROOT)/ace/Null_Mutex.h \ $(ACE_ROOT)/ace/Lock_Adapter_T.h \ $(ACE_ROOT)/ace/Lock_Adapter_T.inl \ - $(ACE_ROOT)/ace/Lock_Adapter_T.cpp \ - Kokyu_defs.h \ - $(ACE_ROOT)/ace/Array.h \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ + $(ACE_ROOT)/ace/Lock_Adapter_T.cpp Kokyu_defs.h \ + $(ACE_ROOT)/ace/Array.h $(ACE_ROOT)/ace/Auto_Ptr.h \ + $(ACE_ROOT)/ace/Auto_Ptr.i $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/Sched_Params.h \ $(ACE_ROOT)/ace/Sched_Params.i \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - kokyu_export.h Kokyu_defs.i Dispatcher_Task.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i kokyu_export.h Kokyu_defs.i \ + Dispatcher_Task.i $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Memory_Pool.h $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/OS_NS_sys_mman.h \ $(ACE_ROOT)/ace/OS_NS_sys_mman.inl \ @@ -838,57 +748,40 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Auto_Event.h \ - $(ACE_ROOT)/ace/Event.h \ - $(ACE_ROOT)/ace/Event.inl \ - $(ACE_ROOT)/ace/Auto_Event.inl \ - $(ACE_ROOT)/ace/Barrier.h \ + $(ACE_ROOT)/ace/Memory_Pool.i $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Auto_Event.h \ + $(ACE_ROOT)/ace/Event.h $(ACE_ROOT)/ace/Event.inl \ + $(ACE_ROOT)/ace/Auto_Event.inl $(ACE_ROOT)/ace/Barrier.h \ $(ACE_ROOT)/ace/Barrier.inl \ $(ACE_ROOT)/ace/Condition_Recursive_Thread_Mutex.h \ $(ACE_ROOT)/ace/Condition_Recursive_Thread_Mutex.inl \ $(ACE_ROOT)/ace/Manual_Event.h \ - $(ACE_ROOT)/ace/Manual_Event.inl \ - $(ACE_ROOT)/ace/Mutex.h \ - $(ACE_ROOT)/ace/Mutex.inl \ - $(ACE_ROOT)/ace/Null_Barrier.h \ + $(ACE_ROOT)/ace/Manual_Event.inl $(ACE_ROOT)/ace/Mutex.h \ + $(ACE_ROOT)/ace/Mutex.inl $(ACE_ROOT)/ace/Null_Barrier.h \ $(ACE_ROOT)/ace/Null_Semaphore.h \ - $(ACE_ROOT)/ace/Semaphore.h \ - $(ACE_ROOT)/ace/Semaphore.inl \ + $(ACE_ROOT)/ace/Semaphore.h $(ACE_ROOT)/ace/Semaphore.inl \ $(ACE_ROOT)/ace/Thread_Semaphore.h \ $(ACE_ROOT)/ace/Thread_Semaphore.inl \ $(ACE_ROOT)/ace/TSS_Adapter.h \ - $(ACE_ROOT)/ace/TSS_Adapter.inl \ - $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/TSS_Adapter.inl $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Reverse_Lock_T.h \ $(ACE_ROOT)/ace/Reverse_Lock_T.inl \ $(ACE_ROOT)/ace/Reverse_Lock_T.cpp \ $(ACE_ROOT)/ace/Condition_T.h \ $(ACE_ROOT)/ace/Condition_T.inl \ - $(ACE_ROOT)/ace/Condition_T.cpp \ - $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Condition_T.cpp $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Synch_T.cpp -.obj/Kokyu_defs.o .obj/Kokyu_defs.so .shobj/Kokyu_defs.o .shobj/Kokyu_defs.so: Kokyu_defs.cpp Kokyu_defs.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/Array.h \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ +.obj/Kokyu_defs.o .obj/Kokyu_defs.so .shobj/Kokyu_defs.o .shobj/Kokyu_defs.so: Kokyu_defs.cpp Kokyu_defs.h $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/Array.h $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/post.h $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Containers.h $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/Containers.i $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/OS_Export.h $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/os_include/sys/os_types.h \ $(ACE_ROOT)/ace/os_include/os_stddef.h \ $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ @@ -915,8 +808,7 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Memory.h $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ $(ACE_ROOT)/ace/OS_NS_stdlib.h \ $(ACE_ROOT)/ace/os_include/os_stdlib.h \ @@ -926,11 +818,9 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/os_include/os_ucontext.h \ $(ACE_ROOT)/ace/os_include/sys/os_resource.h \ $(ACE_ROOT)/ace/os_include/sys/os_time.h \ - $(ACE_ROOT)/ace/os_include/sys/os_select.h \ $(ACE_ROOT)/ace/OS_NS_stdlib.inl \ $(ACE_ROOT)/ace/Object_Manager_Base.h \ - $(ACE_ROOT)/ace/Cleanup.h \ - $(ACE_ROOT)/ace/Cleanup.inl \ + $(ACE_ROOT)/ace/Cleanup.h $(ACE_ROOT)/ace/Cleanup.inl \ $(ACE_ROOT)/ace/Object_Manager_Base.inl \ $(ACE_ROOT)/ace/OS_NS_string.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -947,8 +837,7 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/Time_Value.inl \ $(ACE_ROOT)/ace/OS_NS_sys_time.h \ $(ACE_ROOT)/ace/OS_NS_sys_time.inl \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/Auto_Ptr.h $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ @@ -974,9 +863,17 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/OS_NS_sys_utsname.h \ $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ $(ACE_ROOT)/ace/OS_NS_sys_utsname.inl \ + $(ACE_ROOT)/ace/OS_NS_fcntl.h \ + $(ACE_ROOT)/ace/os_include/os_fcntl.h \ + $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ + $(ACE_ROOT)/ace/OS_NS_fcntl.inl \ + $(ACE_ROOT)/ace/OS_NS_stdio.h \ + $(ACE_ROOT)/ace/OS_NS_stdio.inl \ + $(ACE_ROOT)/ace/OS_NS_pwd.h \ + $(ACE_ROOT)/ace/os_include/os_pwd.h \ + $(ACE_ROOT)/ace/OS_NS_pwd.inl \ $(ACE_ROOT)/ace/Sched_Params.i \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - kokyu_export.h Kokyu_defs.i + $(ACE_ROOT)/ace/Malloc_Allocator.i kokyu_export.h Kokyu_defs.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp index 42f98865006..a6cad99f25b 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp @@ -6,6 +6,10 @@ #include "tao/RTScheduling/Request_Interceptor.h" #include "tao/ORB_Constants.h" +#include "edf_scheduler_config.h" +#include "edf_sched_dsui_families.h" +#include <dsui.h> + EDF_Scheduling::SchedulingParameter EDF_Sched_Param_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -52,7 +56,7 @@ EDF_Scheduler::EDF_Scheduler (CORBA::ORB_ptr orb, ACE_CHECK; IOP::CodecFactory_var codec_factory; - CORBA::Object_var obj = + CORBA::Object_var obj = orb->resolve_initial_references ("CodecFactory" ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -82,6 +86,7 @@ void EDF_Scheduler::shutdown (void) { kokyu_dispatcher_->shutdown (); + DSUI_EVENT_LOG (EDF_SCHED_FAM, DISPATCHER_SHUTDOWN, 0, 0, NULL); ACE_DEBUG ((LM_DEBUG, "kokyu DSRT dispatcher shutdown\n")); } @@ -89,13 +94,16 @@ EDF_Scheduling::SchedulingParameterPolicy_ptr EDF_Scheduler::create_scheduling_parameter (const EDF_Scheduling::SchedulingParameter & value ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { + /* MEASURE: Time to create scheduling parameter */ + DSUI_EVENT_LOG (EDF_SCHED_FAM, CREATE_SCHED_PARAM, 0, 0, NULL); + EDF_Scheduling::SchedulingParameterPolicy_ptr sched_param_policy; ACE_NEW_THROW_EX (sched_param_policy, EDF_Sched_Param_Policy, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, - ENOMEM), + TAO_DEFAULT_MINOR_CODE, + ENOMEM), CORBA::COMPLETED_NO)); sched_param_policy->value (value); @@ -114,18 +122,19 @@ EDF_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { #ifdef KOKYU_DSRT_LOGGING - ACE_DEBUG ((LM_DEBUG, - "(%t|%T):EDF_Scheduler::begin_new_scheduling_segment enter\n")); + ACE_DEBUG ((LM_DEBUG, + "(%t|%T):EDF_Scheduler::begin_new_scheduling_segment enter\n")); #endif -#ifdef KOKYU_DSRT_LOGGING + //#ifdef KOKYU_DSRT_LOGGING int int_guid; ACE_OS::memcpy (&int_guid, guid.get_buffer (), guid.length ()); - ACE_DEBUG ((LM_DEBUG, "(%t|%T): guid is %d\n", int_guid)); -#endif + // ACE_DEBUG ((LM_DEBUG, "(%t|%T): guid is %d\n", int_guid)); + //#endif + DSUI_EVENT_LOG (EDF_SCHED_FAM, BEGIN_SCHED_SEGMENT, int_guid, 0, NULL); EDF_Scheduler_Traits::QoSDescriptor_t qos; EDF_Scheduling::SchedulingParameterPolicy_var sched_param_policy = EDF_Scheduling::SchedulingParameterPolicy::_narrow (sched_policy); @@ -137,19 +146,20 @@ EDF_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType kokyu_dispatcher_->schedule (guid, qos); + DSUI_EVENT_LOG (EDF_SCHED_FAM, END_SCHED_SEGMENT, int_guid, 0, NULL); #ifdef KOKYU_DSRT_LOGGING - ACE_DEBUG ((LM_DEBUG, - "(%t|%T):EDF_Scheduler::begin_new_scheduling_segment exit\n")); + ACE_DEBUG ((LM_DEBUG, + "(%t|%T):EDF_Scheduler::begin_new_scheduling_segment exit\n")); #endif } void EDF_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdType &guid, - const char *name, - CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param - ACE_ENV_ARG_DECL) + const char *name, + CORBA::Policy_ptr sched_param, + CORBA::Policy_ptr implicit_sched_param + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { @@ -212,9 +222,9 @@ EDF_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &guid void EDF_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdType &, - const char *, - CORBA::Policy_ptr - ACE_ENV_ARG_DECL_NOT_USED) + const char *, + CORBA::Policy_ptr + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -226,14 +236,11 @@ EDF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { -/*DTTIME: - first time point which records the entering scheduler time on the client side. - Fifth Time. -*/ + DSUI_EVENT_LOG (EDF_SCHED_FAM, ENTER_CLIENT_SCHED_TIME, 0, 0, NULL); Kokyu::Svc_Ctxt_DSRT_QoS sc_qos; CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK; #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, @@ -249,12 +256,12 @@ EDF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri CORBA::Policy_ptr sched_policy = this->current_->scheduling_parameter(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; -/* - int guid; - ACE_OS::memcpy (&guid, - this->current_->id ()->get_buffer (), - this->current_->id ()->length ()); -*/ + /* + int guid; + ACE_OS::memcpy (&guid, + this->current_->id ()->get_buffer (), + this->current_->id ()->length ()); + */ CORBA::Long importance; TimeBase::TimeT deadline; @@ -285,27 +292,27 @@ EDF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri int_guid)); #endif } - //Fill the guid in the SC Qos struct - sc_qos.guid.length (this->current_->id ()->length ()); - guid_copy (sc_qos.guid, *(this->current_->id ())); - sc_qos.deadline = deadline; - sc_qos.importance = importance; - CORBA::Any sc_qos_as_any; - sc_qos_as_any <<= sc_qos; + //Fill the guid in the SC Qos struct + sc_qos.guid.length (this->current_->id ()->length ()); + guid_copy (sc_qos.guid, *(this->current_->id ())); + sc_qos.deadline = deadline; + sc_qos.importance = importance; + CORBA::Any sc_qos_as_any; + sc_qos_as_any <<= sc_qos; + + sc.context_data = + ACE_reinterpret_cast(IOP::ServiceContext:: + _tao_seq_CORBA_Octet_ &, + *codec_->encode (sc_qos_as_any)); - sc.context_data = - ACE_reinterpret_cast(IOP::ServiceContext:: - _tao_seq_CORBA_Octet_ &, - *codec_->encode (sc_qos_as_any)); - #ifdef KOKYU_DSRT_LOGGING - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t|%T): send_request : about to add sched SC\n"))); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%t|%T): send_request : about to add sched SC\n"))); #endif - // Add this context to the service context list. - ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + // Add this context to the service context list. + ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER); + ACE_CHECK; #ifdef KOKYU_DSRT_LOGGING @@ -315,24 +322,18 @@ EDF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri )); #endif -/*DTTIME: - record the entering dispatcher time on the client side. - Sixth Time. -*/ + DSUI_EVENT_LOG (EDF_SCHED_FAM, CALL_KOKYU_DISPATCH_UPDATE_SCHEDULE, + 0, 0, NULL); kokyu_dispatcher_->update_schedule (*(this->current_->id ()), - Kokyu::BLOCK); -/*DTTIME: - record the leaving dispatcher time on the client side. - Seventh Time. -*/ + Kokyu::BLOCK); + DSUI_EVENT_LOG (EDF_SCHED_FAM, LEAVE_KOKYU_DISPATCH_UPDATE_SCHEDULE, + 0,0,NULL); + #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t|%T): send_request interceptor done\n"))); #endif -/*DTTIME: - record the leaving scheduler time on the client side. - Eighth Time. -*/ + DSUI_EVENT_LOG (EDF_SCHED_FAM, LEAVE_CLIENT_SCHED_TIME, 0,0,NULL); } void @@ -345,10 +346,8 @@ EDF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri, ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { -/*DTTIME: - recording the entering scheduler time on the server side. - Nighth Time. -*/ + DSUI_EVENT_LOG (EDF_SCHED_FAM, ENTER_SERVER_SCHED_TIME, 0,0,NULL); + Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr; #ifdef KOKYU_DSRT_LOGGING @@ -391,9 +390,9 @@ EDF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri, else { CORBA::OctetSeq oc_seq = CORBA::OctetSeq (sc->context_data.length (), - sc->context_data.length (), - sc->context_data.get_buffer (), - 0); + sc->context_data.length (), + sc->context_data.get_buffer (), + 0); CORBA::Any sc_qos_as_any; sc_qos_as_any = *codec_->decode (oc_seq); //Don't store in a _var, since >>= returns a pointer to an @@ -432,22 +431,15 @@ EDF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri, qos.importance_ = importance; qos.deadline_ = deadline; -/*DTTIME: - record the entering dispatcher time on the server side. - Tenth Time. -*/ + DSUI_EVENT_LOG (EDF_SCHED_FAM, ENTER_SERVER_DISPATCH_SCHEDULE, 0,0,NULL); this->kokyu_dispatcher_->schedule (guid, qos); -/*DTTIME: - record the leaving dispatcher time on the server side. - Eleventh Time. -*/ + DSUI_EVENT_LOG (EDF_SCHED_FAM, LEAVE_SERVER_DISPATCH_SCHEDULE, 0,0,NULL); + #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, "(%t|%T): receive_request interceptor done\n")); #endif -/*DTTIME: - record the leaving scheduler time on the server side. - Twelfth Time. -*/ + + DSUI_EVENT_LOG (EDF_SCHED_FAM, LEAVE_SERVER_SCHED_TIME, 0,0,NULL); } void @@ -461,7 +453,7 @@ EDF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr void EDF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { Kokyu::Svc_Ctxt_DSRT_QoS sc_qos; @@ -488,20 +480,20 @@ EDF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri ACE_CHECK; if (CORBA::is_nil (sched_policy)) - { + { #ifdef KOKYU_DSRT_LOGGING - ACE_DEBUG ((LM_DEBUG, - "(%t|%T): sched_policy nil.\n ")); + ACE_DEBUG ((LM_DEBUG, + "(%t|%T): sched_policy nil.\n ")); #endif - //24 hrs from now - infinity - ACE_Time_Value deadline_tv = ACE_OS::gettimeofday () + ACE_Time_Value (24*60*60,0); - deadline = deadline_tv.sec ()*1000000 + deadline_tv.usec ()*10; //100s of nanoseconds for TimeBase::TimeT - importance = 0; - } + //24 hrs from now - infinity + ACE_Time_Value deadline_tv = ACE_OS::gettimeofday () + ACE_Time_Value (24*60*60,0); + deadline = deadline_tv.sec ()*1000000 + deadline_tv.usec ()*10; //100s of nanoseconds for TimeBase::TimeT + importance = 0; + } else { #ifdef KOKYU_DSRT_LOGGING - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "(%t|%T):sched_policy not nil. ", "sched params set\n")); #endif @@ -535,7 +527,7 @@ EDF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri #endif } - kokyu_dispatcher_->update_schedule (*(this->current_->id ()), + kokyu_dispatcher_->update_schedule (*(this->current_->id ()), Kokyu::BLOCK); #ifdef KOKYU_DSRT_LOGGING @@ -589,7 +581,7 @@ EDF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri // expected. IOP::ServiceContext_var sc = - ri->get_reply_service_context (Client_Interceptor::SchedulingInfo + ri->get_reply_service_context (Client_Interceptor::SchedulingInfo ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -652,9 +644,9 @@ EDF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { -/* receive_reply (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; -*/ + /* receive_reply (ri ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + */ } void @@ -682,14 +674,14 @@ EDF_Scheduler::scheduling_policies (const CORBA::PolicyList & CORBA::PolicyList* EDF_Scheduler::poa_policies (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } char * EDF_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.dsui b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.dsui new file mode 100644 index 00000000000..b10916d1a29 --- /dev/null +++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.dsui @@ -0,0 +1,14 @@ +DSTRM_EVENT EDF_SCHED 4 LEAVE_SERVER_DISPATCH_SCHEDULE 12 "Record the exiting dispatcher time on the server side" print_string +DSTRM_EVENT EDF_SCHED 4 ENTER_SERVER_DISPATCH_SCHEDULE 11 "Record the entering dispatcher time on the server side" print_string +DSTRM_EVENT EDF_SCHED 4 LEAVE_SERVER_SCHED_TIME 10 "Record the exiting scheduler time on the server side" print_string +DSTRM_EVENT EDF_SCHED 4 ENTER_SERVER_SCHED_TIME 9 "Record the entering scheduler time on the server side" print_string +DSTRM_EVENT EDF_SCHED 4 LEAVE_CLIENT_SCHED_TIME 8 "Record the leaving scheduler time on the client side" print_string +DSTRM_EVENT EDF_SCHED 4 LEAVE_KOKYU_DISPATCH_UPDATE_SCHEDULE 7 "Leaving dispatcher time on the client side" print_string +DSTRM_EVENT EDF_SCHED 4 CALL_KOKYU_DISPATCH_UPDATE_SCHEDULE 6 "Entering dispatcher time on the client side" print_string +DSTRM_EVENT EDF_SCHED 4 ENTER_CLIENT_SCHED_TIME 5 "Point which records the entering scheduler time on the client side" print_string +DSTRM_EVENT EDF_SCHED 4 DISPATCHER_SHUTDOWN 4 "Kokyu DSRT Dispatcher shutdown" print_string +DSTRM_EVENT EDF_SCHED 4 CREATE_SCHED_PARAM 3 "Create Scheduling parameter" print_string +DSTRM_EVENT EDF_SCHED 4 BEGIN_SCHED_SEGMENT 2 "Start Schedule segment" print_string +DSTRM_EVENT EDF_SCHED 4 END_SCHED_SEGMENT 1 "End Schedule segment" print_string +DSTRM_EVENT EDF_SCHED 4 KOKYU_SCHED_START 0 "Start Kokyu Schedule call" print_string + diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h index 9ad13d68440..0e0952fac97 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h @@ -64,7 +64,7 @@ public TAO_Local_RefCounted_Object { public: - EDF_Scheduler (CORBA::ORB_ptr orb, + EDF_Scheduler (CORBA::ORB_ptr orb, Kokyu::DSRT_Dispatcher_Impl_t, int ace_sched_policy, int ace_sched_scope); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.h b/TAO/examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.h index 82bca2789b1..2046a30d347 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.h @@ -86,54 +86,54 @@ namespace TAO namespace EDF_Scheduling { - + // TAO_IDL - Generated from // be/be_type.cpp:258 - + struct SchedulingParameter; - + typedef TAO_Fixed_Var_T< SchedulingParameter > SchedulingParameter_var; - + typedef SchedulingParameter & SchedulingParameter_out; - + // TAO_IDL - Generated from // be/be_visitor_structure/structure_ch.cpp:52 - + struct Kokyu_DSRT_Schedulers_Export SchedulingParameter { typedef SchedulingParameter_var _var_type; - + static void _tao_any_destructor (void *); TimeBase::TimeT deadline; CORBA::Long importance; }; - + // TAO_IDL - Generated from // be/be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SchedulingParameter; - + // TAO_IDL - Generated from // be/be_interface.cpp:612 #if !defined (_EDF_SCHEDULING_SCHEDULINGPARAMETERPOLICY__VAR_OUT_CH_) #define _EDF_SCHEDULING_SCHEDULINGPARAMETERPOLICY__VAR_OUT_CH_ - + class SchedulingParameterPolicy; typedef SchedulingParameterPolicy *SchedulingParameterPolicy_ptr; - + typedef TAO_Objref_Var_T< SchedulingParameterPolicy > SchedulingParameterPolicy_var; - + typedef TAO_Objref_Out_T< SchedulingParameterPolicy @@ -141,48 +141,48 @@ namespace EDF_Scheduling SchedulingParameterPolicy_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be/be_visitor_interface/interface_ch.cpp:54 #if !defined (_EDF_SCHEDULING_SCHEDULINGPARAMETERPOLICY_CH_) #define _EDF_SCHEDULING_SCHEDULINGPARAMETERPOLICY_CH_ - + class Kokyu_DSRT_Schedulers_Export SchedulingParameterPolicy : public virtual CORBA::Policy { public: typedef SchedulingParameterPolicy_ptr _ptr_type; typedef SchedulingParameterPolicy_var _var_type; - + // The static operations. static SchedulingParameterPolicy_ptr _duplicate (SchedulingParameterPolicy_ptr obj); - + static SchedulingParameterPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static SchedulingParameterPolicy_ptr _nil (void) { return (SchedulingParameterPolicy_ptr)0; } static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be/be_visitor_operation/operation_ch.cpp:46 - + virtual ::EDF_Scheduling::SchedulingParameter value ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be/be_visitor_operation/operation_ch.cpp:46 - + virtual void value ( const EDF_Scheduling::SchedulingParameter & value ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -190,53 +190,53 @@ namespace EDF_Scheduling ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be/be_visitor_interface/interface_ch.cpp:192 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. SchedulingParameterPolicy (void); - + virtual ~SchedulingParameterPolicy (void); - + private: // Private and unimplemented for concrete interfaces. SchedulingParameterPolicy (const SchedulingParameterPolicy &); - + void operator= (const SchedulingParameterPolicy &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be/be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SchedulingParameterPolicy; - + // TAO_IDL - Generated from // be/be_interface.cpp:612 #if !defined (_EDF_SCHEDULING_SCHEDULER__VAR_OUT_CH_) #define _EDF_SCHEDULING_SCHEDULER__VAR_OUT_CH_ - + class Scheduler; typedef Scheduler *Scheduler_ptr; - + typedef TAO_Objref_Var_T< Scheduler > Scheduler_var; - + typedef TAO_Objref_Out_T< Scheduler @@ -244,38 +244,38 @@ namespace EDF_Scheduling Scheduler_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be/be_visitor_interface/interface_ch.cpp:54 #if !defined (_EDF_SCHEDULING_SCHEDULER_CH_) #define _EDF_SCHEDULING_SCHEDULER_CH_ - + class Kokyu_DSRT_Schedulers_Export Scheduler : public virtual RTScheduling::Scheduler { public: typedef Scheduler_ptr _ptr_type; typedef Scheduler_var _var_type; - + // The static operations. static Scheduler_ptr _duplicate (Scheduler_ptr obj); - + static Scheduler_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Scheduler_ptr _nil (void) { return (Scheduler_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be/be_visitor_operation/operation_ch.cpp:46 - + virtual ::EDF_Scheduling::SchedulingParameterPolicy_ptr create_scheduling_parameter ( const EDF_Scheduling::SchedulingParameter & value ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -283,24 +283,24 @@ namespace EDF_Scheduling ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be/be_visitor_interface/interface_ch.cpp:192 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. Scheduler (void); - + virtual ~Scheduler (void); - + private: // Private and unimplemented for concrete interfaces. Scheduler (const Scheduler &); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Makefile.Kokyu_DSRT_Schedulers b/TAO/examples/Kokyu_dsrt_schedulers/Makefile.Kokyu_DSRT_Schedulers index fb9caad8917..b6e5e5eb602 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/Makefile.Kokyu_DSRT_Schedulers +++ b/TAO/examples/Kokyu_dsrt_schedulers/Makefile.Kokyu_DSRT_Schedulers @@ -37,7 +37,7 @@ FILES = \ #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- -ACE_SHLIBS = -lTAO_RTScheduler -lTAO_RTCORBA -lKokyu -lTAO -lACE +ACE_SHLIBS = -lTAO_RTScheduler -lTAO_RTCORBA -lwrappers -lKokyu -ldsui -lTAO -lACE include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU ## We don't need the ACELIB setting from wrapper_macros.GNU ACELIB = @@ -109,7 +109,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU include $(TAO_ROOT)/taoconfig.mk -CPPFLAGS += -I../../../Kokyu -I../../orbsvcs -I../.. -I../../tao -I../../.. +CPPFLAGS += -I../../../Kokyu -I../../orbsvcs -I../.. -I../../tao -I../../.. + ifeq ($(shared_libs),1) ifneq ($(SHLIB),) CPPFLAGS += -DKOKYU_DSRT_SCHEDULERS_BUILD_DLL @@ -121,8 +122,9 @@ ifeq ($(static_libs),1) endif endif -# CPPFLAGS += -DKOKYU_DSRT_LOGGING -LDFLAGS += -L../../../lib +# CPPFLAGS += -DKOKYU_DSRT_LOGGING +CPPFLAGS += -I$(DATASTREAM_ROOT)/include +LDFLAGS += -L../../../lib -L$(DATASTREAM_ROOT)/lib #---------------------------------------------------------------------------- # Local targets @@ -131,9 +133,15 @@ require_warning: @echo This project will not be built due to one of the following missing features: @echo rt_corba +EDF_SCHEDULE_DSUI = edf_sched_dsui_families.h edf_sched_dsui_info.h edf_sched_dsui_table.h +DSUI_PARSE=$(DATASTREAM_ROOT)/bin/dsui-parse +edf_sched_dsui_families.h: EDF_Scheduler.dsui + $(DSUI_PARSE) -n EDF_Scheduler.dsui -t edf_sched -realclean: clean +realclean: clean + -$(RM) $(EDF_SCHEDULE_DSUI) ifneq ($(GENERATED_DIRTY),) -$(RM) -r $(GENERATED_DIRTY) endif + diff --git a/TAO/examples/Kokyu_dsrt_schedulers/edf_example/Makefile.dt_oneway_client b/TAO/examples/Kokyu_dsrt_schedulers/edf_example/Makefile.dt_oneway_client index 28c80158a4b..2f006d4c02a 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/edf_example/Makefile.dt_oneway_client +++ b/TAO/examples/Kokyu_dsrt_schedulers/edf_example/Makefile.dt_oneway_client @@ -119,8 +119,9 @@ $(BIN): $(addprefix $(VDIR), $(OBJS)) $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $(VLDLIBS) $(BORINITEXEOBJ) $(POSTLINK) $^, $@,, endif -realclean: clean +realclean: clean -$(RM) $(foreach ext, $(IDL_EXT), $(foreach file, $(IDL_FILES), $(file)$(ext))) + -$(RM) $(DT_ONEWAY_DSUI) ifneq ($(GENERATED_DIRTY),) -$(RM) -r $(GENERATED_DIRTY) endif diff --git a/TAO/examples/Kokyu_dsrt_schedulers/edf_example/dt_oneway_client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/edf_example/dt_oneway_client.cpp index 4e8aa3fb197..02b4e6cd932 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/edf_example/dt_oneway_client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/edf_example/dt_oneway_client.cpp @@ -92,6 +92,9 @@ int main (int argc, char *argv[]) { ds_control ds_cntrl ("DT_Oneway", "dt_oneway_enable.dsui"); + ACE_High_Res_Timer non_dsui_timer; + non_dsui_timer.calibrate (); + non_dsui_timer.start(); /* MEASURE: Program start time */ DSUI_EVENT_LOG(MAIN_GROUP_FAM, START,1,0,NULL); @@ -192,9 +195,9 @@ main (int argc, char *argv[]) { disp_impl_type = Kokyu::DSRT_OS_BASED; } - + ACE_NEW_RETURN (scheduler, - EDF_Scheduler (orb.in (), + EDF_Scheduler (orb.in (), disp_impl_type, sched_policy, sched_scope), -1); @@ -219,13 +222,13 @@ main (int argc, char *argv[]) int importance=0; ORBSVCS_Time::Time_Value_to_TimeT (deadline, - ACE_OS::gettimeofday () + + ACE_OS::gettimeofday () + ACE_Time_Value (50,0) ); - Worker worker1 (orb.in (), - server.in (), - current.in (), - scheduler, + Worker worker1 (orb.in (), + server.in (), + current.in (), + scheduler, deadline, importance, 30, @@ -247,7 +250,7 @@ main (int argc, char *argv[]) // Get thread id // DSUI_EVENT_LOG (MAIN_GROUP_FAM, WORKER_WAIT_DONE, 1, strlen(msg), msg); - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "(%t): wait for worker threads done in main thread\n")); if (do_shutdown) @@ -268,7 +271,7 @@ main (int argc, char *argv[]) } ACE_DEBUG ((LM_DEBUG, "(%t): about to call server shutdown\n")); - + /* MEASURE: Call to shutdown server */ // char* msg = "(%t): wait for worker threads done in main thread\n"; // Get thread id @@ -290,7 +293,7 @@ main (int argc, char *argv[]) } scheduler->shutdown (); - + /* MEASURE: Scheduler stop time */ DSUI_EVENT_LOG (MAIN_GROUP_FAM, SCHEDULER_SHUTDOWN, 1, 0, NULL); ACE_DEBUG ((LM_DEBUG, "scheduler shutdown done\n")); @@ -305,6 +308,12 @@ main (int argc, char *argv[]) /* MEASURE: Program stop time */ DSUI_EVENT_LOG(MAIN_GROUP_FAM, STOP, 1, 0, NULL); + + non_dsui_timer.stop(); + ACE_Time_Value dsui_ovhd_time; + non_dsui_timer.elapsed_time (dsui_ovhd_time); + + ACE_DEBUG ((LM_DEBUG, "Elapsed time: %lu\n", ((double)dsui_ovhd_time.msec() / 1000))); return 0; } @@ -373,7 +382,7 @@ Worker::svc (void) sched_param.deadline = deadline_; sched_param_policy = scheduler_->create_scheduling_parameter (sched_param); CORBA::Policy_var implicit_sched_param = sched_param_policy; - + /* MEASURE: Start of scheduling segment */ DSUI_EVENT_LOG (WORKER_GROUP_FAM, BEGIN_SCHED_SEGMENT, 1, 0, NULL); ACE_DEBUG ((LM_DEBUG, "(%t|%T):before begin_sched_segment\n")); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/edf_example/dt_oneway_enable.dsui b/TAO/examples/Kokyu_dsrt_schedulers/edf_example/dt_oneway_enable.dsui index fe979b2ad06..0f1c13c9d9f 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/edf_example/dt_oneway_enable.dsui +++ b/TAO/examples/Kokyu_dsrt_schedulers/edf_example/dt_oneway_enable.dsui @@ -1,7 +1,25 @@ +# DSRT DIRECT Dispatcher (DSRT_DIRECT_Dispatcher_Impl_T.cpp) +DSTRM_EVENT DSRT_DIRECT_DISPATCH 7 SCHEDULE_EXIT 1 +DSTRM_EVENT DSRT_DIRECT_DISPATCH 7 SCHEDULE_ENTER 0 + +# DSRT CV Dispatcher (DSRT_CV_Dispatcher_Impl_T.cpp) +DSTRM_EVENT DSRT_CV_DISPATCH 6 SCHEDULE_EXIT 1 +DSTRM_EVENT DSRT_CV_DISPATCH 6 SCHEDULE_ENTER 0 + # DSRT_Dispatcher DSTRM_EVENT DSRT_DISPATCH 5 SCHEDULE 0 # EDF_SCHED +DSTRM_EVENT EDF_SCHED 4 LEAVE_SERVER_DISPATCH_SCHEDULE 12 +DSTRM_EVENT EDF_SCHED 4 ENTER_SERVER_DISPATCH_SCHEDULE 11 +DSTRM_EVENT EDF_SCHED 4 LEAVE_SERVER_SCHED_TIME 10 +DSTRM_EVENT EDF_SCHED 4 ENTER_SERVER_SCHED_TIME 9 +DSTRM_EVENT EDF_SCHED 4 LEAVE_CLIENT_SCHED_TIME 8 +DSTRM_EVENT EDF_SCHED 4 LEAVE_KOKYU_DISPATCH_UPDATE_SCHEDULE 7 +DSTRM_EVENT EDF_SCHED 4 CALL_KOKYU_DISPATCH_UPDATE_SCHEDULE 6 +DSTRM_EVENT EDF_SCHED 4 ENTER_CLIENT_SCHED_TIME 5 +DSTRM_EVENT EDF_SCHED 4 DISPATCHER_SHUTDOWN 4 +DSTRM_EVENT EDF_SCHED 4 CREATE_SCHED_PARAM 3 DSTRM_EVENT EDF_SCHED 4 BEGIN_SCHED_SEGMENT 2 DSTRM_EVENT EDF_SCHED 4 END_SCHED_SEGMENT 1 DSTRM_EVENT EDF_SCHED 4 KOKYU_SCHED_START 0 diff --git a/TAO/examples/Kokyu_dsrt_schedulers/edf_example/dt_oneway_server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/edf_example/dt_oneway_server.cpp index 616916b53c8..b078cb4d477 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/edf_example/dt_oneway_server.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/edf_example/dt_oneway_server.cpp @@ -8,6 +8,8 @@ #include "EDF_Scheduler.h" #include "Task_Stats.h" +#include <dsui.h> + ACE_RCSID(MT_Server, server, "server.cpp,v 1.3 2003/10/14 05:57:01 jwillemsen Exp") const char *ior_output_file = "test1.ior"; @@ -78,6 +80,9 @@ Task_Stats task_stats; int main (int argc, char *argv[]) { + + ds_control ds_cntrl ("DT_Oneway", "dt_oneway_enable.dsui"); + EDF_Scheduler* scheduler = 0; RTScheduling::Current_var current; long flags; |