From 061ebfda6bc438115795ec7e750bffbb70c56286 Mon Sep 17 00:00:00 2001 From: storri Date: Fri, 31 Oct 2003 03:23:25 +0000 Subject: First installation points in Dispatcher_Task.cpp. In order to use the DATASTREAM_ROOT environment variable must be set. I chose to use this because as with the ACE_ROOT it allows use to put the DSUI/DSKI code anywhere. In order to collect data we will need a simple example which I will setup to collect information. Transforming collected data from binary format to will be a bit envolved but nothing that cannot be scripted. --- Kokyu/Dispatcher_Task.cpp | 27 ++++- Kokyu/Kokyu.dsui | 11 ++ Kokyu/Makefile.Kokyu | 300 ++++++++++++++++++++++++---------------------- Kokyu/kokyu_dsui_config.h | 13 ++ 4 files changed, 208 insertions(+), 143 deletions(-) create mode 100644 Kokyu/Kokyu.dsui create mode 100644 Kokyu/kokyu_dsui_config.h diff --git a/Kokyu/Dispatcher_Task.cpp b/Kokyu/Dispatcher_Task.cpp index ce9fe1d3a94..b152ede0231 100644 --- a/Kokyu/Dispatcher_Task.cpp +++ b/Kokyu/Dispatcher_Task.cpp @@ -9,6 +9,10 @@ #include "Dispatcher_Task.i" #endif /* __ACE_INLINE__ */ +#include "kokyu_dsui_config.h" +#include "kokyu_dsui_families.h" +#include + ACE_RCSID(Kokyu, Dispatcher_Task, "$Id$") namespace @@ -121,7 +125,13 @@ Dispatcher_Task::svc (void) ACE_ASSERT(command != 0); - //@@DSUI - DISPATCH_COMMAND_EXECUTE event + //@@DSUI - DISPATCH_EVENT_EXECUTE event + /* Log KOKYU_GROUP_FAM event: DISPATCH_EVENT_EXECUTE + * ID: 0 + * Length of string data: 0 + * String data: NULL + */ + DSUI_EVENT_LOG (KOKYU_GROUP_FAM, DISPATCH_EVENT_EXECUTE, 0, 0, NULL); int result = command->execute (); if (command->can_be_deleted ()) @@ -139,7 +149,20 @@ int Dispatcher_Task::enqueue (const Dispatch_Command* cmd, const QoSDescriptor& qos_info) { - //@@DSUI - DISPATCH_COMMAND_ENQUEUE event + //@@DSUI - DISPATCH_EVENT_ENQUEUE event + /* Log KOKYU_GROUP_FAM event: DISPATCH_EVENT_ENQUEUE + * ID: 0 + * Length of string data: 0 + * String data: NULL + * + * ID is meant to be a unique identifier for the stream of events. + * So if you are tracking a command (number 504) through the system + * you would replace 0 with variable containing 504 + * + * The string data is there in case you want to add someting to the + * datastream data to describe or add information to the timestamp + */ + DSUI_EVENT_LOG (KOKYU_GROUP_FAM, DISPATCH_EVENT_ENQUEUE, 0, 0, NULL); void* buf = this->allocator_->malloc (sizeof (Dispatch_Queue_Item)); if (buf == 0) diff --git a/Kokyu/Kokyu.dsui b/Kokyu/Kokyu.dsui new file mode 100644 index 00000000000..bae31e70b1c --- /dev/null +++ b/Kokyu/Kokyu.dsui @@ -0,0 +1,11 @@ + + +################################################# +# Kokyu Namespace Specification File # +################################################# + + +# Entity type Family Name Fam ID Entity Name Ety ID Description function 1 function2 +DSTRM_EVENT KOKYU_GROUP 1 DISPATCH_EVENT_EXECUTE 2 "Dispatcher event executed" print_string + +DSTRM_EVENT KOKYU_GROUP 1 DISPATCH_EVENT_ENQUEUE 1 "Dispatcher event enqueued" print_string diff --git a/Kokyu/Makefile.Kokyu b/Kokyu/Makefile.Kokyu index cb37e1cf54c..39d9b2f2943 100644 --- a/Kokyu/Makefile.Kokyu +++ b/Kokyu/Makefile.Kokyu @@ -8,8 +8,6 @@ MAKEFILE = Makefile.Kokyu LIB_UNCHECKED = libKokyu.a SHLIB_UNCHECKED = libKokyu.$(SOEXT) - - FILES = \ Dispatcher_Impl \ Kokyu \ @@ -34,9 +32,21 @@ 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.. +CPPFLAGS += -I.. -I$(DATASTREAM_ROOT)/include LDFLAGS += -L../ace +kokyu_dsui_families.h: Kokyu.dsui + $(DATASTREAM_ROOT)/bin/dsui-parse -n Kokyu.dsui -t kokyu + +kokyu_dsui_info.h: Kokyu.dsui + $(DATASTREAM_ROOT)/bin/dsui-parse -n Kokyu.dsui -t kokyu + +kokyu_dsui_table.h: Kokyu.dsui + $(DATASTREAM_ROOT)/bin/dsui-parse -n Kokyu.dsui -t kokyu + + +realclean: + rm kokyu_dsui_families.h kokyu_dsui_info.h kokyu_dsui_table.h #---------------------------------------------------------------------------- # Local targets @@ -50,17 +60,14 @@ 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/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/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/Containers.i $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Global_Macros.h \ @@ -106,8 +113,7 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/Message_Block_T.h \ $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/Sched_Params.h \ - $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/Sched_Params.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/os_include/os_dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -127,8 +133,7 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/os_include/os_string.h \ $(ACE_ROOT)/ace/os_include/os_strings.h \ $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/OS_TLI.h $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/os_include/os_dlfcn.h \ $(ACE_ROOT)/ace/os_include/os_netdb.h \ $(ACE_ROOT)/ace/os_include/netinet/os_in.h \ @@ -154,23 +159,20 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/os_include/sys/os_msg.h \ $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ $(ACE_ROOT)/ace/os_include/os_syslog.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Sched_Params.i \ - kokyu_export.h Kokyu_defs.i Dispatcher_Impl.i + $(ACE_ROOT)/ace/OS.i $(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 -.obj/Kokyu.o .obj/Kokyu.so .shobj/Kokyu.o .shobj/Kokyu.so: Kokyu.cpp Kokyu.h \ - $(ACE_ROOT)/ace/pre.h \ - kokyu_export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - Kokyu_defs.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/ACE_export.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Node.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 \ @@ -216,8 +218,7 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/Message_Block_T.h \ $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/Sched_Params.h \ - $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/Sched_Params.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/os_include/os_dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -237,8 +238,7 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/os_include/os_string.h \ $(ACE_ROOT)/ace/os_include/os_strings.h \ $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/OS_TLI.h $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/os_include/os_dlfcn.h \ $(ACE_ROOT)/ace/os_include/os_netdb.h \ $(ACE_ROOT)/ace/os_include/netinet/os_in.h \ @@ -264,10 +264,10 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/os_include/sys/os_msg.h \ $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ $(ACE_ROOT)/ace/os_include/os_syslog.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Sched_Params.i \ - Kokyu_defs.i Dispatcher_Impl.h Dispatcher_Impl.i Kokyu.i \ - Default_Dispatcher_Impl.h \ + $(ACE_ROOT)/ace/OS.i $(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/Shared_Object.h \ @@ -279,8 +279,7 @@ LDFLAGS += -L../ace $(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/Guard_T.h $(ACE_ROOT)/ace/Lock.h \ $(ACE_ROOT)/ace/Lock.inl \ $(ACE_ROOT)/ace/Guard_T.inl \ $(ACE_ROOT)/ace/Guard_T.cpp \ @@ -305,10 +304,8 @@ LDFLAGS += -L../ace $(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.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 \ @@ -320,8 +317,7 @@ 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/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 \ @@ -336,8 +332,7 @@ LDFLAGS += -L../ace $(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/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 \ @@ -346,40 +341,42 @@ LDFLAGS += -L../ace $(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/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Task_T.i $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h $(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 \ + 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.h \ + $(ACE_ROOT)/ace/os_include/sys/os_types.h \ + $(ACE_ROOT)/ace/os_include/os_stddef.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/os_include/os_signal.h \ + $(ACE_ROOT)/ace/os_include/os_time.h \ + $(ACE_ROOT)/ace/os_include/os_ucontext.h \ + $(ACE_ROOT)/ace/Atomic_Op.h \ + $(ACE_ROOT)/ace/Thread_Mutex.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.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_include/os_dirent.h \ - $(ACE_ROOT)/ace/os_include/sys/os_types.h \ - $(ACE_ROOT)/ace/os_include/os_stddef.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 \ @@ -392,9 +389,6 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/os_include/os_float.h \ $(ACE_ROOT)/ace/os_include/os_stdlib.h \ $(ACE_ROOT)/ace/os_include/sys/os_wait.h \ - $(ACE_ROOT)/ace/os_include/os_signal.h \ - $(ACE_ROOT)/ace/os_include/os_time.h \ - $(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 \ @@ -405,8 +399,7 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_Memory.h \ $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/OS_TLI.h $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/os_include/os_dlfcn.h \ $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(ACE_ROOT)/ace/os_include/os_netdb.h \ @@ -439,16 +432,10 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ $(ACE_ROOT)/ace/os_include/os_syslog.h \ $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Atomic_Op.h \ - $(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/Guard_T.h $(ACE_ROOT)/ace/Lock.h \ $(ACE_ROOT)/ace/Lock.inl \ $(ACE_ROOT)/ace/Guard_T.inl \ $(ACE_ROOT)/ace/Guard_T.cpp \ @@ -475,8 +462,7 @@ LDFLAGS += -L../ace $(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/Node.cpp \ + $(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 \ @@ -494,10 +480,8 @@ LDFLAGS += -L../ace $(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.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 \ @@ -509,8 +493,7 @@ 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/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 \ @@ -525,8 +508,7 @@ LDFLAGS += -L../ace $(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/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 \ @@ -540,10 +522,8 @@ LDFLAGS += -L../ace $(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/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Task_T.i $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Module.i \ $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ @@ -551,35 +531,41 @@ LDFLAGS += -L../ace $(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/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 \ - Kokyu_defs.i Dispatcher_Impl.h Dispatcher_Impl.i Dispatcher_Task.h \ + $(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/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.h \ + $(ACE_ROOT)/ace/os_include/sys/os_types.h \ + $(ACE_ROOT)/ace/os_include/os_stddef.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/os_include/os_signal.h \ + $(ACE_ROOT)/ace/os_include/os_time.h \ + $(ACE_ROOT)/ace/os_include/os_ucontext.h \ + $(ACE_ROOT)/ace/Atomic_Op.h \ + $(ACE_ROOT)/ace/Thread_Mutex.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.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_include/os_dirent.h \ - $(ACE_ROOT)/ace/os_include/sys/os_types.h \ - $(ACE_ROOT)/ace/os_include/os_stddef.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 \ @@ -592,9 +578,6 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/os_include/os_float.h \ $(ACE_ROOT)/ace/os_include/os_stdlib.h \ $(ACE_ROOT)/ace/os_include/sys/os_wait.h \ - $(ACE_ROOT)/ace/os_include/os_signal.h \ - $(ACE_ROOT)/ace/os_include/os_time.h \ - $(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 \ @@ -605,8 +588,7 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/os_include/os_ctype.h \ $(ACE_ROOT)/ace/OS_Memory.h \ $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/OS_TLI.h $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/os_include/os_dlfcn.h \ $(ACE_ROOT)/ace/os_include/sys/os_mman.h \ $(ACE_ROOT)/ace/os_include/os_netdb.h \ @@ -639,16 +621,10 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ $(ACE_ROOT)/ace/os_include/os_syslog.h \ $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Atomic_Op.h \ - $(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/Guard_T.h $(ACE_ROOT)/ace/Lock.h \ $(ACE_ROOT)/ace/Lock.inl \ $(ACE_ROOT)/ace/Guard_T.inl \ $(ACE_ROOT)/ace/Guard_T.cpp \ @@ -675,8 +651,7 @@ LDFLAGS += -L../ace $(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/Node.cpp \ + $(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 \ @@ -694,10 +669,8 @@ LDFLAGS += -L../ace $(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.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 \ @@ -709,8 +682,7 @@ 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/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 \ @@ -725,8 +697,7 @@ LDFLAGS += -L../ace $(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/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 \ @@ -740,10 +711,8 @@ LDFLAGS += -L../ace $(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/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Task_T.i $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Module.i \ $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ @@ -751,27 +720,77 @@ LDFLAGS += -L../ace $(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/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 \ - kokyu_export.h Kokyu_defs.i Dispatcher_Task.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/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(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/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/Null_Semaphore.h \ + $(ACE_ROOT)/ace/RW_Mutex.h \ + $(ACE_ROOT)/ace/RW_Mutex.inl \ + $(ACE_ROOT)/ace/RW_Thread_Mutex.h \ + $(ACE_ROOT)/ace/RW_Thread_Mutex.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/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/Synch_T.cpp kokyu_dsui_config.h \ + kokyu_dsui_families.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 \ +.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/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/Containers.i $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Global_Macros.h \ @@ -817,8 +836,7 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/Message_Block_T.h \ $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/Sched_Params.h \ - $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/Sched_Params.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/os_include/os_dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -838,8 +856,7 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/os_include/os_string.h \ $(ACE_ROOT)/ace/os_include/os_strings.h \ $(ACE_ROOT)/ace/os_include/os_ctype.h \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/OS_TLI.h $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/os_include/os_dlfcn.h \ $(ACE_ROOT)/ace/os_include/os_netdb.h \ $(ACE_ROOT)/ace/os_include/netinet/os_in.h \ @@ -865,8 +882,9 @@ LDFLAGS += -L../ace $(ACE_ROOT)/ace/os_include/sys/os_msg.h \ $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \ $(ACE_ROOT)/ace/os_include/os_syslog.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Sched_Params.i \ - kokyu_export.h Kokyu_defs.i + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Sched_Params.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i kokyu_export.h \ + Kokyu_defs.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/Kokyu/kokyu_dsui_config.h b/Kokyu/kokyu_dsui_config.h new file mode 100644 index 00000000000..70398a1208c --- /dev/null +++ b/Kokyu/kokyu_dsui_config.h @@ -0,0 +1,13 @@ +/** + * @file kokyu_dsui_config.h + * + * $Id$ + * + * @author Stephen Torri (storri@cse.wustl.edu) + */ +#ifndef KOKYU_DSUI_CONFIG_H +#define KOKYU_DSUI_CONFIG_H + +#define CONFIG_DSTREAM_KOKYU_GROUP + +#endif /* KOKYU_DSUI_CONFIG_H */ -- cgit v1.2.1