diff options
258 files changed, 11774 insertions, 15414 deletions
diff --git a/ACEXML/ACEXML.mwc b/ACEXML/ACEXML.mwc new file mode 100644 index 00000000000..3bcd3bd09c4 --- /dev/null +++ b/ACEXML/ACEXML.mwc @@ -0,0 +1,7 @@ +workspace (ACEXML) { + common + parser + apps + examples + tests +} diff --git a/ACEXML/Makefile b/ACEXML/Makefile index ccba2b77d1c..18e8c1ead27 100644 --- a/ACEXML/Makefile +++ b/ACEXML/Makefile @@ -1,21 +1,34 @@ +# $Id$ #---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for the client programs that test the ACE network services +# GNU Workspace #---------------------------------------------------------------------------- -DIRS = common \ - parser \ - apps \ - tests \ - examples - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU +TARGETS_NESTED := $(TARGETS_NESTED:.nested=) +MFILES = \ + common/Makefile.XML_Common \ + parser/parser/Makefile.Parser \ + parser/debug_validator/Makefile.Validator \ + apps/svcconf/Makefile.XML_Svc_Conf_Parser \ + examples/svcconf/Makefile.Svcconf \ + examples/SAXPrint/Makefile.SAXPrint \ + tests/Makefile.HttpCharStream_Test \ + tests/Makefile.Transcoder_Test \ + tests/Makefile.NamespaceSupport_Test + +$(TARGETS_NESTED): +ifneq (Windows,$(findstring Windows,$(OS))) + @for file in $(MFILES); do \ + $(MAKE) -f `basename $$file` -C `dirname $$file` $(@); \ + done +else + -@cmd /c "$(MAKE) -f Makefile.XML_Common -C common $(@)" + -@cmd /c "$(MAKE) -f Makefile.Parser -C parser/parser $(@)" + -@cmd /c "$(MAKE) -f Makefile.Validator -C parser/debug_validator $(@)" + -@cmd /c "$(MAKE) -f Makefile.XML_Svc_Conf_Parser -C apps/svcconf $(@)" + -@cmd /c "$(MAKE) -f Makefile.Svcconf -C examples/svcconf $(@)" + -@cmd /c "$(MAKE) -f Makefile.SAXPrint -C examples/SAXPrint $(@)" + -@cmd /c "$(MAKE) -f Makefile.HttpCharStream_Test -C tests $(@)" + -@cmd /c "$(MAKE) -f Makefile.Transcoder_Test -C tests $(@)" + -@cmd /c "$(MAKE) -f Makefile.NamespaceSupport_Test -C tests $(@)" +endif diff --git a/ACEXML/apps/Makefile b/ACEXML/apps/Makefile deleted file mode 100644 index a5f05b99ae5..00000000000 --- a/ACEXML/apps/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for the client programs that test the ACE network services -#---------------------------------------------------------------------------- - -DIRS = svcconf - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU diff --git a/ACEXML/apps/svcconf/Makefile b/ACEXML/apps/svcconf/Makefile deleted file mode 100644 index 0057efc38f6..00000000000 --- a/ACEXML/apps/svcconf/Makefile +++ /dev/null @@ -1,410 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for the server-side ACE network services -#---------------------------------------------------------------------------- - -LIB = libACEXML_XML_Svc_Conf_Parser.a -SHLIB = libACEXML_XML_Svc_Conf_Parser.$(SOEXT) - -FILES = Svcconf_Handler \ - Svcconf - -DEFS = $(addsuffix .h,$(FILES)) -LSRC = $(addsuffix .cpp,$(FILES)) - -LIBS += -lACEXML_Parser -lACEXML $(ACELIB) - -BUILD = $(VLIB) $(VSHLIB) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - -.obj/Svcconf_Handler.o .obj/Svcconf_Handler.so .shobj/Svcconf_Handler.o .shobj/Svcconf_Handler.so: Svcconf_Handler.cpp Svcconf_Handler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/ContentHandler.h \ - $(ACE_ROOT)/ACEXML/common/Env.h \ - $(ACE_ROOT)/ACEXML/common/XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - $(ACE_ROOT)/ACEXML/common/Exception.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/Env.i \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.i \ - $(ACE_ROOT)/ACEXML/common/Locator.h \ - $(ACE_ROOT)/ACEXML/common/Attributes.h \ - $(ACE_ROOT)/ACEXML/common/DTDHandler.h \ - $(ACE_ROOT)/ACEXML/common/EntityResolver.h \ - $(ACE_ROOT)/ACEXML/common/InputSource.h \ - $(ACE_ROOT)/ACEXML/common/CharStream.h \ - $(ACE_ROOT)/ACEXML/common/ErrorHandler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.i \ - $(ACE_ROOT)/ace/Service_Types.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 \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/ARGV.h \ - $(ACE_ROOT)/ace/ARGV.i \ - $(ACE_ROOT)/ace/Module.h \ - $(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 \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(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.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ - $(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 \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component.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.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp - -.obj/Svcconf.o .obj/Svcconf.so .shobj/Svcconf.o .shobj/Svcconf.so: Svcconf.cpp Svcconf.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/parser/parser/Parser.h \ - $(ACE_ROOT)/ACEXML/parser/parser/Parser_export.h \ - $(ACE_ROOT)/ACEXML/common/XMLReader.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ACEXML/common/ContentHandler.h \ - $(ACE_ROOT)/ACEXML/common/Env.h \ - $(ACE_ROOT)/ACEXML/common/XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - $(ACE_ROOT)/ACEXML/common/Exception.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/Env.i \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.i \ - $(ACE_ROOT)/ACEXML/common/Locator.h \ - $(ACE_ROOT)/ACEXML/common/Attributes.h \ - $(ACE_ROOT)/ACEXML/common/DTDHandler.h \ - $(ACE_ROOT)/ACEXML/common/EntityResolver.h \ - $(ACE_ROOT)/ACEXML/common/InputSource.h \ - $(ACE_ROOT)/ACEXML/common/CharStream.h \ - $(ACE_ROOT)/ACEXML/common/ErrorHandler.h \ - $(ACE_ROOT)/ACEXML/common/LocatorImpl.h \ - $(ACE_ROOT)/ACEXML/common/LocatorImpl.i \ - $(ACE_ROOT)/ACEXML/common/NamespaceSupport.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Types.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 \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ACEXML/common/NamespaceSupport.i \ - $(ACE_ROOT)/ace/Obstack.h \ - $(ACE_ROOT)/ace/Obstack_T.h \ - $(ACE_ROOT)/ace/Obchunk.h \ - $(ACE_ROOT)/ace/Obchunk.i \ - $(ACE_ROOT)/ace/Obstack_T.i \ - $(ACE_ROOT)/ace/Obstack_T.cpp \ - $(ACE_ROOT)/ACEXML/parser/parser/Entity_Manager.h \ - $(ACE_ROOT)/ACEXML/parser/parser/Entity_Manager.i \ - $(ACE_ROOT)/ACEXML/parser/parser/Parser.i \ - Svcconf_Handler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.i \ - $(ACE_ROOT)/ACEXML/common/FileCharStream.h \ - $(ACE_ROOT)/ACEXML/common/Encoding.h \ - $(ACE_ROOT)/ACEXML/common/StrCharStream.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/apps/svcconf/Makefile.XML_Svc_Conf_Parser b/ACEXML/apps/svcconf/Makefile.XML_Svc_Conf_Parser new file mode 100644 index 00000000000..d59b8be097e --- /dev/null +++ b/ACEXML/apps/svcconf/Makefile.XML_Svc_Conf_Parser @@ -0,0 +1,47 @@ +#---------------------------------------------------------------------------- +# GNU Makefile +#---------------------------------------------------------------------------- + +MAKEFILE = Makefile.XML_Svc_Conf_Parser +DEPENDENCY_FILE = .depend.Makefile.XML_Svc_Conf_Parser +LIB_UNCHECKED = libACEXML_XML_Svc_Conf_Parser.a +SHLIB_UNCHECKED = libACEXML_XML_Svc_Conf_Parser.$(SOEXT) + + + +FILES = \ + Svcconf \ + Svcconf_Handler + +LIB = $(LIB_UNCHECKED) +SHLIB = $(SHLIB_UNCHECKED) + +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +LSRC = $(addsuffix .cpp, $(FILES)) +ACELIB = -lACE + +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +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 + +ACE_SHLIBS = -lACEXML_Parser -lACEXML $(ACELIB) + +#---------------------------------------------------------------------------- +# Local targets +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Dependencies +#---------------------------------------------------------------------------- +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/apps/svcconf/svcconf.mpc b/ACEXML/apps/svcconf/svcconf.mpc new file mode 100644 index 00000000000..2495fe07e1f --- /dev/null +++ b/ACEXML/apps/svcconf/svcconf.mpc @@ -0,0 +1,5 @@ +project (XML_Svc_Conf_Parser) : acelib { + depends = XML_Parser + sharedname = ACEXML_XML_Svc_Conf_Parser + libs = ACEXML_Parser ACEXML +} diff --git a/ACEXML/common/Attributes.h b/ACEXML/common/Attributes.h index 87937a5624c..ceff8fa0d2e 100644 --- a/ACEXML/common/Attributes.h +++ b/ACEXML/common/Attributes.h @@ -14,12 +14,6 @@ #define _ACEXML_ATTRIBUTES_H_ #include "ace/pre.h" -#include "ACEXML/common/ACEXML_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - #include "ACEXML/common/XML_Types.h" /** diff --git a/ACEXML/common/Attributes_Def_Builder.h b/ACEXML/common/Attributes_Def_Builder.h index 26404fe6d86..ed7139bd2a3 100644 --- a/ACEXML/common/Attributes_Def_Builder.h +++ b/ACEXML/common/Attributes_Def_Builder.h @@ -39,7 +39,7 @@ public: typedef auto_ptr<ACEXML_Attribute_Def_Builder> VAR; - typedef enum { + enum ATT_TYPE { CDATA, ID, IDREF, @@ -51,14 +51,14 @@ public: NOTATION, ENUMERATION, ERROR_TYPE - } ATT_TYPE; + }; - typedef enum { + enum DEFAULT_DECL { REQUIRED, IMPLIED, FIXED, INVALID - } DEFAULT_DECL; + }; virtual ~ACEXML_Attribute_Def_Builder () = 0; diff --git a/ACEXML/common/CharStream.h b/ACEXML/common/CharStream.h index 1b5c199f527..06d0efad61a 100644 --- a/ACEXML/common/CharStream.h +++ b/ACEXML/common/CharStream.h @@ -57,8 +57,7 @@ public: /** * Read the next batch of ACEXML_Char strings */ - virtual int read (ACEXML_Char *str, - size_t len) = 0; + virtual int read (ACEXML_Char *str, size_t len) = 0; /** * Peek the next ACEXML_Char in the CharStream. Return the diff --git a/ACEXML/common/DefaultHandler.cpp b/ACEXML/common/DefaultHandler.cpp index f96e29d3cf3..60d2d783366 100644 --- a/ACEXML/common/DefaultHandler.cpp +++ b/ACEXML/common/DefaultHandler.cpp @@ -103,7 +103,7 @@ ACEXML_DefaultHandler::startPrefixMapping (const ACEXML_Char *, // No-op. } - // *** Methods inherit from ACEXML_DTDHandler. + // *** Methods inherited from ACEXML_DTDHandler. void ACEXML_DefaultHandler::notationDecl (const ACEXML_Char *, @@ -124,7 +124,7 @@ ACEXML_DefaultHandler::unparsedEntityDecl (const ACEXML_Char *, // No-op. } - // Methods inherit from ACEXML_EnitityResolver. + // Methods inherited from ACEXML_EntityResolver. ACEXML_InputSource * ACEXML_DefaultHandler::resolveEntity (const ACEXML_Char *, @@ -135,7 +135,7 @@ ACEXML_DefaultHandler::resolveEntity (const ACEXML_Char *, return 0; } - // Methods inherit from ACEXML_ErrorHandler. + // Methods inherited from ACEXML_ErrorHandler. /* * Receive notification of a recoverable error. diff --git a/ACEXML/common/Encoding.cpp b/ACEXML/common/Encoding.cpp index 7fe8811cdbd..9bf788ff649 100644 --- a/ACEXML/common/Encoding.cpp +++ b/ACEXML/common/Encoding.cpp @@ -7,8 +7,8 @@ const ACEXML_Char* ACEXML_Encoding::encoding_names_[8] = { ACE_TEXT ("UCS-4LE"), ACE_TEXT ("UCS-4_2143"), ACE_TEXT ("UCS-4_3412"), - ACE_TEXT ("UTF-16BE"), - ACE_TEXT ("UTF-16LE"), + ACE_TEXT ("UTF-16"), + ACE_TEXT ("UTF-16"), ACE_TEXT ("UTF-8"), ACE_TEXT ("Unsupported Encoding") }; @@ -18,8 +18,8 @@ const ACEXML_UTF8 ACEXML_Encoding::byte_order_mark_[][4] = { { '\xFF', '\xFE', '\x00', '\x00' }, // UCS-4, little-endian (4321 order) { '\x00', '\x00', '\xFF', '\xFE' }, // UCS-4, unusual octet order (2143) { '\xFE', '\xFF', '\x00', '\x00' }, // UCS-4, unusual octet order (3412) - { '\xFE', '\xFF', '\xFF', '\xFF' }, // UTF-16, big-endian (3 & 4 ignored) - { '\xFF', '\xFE', '\xFF', '\xFF' }, // UTF-16, little-endian ( 3 & 4 ignored) + { '\xFE', '\xFF', '\xFF', '\xFF' }, // UTF-16, big-endian (3 & 4 != 0) + { '\xFF', '\xFE', '\xFF', '\xFF' }, // UTF-16, little-endian ( 3 & 4 != 0) { '\xEF', '\xBB', '\xBF', '\xFF' } // UTF-8 }; @@ -36,11 +36,13 @@ const ACEXML_UTF8 ACEXML_Encoding::magic_values_[][4] = { const ACEXML_Char* ACEXML_Encoding::get_encoding (const char* input) { - if (ACE_OS::memcmp (&ACEXML_Encoding::byte_order_mark_[ACEXML_Encoding::UTF16BE][0], input, 2) == 0) + if ((ACE_OS::memcmp (&ACEXML_Encoding::byte_order_mark_[ACEXML_Encoding::UTF16BE][0], input, 2) == 0) + && (input[2] != 0 || input[3] != 0)) // 3 & 4 should not be both zero return ACEXML_Encoding::encoding_names_[ACEXML_Encoding::UTF16BE]; - else if (ACE_OS::memcmp (&ACEXML_Encoding::byte_order_mark_[ACEXML_Encoding::UTF16LE][0], input, 2) == 0) + else if ((ACE_OS::memcmp (&ACEXML_Encoding::byte_order_mark_[ACEXML_Encoding::UTF16LE][0], input, 2) == 0) + && (input[2] != 0 && input[3] != 0)) // 3 & 4 should not be both zero return ACEXML_Encoding::encoding_names_[ACEXML_Encoding::UTF16LE]; - else if (ACE_OS::memcmp (&ACEXML_Encoding::byte_order_mark_[ACEXML_Encoding::UTF8][0], input, 4) == 0) + else if (ACE_OS::memcmp (&ACEXML_Encoding::byte_order_mark_[ACEXML_Encoding::UTF8][0], input, 3) == 0) return ACEXML_Encoding::encoding_names_[ACEXML_Encoding::UTF8]; else if (ACE_OS::memcmp (&ACEXML_Encoding::magic_values_[ACEXML_Encoding::UTF16BE][0], input, 4) == 0) return ACEXML_Encoding::encoding_names_[ACEXML_Encoding::UTF16BE]; @@ -49,5 +51,8 @@ ACEXML_Encoding::get_encoding (const char* input) else if (ACE_OS::memcmp (&ACEXML_Encoding::magic_values_[ACEXML_Encoding::UTF8][0], input, 4) == 0) return ACEXML_Encoding::encoding_names_[ACEXML_Encoding::UTF8]; else - return ACEXML_Encoding::encoding_names_[ACEXML_Encoding::OTHER]; + { + // ACE_ERROR ((LM_ERROR, "Unknown encoding. Assuming UTF-8\n")); + return ACEXML_Encoding::encoding_names_[ACEXML_Encoding::UTF8]; + } } diff --git a/ACEXML/common/Encoding.h b/ACEXML/common/Encoding.h index fc0917c0b91..9c334a3b602 100644 --- a/ACEXML/common/Encoding.h +++ b/ACEXML/common/Encoding.h @@ -36,14 +36,14 @@ class ACEXML_Export ACEXML_Encoding { public: enum { - UCS4BE = 0, - UCS4LE = 1, - UCS4_2143 = 2, - UCS4_3412 = 3, - UTF16BE = 4, - UTF16LE = 5, - UTF8 = 6, - OTHER = 7 + UCS4BE, + UCS4LE, + UCS4_2143, + UCS4_3412, + UTF16BE, + UTF16LE, + UTF8, + OTHER } ENCODING; static const ACEXML_Char* encoding_names_[8]; diff --git a/ACEXML/common/Exception.cpp b/ACEXML/common/Exception.cpp index 3086a8a7bfb..88b2a5709a7 100644 --- a/ACEXML/common/Exception.cpp +++ b/ACEXML/common/Exception.cpp @@ -45,7 +45,7 @@ ACEXML_Exception::is_a (const ACEXML_Char *name) void ACEXML_Exception::print (void) { - ACE_DEBUG ((LM_ERROR, + ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACEXML: (%P|%t) EXCEPTION : %s\n"), this->exception_name_)); } diff --git a/ACEXML/common/FileCharStream.cpp b/ACEXML/common/FileCharStream.cpp index 07aaa2ee97c..68aa2949013 100644 --- a/ACEXML/common/FileCharStream.cpp +++ b/ACEXML/common/FileCharStream.cpp @@ -50,22 +50,22 @@ ACEXML_FileCharStream::determine_encoding (void) const ACEXML_Char* temp = ACEXML_Encoding::get_encoding (input); if (!temp) return -1; - if (ACE_OS::strcmp (temp, - ACEXML_Encoding::encoding_names_[ACEXML_Encoding::OTHER]) == 0) - return -1; else { this->encoding_ = ACE::strnew (temp); - ACE_DEBUG ((LM_DEBUG, "File's encoding is %s\n", this->encoding_)); +// ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("File's encoding is %s\n"), +// this->encoding_)); } // Rewind the stream this->rewind(); // Move over the byte-order-mark if present. char ch; - for (int j = 0; j < 2; ++j) + for (int j = 0; j < 3; ++j) { - this->getchar_i (ch); - if (ch == '\xFF' || ch == '\xFE' || ch == '\xEF') + if (this->getchar_i (ch) < 0) + return -1; + if (ch == '\xFF' || ch == '\xFE' || ch == '\xEF' || ch == '\xBB' || + ch == '\xBF') continue; else { @@ -115,7 +115,7 @@ int ACEXML_FileCharStream::read (ACEXML_Char *str, size_t len) { - return ACE_OS::fread (str, len, 1, this->infile_); + return ACE_OS::fread (str, sizeof (ACEXML_Char), len, this->infile_); } int @@ -159,7 +159,7 @@ ACEXML_FileCharStream::get_i (ACEXML_Char& ch) ch = 0; return -1; } - ch = (BE) ? (input[0] << 8) | input[1] : (input[1] << 8) | input[0]; + ch = BE ? input[0] << 8 | input[1] : input[1] << 8 | input[0]; return 0; } #endif /* ACE_USES_WCHAR */ @@ -208,7 +208,7 @@ ACEXML_FileCharStream::peek_i (void) this->peek_ = 0; return -1; } - this->peek_ = (BE) ? (input[0] << 8) | input[1] : (input[1] << 8) | input[0]; + this->peek_ = BE ? input[0] << 8 | input[1] : input[1] << 8 | input[0]; return this->peek_; } #endif /* ACE_USES_WCHAR */ diff --git a/ACEXML/common/FileCharStream.h b/ACEXML/common/FileCharStream.h index d71792aac59..9feb5dcfbe2 100644 --- a/ACEXML/common/FileCharStream.h +++ b/ACEXML/common/FileCharStream.h @@ -54,7 +54,7 @@ public: /** * Read the next ACEXML_Char. Return -1 if we are not able to - * return an ACEXML_Char, 0 if EOS is reached, or 1 if succeed. + * return an ACEXML_Char, 0 if EOF is reached, or 1 if succeed. */ virtual int get (ACEXML_Char& ch); diff --git a/ACEXML/common/HttpCharStream.cpp b/ACEXML/common/HttpCharStream.cpp index 83426595168..d5f7f244471 100644 --- a/ACEXML/common/HttpCharStream.cpp +++ b/ACEXML/common/HttpCharStream.cpp @@ -4,6 +4,7 @@ #include "ace/ace_wchar.h" #include "ace/Auto_Ptr.h" #include "ACEXML/common/HttpCharStream.h" +#include "ACEXML/common/Encoding.h" ACE_RCSID (common, HttpCharStream, "$Id$") @@ -72,7 +73,7 @@ ACEXML_HttpCharStream::open (const ACEXML_Char *url) this->close(); ACE_ERROR_RETURN ((LM_ERROR, "Server returned status %d : %s\n", result, - "Refer HTTP/1.1 for details"), -1); + "Refer HTTP/1.0 for details"), -1); } this->size_ = len; @@ -236,6 +237,9 @@ ACEXML_HttpCharStream::get_url (size_t& len) if (this->stream_->seek (data_offset, SEEK_SET) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%s: %m", "Error in seeking to beginning of data"), -1); + + if (this->determine_encoding() == -1) + return -1; return status; } @@ -257,7 +261,7 @@ ACEXML_HttpCharStream::send_request (void) // Ensure that the <command> memory is deallocated. ACE_Auto_Basic_Array_Ptr<char> cmd_ptr (command); - int bytes = ACE_OS::sprintf (command, "GET %s HTTP/1.1\r\n", path); + int bytes = ACE_OS::sprintf (command, "GET %s HTTP/1.0\r\n", path); bytes += ACE_OS::sprintf (&command[bytes], "Host: %s\r\n", this->url_addr_->get_host_name ()); bytes += ACE_OS::sprintf (&command[bytes], "\r\n"); @@ -302,16 +306,53 @@ ACEXML_HttpCharStream::close (void) } int -ACEXML_HttpCharStream::get (ACEXML_Char& ch) +ACEXML_HttpCharStream::determine_encoding (void) { - ch = (ACEXML_Char) this->stream_->get_char(); - return (ch == (ACEXML_Char)EOF ? -1 :0); + char input[4] = {0, 0, 0, 0}; + int i = 0; + for (; i < 4 && input[i] != -1; ++i) + input[i] = this->stream_->peek_char(i); + if (i < 4) + return -1; + const ACEXML_Char* temp = ACEXML_Encoding::get_encoding (input); + if (!temp) + return -1; + else + { + this->encoding_ = ACE::strnew (temp); + // ACE_DEBUG ((LM_DEBUG, "URI's encoding is %s\n", this->encoding_)); + } + // Move over the byte-order-mark if present. + for (int j = 0; j < 3; ++j) + { + if (input[i] == '\xFF' || input[i] == '\xFE' || input[i] == '\xEF' || + input[i] == '\xBB' || input[i] == '\xBF') + { + this->stream_->get_char(); + continue; + } + break; + } + return 0; +} + +void +ACEXML_HttpCharStream::rewind (void) +{ + this->stream_->rewind(); +} + +const ACEXML_Char* +ACEXML_HttpCharStream::getEncoding (void) +{ + return this->encoding_; } int ACEXML_HttpCharStream::read (ACEXML_Char *str, size_t len) { + len = len * sizeof (ACEXML_Char); char* temp = ACE_const_cast (char*, this->stream_->recv (len)); str = ACE_TEXT_CHAR_TO_TCHAR (temp); if (str == 0) @@ -319,20 +360,76 @@ ACEXML_HttpCharStream::read (ACEXML_Char *str, return len; } + +int +ACEXML_HttpCharStream::get (ACEXML_Char& ch) +{ +#if defined (ACE_USES_WCHAR) + return this->get_i (ch); +#else + ch = (ACEXML_Char) this->stream_->get_char(); + return (ch == (ACEXML_Char)EOF ? -1 :0); +#endif /* ACE_USES_WCHAR */ +} + int ACEXML_HttpCharStream::peek (void) { +#if defined (ACE_USES_WCHAR) + return this->peek_i(); +#else return this->stream_->peek_char (0); +#endif /* ACE_USES_WCHAR */ } -void -ACEXML_HttpCharStream::rewind (void) + +#if defined (ACE_USES_WCHAR) +int +ACEXML_HttpCharStream::get_i (ACEXML_Char& ch) { - this->stream_->rewind(); + if (ACE_OS::strcmp (this->encoding_, ACE_TEXT ("UTF-8")) == 0) + { + ch = (ACEXML_Char) this->stream_->getchar(); + return (ch == (ACEXML_Char)EOF ? -1 : 0); + } + int BE = (ACE_OS::strcmp (this->encoding_, + ACE_TEXT ("UTF-16BE")) == 0) ? 1 : 0; + ACEXML_Char input[2] = {0}; + int i = 0; + for (; i < 2 && input[i] != EOF; ++i) + { + input[i] = this->stream_->get_char(); + } + if (i < 2) + { + ch = 0; + return input[i]; + } + ch = BE ? input[0] << 8 | input[1] : input[1] << 8 | input[0]; + return 0; } -const ACEXML_Char* -ACEXML_HttpCharStream::getEncoding (void) +int +ACEXML_HttpCharStream::peek_i (void) { - return this->encoding_; + // If we are reading a UTF-8 encoded file, just use the plain unget. + if (ACE_OS::strcmp (this->encoding_, ACE_TEXT ("UTF-8")) == 0) + { + ACEXML_Char ch = (ACEXML_Char) this->stream_->peek_char (0); + return ch; + } + + int BE = (ACE_OS::strcmp (this->encoding_, + ACE_TEXT ("UTF-16BE")) == 0) ? 1 : 0; + // Peek into the stream. + ACEXML_Char input[2]; + int i = 0; + for (; i < 2 && input[i] != EOF; ++i) + { + input[i] = this->peek_char (i); + } + if (i < 2) + return -1; + return (BE ? input[0] << 8 | input[1] : input[1] << 8 | input[0]); } +#endif /* ACE_USES_WCHAR */ diff --git a/ACEXML/common/HttpCharStream.h b/ACEXML/common/HttpCharStream.h index 7bce23a224b..6a164605d0f 100644 --- a/ACEXML/common/HttpCharStream.h +++ b/ACEXML/common/HttpCharStream.h @@ -62,8 +62,7 @@ public: /** * Read the next batch of ACEXML_Char strings */ - virtual int read (ACEXML_Char *str, - size_t len); + virtual int read (ACEXML_Char *str, size_t len); /** * Peek the next ACEXML_Char in the CharStream. Return the @@ -77,6 +76,11 @@ public: virtual void rewind (void); /** + * Determine the encoding of the file. + */ + virtual int determine_encoding (void); + + /** * Get the encoding of the file */ virtual const ACEXML_Char* getEncoding (void); diff --git a/ACEXML/common/InputSource.cpp b/ACEXML/common/InputSource.cpp index 0dcdeb0f2ba..1292f3caa31 100644 --- a/ACEXML/common/InputSource.cpp +++ b/ACEXML/common/InputSource.cpp @@ -22,8 +22,7 @@ ACEXML_InputSource::ACEXML_InputSource (ACEXML_CharStream *stm) /* * Create a new input source with a character stream. - * / - InputSource (Reader); + * */ ACEXML_InputSource::ACEXML_InputSource (const ACEXML_Char *systemId) @@ -40,31 +39,25 @@ ACEXML_InputSource::~ACEXML_InputSource (void) } ACEXML_CharStream * -ACEXML_InputSource::getCharStream (void) +ACEXML_InputSource::getCharStream (void) const { return this->charStream_; } - /* - * Get the character stream for this input source. - * / - virtual Reader *getCharacterStream (void); - */ - const ACEXML_Char * -ACEXML_InputSource::getEncoding (void) +ACEXML_InputSource::getEncoding (void) const { return this->encoding_; } const ACEXML_Char * -ACEXML_InputSource::getPublicId (void) +ACEXML_InputSource::getPublicId (void) const { return this->publicId_; } const ACEXML_Char * -ACEXML_InputSource::getSystemId (void) +ACEXML_InputSource::getSystemId (void) const { return this->systemId_; } @@ -76,11 +69,6 @@ ACEXML_InputSource::setCharStream (ACEXML_CharStream *stm) this->charStream_ = stm; } - /* - * Set the character stream for this input source. - * - */ - void ACEXML_InputSource::setEncoding (const ACEXML_Char *encoding) { diff --git a/ACEXML/common/InputSource.h b/ACEXML/common/InputSource.h index 2d8c5a7beb5..aca68f1adeb 100644 --- a/ACEXML/common/InputSource.h +++ b/ACEXML/common/InputSource.h @@ -63,7 +63,7 @@ public: * Notice that ACEXML_InputSource assumes the ownership * of <stream> */ - ACEXML_InputSource (ACEXML_CharStream *stream); + ACE_EXPLICIT ACEXML_InputSource (ACEXML_CharStream *stream); /* * Create a new input source with a system identifier. @@ -78,22 +78,22 @@ public: /* * Get the ACEXML_Char stream for this input source. */ - virtual ACEXML_CharStream *getCharStream (void); + virtual ACEXML_CharStream *getCharStream (void) const; /* * Get the character encoding for a byte stream or URI. */ - virtual const ACEXML_Char *getEncoding (void); + virtual const ACEXML_Char *getEncoding (void) const; /* * Get the public identifier for this input source. */ - virtual const ACEXML_Char *getPublicId (void); + virtual const ACEXML_Char *getPublicId (void) const; /* * Get the system identifier for this input source. */ - virtual const ACEXML_Char *getSystemId (void); + virtual const ACEXML_Char *getSystemId (void) const; /* * Set the ACEXML_Char stream for this input source. diff --git a/ACEXML/common/LocatorImpl.cpp b/ACEXML/common/LocatorImpl.cpp index d304092e9fc..ec04b231512 100644 --- a/ACEXML/common/LocatorImpl.cpp +++ b/ACEXML/common/LocatorImpl.cpp @@ -14,9 +14,19 @@ ACEXML_LocatorImpl::ACEXML_LocatorImpl (void) { } +ACEXML_LocatorImpl::ACEXML_LocatorImpl (const ACEXML_Char* systemId, + const ACEXML_Char* publicId) + : publicId_ (publicId ? ACE::strnew (publicId) : 0), + systemId_ (systemId ? ACE::strnew (systemId) : 0), + lineNumber_ (1), + columnNumber_ (0) +{ +} + + ACEXML_LocatorImpl::ACEXML_LocatorImpl (const ACEXML_Locator& locator) - : publicId_ (ACE::strnew (locator.getPublicId ())), - systemId_ (ACE::strnew (locator.getSystemId ())), + : publicId_ (locator.getPublicId() ? ACE::strnew(locator.getPublicId ()): 0), + systemId_ (locator.getSystemId() ? ACE::strnew(locator.getSystemId ()): 0), lineNumber_ (locator.getLineNumber ()), columnNumber_ (locator.getColumnNumber ()) { diff --git a/ACEXML/common/LocatorImpl.h b/ACEXML/common/LocatorImpl.h index 5e0bbdace23..2bea4e80c22 100644 --- a/ACEXML/common/LocatorImpl.h +++ b/ACEXML/common/LocatorImpl.h @@ -66,7 +66,13 @@ public: */ ACEXML_LocatorImpl (void); - /* + /** + * Construct a locator with systemId and publicId + * + */ + ACEXML_LocatorImpl (const ACEXML_Char* systemId, + const ACEXML_Char* publicId); + /** * Copy constructor. Create a persistent copy of the current state * of a locator. When the original locator changes, this copy will * still keep the original values (and it can be used outside the diff --git a/ACEXML/common/Makefile b/ACEXML/common/Makefile deleted file mode 100644 index 3b0edf01caf..00000000000 --- a/ACEXML/common/Makefile +++ /dev/null @@ -1,2807 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for the server-side ACE network services -#---------------------------------------------------------------------------- - -LIB = libACEXML.a -SHLIB = libACEXML.$(SOEXT) - -FILES = Attributes_Def_Builder \ - AttributesImpl \ - CharStream \ - DefaultHandler \ - DTD_Manager \ - Element_Def_Builder \ - Env \ - Exception \ - FileCharStream \ - InputSource \ - LocatorImpl \ - NamespaceSupport \ - SAXExceptions \ - StrCharStream \ - Transcode \ - Validator \ - XMLFilterImpl \ - XML_Codecs \ - Mem_Map_Stream \ - URL_Addr \ - HttpCharStream \ - StreamFactory \ - Encoding - -DEFS = $(addsuffix .h,$(FILES)) -LSRC = $(addsuffix .cpp,$(FILES)) - -LIBS += $(ACELIB) - -BUILD = $(VLIB) $(VSHLIB) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - -.obj/Attributes_Def_Builder.o .obj/Attributes_Def_Builder.so .shobj/Attributes_Def_Builder.o .shobj/Attributes_Def_Builder.so: Attributes_Def_Builder.cpp \ - $(ACE_ROOT)/ACEXML/common/Attributes_Def_Builder.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/Env.h \ - $(ACE_ROOT)/ACEXML/common/XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - $(ACE_ROOT)/ACEXML/common/Exception.h \ - $(ACE_ROOT)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/Env.i \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.i - -.obj/AttributesImpl.o .obj/AttributesImpl.so .shobj/AttributesImpl.o .shobj/AttributesImpl.so: AttributesImpl.cpp \ - $(ACE_ROOT)/ACEXML/common/AttributesImpl.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/Attributes.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ACEXML/common/AttributesImpl.i - -.obj/CharStream.o .obj/CharStream.so .shobj/CharStream.o .shobj/CharStream.so: CharStream.cpp \ - $(ACE_ROOT)/ACEXML/common/CharStream.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i - -.obj/DefaultHandler.o .obj/DefaultHandler.so .shobj/DefaultHandler.o .shobj/DefaultHandler.so: DefaultHandler.cpp \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/ContentHandler.h \ - $(ACE_ROOT)/ACEXML/common/Env.h \ - $(ACE_ROOT)/ACEXML/common/XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - $(ACE_ROOT)/ACEXML/common/Exception.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/Env.i \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.i \ - $(ACE_ROOT)/ACEXML/common/Locator.h \ - $(ACE_ROOT)/ACEXML/common/Attributes.h \ - $(ACE_ROOT)/ACEXML/common/DTDHandler.h \ - $(ACE_ROOT)/ACEXML/common/EntityResolver.h \ - $(ACE_ROOT)/ACEXML/common/InputSource.h \ - $(ACE_ROOT)/ACEXML/common/CharStream.h \ - $(ACE_ROOT)/ACEXML/common/ErrorHandler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.i - -.obj/DTD_Manager.o .obj/DTD_Manager.so .shobj/DTD_Manager.o .shobj/DTD_Manager.so: DTD_Manager.cpp \ - $(ACE_ROOT)/ACEXML/common/DTD_Manager.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/Attributes_Def_Builder.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/Env.h \ - $(ACE_ROOT)/ACEXML/common/XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - $(ACE_ROOT)/ACEXML/common/Exception.h \ - $(ACE_ROOT)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/Env.i \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.i \ - $(ACE_ROOT)/ACEXML/common/Element_Def_Builder.h \ - $(ACE_ROOT)/ACEXML/common/Validator.h \ - $(ACE_ROOT)/ACEXML/common/Attributes.h - -.obj/Element_Def_Builder.o .obj/Element_Def_Builder.so .shobj/Element_Def_Builder.o .shobj/Element_Def_Builder.so: Element_Def_Builder.cpp \ - $(ACE_ROOT)/ACEXML/common/Element_Def_Builder.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ACEXML/common/XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/Env.h \ - $(ACE_ROOT)/ACEXML/common/XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - $(ACE_ROOT)/ACEXML/common/Exception.h \ - $(ACE_ROOT)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/Env.i \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.i - -.obj/Env.o .obj/Env.so .shobj/Env.o .shobj/Env.so: Env.cpp \ - $(ACE_ROOT)/ACEXML/common/Env.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - $(ACE_ROOT)/ACEXML/common/Exception.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/Env.i - -.obj/Exception.o .obj/Exception.so .shobj/Exception.o .shobj/Exception.so: Exception.cpp \ - $(ACE_ROOT)/ACEXML/common/Exception.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - $(ACE_ROOT)/ACEXML/common/Exception.i - -.obj/FileCharStream.o .obj/FileCharStream.so .shobj/FileCharStream.o .shobj/FileCharStream.so: FileCharStream.cpp \ - $(ACE_ROOT)/ACEXML/common/FileCharStream.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/CharStream.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/Encoding.h - -.obj/InputSource.o .obj/InputSource.so .shobj/InputSource.o .shobj/InputSource.so: InputSource.cpp \ - $(ACE_ROOT)/ACEXML/common/InputSource.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/CharStream.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i - -.obj/LocatorImpl.o .obj/LocatorImpl.so .shobj/LocatorImpl.o .shobj/LocatorImpl.so: LocatorImpl.cpp \ - $(ACE_ROOT)/ACEXML/common/LocatorImpl.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/Locator.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/LocatorImpl.i - -.obj/NamespaceSupport.o .obj/NamespaceSupport.so .shobj/NamespaceSupport.o .shobj/NamespaceSupport.so: NamespaceSupport.cpp \ - $(ACE_ROOT)/ACEXML/common/NamespaceSupport.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Types.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 \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ACEXML/common/NamespaceSupport.i - -.obj/SAXExceptions.o .obj/SAXExceptions.so .shobj/SAXExceptions.o .shobj/SAXExceptions.so: SAXExceptions.cpp \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/Exception.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - $(ACE_ROOT)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.i - -.obj/StrCharStream.o .obj/StrCharStream.so .shobj/StrCharStream.o .shobj/StrCharStream.so: StrCharStream.cpp \ - $(ACE_ROOT)/ACEXML/common/StrCharStream.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/CharStream.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/Encoding.h - -.obj/Transcode.o .obj/Transcode.so .shobj/Transcode.o .shobj/Transcode.so: Transcode.cpp \ - $(ACE_ROOT)/ACEXML/common/Transcode.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/Transcode.i - -.obj/Validator.o .obj/Validator.so .shobj/Validator.o .shobj/Validator.so: Validator.cpp \ - $(ACE_ROOT)/ACEXML/common/Validator.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/Attributes.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/Env.h \ - $(ACE_ROOT)/ACEXML/common/XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - $(ACE_ROOT)/ACEXML/common/Exception.h \ - $(ACE_ROOT)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/Env.i \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.i - -.obj/XMLFilterImpl.o .obj/XMLFilterImpl.so .shobj/XMLFilterImpl.o .shobj/XMLFilterImpl.so: XMLFilterImpl.cpp \ - $(ACE_ROOT)/ACEXML/common/XMLFilterImpl.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/XMLFilter.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/XMLReader.h \ - $(ACE_ROOT)/ACEXML/common/ContentHandler.h \ - $(ACE_ROOT)/ACEXML/common/Env.h \ - $(ACE_ROOT)/ACEXML/common/XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - $(ACE_ROOT)/ACEXML/common/Exception.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/Env.i \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.i \ - $(ACE_ROOT)/ACEXML/common/Locator.h \ - $(ACE_ROOT)/ACEXML/common/Attributes.h \ - $(ACE_ROOT)/ACEXML/common/DTDHandler.h \ - $(ACE_ROOT)/ACEXML/common/EntityResolver.h \ - $(ACE_ROOT)/ACEXML/common/InputSource.h \ - $(ACE_ROOT)/ACEXML/common/CharStream.h \ - $(ACE_ROOT)/ACEXML/common/ErrorHandler.h \ - $(ACE_ROOT)/ACEXML/common/XMLFilterImpl.i - -.obj/XML_Codecs.o .obj/XML_Codecs.so .shobj/XML_Codecs.o .shobj/XML_Codecs.so: XML_Codecs.cpp \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ACEXML/common/XML_Codecs.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Codecs.h - -.obj/Mem_Map_Stream.o .obj/Mem_Map_Stream.so .shobj/Mem_Map_Stream.o .shobj/Mem_Map_Stream.so: Mem_Map_Stream.cpp \ - $(ACE_ROOT)/ace/FILE_Addr.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/Flag_Manip.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/FILE_Addr.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/Mem_Map_Stream.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Types.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 \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ - $(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 \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component.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/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(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/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/Recyclable.h \ - $(ACE_ROOT)/ace/Recyclable.inl \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Refcountable.h \ - $(ACE_ROOT)/ace/Refcountable.inl \ - $(ACE_ROOT)/ace/Hashable.h \ - $(ACE_ROOT)/ace/Hashable.inl \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ACEXML/common/XML_Types.h - -.obj/URL_Addr.o .obj/URL_Addr.so .shobj/URL_Addr.o .shobj/URL_Addr.so: URL_Addr.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ACEXML/common/URL_Addr.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ACEXML/common/XML_Types.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/URL_Addr.inl - -.obj/HttpCharStream.o .obj/HttpCharStream.so .shobj/HttpCharStream.o .shobj/HttpCharStream.so: HttpCharStream.cpp \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ACEXML/common/HttpCharStream.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ACEXML/common/CharStream.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/URL_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ACEXML/common/URL_Addr.inl \ - $(ACE_ROOT)/ACEXML/common/Mem_Map_Stream.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Types.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 \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ - $(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 \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component.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/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(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/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/Recyclable.h \ - $(ACE_ROOT)/ace/Recyclable.inl \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Refcountable.h \ - $(ACE_ROOT)/ace/Refcountable.inl \ - $(ACE_ROOT)/ace/Hashable.h \ - $(ACE_ROOT)/ace/Hashable.inl \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Connector.cpp - -.obj/StreamFactory.o .obj/StreamFactory.so .shobj/StreamFactory.o .shobj/StreamFactory.so: StreamFactory.cpp \ - $(ACE_ROOT)/ACEXML/common/StreamFactory.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/FileCharStream.h \ - $(ACE_ROOT)/ACEXML/common/CharStream.h \ - $(ACE_ROOT)/ACEXML/common/Encoding.h \ - $(ACE_ROOT)/ACEXML/common/HttpCharStream.h \ - $(ACE_ROOT)/ACEXML/common/URL_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ACEXML/common/URL_Addr.inl \ - $(ACE_ROOT)/ACEXML/common/Mem_Map_Stream.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Types.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 \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ - $(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 \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component.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/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(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/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/Recyclable.h \ - $(ACE_ROOT)/ace/Recyclable.inl \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Refcountable.h \ - $(ACE_ROOT)/ace/Refcountable.inl \ - $(ACE_ROOT)/ace/Hashable.h \ - $(ACE_ROOT)/ace/Hashable.inl \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Connector.cpp - -.obj/Encoding.o .obj/Encoding.so .shobj/Encoding.o .shobj/Encoding.so: Encoding.cpp \ - $(ACE_ROOT)/ACEXML/common/Encoding.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/common/Makefile.XML_Common b/ACEXML/common/Makefile.XML_Common new file mode 100644 index 00000000000..1268ed42dff --- /dev/null +++ b/ACEXML/common/Makefile.XML_Common @@ -0,0 +1,69 @@ +#---------------------------------------------------------------------------- +# GNU Makefile +#---------------------------------------------------------------------------- + +MAKEFILE = Makefile.XML_Common +DEPENDENCY_FILE = .depend.Makefile.XML_Common +LIB_UNCHECKED = libACEXML.a +SHLIB_UNCHECKED = libACEXML.$(SOEXT) + + + +FILES = \ + AttributesImpl \ + Attributes_Def_Builder \ + CharStream \ + DTD_Manager \ + DefaultHandler \ + Element_Def_Builder \ + Encoding \ + Env \ + Exception \ + FileCharStream \ + HttpCharStream \ + InputSource \ + LocatorImpl \ + Mem_Map_Stream \ + NamespaceSupport \ + SAXExceptions \ + StrCharStream \ + StreamFactory \ + Transcode \ + URL_Addr \ + Validator \ + XMLFilterImpl \ + XML_Codecs \ + ZipCharStream + +LIB = $(LIB_UNCHECKED) +SHLIB = $(SHLIB_UNCHECKED) + +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +LSRC = $(addsuffix .cpp, $(FILES)) +ACELIB = -lACE + +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +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 + +ACE_SHLIBS = -lz -lzzip $(ACELIB) + +#---------------------------------------------------------------------------- +# Local targets +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Dependencies +#---------------------------------------------------------------------------- +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/common/NamespaceSupport.cpp b/ACEXML/common/NamespaceSupport.cpp index b28b9d07248..d4f27ba71c4 100644 --- a/ACEXML/common/NamespaceSupport.cpp +++ b/ACEXML/common/NamespaceSupport.cpp @@ -2,18 +2,15 @@ #include "ACEXML/common/NamespaceSupport.h" -static const ACEXML_Char ACEXML_XMLNS_PREFIX_name[] = {'x', 'm', 'l', 'n', 's', 0}; +static const ACEXML_Char ACEXML_XMLNS_PREFIX_name[] = ACE_TEXT ("xmlns"); + const ACEXML_Char *ACEXML_NamespaceSupport::XMLNS_PREFIX = ACEXML_XMLNS_PREFIX_name; static const ACEXML_Char ACEXML_DEFAULT_NS_PREFIX[] = {0}; -static const ACEXML_Char ACEXML_TABOO_NS_PREFIX[] = {'x', 'm', 'l', 0}; +static const ACEXML_Char ACEXML_TABOO_NS_PREFIX[] = ACE_TEXT ("xml"); -static const ACEXML_Char ACEXML_XMLNS_URI_name[] = { - 'h', 't', 't', 'p', ':', '/', '/', - 'w', 'w', 'w', '.', 'w', '3', '.', 'o', 'r', 'g', '/', - 'X', 'M', 'L', '/', '1', '9', '9', '8', '/', - 'n', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', 0}; +static const ACEXML_Char ACEXML_XMLNS_URI_name[] = ACE_TEXT ("http://www.w3.org/XML/1998/namespace"); const ACEXML_Char *ACEXML_NamespaceSupport::XMLNS = ACEXML_XMLNS_URI_name; #if !defined (__ACEXML_INLINE__) @@ -82,6 +79,9 @@ int ACEXML_NamespaceSupport::declarePrefix (const ACEXML_Char *prefix, const ACEXML_Char *uri) { + if (!prefix || !uri) + return -1; + // Unless predefined by w3.org(?) NS prefix can never start with // "xml". if (ACE_OS_String::strcmp (ACEXML_TABOO_NS_PREFIX, prefix) == 0) @@ -112,6 +112,9 @@ ACEXML_NamespaceSupport::getDeclaredPrefixes (ACEXML_STR_LIST &prefixes) const const ACEXML_Char * ACEXML_NamespaceSupport::getPrefix (const ACEXML_Char *uri) const { + if (!uri) + return 0; + ACEXML_NS_CONTEXT_ENTRY *entry; for (ACEXML_NS_CONTEXT_ITER iter (*this->effective_context_); @@ -146,6 +149,9 @@ int ACEXML_NamespaceSupport::getPrefixes (const ACEXML_Char *uri, ACEXML_STR_LIST &prefixes) const { + if (!uri) + return -1; + ACEXML_NS_CONTEXT_ENTRY *entry; for (ACEXML_NS_CONTEXT_ITER iter (*this->effective_context_); @@ -163,6 +169,9 @@ ACEXML_NamespaceSupport::getPrefixes (const ACEXML_Char *uri, const ACEXML_Char * ACEXML_NamespaceSupport::getURI (const ACEXML_Char *prefix) const { + if (!prefix) + return 0; + ACEXML_NS_CONTEXT_ENTRY *entry; if (this->effective_context_->find (ACEXML_String (prefix, 0, 0), @@ -236,21 +245,24 @@ ACEXML_NamespaceSupport::processName (const ACEXML_Char *qName, ACEXML_NS_CONTEXT_ENTRY *entry; - if (this->effective_context_->find (prefix, entry) == 0) - uri = entry->int_id_.c_str (); + if (prefix != ACEXML_DEFAULT_NS_PREFIX) + { + if (this->effective_context_->find (prefix, entry) == 0) + uri = entry->int_id_.c_str (); + } else { uri = ACEXML_DEFAULT_NS_PREFIX; return -1; } - return 0; } int ACEXML_NamespaceSupport::reset (void) { - // Not implemented. + while (this->popContext() != -1) + ; return 0; } diff --git a/ACEXML/common/NamespaceSupport.h b/ACEXML/common/NamespaceSupport.h index 83d78a3c58d..c39bd6fc731 100644 --- a/ACEXML/common/NamespaceSupport.h +++ b/ACEXML/common/NamespaceSupport.h @@ -210,7 +210,7 @@ public: /** * Reset this Namespace support object for reuse. - * @todo Not implemented. + * */ int reset (void); diff --git a/ACEXML/common/SAXExceptions.cpp b/ACEXML/common/SAXExceptions.cpp index fe0963cd169..4f56ed31d99 100644 --- a/ACEXML/common/SAXExceptions.cpp +++ b/ACEXML/common/SAXExceptions.cpp @@ -105,7 +105,7 @@ ACEXML_SAXException::is_a (const ACEXML_Char *name) void ACEXML_SAXException::print (void) { - ACE_DEBUG ((LM_ERROR, + ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACEXML: (%P|%t) %s: %s\n"), this->exception_name_, this->message())); } @@ -249,7 +249,7 @@ ACEXML_SAXParseException::is_a (const ACEXML_Char *name) void ACEXML_SAXParseException::print (void) { - ACE_DEBUG ((LM_ERROR, + ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACEXML: (%P|%t) %s: %s\n"), this->exception_name_, this->message())); } diff --git a/ACEXML/common/StrCharStream.cpp b/ACEXML/common/StrCharStream.cpp index 046511407c2..9bfcc95072c 100644 --- a/ACEXML/common/StrCharStream.cpp +++ b/ACEXML/common/StrCharStream.cpp @@ -73,13 +73,10 @@ ACEXML_StrCharStream::determine_encoding (void) const ACEXML_Char* temp = ACEXML_Encoding::get_encoding (input); if (!temp) return -1; - if (ACE_OS::strcmp (temp, - ACEXML_Encoding::encoding_names_[ACEXML_Encoding::OTHER]) == 0) - return -1; else { this->encoding_ = ACE::strnew (temp); - ACE_DEBUG ((LM_DEBUG, "String's encoding is %s\n", this->encoding_)); + // ACE_DEBUG ((LM_DEBUG, "String's encoding is %s\n", this->encoding_)); } return 0; } @@ -96,23 +93,19 @@ ACEXML_StrCharStream::get (ACEXML_Char& ch) if (this->start_ != 0 && this->ptr_ != this->end_) { ch = *this->ptr_++; - return 0; } - return -1; } int -ACEXML_StrCharStream::read (ACEXML_Char *str, - size_t len) +ACEXML_StrCharStream::read (ACEXML_Char *str, size_t len) { if (this->start_ != 0 && this->ptr_ != this->end_) { - if ((int) len > this->end_ - this->ptr_) + if (len * sizeof (ACEXML_Char) > (size_t) (this->end_ - this->ptr_)) len = this->end_ - this->ptr_; - ACE_OS_String::strncpy (str, this->ptr_, len); this->ptr_ += len; return len; diff --git a/ACEXML/common/StrCharStream.h b/ACEXML/common/StrCharStream.h index 6321decb9a2..0898ab2f1d1 100644 --- a/ACEXML/common/StrCharStream.h +++ b/ACEXML/common/StrCharStream.h @@ -68,8 +68,7 @@ public: /** * Read the next batch of ACEXML_Char strings */ - virtual int read (ACEXML_Char *str, - size_t len); + virtual int read (ACEXML_Char *str, size_t len); /** * Peek the next ACEXML_Char in the CharStream. Return the diff --git a/ACEXML/common/StreamFactory.cpp b/ACEXML/common/StreamFactory.cpp index 80edc8a265f..005b18c668b 100644 --- a/ACEXML/common/StreamFactory.cpp +++ b/ACEXML/common/StreamFactory.cpp @@ -3,6 +3,7 @@ #include "ACEXML/common/StreamFactory.h" #include "ACEXML/common/FileCharStream.h" #include "ACEXML/common/HttpCharStream.h" +#include "ACEXML/common/ZipCharStream.h" ACE_RCSID (common, StreamFactory, "$Id$") @@ -11,8 +12,8 @@ ACEXML_StreamFactory::create_stream (const ACEXML_Char* uri) { if (uri == 0) return 0; - ACEXML_FileCharStream* fstream = 0; + ACEXML_ZipCharStream* zstream = 0; ACEXML_HttpCharStream* hstream = 0; if (ACE_OS::strstr (uri, ACE_TEXT("ftp://")) != 0) @@ -24,17 +25,22 @@ ACEXML_StreamFactory::create_stream (const ACEXML_Char* uri) ACE_NEW_RETURN (hstream, ACEXML_HttpCharStream, 0); if (hstream->open (uri) != -1) return hstream; - else - return 0; } else { + if (ACE_OS::strstr (uri, ACE_TEXT ("file://")) != 0) + uri += 7; // Skip over file:// ACE_NEW_RETURN (fstream, ACEXML_FileCharStream, 0); if (fstream->open (uri) != -1) return fstream; else - return 0; + { + ACE_NEW_RETURN (zstream, ACEXML_ZipCharStream, 0); + if (zstream->open (uri) != -1) + return zstream; + } } + return 0; } ACEXML_StreamFactory::~ACEXML_StreamFactory () diff --git a/ACEXML/common/Transcode.cpp b/ACEXML/common/Transcode.cpp index 4007d346494..d857756d7dd 100644 --- a/ACEXML/common/Transcode.cpp +++ b/ACEXML/common/Transcode.cpp @@ -7,6 +7,239 @@ #endif /* __ACEXML_INLINE__ */ int +ACEXML_Transcoder::utf162utf8 (ACEXML_UTF16 src, + ACEXML_UTF8 *dst, + size_t len) +{ + // Check for valid argument first... + + if (dst == 0) + return INVALID_ARGS; + + if (src < 0x80) + { + if (len < 1) + return DESTINATION_TOO_SHORT; + + *dst = ACE_static_cast (ACEXML_UTF8, src); + return 1; + } + else if (src < 0x800) + { + if (len < 2) + return DESTINATION_TOO_SHORT; + + *dst = 0xc0 | (src / 0x40); + *(dst+1) = 0x80 | (src % 0x40); + return 2; + } + else + { + if (len < 3) + return DESTINATION_TOO_SHORT; + + // Surrogates (0xD800 - 0xDFFF) are not valid unicode values + if (src >= 0xD800 && src < 0xE000) + return IS_SURROGATE; + + *dst = 0xe0 | (src / 0x1000); + *(dst+1) = 0x80 | ((src % 0x1000) / 0x40); + *(dst+2) = 0x80 | (src % 0x40); + return 3; + } + ACE_NOTREACHED (return NON_UNICODE;) + } + +int +ACEXML_Transcoder::ucs42utf8 (ACEXML_UCS4 src, + ACEXML_UTF8 *dst, + size_t len) +{ + if (src < 0x10000) + { + int retv = ACEXML_Transcoder::utf162utf8 + (ACE_static_cast (ACEXML_UTF16, src), + dst, len); + return (retv == IS_SURROGATE ? NON_UNICODE : retv); + } + else if (src >= 0x100000 && src < 0x110000) + { + if (len < 4) + return DESTINATION_TOO_SHORT; + + if (dst == 0) + return INVALID_ARGS; + + *dst = 0xf0 | (src / 0x40000); + *(dst+1) = 0x80 | ((src % 0x40000) / 0x1000); + *(dst+2) = 0x80 | ((src % 0x1000) / 0x40); + *(dst+3) = 0x80 | (src % 0x40); + return 4; + } + return NON_UNICODE; +} + + +int +ACEXML_Transcoder::ucs42utf16 (ACEXML_UCS4 src, + ACEXML_UTF16 *dst, + size_t len) +{ + if (dst == 0) + return INVALID_ARGS; + + if (src < 0x10000) + { + if (len < 1) + return DESTINATION_TOO_SHORT; + + if (src >= 0xD800 && src < 0xE000) + return NON_UNICODE; // Surrogates are not valid unicode value + + *dst = ACE_static_cast (ACEXML_UTF16, src); + return 1; + } + else if (src >= 0x100000 && src < 0x110000) + // Scalar values are encoded into surrogates + { + if (len < 2) + return DESTINATION_TOO_SHORT; + + *dst = 0xD800 | (src / 0x400); + *(dst+1) = 0xDC00 | (src % 0x400); + return 2; + } + + return NON_UNICODE; +} + +int +ACEXML_Transcoder::surrogate2utf8 (ACEXML_UTF16 high, + ACEXML_UTF16 low, + ACEXML_UTF8 *dst, + size_t len) +{ + if (len < 3) + return DESTINATION_TOO_SHORT; + + if (dst == 0 || + (high >= 0xD800 && high < 0xDC00) || + (low >= 0xDC00 && low < 0xE000)) + return INVALID_ARGS; + + ACEXML_UCS4 src = (high - 0xD800) * 0x400 + (low - 0xDC00) + 0x10000; + *dst = 0xD800 | (src / 0x400); + *(dst+1) = 0xDC00 | (src % 0x400); + return 2; +} + +int +ACEXML_Transcoder::surrogate2ucs4 (ACEXML_UTF16 high, + ACEXML_UTF16 low, + ACEXML_UCS4 &dst) +{ + if ((high >= 0xD800 && high < 0xDC00) || + (low >= 0xDC00 && low < 0xE000)) + return INVALID_ARGS; + + dst = (high - 0xD800) * 0x400 + (low - 0xDC00) + 0x10000; + return SUCCESS; +} + +int +ACEXML_Transcoder::utf82ucs4 (const ACEXML_UTF8 *the_src, + size_t len, + ACEXML_UCS4 &dst) +{ + if (the_src == 0) + return INVALID_ARGS; + + const unsigned char *src = ACE_reinterpret_cast (const unsigned char *, + the_src); + + size_t forward = 1; + + if (forward > len) + return END_OF_SOURCE; + + if (ACE_static_cast (unsigned char, *src) < 0x80) + dst = *src; + else if ((*src & 0xE0) == 0xC0) + { + dst = (*(src++) & 0x1f) * 0x40; + if (++forward > len) + return END_OF_SOURCE; + if ((*src & 0xC0) != 0x80) + return NON_UNICODE; // Error transcoding unicode scalar + dst += *src & 0x3f; + } + else if ((*src & 0xF0) == 0xE0) + { + dst = (*src++ & 0x0f) * 0x40; + if (++forward > len) + return END_OF_SOURCE; + if ((*src & 0xC0) != 0x80) + return NON_UNICODE; + dst = (dst + (*src++ & 0x3f)) * 0x40; + if (++forward > len) + return END_OF_SOURCE; + if ((*src & 0xC0) != 0x80) + return NON_UNICODE; + dst += *src & 0x3f; + } + else if ((*src & 0xF8) == 0xF0) + { + dst = (*src++ & 0x0f) * 0x40; + if (++forward > len) + return END_OF_SOURCE; + if ((*src & 0xC0) != 0x80) + return NON_UNICODE; + dst = (dst + (*src++ & 0x3f)) * 0x40; + if (++forward > len) + return END_OF_SOURCE; + if ((*src & 0xC0) != 0x80) + return NON_UNICODE; + dst = (dst + (*src++ & 0x3f)) * 0x40; + if (++forward > len) + return END_OF_SOURCE; + if ((*src & 0xC0) != 0x80) + return NON_UNICODE; + dst += *src & 0x3f; + } + else + return NON_UNICODE; + + return forward; +} + +int +ACEXML_Transcoder::utf162ucs4 (const ACEXML_UTF16 *src, + size_t len, + ACEXML_UCS4 &dst) +{ + if (src == 0) + return INVALID_ARGS; + + size_t forward = 1; + if (*src >= 0xDC00 && *src < 0xE000) + { + if (len < 2) + return END_OF_SOURCE; + return ACEXML_Transcoder::surrogate2ucs4 (*src, + *(src+1), + dst); + } + else + { + if (len < 1) + return END_OF_SOURCE; + dst = *src; + } + + return forward; +} + +int ACEXML_Transcoder::utf8s2utf16s (const ACEXML_UTF8 *src, ACEXML_UTF16 *dst, size_t len) diff --git a/ACEXML/common/Transcode.h b/ACEXML/common/Transcode.h index 427784891db..904d699ab56 100644 --- a/ACEXML/common/Transcode.h +++ b/ACEXML/common/Transcode.h @@ -58,7 +58,7 @@ public: * Convert a UTF-16 character into a string in UTF-8 encoding. * * @return number of characters the function uses to store the - * converted string if succeeds or one of the error STATUS + * converted string if it succeeds or one of the error STATUS * otherwise. */ static int utf162utf8 (ACEXML_UTF16 src, @@ -69,7 +69,7 @@ public: * Convert a UCS-4 character into a string in UTF-8 encoding. * * @return number of characters the function uses to store the - * converted string if succeeds or one of the error STATUS + * converted string if it succeeds or one of the error STATUS * otherwise. */ static int ucs42utf8 (ACEXML_UCS4 src, @@ -80,7 +80,7 @@ public: * Convert a UCS-4 character into a string in UTF-16 encoding. * * @return number of characters the function uses to store the - * converted string if succeeds or one of the error STATUS + * converted string if it succeeds or one of the error STATUS * otherwise. */ static int ucs42utf16 (ACEXML_UCS4 src, @@ -91,7 +91,7 @@ public: * Convert a UTF-16 surrogate character pair into a string in UTF-8 encoding. * * @return number of characters the function uses to store the - * converted string if succeeds or one of the error STATUS + * converted string if it succeeds or one of the error STATUS * otherwise. */ static int surrogate2utf8 (ACEXML_UTF16 high, @@ -102,7 +102,7 @@ public: /* * Convert a UTF-16 surrogate character pair into a UCS-4 character. * - * @return SUCCESS if succeeds or one of the error STATUS + * @return SUCCESS if it succeeds or one of the error STATUS * otherwise. */ static int surrogate2ucs4 (ACEXML_UTF16 high, @@ -114,7 +114,7 @@ public: * into a UCS-4 character. * * @return number of characters the function consumed from the - * UTF-8 string if succeeds or one of the error STATUS + * UTF-8 string if it succeeds or one of the error STATUS * otherwise. */ static int utf82ucs4 (const ACEXML_UTF8 *src, @@ -126,7 +126,7 @@ public: * into a UCS-4 character. * * @return number of characters the function consumed from the - * UTF-16 string if succeeds or one of the error STATUS + * UTF-16 string if it succeeds or one of the error STATUS * otherwise. */ static int utf162ucs4 (const ACEXML_UTF16 *src, @@ -146,7 +146,7 @@ public: * @param len The length of @a dst string. * * @return number of characters the function consumed from the - * UTF-8 string if succeeds or one of the error STATUS + * UTF-8 string if it succeeds or one of the error STATUS * otherwise. */ static int utf8s2utf16s (const ACEXML_UTF8 *src, @@ -159,7 +159,7 @@ public: * @param len The length of @a dst string. * * @return number of characters the function uses in - * UTF-8 string if succeeds or one of the error STATUS + * UTF-8 string if it succeeds or one of the error STATUS * otherwise. */ static int utf16s2utf8s (const ACEXML_UTF16 *src, diff --git a/ACEXML/common/Transcode.i b/ACEXML/common/Transcode.i index e9ec3936e80..77b4466a3cb 100644 --- a/ACEXML/common/Transcode.i +++ b/ACEXML/common/Transcode.i @@ -1,234 +1 @@ // -*- C++ -*- $Id$ - -ACEXML_INLINE int -ACEXML_Transcoder::utf162utf8 (ACEXML_UTF16 src, - ACEXML_UTF8 *dst, - size_t len) -{ - // Check for valid argument first... - - if (dst == 0) - return INVALID_ARGS; - - if (src < 0x80) - { - if (len < 1) - return DESTINATION_TOO_SHORT; - - *dst = ACE_static_cast (ACEXML_UTF8, src); - return 1; - } - else if (src < 0x800) - { - if (len < 2) - return DESTINATION_TOO_SHORT; - - *dst = 0xc0 | (src / 0x40); - *(dst+1) = 0x80 | (src % 0x40); - return 2; - } - else - { - if (len < 3) - return DESTINATION_TOO_SHORT; - - // Surrogates (0xD800 - 0xDFFF) are not valid unicode values - if (src >= 0xD800 && src < 0xE000) - return IS_SURROGATE; - - *dst = 0xe0 | (src / 0x1000); - *(dst+1) = 0x80 | ((src % 0x1000) / 0x40); - *(dst+2) = 0x80 | (src % 0x40); - return 3; - } - ACE_NOTREACHED (return NON_UNICODE;) -} - -ACEXML_INLINE int -ACEXML_Transcoder::ucs42utf8 (ACEXML_UCS4 src, - ACEXML_UTF8 *dst, - size_t len) -{ - if (src < 0x10000) - { - int retv = ACEXML_Transcoder::utf162utf8 - (ACE_static_cast (ACEXML_UTF16, src), - dst, len); - return (retv == IS_SURROGATE ? NON_UNICODE : retv); - } - else if (src >= 0x100000 && src < 0x110000) - { - if (len < 4) - return DESTINATION_TOO_SHORT; - - if (dst == 0) - return INVALID_ARGS; - - *dst = 0xf0 | (src / 0x40000); - *(dst+1) = 0x80 | ((src % 0x40000) / 0x1000); - *(dst+2) = 0x80 | ((src % 0x1000) / 0x40); - *(dst+3) = 0x80 | (src % 0x40); - return 4; - } - return NON_UNICODE; -} - - -ACEXML_INLINE int -ACEXML_Transcoder::ucs42utf16 (ACEXML_UCS4 src, - ACEXML_UTF16 *dst, - size_t len) -{ - if (dst == 0) - return INVALID_ARGS; - - if (src < 0x10000) - { - if (len < 1) - return DESTINATION_TOO_SHORT; - - if (src >= 0xD800 && src < 0xE000) - return NON_UNICODE; // Surrogates are not valid unicode value - - *dst = ACE_static_cast (ACEXML_UTF16, src); - return 1; - } - else if (src >= 0x100000 && src < 0x110000) - // Scalar values are encoded into surrogates - { - if (len < 2) - return DESTINATION_TOO_SHORT; - - *dst = 0xD800 | (src / 0x400); - *(dst+1) = 0xDC00 | (src % 0x400); - return 2; - } - - return NON_UNICODE; -} - -ACEXML_INLINE int -ACEXML_Transcoder::surrogate2utf8 (ACEXML_UTF16 high, - ACEXML_UTF16 low, - ACEXML_UTF8 *dst, - size_t len) -{ - if (len < 3) - return DESTINATION_TOO_SHORT; - - if (dst == 0 || - (high >= 0xD800 && high < 0xDC00) || - (low >= 0xDC00 && low < 0xE000)) - return INVALID_ARGS; - - ACEXML_UCS4 src = (high - 0xD800) * 0x400 + (low - 0xDC00) + 0x10000; - *dst = 0xD800 | (src / 0x400); - *(dst+1) = 0xDC00 | (src % 0x400); - return 2; -} - -ACEXML_INLINE int -ACEXML_Transcoder::surrogate2ucs4 (ACEXML_UTF16 high, - ACEXML_UTF16 low, - ACEXML_UCS4 &dst) -{ - if ((high >= 0xD800 && high < 0xDC00) || - (low >= 0xDC00 && low < 0xE000)) - return INVALID_ARGS; - - dst = (high - 0xD800) * 0x400 + (low - 0xDC00) + 0x10000; - return SUCCESS; -} - -ACEXML_INLINE int -ACEXML_Transcoder::utf82ucs4 (const ACEXML_UTF8 *the_src, - size_t len, - ACEXML_UCS4 &dst) -{ - if (the_src == 0) - return INVALID_ARGS; - - const unsigned char *src = ACE_reinterpret_cast (const unsigned char *, - the_src); - - size_t forward = 1; - - if (forward > len) - return END_OF_SOURCE; - - if (ACE_static_cast (unsigned char, *src) < 0x80) - dst = *src; - else if ((*src & 0xE0) == 0xC0) - { - dst = (*(src++) & 0x1f) * 0x40; - if (++forward > len) - return END_OF_SOURCE; - if ((*src & 0xC0) != 0x80) - return NON_UNICODE; // Error transcoding unicode scalar - dst += *src & 0x3f; - } - else if ((*src & 0xF0) == 0xE0) - { - dst = (*src++ & 0x0f) * 0x40; - if (++forward > len) - return END_OF_SOURCE; - if ((*src & 0xC0) != 0x80) - return NON_UNICODE; - dst = (dst + (*src++ & 0x3f)) * 0x40; - if (++forward > len) - return END_OF_SOURCE; - if ((*src & 0xC0) != 0x80) - return NON_UNICODE; - dst += *src & 0x3f; - } - else if ((*src & 0xF8) == 0xF0) - { - dst = (*src++ & 0x0f) * 0x40; - if (++forward > len) - return END_OF_SOURCE; - if ((*src & 0xC0) != 0x80) - return NON_UNICODE; - dst = (dst + (*src++ & 0x3f)) * 0x40; - if (++forward > len) - return END_OF_SOURCE; - if ((*src & 0xC0) != 0x80) - return NON_UNICODE; - dst = (dst + (*src++ & 0x3f)) * 0x40; - if (++forward > len) - return END_OF_SOURCE; - if ((*src & 0xC0) != 0x80) - return NON_UNICODE; - dst += *src & 0x3f; - } - else - return NON_UNICODE; - - return forward; -} - -ACEXML_INLINE int -ACEXML_Transcoder::utf162ucs4 (const ACEXML_UTF16 *src, - size_t len, - ACEXML_UCS4 &dst) -{ - if (src == 0) - return INVALID_ARGS; - - size_t forward = 1; - if (*src >= 0xDC00 && *src < 0xE000) - { - if (len < 2) - return END_OF_SOURCE; - return ACEXML_Transcoder::surrogate2ucs4 (*src, - *(src+1), - dst); - } - else - { - if (len < 1) - return END_OF_SOURCE; - dst = *src; - } - - return forward; -} diff --git a/ACEXML/common/ZipCharStream.cpp b/ACEXML/common/ZipCharStream.cpp new file mode 100644 index 00000000000..f9c728fafc9 --- /dev/null +++ b/ACEXML/common/ZipCharStream.cpp @@ -0,0 +1,213 @@ +// $Id$ + +#include "ACEXML/common/ZipCharStream.h" +#include "ace/ACE.h" + + +ACEXML_ZipCharStream::ACEXML_ZipCharStream (void) + : filename_ (0), encoding_ (0), size_ (0), infile_ (NULL), pos_ (0), + limit_ (0) +{ +} + +ACEXML_ZipCharStream::~ACEXML_ZipCharStream (void) +{ + this->close(); +} + +int +ACEXML_ZipCharStream::open (const ACEXML_Char *name) +{ + delete[] this->filename_; + this->filename_ = 0; + + delete[] this->encoding_; + this->encoding_ = 0; + + this->infile_ = zzip_fopen (name, ACE_TEXT ("r")); + if (this->infile_ == NULL) + return -1; + + this->filename_ = ACE::strnew (ACE::basename (name)); + if (this->determine_encoding() == -1) + return -1; + return 0; +} + +int +ACEXML_ZipCharStream::determine_encoding (void) +{ + char input[4]; + int i = 0; + for (; i < 4 && (input[i] = this->peekchar_i(i)); ++i) + ; + if (i < 4) + return -1; + const ACEXML_Char* temp = ACEXML_Encoding::get_encoding (input); + if (!temp) + return -1; + else + { + this->encoding_ = ACE::strnew (temp); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("File's encoding is %s\n"), +// this->encoding_)); + } + // Move over the byte-order-mark if present. + char ch; + for (int j = 0; j < 3; ++j) + { + if ((ch = this->peekchar_i()) < 0) + return -1; + if (ch == '\xFF' || ch == '\xFE' || ch == '\xEF' || ch == '\xBB' || + ch == '\xBF') + this->get(ch); + else + break; + } + return 0; +} + +void +ACEXML_ZipCharStream::rewind() +{ + zzip_rewind (this->infile_); +} + +int +ACEXML_ZipCharStream::available (void) +{ + long curr; + if ((curr = zzip_tell (this->infile_)) < 0) + return -1; + return (this->size_ - curr); +} + +int +ACEXML_ZipCharStream::close (void) +{ + if (this->infile_ != NULL) + zzip_close (this->infile_); + delete[] this->filename_; + delete[] this->encoding_; + this->size_ = 0; + return 0; +} + + +int +ACEXML_ZipCharStream::getchar_i (char& ch) +{ + if (this->pos_ < this->limit_) + { + ch = this->buf_[this->pos_++]; + return 0; + } + this->limit_ = zzip_read (this->infile_, this->buf_, sizeof (this->buf_)); + if (this->limit_ == 0) + return -1; + this->pos_ = 0; + ch = this->buf_[this->pos_++]; + return 0; +} + +int +ACEXML_ZipCharStream::peekchar_i (off_t offset) +{ + if (offset > (off_t) sizeof (this->buf_)) + return -1; + if (this->pos_ + offset < this->limit_) + return this->buf_[this->pos_ + offset]; + int i = 0; + for (; this->pos_ < this->limit_; ++this->pos_, ++i) + this->buf_[i] = this->buf_[this->pos_]; + this->limit_ = zzip_read (this->infile_, this->buf_ + i, + sizeof (this->buf_) - i); + this->limit_ += i; + if (this->limit_ == 0) + return -1; + this->pos_ = 0; + return this->buf_[this->pos_ + offset]; +} + +int +ACEXML_ZipCharStream::read (ACEXML_Char *str, size_t len) +{ + size_t i = 0; + for (; i < len && this->pos_ < this->limit_; ++i) + str[i] = this->buf_[this->pos_++]; + if (i == len) + return len; + len = len - i; + return zzip_fread (str + i, sizeof (ACEXML_Char), len, this->infile_); +} + +int +ACEXML_ZipCharStream::get (ACEXML_Char& ch) +{ +#if defined (ACE_USES_WCHAR) + return this->get_i (ch); +#else + return this->getchar_i (ch); +#endif /* ACE_USES_WCHAR */ +} + + +int +ACEXML_ZipCharStream::peek (void) +{ +#if defined (ACE_USES_WCHAR) + return this->peek_i(); +#else + return this->peekchar_i(); +#endif /* ACE_USES_WCHAR */ +} + +const ACEXML_Char* +ACEXML_ZipCharStream::getEncoding (void) +{ + return this->encoding_; +} + +#if defined (ACE_USES_WCHAR) +int +ACEXML_ZipCharStream::get_i (ACEXML_Char& ch) +{ + if (ACE_OS::strcmp (this->encoding_, ACE_TEXT ("UTF-8")) == 0) + return this->getchar_i (ch); + + int BE = (ACE_OS::strcmp (this->encoding_, + ACE_TEXT ("UTF-16BE")) == 0) ? 1 : 0; + ACEXML_Char input[2]; + int i = 0; + for (; i < 2 && (this->getchar_i (input[i]) == 0); ++i) + ; + if (i < 2) + { + ch = 0; + return -1; + } + ch = BE ? input[0] << 8 | input[1] : input[1] << 8 | input[0]; + return 0; +} + +int +ACEXML_ZipCharStream::peek_i (void) +{ + // If we are reading a UTF-8 encoded file, just use the plain unget. + if (ACE_OS::strcmp (this->encoding_, ACE_TEXT ("UTF-8")) == 0) + return this->peekchar_i(); + + // Peek into the stream. This reads two characters off the stream, keeps + // it in peek_. + int BE = (ACE_OS::strcmp (this->encoding_, + ACE_TEXT ("UTF-16BE")) == 0) ? 1 : 0; + + ACEXML_Char input[2]; + int i = 0; + for (; i < 2 && (input[i] = this->peekchar_i (i)); ++i) + ; + if (i < 2) + return -1; + return (BE ? input[0] << 8 | input[1] : input[1] << 8 | input[0]); +} +#endif /* ACE_USES_WCHAR */ diff --git a/ACEXML/common/ZipCharStream.h b/ACEXML/common/ZipCharStream.h new file mode 100644 index 00000000000..51f5241b854 --- /dev/null +++ b/ACEXML/common/ZipCharStream.h @@ -0,0 +1,133 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file ZipCharStream.h + * + * $Id$ + * + * @author Krishnakumar B <kitty@cs.wustl.edu> + */ +//============================================================================= + +#ifndef _ACEXML_ZIPCHARSTREAM_H_ +#define _ACEXML_ZIPCHARSTREAM_H_ + +#include "ace/pre.h" +#include "ACEXML/common/ACEXML_Export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "ACEXML/common/CharStream.h" +#include "ACEXML/common/Encoding.h" +#include "zziplib.h" + +// Ugly wart to get aroung a macro version of read +#undef read + +/** + * @class ACEXML_ZipCharStream ZipCharStream.h "ACEXML/common/ZipCharStream.h" + * + * An implementation of ACEXML_CharStream for reading input from a ZIP archive. + */ +class ACEXML_Export ACEXML_ZipCharStream : public ACEXML_CharStream +{ +public: + /// Default constructor. + ACEXML_ZipCharStream (void); + + /// Destructor + virtual ~ACEXML_ZipCharStream (void); + + /// Open a file. + int open (const ACEXML_Char *name); + + /** + * Returns the available ACEXML_Char in the buffer. -1 + * if the object is not initialized properly. + */ + virtual int available (void); + + /** + * Close this stream and release all resources used by it. + */ + virtual int close (void); + + /** + * Read the next ACEXML_Char. Return -1 if we are not able to + * return an ACEXML_Char, 0 if EOF is reached, or 1 if succeed. + */ + virtual int get (ACEXML_Char& ch); + + /** + * Read the next batch of ACEXML_Char strings + */ + virtual int read (ACEXML_Char *str, size_t len); + + /** + * Determine the encoding of the file. + */ + virtual int determine_encoding (void); + + + /** + * Peek the next ACEXML_Char in the CharStream. Return the + * character if success, -1 if EOF is reached. + */ + virtual int peek (void); + + /** + * Resets the file pointer to the beginning of the stream. + */ + virtual void rewind (void); + + /* + * Get the character encoding for a byte stream or URI. + */ + virtual const ACEXML_Char *getEncoding (void); + +protected: + + /** Read the next character as a normal character. Return -1 if EOF is + * reached, else return 0. + */ + virtual int getchar_i (char& ch); + + /** + * Peek @c offset bytes into the stream and return the character at @c + * offset. If EOF is reached, return -1. + */ + virtual int peekchar_i (off_t offset = 0); + +private: + +#if defined (ACE_USES_WCHAR) + /** + * Read the next character from the stream taking into account the + * encoding of the file. + */ + int get_i (ACEXML_Char& ch); + + /** + * Return the next character from the stream taking into account the + * encoding of the file. Subsequent call to get() returns this + * character. + */ + int peek_i (void); + +#endif /* ACE_USES_WCHAR */ + + ACEXML_Char* filename_; + ACEXML_Char* encoding_; + off_t size_; + ZZIP_FILE* infile_; + char buf_[80]; + int pos_; + int limit_; +}; + +#include "ace/post.h" + +#endif /* _ACEXML_ZIPCHARSTREAM_H_ */ diff --git a/ACEXML/common/common.mpc b/ACEXML/common/common.mpc new file mode 100644 index 00000000000..76957ad9864 --- /dev/null +++ b/ACEXML/common/common.mpc @@ -0,0 +1,6 @@ +project (XML_Common) : acelib { + depends = ace + sharedname = ACEXML + dllflags = ACEXML_BUILD + libs = z zzip +} diff --git a/ACEXML/examples/Makefile b/ACEXML/examples/Makefile deleted file mode 100644 index a508ee1d096..00000000000 --- a/ACEXML/examples/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for the client programs that test the ACE network services -#---------------------------------------------------------------------------- - -DIRS = SAXPrint - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU diff --git a/ACEXML/examples/SAXPrint/Makefile b/ACEXML/examples/SAXPrint/Makefile deleted file mode 100644 index f676c17b018..00000000000 --- a/ACEXML/examples/SAXPrint/Makefile +++ /dev/null @@ -1,273 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for repeating token client application -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -LDLIBS = -lACEXML_Parser -lACEXML -FILES = Print_Handler \ - SAXPrint_Handler - -SRC = $(addsuffix .cpp,$(FILES)) -OBJ = $(LSRC:%.cpp=$(VDIR)%.o) - -BIN = main - -BUILD = $(VBIN) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - -.obj/Print_Handler.o .obj/Print_Handler.so .shobj/Print_Handler.o .shobj/Print_Handler.so: Print_Handler.cpp Print_Handler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/ContentHandler.h \ - $(ACE_ROOT)/ACEXML/common/Env.h \ - $(ACE_ROOT)/ACEXML/common/XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - $(ACE_ROOT)/ACEXML/common/Exception.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/Env.i \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.i \ - $(ACE_ROOT)/ACEXML/common/Locator.h \ - $(ACE_ROOT)/ACEXML/common/Attributes.h \ - $(ACE_ROOT)/ACEXML/common/DTDHandler.h \ - $(ACE_ROOT)/ACEXML/common/EntityResolver.h \ - $(ACE_ROOT)/ACEXML/common/InputSource.h \ - $(ACE_ROOT)/ACEXML/common/CharStream.h \ - $(ACE_ROOT)/ACEXML/common/ErrorHandler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.i - -.obj/SAXPrint_Handler.o .obj/SAXPrint_Handler.so .shobj/SAXPrint_Handler.o .shobj/SAXPrint_Handler.so: SAXPrint_Handler.cpp SAXPrint_Handler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/ContentHandler.h \ - $(ACE_ROOT)/ACEXML/common/Env.h \ - $(ACE_ROOT)/ACEXML/common/XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - $(ACE_ROOT)/ACEXML/common/Exception.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/Env.i \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.i \ - $(ACE_ROOT)/ACEXML/common/Locator.h \ - $(ACE_ROOT)/ACEXML/common/Attributes.h \ - $(ACE_ROOT)/ACEXML/common/DTDHandler.h \ - $(ACE_ROOT)/ACEXML/common/EntityResolver.h \ - $(ACE_ROOT)/ACEXML/common/InputSource.h \ - $(ACE_ROOT)/ACEXML/common/CharStream.h \ - $(ACE_ROOT)/ACEXML/common/ErrorHandler.h \ - $(ACE_ROOT)/ACEXML/common/DefaultHandler.i \ - SAXPrint_Handler.i - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/examples/SAXPrint/Makefile.SAXPrint b/ACEXML/examples/SAXPrint/Makefile.SAXPrint new file mode 100644 index 00000000000..752f4b81b2e --- /dev/null +++ b/ACEXML/examples/SAXPrint/Makefile.SAXPrint @@ -0,0 +1,50 @@ +#---------------------------------------------------------------------------- +# GNU Makefile +#---------------------------------------------------------------------------- + +MAKEFILE = Makefile.SAXPrint +DEPENDENCY_FILE = .depend.Makefile.SAXPrint +BIN_UNCHECKED = SAXPrint + + + +FILES = \ + main \ + SAXPrint_Handler \ + Print_Handler + +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU + +BIN = $(BIN_UNCHECKED) + +OBJS = $(addsuffix .o, $(notdir $(FILES))) +SRC = $(addsuffix .cpp, $(FILES)) +ACELIB = -lACE + +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU + +CPPFLAGS += -I../../.. +LDFLAGS += -L../../../ace + +LDLIBS = -lACEXML_Parser -lACEXML + +#---------------------------------------------------------------------------- +# Local targets +#---------------------------------------------------------------------------- + +$(BIN): $(addprefix $(VDIR), $(OBJS)) + $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) $(POSTLINK) + +#---------------------------------------------------------------------------- +# Dependencies +#---------------------------------------------------------------------------- +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/examples/SAXPrint/Print_Handler.cpp b/ACEXML/examples/SAXPrint/Print_Handler.cpp index 19cfb44ba8d..3d50bb0f620 100644 --- a/ACEXML/examples/SAXPrint/Print_Handler.cpp +++ b/ACEXML/examples/SAXPrint/Print_Handler.cpp @@ -22,14 +22,14 @@ ACEXML_Print_Handler::~ACEXML_Print_Handler (void) void ACEXML_Print_Handler::characters (const ACEXML_Char *cdata, int start, - int end ACEXML_ENV_ARG_DECL_NOT_USED) + int length ACEXML_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((ACEXML_SAXException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("* Event characters () ** start: %d end: %d ***************\n%s\n- End event characters () ---------------\n"), - start, end, cdata)); + start, length, cdata)); } void @@ -75,10 +75,8 @@ ACEXML_Print_Handler::ignorableWhitespace (const ACEXML_Char *, ACEXML_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((ACEXML_SAXException)) { - - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("* Event ignorableWhitespace () ***************\n"))); +// ACE_DEBUG ((LM_DEBUG, +// ACE_TEXT ("* Event ignorableWhitespace () ***************\n"))); } void @@ -99,8 +97,7 @@ ACEXML_Print_Handler::setDocumentLocator (ACEXML_Locator * locator) { this->locator_ = locator; - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("* Event setDocumentLocator () ***************\n"))); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("* Event setDocumentLocator () ***************\n"))); } void diff --git a/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp b/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp index 66d96dca47b..008fb19f46e 100644 --- a/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp +++ b/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp @@ -22,12 +22,12 @@ ACEXML_SAXPrint_Handler::~ACEXML_SAXPrint_Handler (void) void ACEXML_SAXPrint_Handler::characters (const ACEXML_Char *cdata, int start, - int end ACEXML_ENV_ARG_DECL_NOT_USED) + int length ACEXML_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((ACEXML_SAXException)) { ACE_UNUSED_ARG (start); - ACE_UNUSED_ARG (end); + ACE_UNUSED_ARG (length); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s"), cdata)); @@ -76,10 +76,8 @@ ACEXML_SAXPrint_Handler::ignorableWhitespace (const ACEXML_Char *, int ACEXML_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((ACEXML_SAXException)) { - - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("* Event ignorableWhitespace () ***************\n"))); +// ACE_DEBUG ((LM_DEBUG, +// ACE_TEXT ("* Event ignorableWhitespace () ***************\n"))); } void @@ -101,8 +99,7 @@ ACEXML_SAXPrint_Handler::setDocumentLocator (ACEXML_Locator * locator) { this->locator_ = locator; - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("* Event setDocumentLocator () ***************\n"))); + //ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("* Event setDocumentLocator () ***************\n"))); } void @@ -206,7 +203,8 @@ ACEXML_SAXPrint_Handler::error (ACEXML_SAXParseException & ex ACEXML_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((ACEXML_SAXException)) { - ACE_DEBUG ((LM_DEBUG, "%s: line :%d col: %d ", this->fileName_, + ACE_DEBUG ((LM_DEBUG, "%s: line :%d col: %d ", + (this->locator_->getSystemId() == 0 ? this->fileName_ : this->locator_->getSystemId()), this->locator_->getLineNumber(), this->locator_->getColumnNumber())); ex.print(); @@ -217,7 +215,8 @@ ACEXML_SAXPrint_Handler::fatalError (ACEXML_SAXParseException & ex ACEXML_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((ACEXML_SAXException)) { - ACE_DEBUG ((LM_DEBUG, "%s: line :%d col: %d ", this->fileName_, + ACE_DEBUG ((LM_DEBUG, "%s: line :%d col: %d ", + (this->locator_->getSystemId() == 0 ? this->fileName_ : this->locator_->getSystemId()), this->locator_->getLineNumber(), this->locator_->getColumnNumber())); ex.print(); @@ -228,7 +227,8 @@ ACEXML_SAXPrint_Handler::warning (ACEXML_SAXParseException & ex ACEXML_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((ACEXML_SAXException)) { - ACE_DEBUG ((LM_DEBUG, "%s: line :%d col: %d ", this->fileName_, + ACE_DEBUG ((LM_DEBUG, "%s: line :%d col: %d ", + (this->locator_->getSystemId() == 0 ? this->fileName_ : this->locator_->getSystemId()), this->locator_->getLineNumber(), this->locator_->getColumnNumber())); ex.print(); diff --git a/ACEXML/examples/SAXPrint/main.cpp b/ACEXML/examples/SAXPrint/main.cpp index 771411867b1..f9db2084d15 100644 --- a/ACEXML/examples/SAXPrint/main.cpp +++ b/ACEXML/examples/SAXPrint/main.cpp @@ -2,6 +2,7 @@ #include "ACEXML/common/FileCharStream.h" #include "ACEXML/common/HttpCharStream.h" +#include "ACEXML/common/ZipCharStream.h" #include "ACEXML/common/StrCharStream.h" #include "ACEXML/parser/parser/Parser.h" #include "Print_Handler.h" @@ -16,10 +17,11 @@ static void usage (const ACE_TCHAR* program) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Usage: %s [-sl] [-f <filename> | -u <url>]\n") + ACE_TEXT ("Usage: %s [-sl] [-f <filename> | -u <url> | -z <ZIP Archive>]\n") ACE_TEXT (" -s: Use SAXPrint_Handler (Default is Print_Handler)\n") ACE_TEXT (" -l: Parse the internal strings (test the StrCharStream class)\n") ACE_TEXT (" -f: Specify the filename when -l is not specified\n") + ACE_TEXT (" -z: Specify that the file is inside a ZIP archive\n") ACE_TEXT (" -u: URL specifying the path to the file\n"), program)); } @@ -30,30 +32,34 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACEXML_Char* filename = 0; int sax = 0; // Use SAXPrint handler or not. int str = 0; + int zip = 0; ACEXML_Char* url = 0; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("sf:lu:")); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("sf:lu:z")); int c; while ((c = get_opt ()) != EOF) { switch (c) { - case 's': - sax = 1; - break; - case 'l': - str = 1; - break; - case 'f': - filename = get_opt.opt_arg (); - break; - case 'u': - url = get_opt.opt_arg(); - break; - default: - usage(argv[0]); - return -1; + case 's': + sax = 1; + break; + case 'l': + str = 1; + break; + case 'f': + filename = get_opt.opt_arg (); + break; + case 'u': + url = get_opt.opt_arg(); + break; + case 'z': + zip = 1; + break; + default: + usage(argv[0]); + return -1; } } @@ -67,66 +73,78 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACEXML_CharStream *stm = 0; ACEXML_FileCharStream *fstm = 0; ACEXML_HttpCharStream *ustm = 0; - if (filename != 0) - { - ACE_NEW_RETURN (fstm, - ACEXML_FileCharStream (), - -1); - - if (fstm->open (filename) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Failed to open XML file: %s\n"), - filename), - -1); - stm = fstm; - } - else if (url != 0) - { + ACEXML_ZipCharStream* zstm = 0; + if (filename != 0) + { + if (zip) + { + ACE_NEW_RETURN (zstm, ACEXML_ZipCharStream(), -1); + if (zstm->open (filename) != 0) + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("Failed to open XML file: %s\n"), + filename), + -1); + stm = zstm; + } + else + { + ACE_NEW_RETURN (fstm, ACEXML_FileCharStream (), -1); + if (fstm->open (filename) != 0) + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("Failed to open XML file: %s\n"), + filename), + -1); + stm = fstm; + } + } + else if (url != 0) + { - ACE_NEW_RETURN (ustm, - ACEXML_HttpCharStream (), - -1); - if (ustm->open (url) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Failed to open URL : %s\n"), - url), - -1); - stm = ustm; - } - else { - ACE_NEW_RETURN (stm, - ACEXML_StrCharStream (test_string), - -1); - } + ACE_NEW_RETURN (ustm, + ACEXML_HttpCharStream (), + -1); + if (ustm->open (url) != 0) + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("Failed to open URL : %s\n"), + url), + -1); + stm = ustm; + } + else { + ACE_NEW_RETURN (stm, + ACEXML_StrCharStream (test_string), + -1); + } ACEXML_Char* name = (filename == 0) ? url : filename; - if (sax == 0) - ACE_NEW_RETURN (handler, + if (sax == 0) + ACE_NEW_RETURN (handler, ACEXML_Print_Handler (name), - -1); - else - ACE_NEW_RETURN (handler, + -1); + else + ACE_NEW_RETURN (handler, ACEXML_SAXPrint_Handler (name), - -1); + -1); - ACEXML_Parser parser; - ACEXML_InputSource input(stm); + ACEXML_Parser parser; + ACEXML_InputSource* input = 0; + ACE_NEW_RETURN (input, ACEXML_InputSource (stm), -1); - parser.setContentHandler (handler); - parser.setDTDHandler (handler); - parser.setErrorHandler (handler); - parser.setEntityResolver (handler); + parser.setContentHandler (handler); + parser.setDTDHandler (handler); + parser.setErrorHandler (handler); + parser.setEntityResolver (handler); ACEXML_TRY_NEW_ENV { - parser.parse (&input ACEXML_ENV_ARG_PARAMETER); + parser.parse (input ACEXML_ENV_ARG_PARAMETER); ACEXML_TRY_CHECK; } ACEXML_CATCH (ACEXML_SAXException, ex) { ACE_UNUSED_ARG (ex); ACE_DEBUG ((LM_ERROR, ACE_TEXT ("Exception occurred. Exiting...\n"))); - } + } ACEXML_ENDTRY; return 0; } diff --git a/ACEXML/examples/SAXPrint/namespaces.xml b/ACEXML/examples/SAXPrint/namespaces.xml new file mode 100644 index 00000000000..f2418848929 --- /dev/null +++ b/ACEXML/examples/SAXPrint/namespaces.xml @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="iso8859-1"?> + +<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:sy="http://purl.org/rss/1.0/modules/syndication/" xmlns:admin="http://webns.net/mvcb/" xmlns="http://purl.org/rss/1.0/"> + +<channel rdf:about="http://primates.ximian.com/~ravi/BoozeLog/"> +<title>Vignesh Blogs Here</title> +<link>http://primates.ximian.com/~ravi/BoozeLog/</link> +<description></description> +<language>en-us</language> +<webMaster></webMaster> +<lastBuildDate>2002-10-11T00:50:42-06:00</lastBuildDate> +<pubDate>2002-10-12T20:19:57-06:00</pubDate> +<admin:generatorAgent rdf:resource="http://www.movabletype.org/?v=2.21" /> + +<items> +<rdf:Seq><rdf:li rdf:resource="http://primates.ximian.com/~ravi/BoozeLog/archives/000025.html" /> +<rdf:li rdf:resource="http://primates.ximian.com/~ravi/BoozeLog/archives/000024.html" /> +<rdf:li rdf:resource="http://primates.ximian.com/~ravi/BoozeLog/archives/000023.html" /> +<rdf:li rdf:resource="http://primates.ximian.com/~ravi/BoozeLog/archives/000020.html" /> +<rdf:li rdf:resource="http://primates.ximian.com/~ravi/BoozeLog/archives/000013.html" /> +<rdf:li rdf:resource="http://primates.ximian.com/~ravi/BoozeLog/archives/000012.html" /> +<rdf:li rdf:resource="http://primates.ximian.com/~ravi/BoozeLog/archives/000011.html" /> +<rdf:li rdf:resource="http://primates.ximian.com/~ravi/BoozeLog/archives/000008.html" /> +</rdf:Seq> +</items> + +</channel> + +<item rdf:about="http://primates.ximian.com/~ravi/BoozeLog/archives/000025.html"> +<title>Happy Birthday Vidya</title> +<description>Today is Vidya's birthday ! Happy Birthday Vidya! We had a midnight party,as usual, at Swapna's place, though I dont...</description> +<link>http://primates.ximian.com/~ravi/BoozeLog/archives/000025.html</link> +<dc:subject>Blog entry</dc:subject> +<dc:creator>Booze</dc:creator> +<dc:date>2002-10-11T00:50:42-06:00</dc:date> +</item> +<item rdf:about="http://primates.ximian.com/~ravi/BoozeLog/archives/000024.html"> +<title>Way to go, Shaastra!</title> +<description>On Flash Back mode now: Shaastra is the technical festival at my alma mater, IIT Madras, that replaced the old,...</description> +<link>http://primates.ximian.com/~ravi/BoozeLog/archives/000024.html</link> +<dc:subject>Blog entry</dc:subject> +<dc:creator>Booze</dc:creator> +<dc:date>2002-10-10T11:52:02-06:00</dc:date> +</item> +<item rdf:about="http://primates.ximian.com/~ravi/BoozeLog/archives/000023.html"> +<title>Back and Forth in Time</title> +<description>The blog is going to be a little skewed in time for the next coupla days.. Inspite of my laziness,...</description> +<link>http://primates.ximian.com/~ravi/BoozeLog/archives/000023.html</link> +<dc:subject>Blog entry</dc:subject> +<dc:creator>Booze</dc:creator> +<dc:date>2002-10-09T23:47:19-06:00</dc:date> +</item> +<item rdf:about="http://primates.ximian.com/~ravi/BoozeLog/archives/000020.html"> +<title>Frisco Rocks!</title> +<description>If there be any reason the blog hasnt been updated,it is simply because I am enjoying my trip to San...</description> +<link>http://primates.ximian.com/~ravi/BoozeLog/archives/000020.html</link> +<dc:subject>Blog entry</dc:subject> +<dc:creator>Booze</dc:creator> +<dc:date>2002-10-03T23:53:16-06:00</dc:date> +</item> +<item rdf:about="http://primates.ximian.com/~ravi/BoozeLog/archives/000013.html"> +<title>Think but not make thoughts your aim</title> +<description>A line from Rudyard Kipling's IF : would sum up my feelings for today, a lot of thinking from morning...</description> +<link>http://primates.ximian.com/~ravi/BoozeLog/archives/000013.html</link> +<dc:subject>Blog entry</dc:subject> +<dc:creator>Booze</dc:creator> +<dc:date>2002-09-28T22:48:09-06:00</dc:date> +</item> +<item rdf:about="http://primates.ximian.com/~ravi/BoozeLog/archives/000012.html"> +<title>New ARM but...</title> +<description>ARM stands for Advanced Recording Model, a simulation software that I use for my work, and I have been tinkering...</description> +<link>http://primates.ximian.com/~ravi/BoozeLog/archives/000012.html</link> +<dc:subject>Blog entry</dc:subject> +<dc:creator>Booze</dc:creator> +<dc:date>2002-09-27T22:36:28-06:00</dc:date> +</item> +<item rdf:about="http://primates.ximian.com/~ravi/BoozeLog/archives/000011.html"> +<title>A much needed break</title> +<description>Slowly got over the hangover of Sandhya's departure and moved to more mundane things in life : assignments, submissions and...</description> +<link>http://primates.ximian.com/~ravi/BoozeLog/archives/000011.html</link> +<dc:subject>Blog entry</dc:subject> +<dc:creator>Booze</dc:creator> +<dc:date>2002-09-26T23:05:46-06:00</dc:date> +</item> +<item rdf:about="http://primates.ximian.com/~ravi/BoozeLog/archives/000008.html"> +<title>Here we go !</title> +<description>My first attempts at Blogging, the idea was introduced to me by Ravi Pratap. MoveableType really makes it easy and...</description> +<link>http://primates.ximian.com/~ravi/BoozeLog/archives/000008.html</link> +<dc:subject>Blog entry</dc:subject> +<dc:creator>Booze</dc:creator> +<dc:date>2002-09-25T19:27:22-06:00</dc:date> +</item> + + +</rdf:RDF> diff --git a/ACEXML/examples/svcconf/Makefile.Svcconf b/ACEXML/examples/svcconf/Makefile.Svcconf new file mode 100644 index 00000000000..ccce348faad --- /dev/null +++ b/ACEXML/examples/svcconf/Makefile.Svcconf @@ -0,0 +1,49 @@ +#---------------------------------------------------------------------------- +# GNU Makefile +#---------------------------------------------------------------------------- + +MAKEFILE = Makefile.Svcconf +DEPENDENCY_FILE = .depend.Makefile.Svcconf +BIN_UNCHECKED = Svcconf + + + +FILES = \ + main \ + Svcconf_Handler + +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU + +BIN = $(BIN_UNCHECKED) + +OBJS = $(addsuffix .o, $(notdir $(FILES))) +SRC = $(addsuffix .cpp, $(FILES)) +ACELIB = -lACE + +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU + +CPPFLAGS += -I../../.. +LDFLAGS += -L../../../ace + +LDLIBS = -lACEXML_XML_Svc_Conf_Parser -lACEXML_Parser -lACEXML + +#---------------------------------------------------------------------------- +# Local targets +#---------------------------------------------------------------------------- + +$(BIN): $(addprefix $(VDIR), $(OBJS)) + $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) $(POSTLINK) + +#---------------------------------------------------------------------------- +# Dependencies +#---------------------------------------------------------------------------- +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/examples/svcconf/Svcconf.mpc b/ACEXML/examples/svcconf/Svcconf.mpc new file mode 100644 index 00000000000..cd695e4d08c --- /dev/null +++ b/ACEXML/examples/svcconf/Svcconf.mpc @@ -0,0 +1,8 @@ +project (Svcconf) : aceexe { + exename = Svcconf + libs = ACEXML_XML_Svc_Conf_Parser ACEXML_Parser ACEXML + Source_Files { + main.cpp + Svcconf_Handler.cpp + } +} diff --git a/ACEXML/parser/Makefile b/ACEXML/parser/Makefile deleted file mode 100644 index 9a519bc492b..00000000000 --- a/ACEXML/parser/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for the client programs that test the ACE network services -#---------------------------------------------------------------------------- - -DIRS = parser - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU diff --git a/ACEXML/parser/debug_validator/Makefile.Validator b/ACEXML/parser/debug_validator/Makefile.Validator new file mode 100644 index 00000000000..aba23bd3161 --- /dev/null +++ b/ACEXML/parser/debug_validator/Makefile.Validator @@ -0,0 +1,49 @@ +#---------------------------------------------------------------------------- +# GNU Makefile +#---------------------------------------------------------------------------- + +MAKEFILE = Makefile.Validator +DEPENDENCY_FILE = .depend.Makefile.Validator +LIB_UNCHECKED = libACEXML_Validator.a +SHLIB_UNCHECKED = libACEXML_Validator.$(SOEXT) + + + +FILES = \ + Debug_Attributes_Builder \ + Debug_DTD_Manager \ + Debug_Element_Builder \ + Element_Tree + +LIB = $(LIB_UNCHECKED) +SHLIB = $(SHLIB_UNCHECKED) + +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +LSRC = $(addsuffix .cpp, $(FILES)) +ACELIB = -lACE + +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +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 + +ACE_SHLIBS = -lACEXML_Parser -lACEXML $(ACELIB) + +#---------------------------------------------------------------------------- +# Local targets +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Dependencies +#---------------------------------------------------------------------------- +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/parser/debug_validator/validator.mpc b/ACEXML/parser/debug_validator/validator.mpc new file mode 100644 index 00000000000..dcfb5bc2ab3 --- /dev/null +++ b/ACEXML/parser/debug_validator/validator.mpc @@ -0,0 +1,5 @@ +project (Validator) : acelib { + depends = XML_Parser + sharedname = ACEXML_Validator + libs = ACEXML_Parser ACEXML +} diff --git a/ACEXML/parser/parser/Entity_Manager.cpp b/ACEXML/parser/parser/Entity_Manager.cpp index d0c86862805..0b781b6f0e4 100644 --- a/ACEXML/parser/parser/Entity_Manager.cpp +++ b/ACEXML/parser/parser/Entity_Manager.cpp @@ -2,45 +2,17 @@ #include "ACEXML/parser/parser/Entity_Manager.h" +static const ACEXML_Char empty_string[] = { 0 }; + #if !defined (__ACEXML_INLINE__) # include "ACEXML/parser/parser/Entity_Manager.i" #endif /* __ACEXML_INLINE__ */ -static const ACEXML_Char amp_name[] = {'a', 'm', 'p', 0 }; -static const ACEXML_Char amp_value[] = {'&', 0}; -static const ACEXML_Char lt_name[] = {'l', 't', 0}; -static const ACEXML_Char lt_value[] = {'<', 0}; -static const ACEXML_Char gt_name[] = {'g', 't', 0}; -static const ACEXML_Char gt_value[] = {'>', 0}; -static const ACEXML_Char apos_name[] = {'a', 'p', 'o', 's', 0}; -static const ACEXML_Char apos_value[] = {'\'', 0}; -static const ACEXML_Char quot_name[] = {'q', 'u', 'o', 't', 0}; -static const ACEXML_Char quot_value[] = {'"', 0}; ACEXML_Entity_Manager::ACEXML_Entity_Manager (void) : entities_ () { - // @@ No way to know if these bindings succeed or not. - - ACEXML_String ampname (amp_name, 0, 0); - ACEXML_String ampvalue (amp_value, 0, 0); - this->entities_.bind (ampname, ampvalue); - - ACEXML_String ltname (lt_name, 0, 0); - ACEXML_String ltvalue (lt_value, 0, 0); - this->entities_.bind (ltname, ltvalue); - - ACEXML_String gtname (gt_name, 0, 0); - ACEXML_String gtvalue (gt_value, 0, 0); - this->entities_.bind (gtname, gtvalue); - - ACEXML_String aposname (apos_name, 0, 0); - ACEXML_String aposvalue (apos_value, 0, 0); - this->entities_.bind (aposname, aposvalue); - ACEXML_String quotname (quot_name, 0, 0); - ACEXML_String quotvalue (quot_value, 0, 0); - this->entities_.bind (quotname, quotvalue); } ACEXML_Entity_Manager::~ACEXML_Entity_Manager (void) diff --git a/ACEXML/parser/parser/Entity_Manager.h b/ACEXML/parser/parser/Entity_Manager.h index 7d2f4ef9b6e..ba16279eb05 100644 --- a/ACEXML/parser/parser/Entity_Manager.h +++ b/ACEXML/parser/parser/Entity_Manager.h @@ -44,6 +44,12 @@ typedef ACE_Hash_Map_Reverse_Iterator_Ex<ACEXML_String, ACE_Equal_To<ACEXML_String>, ACE_Null_Mutex> ACEXML_ENTITIES_MANAGER_REVERSE_ITER; +typedef ACE_Hash_Map_Bucket_Iterator<ACEXML_String, + ACEXML_String, + ACE_Hash<ACEXML_String>, + ACE_Equal_To<ACEXML_String>, + ACE_Null_Mutex> ACEXML_ENTITY_ENTRY_ITERATOR; + /** * @class ACEXML_Entity_Manager Entity_Manager.h "ACEXML/parser/parser/Entity_Manager.h" * @@ -61,11 +67,21 @@ public: ~ACEXML_Entity_Manager (void); /// Add a new entity declaration. - int add_entity (const ACEXML_Char *ref, - const ACEXML_Char *value); + int add_entity (const ACEXML_Char *ref, const ACEXML_Char *value); /// Resolve an entity reference. - const ACEXML_String *resolve_entity (const ACEXML_Char *ref); + const ACEXML_Char* resolve_entity (const ACEXML_Char *ref); + + /// Resolve an entity reference and return the tuple of @c systemId and + /// @c publicId + int resolve_entity (const ACEXML_Char* ref, ACEXML_Char*& systemId, + ACEXML_Char*& publicId); + + /// Number of items in the Entity Manager + const size_t size(void) const; + + /// Reset the state + int reset (void); private: ACEXML_ENTITIES_MANAGER entities_; diff --git a/ACEXML/parser/parser/Entity_Manager.i b/ACEXML/parser/parser/Entity_Manager.i index 696b82b64e4..26da9ad15d9 100644 --- a/ACEXML/parser/parser/Entity_Manager.i +++ b/ACEXML/parser/parser/Entity_Manager.i @@ -9,13 +9,46 @@ ACEXML_Entity_Manager::add_entity (const ACEXML_Char *ref, return this->entities_.bind (name, value); } -ACEXML_INLINE const ACEXML_String * +ACEXML_INLINE const ACEXML_Char* ACEXML_Entity_Manager::resolve_entity (const ACEXML_Char *ref) { ACEXML_ENTITY_ENTRY *entry; if (this->entities_.find (ACEXML_String (ref, 0, 0), entry) == 0) - return &entry->int_id_; + return entry->int_id_.c_str(); return 0; } + +ACEXML_INLINE int +ACEXML_Entity_Manager::resolve_entity (const ACEXML_Char* ref, + ACEXML_Char*& systemId, + ACEXML_Char*& publicId) +{ + publicId = systemId = 0; + ACEXML_ENTITY_ENTRY_ITERATOR iter (this->entities_, ref); + ACEXML_ENTITY_ENTRY_ITERATOR end (this->entities_, ref, 1); + + if (iter != end) + { + systemId = ACE_const_cast (ACEXML_Char*, (*iter).int_id_.c_str()); + ++iter; + if (iter != end) + publicId = ACE_const_cast (ACEXML_Char*, (*iter).int_id_.c_str()); + return 0; + } + return -1; +} + +ACEXML_INLINE int +ACEXML_Entity_Manager::reset (void) +{ + return this->entities_.close(); +} + + +ACEXML_INLINE const size_t +ACEXML_Entity_Manager::size (void) const +{ + return this->entities_.current_size(); +} diff --git a/ACEXML/parser/parser/Makefile b/ACEXML/parser/parser/Makefile deleted file mode 100644 index f44148962d7..00000000000 --- a/ACEXML/parser/parser/Makefile +++ /dev/null @@ -1,348 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for the server-side ACE network services -#---------------------------------------------------------------------------- - -LIB = libACEXML_Parser.a -SHLIB = libACEXML_Parser.$(SOEXT) - -FILES = Entity_Manager \ - Parser - -DEFS = $(addsuffix .h,$(FILES)) -LSRC = $(addsuffix .cpp,$(FILES)) - -LIBS += -lACEXML $(ACELIB) - -BUILD = $(VLIB) $(VSHLIB) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - -.obj/Entity_Manager.o .obj/Entity_Manager.so .shobj/Entity_Manager.o .shobj/Entity_Manager.so: Entity_Manager.cpp \ - $(ACE_ROOT)/ACEXML/parser/parser/Entity_Manager.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/parser/parser/Parser_export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Types.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 \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ACEXML/parser/parser/Entity_Manager.i - -.obj/Parser.o .obj/Parser.so .shobj/Parser.o .shobj/Parser.so: Parser.cpp \ - $(ACE_ROOT)/ACEXML/parser/parser/Parser.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/parser/parser/Parser_export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/XMLReader.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ACEXML/common/ContentHandler.h \ - $(ACE_ROOT)/ACEXML/common/Env.h \ - $(ACE_ROOT)/ACEXML/common/XML_Macros.h \ - $(ACE_ROOT)/ace/Exception_Macros.h \ - $(ACE_ROOT)/ACEXML/common/Exception.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/Exception.i \ - $(ACE_ROOT)/ACEXML/common/Env.i \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.h \ - $(ACE_ROOT)/ACEXML/common/SAXExceptions.i \ - $(ACE_ROOT)/ACEXML/common/Locator.h \ - $(ACE_ROOT)/ACEXML/common/Attributes.h \ - $(ACE_ROOT)/ACEXML/common/DTDHandler.h \ - $(ACE_ROOT)/ACEXML/common/EntityResolver.h \ - $(ACE_ROOT)/ACEXML/common/InputSource.h \ - $(ACE_ROOT)/ACEXML/common/CharStream.h \ - $(ACE_ROOT)/ACEXML/common/ErrorHandler.h \ - $(ACE_ROOT)/ACEXML/common/LocatorImpl.h \ - $(ACE_ROOT)/ACEXML/common/LocatorImpl.i \ - $(ACE_ROOT)/ACEXML/common/NamespaceSupport.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Types.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 \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ACEXML/common/NamespaceSupport.i \ - $(ACE_ROOT)/ace/Obstack.h \ - $(ACE_ROOT)/ace/Obstack_T.h \ - $(ACE_ROOT)/ace/Obchunk.h \ - $(ACE_ROOT)/ace/Obchunk.i \ - $(ACE_ROOT)/ace/Obstack_T.i \ - $(ACE_ROOT)/ace/Obstack_T.cpp \ - $(ACE_ROOT)/ACEXML/parser/parser/Entity_Manager.h \ - $(ACE_ROOT)/ACEXML/parser/parser/Entity_Manager.i \ - $(ACE_ROOT)/ACEXML/parser/parser/Parser.i \ - $(ACE_ROOT)/ACEXML/common/Transcode.h \ - $(ACE_ROOT)/ACEXML/common/Transcode.i \ - $(ACE_ROOT)/ACEXML/common/AttributesImpl.h \ - $(ACE_ROOT)/ACEXML/common/AttributesImpl.i - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/parser/parser/Makefile.Parser b/ACEXML/parser/parser/Makefile.Parser new file mode 100644 index 00000000000..0a0a464f338 --- /dev/null +++ b/ACEXML/parser/parser/Makefile.Parser @@ -0,0 +1,49 @@ +#---------------------------------------------------------------------------- +# GNU Makefile +#---------------------------------------------------------------------------- + +MAKEFILE = Makefile.Parser +DEPENDENCY_FILE = .depend.Makefile.Parser +LIB_UNCHECKED = libACEXML_Parser.a +SHLIB_UNCHECKED = libACEXML_Parser.$(SOEXT) + + + +FILES = \ + Entity_Manager \ + Parser \ + ParserContext \ + ParserInternals + +LIB = $(LIB_UNCHECKED) +SHLIB = $(SHLIB_UNCHECKED) + +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +LSRC = $(addsuffix .cpp, $(FILES)) +ACELIB = -lACE + +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +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 + +ACE_SHLIBS = -lACEXML $(ACELIB) + +#---------------------------------------------------------------------------- +# Local targets +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Dependencies +#---------------------------------------------------------------------------- +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/parser/parser/Parser.cpp b/ACEXML/parser/parser/Parser.cpp index 4b49b5ed895..f9f202ae301 100644 --- a/ACEXML/parser/parser/Parser.cpp +++ b/ACEXML/parser/parser/Parser.cpp @@ -1,39 +1,52 @@ // $Id$ -#include "ACEXML/parser/parser/Parser.h" +#include "ace/ACE.h" #include "ACEXML/common/Transcode.h" #include "ACEXML/common/AttributesImpl.h" -#include "ace/ACE.h" +#include "ACEXML/common/StrCharStream.h" +#include "ACEXML/common/StreamFactory.h" +#include "ACEXML/parser/parser/Parser.h" +#include "ACEXML/parser/parser/ParserInternals.h" + +#if !defined (__ACEXML_INLINE__) +# include "ACEXML/parser/parser/Parser.i" +#endif /* __ACEXML_INLINE__ */ -static const ACEXML_Char default_attribute_type[] = {'C', 'D', 'A', 'T', 'A', 0}; +static const ACEXML_Char default_attribute_type[] = ACE_TEXT ("CDATA"); static const ACEXML_Char empty_string[] = { 0 }; const ACEXML_Char -ACEXML_Parser::simple_parsing_feature_[] = { 'S', 'i', 'm', 'p', 'l', 'e', 0 }; +ACEXML_Parser::simple_parsing_feature_[] = ACE_TEXT ("Simple"); const ACEXML_Char -ACEXML_Parser::namespaces_feature_[] = {'h', 't', 't', 'p', ':', '/', '/', 'x', 'm', 'l', '.', 'o', 'r', 'g', '/', 's', 'a', 'x', '/', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '/', 'n', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', 's', 0 }; +ACEXML_Parser::namespaces_feature_[] = ACE_TEXT ("http://xml.org/sax/features/namespaces"); const ACEXML_Char -ACEXML_Parser::namespace_prefixes_feature_[] = {'h', 't', 't', 'p', ':', '/', '/', 'x', 'm', 'l', '.', 'o', 'r', 'g', '/', 's', 'a', 'x', '/', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '/', 'n', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '-', 'p', 'r', 'e', 'f', 'i', 'x', 'e', 's', 0 }; +ACEXML_Parser::namespace_prefixes_feature_[] = ACE_TEXT ("http://xml.org/sax/features/namespace-prefixes"); -#if !defined (__ACEXML_INLINE__) -# include "ACEXML/parser/parser/Parser.i" -#endif /* __ACEXML_INLINE__ */ +const ACEXML_Char +ACEXML_Parser::validation_feature_[] = ACE_TEXT ("http://xml.org/sax/features/validation"); ACEXML_Parser::ACEXML_Parser (void) : dtd_handler_ (0), entity_resolver_ (0), content_handler_ (0), error_handler_ (0), - instream_ (0), doctype_ (0), - dtd_system_ (0), - dtd_public_ (0), - locator_(), + current_ (0), + alt_stack_ (MAXPATHLEN), + nested_namespace_ (0), + ref_state_ (ACEXML_ParserInt::INVALID), + external_subset_ (0), + external_entity_ (0), + has_pe_refs_ (0), simple_parsing_ (0), + validate_ (1), namespaces_(1), - namespace_prefixes_ (0) + namespace_prefixes_ (0), + standalone_ (0), + external_dtd_ (0), + internal_dtd_ (0) { } @@ -42,190 +55,137 @@ ACEXML_Parser::~ACEXML_Parser (void) } int -ACEXML_Parser::getFeature (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) +ACEXML_Parser::initialize(ACEXML_InputSource* input) { - if (ACE_OS::strcmp (name, - ACEXML_Parser::simple_parsing_feature_) == 0) + for (int i = 0; i < 5; ++i) { - return this->simple_parsing_; - } - else if (ACE_OS::strcmp (name, - ACEXML_Parser::namespaces_feature_) == 0) - { - return this->namespaces_; - } - else if (ACE_OS::strcmp (name, - ACEXML_Parser::namespace_prefixes_feature_) == 0) - { - return this->namespace_prefixes_; + if (this->predef_entities_.add_entity (ACEXML_ParserInt::predef_ent_[i], + ACEXML_ParserInt::predef_val_[i]) + != 0) + { + ACE_ERROR ((LM_DEBUG, ACE_TEXT ("Error adding entity %s to Manager"), + ACEXML_ParserInt::predef_ent_[i])); + return -1; + } } - - ACEXML_THROW_RETURN (ACEXML_SAXNotRecognizedException (name), -1); + return this->switch_input (input); } - - void -ACEXML_Parser::setFeature (const ACEXML_Char *name, - int boolean_value ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) +ACEXML_Parser::parse (ACEXML_InputSource *input ACEXML_ENV_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)) { - if (ACE_OS::strcmp (name, - ACEXML_Parser::simple_parsing_feature_) == 0) + if (input == 0) { - this->simple_parsing_ = (boolean_value == 0 ? 0 : 1); - return; - } - else if (ACE_OS::strcmp (name, - ACEXML_Parser::namespaces_feature_) == 0) - { - this->namespaces_ = (boolean_value == 0 ? 0 : 1); - return; + this->fatal_error(ACE_TEXT ("Invalid input source") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK; } - else if (ACE_OS::strcmp (name, - ACEXML_Parser::namespace_prefixes_feature_) == 0) + if (this->initialize(input) == -1) { - this->namespace_prefixes_ = (boolean_value == 0 ? 0 : 1); - return; + this->fatal_error (ACE_TEXT ("Failed to initialize parser state") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK; } + // Set up Locator. + if (this->content_handler_) + this->content_handler_->setDocumentLocator (this->current_->getLocator()); - ACEXML_THROW (ACEXML_SAXNotRecognizedException (name)); -} - -void * -ACEXML_Parser::getProperty (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) -{ - ACEXML_THROW_RETURN (ACEXML_SAXNotSupportedException (name), 0); -} - -void -ACEXML_Parser::setProperty (const ACEXML_Char *name, - void *value ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, - ACEXML_SAXNotSupportedException)) -{ - ACE_UNUSED_ARG (value); - - ACEXML_THROW (ACEXML_SAXNotSupportedException (name)); -} - -void -ACEXML_Parser::report_error (const ACEXML_Char* message ACEXML_ENV_ARG_DECL) -{ - ACEXML_SAXParseException* exception = 0; - ACE_NEW_NORETURN (exception, - ACEXML_SAXParseException (message)); - if (this->error_handler_) - this->error_handler_->error (*exception ACEXML_ENV_ARG_PARAMETER); - else - ACEXML_ENV_RAISE (exception); - return; -} - -void -ACEXML_Parser::report_warning (const ACEXML_Char* message ACEXML_ENV_ARG_DECL) -{ - ACEXML_SAXParseException* exception = 0; - ACE_NEW_NORETURN (exception, - ACEXML_SAXParseException (message)); - if (this->error_handler_) - this->error_handler_->warning (*exception ACEXML_ENV_ARG_PARAMETER); - return; -} - -void -ACEXML_Parser::report_fatal_error (const ACEXML_Char* message ACEXML_ENV_ARG_DECL) -{ - ACEXML_SAXParseException* exception = 0; - ACE_NEW_NORETURN (exception, - ACEXML_SAXParseException (message)); - if (this->error_handler_) - this->error_handler_->fatalError (*exception ACEXML_ENV_ARG_PARAMETER); - ACEXML_ENV_RAISE (exception); - return; -} - -void -ACEXML_Parser::parse (ACEXML_InputSource *input ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) -{ - if (input == 0 || (this->instream_ = input->getCharStream ()) == 0) + int xmldecl_defined = 0; + ACEXML_Char fwd = this->get(); // Consume '<' + if (fwd == '<' && this->peek() == '?') { - this->report_fatal_error(ACE_TEXT ("Invalid input source") ACEXML_ENV_ARG_PARAMETER); - return; + this->get(); // Consume '?' + fwd = this->peek(); + if (fwd == 'x' && !xmldecl_defined) + { + this->parse_xml_decl (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK; + xmldecl_defined = 1; + } } - - // Set up Locator. At this point, the systemId and publicId are null. We - // can't do better, as we don't know anything about the InputSource - // currently, and according to the SAX spec, the parser should set up the - // locator before reporting any document events. - if (this->content_handler_) - this->content_handler_->setDocumentLocator (&this->locator_); - - if (this->simple_parsing_ == 0) + // We need a XMLDecl in a Valid XML document + if (this->validate_ && !xmldecl_defined) { - this->parse_xml_prolog (ACEXML_ENV_SINGLE_ARG_PARAMETER); + this->fatal_error (ACE_TEXT ("Expecting an XMLDecl at the beginning of" + " a valid document") + ACEXML_ENV_ARG_PARAMETER); ACEXML_CHECK; } - this->content_handler_->startDocument (ACEXML_ENV_SINGLE_ARG_PARAMETER); ACEXML_CHECK; int doctype_defined = 0; - for (int prolog_done = 0; prolog_done == 0; ) { - if (this->skip_whitespace (0) != '<') - { - this->report_fatal_error (ACE_TEXT ("Expecting '<'") ACEXML_ENV_ARG_PARAMETER); - return; - } - ACEXML_Char fwd = this->peek (); - switch (fwd) + // Expect a '<' only if we have encountered a XMLDecl, or we are + // looping through Misc blocks. + if (xmldecl_defined) { - case '!': - this->get (); // consume the '!' - fwd = this->peek (); - if (fwd == 'D' && !doctype_defined) // DOCTYPE + if (this->skip_whitespace () != '<') { - // This will also take care of the trailing MISC block if any. - this->parse_doctypedecl (ACEXML_ENV_SINGLE_ARG_PARAMETER); + this->fatal_error (ACE_TEXT ("Expecting '<' at the beginning of " + "Misc section") + ACEXML_ENV_ARG_PARAMETER); ACEXML_CHECK; - doctype_defined = 1; - break; - } - else if (fwd == '-') // COMMENT - { - if (this->grok_comment () < 0) - { - this->report_fatal_error(ACE_TEXT ("Invalid comment") ACEXML_ENV_ARG_PARAMETER); - return; - } } - else - { - this->report_fatal_error (ACE_TEXT ("Duplicate DOCTYPE definitions") ACEXML_ENV_ARG_PARAMETER); - return; - } - break; - case '?': - this->parse_processing_instruction (ACEXML_ENV_SINGLE_ARG_PARAMETER); - ACEXML_CHECK; - break; - case 0: - this->report_fatal_error (ACE_TEXT ("Unexpected EOF") ACEXML_ENV_ARG_PARAMETER); - return; - default: // Root element begins - prolog_done = 1; - break; + fwd = this->peek(); + } + switch (fwd) + { + case '?': + this->get(); + this->parse_processing_instruction (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK; + xmldecl_defined = 1; + break; + case '!': + this->get(); + fwd = this->peek (); + if (fwd == 'D' && !doctype_defined) // DOCTYPE + { + // This will also take care of the trailing MISC block if any. + this->parse_doctypedecl (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK; + doctype_defined = 1; + // Now that we have a DOCTYPE Decl defined, we shouldn't + // accept XML Decl any longer + xmldecl_defined = 1; + } + else if (fwd == 'D') + { + this->fatal_error (ACE_TEXT ("Duplicate DOCTYPE declaration") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK; + } + else if (fwd == '-') // COMMENT + { + if (this->parse_comment () < 0) + { + this->fatal_error(ACE_TEXT ("Invalid comment in document") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK; + } + xmldecl_defined = 1; + } + break; + case 0: + this->fatal_error (ACE_TEXT ("Unexpected end-of-file") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK; + default: // Root element begins + prolog_done = 1; + break; } } + if (this->validate_ && !doctype_defined) + { + this->warning (ACE_TEXT ("No doctypeDecl in valid document") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK; + } + // Now parse root element. this->parse_element (1 ACEXML_ENV_ARG_PARAMETER); ACEXML_CHECK; @@ -233,8 +193,8 @@ ACEXML_Parser::parse (ACEXML_InputSource *input ACEXML_ENV_ARG_DECL) this->content_handler_->endDocument (ACEXML_ENV_SINGLE_ARG_PARAMETER); ACEXML_CHECK; - // Reset the Locator held within the parser - this->locator_.reset(); + // Reset the parser state + this->reset(); } void @@ -248,384 +208,730 @@ ACEXML_Parser::parse (const ACEXML_Char *systemId ACEXML_ENV_ARG_DECL) } -void -ACEXML_Parser::parse_xml_prolog (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) + +int +ACEXML_Parser::parse_doctypedecl (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)) { - if (this->parse_token (ACE_TEXT("<?xml")) < 0) + if (this->parse_token (ACE_TEXT ("DOCTYPE")) < 0) { - this->report_fatal_error(ACE_TEXT ("Invalid XMLDecl ('<?xml' ?)") ACEXML_ENV_ARG_PARAMETER); - return; + this->fatal_error(ACE_TEXT ("Expecting keyword DOCTYPE in a doctypedecl") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } - ACEXML_Char *astring; + ACEXML_Char nextch = 0; + if (this->skip_whitespace_count (&nextch) == 0) + { + this->fatal_error(ACE_TEXT ("Expecting a space between DOCTYPE keyword " + "and name") ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } - if (this->skip_whitespace (0) != 'v' // Discard whitespace - || (this->parse_token (ACE_TEXT("ersion")) < 0) - || this->skip_equal () != 0 - || this->get_quoted_string (astring) != 0) + this->doctype_ = this->parse_name (); + if (this->doctype_ == 0) { - this->report_fatal_error (ACE_TEXT ("Unrecognized XMLDecl ('version'?)") ACEXML_ENV_ARG_PARAMETER); - return; + this->fatal_error(ACE_TEXT ("Invalid DOCTYPE name") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } - // @@ Handle version number here. - int xmldecl_state = 0; - int seen_encoding = 0; + int count = this->skip_whitespace_count (&nextch); - while (1) + if (nextch == 'S' || nextch == 'P') // ExternalID defined { - ACEXML_Char fwd = this->peek (); - if (fwd != '?') + if (count == 0) { - fwd = this->skip_whitespace (0); // Discard whitespace - if (fwd == '?') - { - // Fall down to consume the '?' and wrap up the XML Decl parsing. - } - else if (xmldecl_state == 0 && fwd == 'e') - { - if ((this->parse_token (ACE_TEXT("ncoding")) == 0) && - this->skip_equal () == 0 && - this->get_quoted_string (astring) == 0) - { - if (seen_encoding) - { - this->report_fatal_error (ACE_TEXT ("Duplicate encoding defined") ACEXML_ENV_ARG_PARAMETER); - return; - } - else - { - seen_encoding = 1; - if (ACE_OS::strcmp (astring, - this->instream_->getEncoding()) != 0) - { - if (ACE_OS::strstr (astring, - this->instream_->getEncoding()) != 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Detected Encoding is %s : Declared Encoding is %s"), - this->instream_->getEncoding(), astring)); - this->report_fatal_error (ACE_TEXT ("Encoding declaration doesn't match detected encoding") ACEXML_ENV_ARG_PARAMETER); - return; - } - } - } - continue; - } - else - break; - } - else if (xmldecl_state < 2 && fwd == 's') - { - if ((this->parse_token (ACE_TEXT("tandalone")) == 0) && - this->skip_equal () == 0 && - this->get_quoted_string (astring) == 0) - { - xmldecl_state = 2; - if (ACE_OS::strcmp (astring, ACE_TEXT ("yes")) == 0) - { - // @@ This is a standalone XML file. - continue; - } - else if (ACE_OS::strcmp (astring, ACE_TEXT ("no")) == 0) - { - // @@ This is not a stand alone XML file. - continue; - } - } - break; - } - else - break; + this->fatal_error(ACE_TEXT ("Expecting a space between DOCTYPE" + "keyword and name") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } - if (this->parse_token (ACE_TEXT ("?>")) < 0) - break; - return; - } // End parsing XML Decl. - this->report_fatal_error (ACE_TEXT ("Unrecognized XML Decl ('standalone'?)") ACEXML_ENV_ARG_PARAMETER); - return; -} - -int -ACEXML_Parser::grok_comment (void) -{ - /// Simply filter out all the comment - int state = 0; + this->external_dtd_ = 1; + this->parse_external_dtd (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } - if (this->get () != '-' || // Skip the opening "<!--" - this->get () != '-' || // completely. - this->get () == '-') // and at least something not '-'. - return -1; + nextch = this->skip_whitespace (); + switch (nextch) + { + case '[': + this->internal_dtd_ = 1; // Internal DTD definition + this->parse_internal_dtd (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + case '>': // End of DTD definition + // This is an XML document without a doctypedecl. + if (this->validate_ && !this->external_dtd_) + { + this->fatal_error (ACE_TEXT ("No DTD defined") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + return 0; + case '0': + this->fatal_error (ACE_TEXT ("Unexpected end-of-file") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + default: + break; + } - while (state < 3) - // Waiting for the trailing three character '-->'. Notice that - // according to the spec, '--->' is not a valid closing comment - // sequence. But we'll let it pass anyway. + if (this->skip_whitespace() != '>') { - ACEXML_Char fwd = this->get (); - if ((fwd == '-' && state < 2) || - (fwd == '>' && state == 2)) - state += 1; - else - state = 0; // Reset parse state. + this->fatal_error(ACE_TEXT ("Expecting '>' at end of doctypedecl") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } return 0; } int -ACEXML_Parser::parse_processing_instruction (ACEXML_ENV_SINGLE_ARG_DECL) +ACEXML_Parser::parse_external_dtd (ACEXML_ENV_SINGLE_ARG_DECL) { - if (this->get () != '?') - { // How did we get here? - this->report_fatal_error(ACE_TEXT ("Internal error") ACEXML_ENV_ARG_PARAMETER); - return -1; + this->ref_state_ = ACEXML_ParserInt::IN_EXT_DTD; + ACEXML_Char* publicId = 0; + ACEXML_Char* systemId = 0; + if (this->parse_external_id (publicId, systemId + ACEXML_ENV_ARG_PARAMETER) != 0) + { + this->fatal_error (ACE_TEXT ("Error in parsing ExternalID") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } - const ACEXML_Char *pitarget = this->read_name (); - ACEXML_Char *instruction = 0; - - if (ACE_OS::strcasecmp (ACE_TEXT ("xml"), pitarget) != 0) + ACEXML_Char* uri = this->normalize_systemid (systemId); + ACE_Auto_Basic_Array_Ptr<ACEXML_Char> cleanup_uri (uri); + ACEXML_InputSource* ip = 0; + if (this->entity_resolver_) { - // Invalid PITarget name. - this->report_fatal_error(ACE_TEXT ("PITarget name cannot start with 'xml'") ACEXML_ENV_ARG_PARAMETER); - return -1; + ip = this->entity_resolver_->resolveEntity (publicId, + (uri ? uri : systemId) + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } - - int state = 0; - ACEXML_Char ch = this->skip_whitespace (0); - - while (state < 2) + if (ip) { - switch (ch) - { - case '?': - if (state == 0) - state = 1; + if (this->switch_input (ip, (uri ? uri : systemId), publicId) != 0) + return -1; + } + else + { + ACEXML_StreamFactory factory; + ACEXML_CharStream* cstream = factory.create_stream (uri ? uri: systemId); + if (!cstream) { + this->fatal_error (ACE_TEXT ("Invalid input source") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + if (this->switch_input (cstream, systemId, publicId) != 0) + return -1; + } + this->parse_external_subset (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + return 0; +} + +int +ACEXML_Parser::parse_internal_dtd (ACEXML_ENV_SINGLE_ARG_DECL) +{ + this->ref_state_ = ACEXML_ParserInt::IN_INT_DTD; + ACEXML_Char nextch = this->skip_whitespace (); + do { + switch (nextch) + { + case '<': + nextch = this->get(); + switch (nextch) + { + case '!': + this->parse_markup_decl (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + case '?': + this->parse_processing_instruction (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + default: + this->fatal_error (ACE_TEXT ("Invalid internal subset") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + } + break; + case '%': + this->has_pe_refs_ = 1; + this->parse_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + case ']': // End of internal definitions. + return 0; + case '&': + this->fatal_error (ACE_TEXT ("Invalid Reference in internal DTD") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); break; - case '>': - if (state == 1) + case 0: + this->pop_context (0 ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + default: + this->fatal_error (ACE_TEXT ("Invalid content in internal subset") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + }; + nextch = this->skip_whitespace (); + } while (1); + + ACE_NOTREACHED (return -1); +} + +int +ACEXML_Parser::parse_external_subset (ACEXML_ENV_SINGLE_ARG_DECL) +{ + this->ref_state_ = ACEXML_ParserInt::IN_EXT_DTD; + this->external_subset_ = 1; + int nrelems = 0; + ACEXML_Char nextch = this->skip_whitespace(); + do { + switch (nextch) + { + case '<': + nextch = this->get(); + switch (nextch) { - instruction = this->obstack_.freeze (); - this->content_handler_->processingInstruction (pitarget, - instruction ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK_RETURN (-1); - this->obstack_.unwind (ACE_const_cast (ACEXML_Char*, pitarget)); - return 0; + case '!': + nextch = this->peek(); + if (nextch == '[') + this->parse_conditional_section (ACEXML_ENV_SINGLE_ARG_PARAMETER); + else + this->parse_markup_decl (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + case '?': + nextch = this->peek(); + if (nextch == 'x') + this->parse_text_decl (ACEXML_ENV_SINGLE_ARG_PARAMETER); + else + this->parse_processing_instruction (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + default: + this->fatal_error (ACE_TEXT ("Invalid content in external DTD") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } break; - case 0x0D: // End-of-Line handling - ch = (this->peek () == 0x0A ? this->get () : 0x0A); - // Fall thru... - case 0x0A: - // Fall thru... + case '%': + this->parse_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + case 0: + nrelems = this->pop_context (0 ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + if (nrelems == 1) + return 0; + break; default: - if (state == 1) - this->obstack_.grow ('?'); - this->obstack_.grow (ch); - state = 0; - } - ch = this->get (); - } - return -1; + this->fatal_error (ACE_TEXT ("Invalid content in external DTD") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + nextch = this->skip_whitespace(); + } while (1); } int -ACEXML_Parser::parse_doctypedecl (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) +ACEXML_Parser::parse_conditional_section (ACEXML_ENV_SINGLE_ARG_DECL) { - if (this->parse_token (ACE_TEXT ("DOCTYPE")) < 0) + ACEXML_Char ch = this->get (); + if (ch != '[') { - this->report_fatal_error(ACE_TEXT ("Expecting keyword 'DOCTYPE'") ACEXML_ENV_ARG_PARAMETER); - return -1; + this->fatal_error(ACE_TEXT ("Internal Parser Error") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } - - ACEXML_Char nextch = this->skip_whitespace (0); - if (nextch == 0) + if (this->skip_whitespace() != 'I') { - this->report_fatal_error(ACE_TEXT ("Expecting a DOCTYPE name") ACEXML_ENV_ARG_PARAMETER); - return -1; + this->fatal_error (ACE_TEXT ("Invalid conditionalSect") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + ch = this->get(); + int include = 0; + switch (ch) + { + case 'N': + if (this->parse_token (ACE_TEXT ("CLUDE")) < 0) + { + this->fatal_error (ACE_TEXT ("Expecting keyword INCLUDE in " + "conditionalSect") ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + include = 1; + break; + case 'G': + if (this->parse_token (ACE_TEXT ("GNORE")) < 0) + { + this->fatal_error (ACE_TEXT ("Expecting keyword IGNORE in " + "conditionalSect") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + include = 0; + break; + default: + this->fatal_error (ACE_TEXT ("Invalid conditionalSect") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + if (this->skip_whitespace() != '[') + { + this->fatal_error (ACE_TEXT ("Expecting '[' in conditionalSect") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } + if (include) + this->parse_includesect (ACEXML_ENV_SINGLE_ARG_PARAMETER); + else + this->parse_ignoresect (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + return 0; +} - this->doctype_ = this->read_name (nextch); +int +ACEXML_Parser::parse_ignoresect (ACEXML_ENV_SINGLE_ARG_DECL) +{ + ACEXML_Char nextch = this->skip_whitespace(); + int count = 0; + do { + switch (nextch) + { + case '<': + if (this->peek() == '!') + { + this->get(); + if (this->peek() == '[') + { + this->get(); + count++; + } + } + break; + case ']': + if (this->peek() == ']') + { + this->get(); + if (this->peek() == '>') + { + this->get(); + --count; + } + } + break; + case 0: // [VC: Proper Conditional Section/PE Nesting] + if (count != 0) + { + this->fatal_error (ACE_TEXT ("Invalid Conditional Section/PE " + "Nesting ") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + default: + break; + } + nextch = this->get(); + } while (1); +} - this->skip_whitespace_count (&nextch); +int +ACEXML_Parser::parse_includesect (ACEXML_ENV_SINGLE_ARG_DECL) +{ + ACEXML_Char nextch = this->skip_whitespace(); + do { + switch (nextch) + { + case '<': + nextch = this->get(); + switch (nextch) + { + case '!': + nextch = this->peek(); + if (nextch == '[') + this->parse_conditional_section (ACEXML_ENV_SINGLE_ARG_PARAMETER); + else + this->parse_markup_decl (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + case '?': + nextch = this->peek(); + this->parse_processing_instruction (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + default: + this->fatal_error (ACE_TEXT ("Invalid includeSect") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + break; + case '%': + this->parse_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + case 0: // [VC: Proper Conditional Section/PE Nesting] + this->fatal_error (ACE_TEXT ("Invalid Conditional Section/PE " + "Nesting ") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + case ']': + if (this->peek() == ']') + { + nextch = this->get(); + if (this->peek() == '>') + { + nextch = this->get(); + return 0; + } + } + default: + this->fatal_error (ACE_TEXT ("Invalid includeSect") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + nextch = this->skip_whitespace(); + } while (1); +} - if (nextch == 'S' || nextch == 'P') // ExternalID defined +int +ACEXML_Parser::parse_markup_decl (ACEXML_ENV_SINGLE_ARG_DECL) +{ + ACEXML_Char nextch = this->peek (); + switch (nextch) { - this->parse_external_id_and_ref (this->dtd_public_, - this->dtd_system_ - ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK_RETURN (-1); -// if (this->dtd_public_ == 0) -// ACE_DEBUG ((LM_DEBUG, -// ACE_TEXT ("ACEXML Parser got external DTD id: SYSTEM %s\n"), -// this->dtd_system_)); -// else -// ACE_DEBUG ((LM_DEBUG, -// ACE_TEXT ("ACEXML Parser got DTD external id: PUBLIC %s %s\n"), -// this->dtd_public_, this->dtd_system_)); + case 'E': // An ELEMENT or ENTITY decl + this->get (); + nextch = this->peek (); + switch (nextch) + { + case 'L': + this->parse_element_decl (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + case 'N': + this->parse_entity_decl (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + default: + this->fatal_error(ACE_TEXT ("Expecting keyword ELEMENT/ENTITY") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + break; + + case 'A': // An ATTLIST decl + this->parse_attlist_decl (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + + case 'N': // A NOTATION decl + this->parse_notation_decl (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + + case '-': // a comment. + if (this->parse_comment () < 0) + { + this->fatal_error(ACE_TEXT ("Invalid comment") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + break; + case 0: // [VC: Proper Declaration/PE Nesting] + this->fatal_error (ACE_TEXT ("Unexpected end-of-file") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + default: + this->fatal_error (ACE_TEXT ("Invalid markupDecl") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } + return 0; +} - nextch = this->skip_whitespace (0); +int +ACEXML_Parser::parse_external_id (ACEXML_Char *&publicId, + ACEXML_Char *&systemId + ACEXML_ENV_ARG_DECL) +{ + publicId = systemId = 0; + ACEXML_Char nextch = this->get (); + ACEXML_Char fwd = 0; switch (nextch) { - case '[': // Internal DTD definition - if (this->parse_internal_dtd (ACEXML_ENV_SINGLE_ARG_PARAMETER) < 0) - return -1; // Error in markupdecl - break; - case '>': // End of DTD definition - // this is an XML document without a dectypedecl. - return 0; - case '0': - this->report_fatal_error (ACE_TEXT ("Unexpected EOF") ACEXML_ENV_ARG_PARAMETER); - return -1; - default: - break; + case 'S': // External SYSTEM id. + if (this->parse_token (ACE_TEXT ("YSTEM")) < 0 || + this->skip_whitespace_count () < 1) + { + this->fatal_error(ACE_TEXT ("Expecting keyword SYSTEM") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + if (this->parse_system_literal (systemId) != 0) + { + this->fatal_error(ACE_TEXT ("Invalid systemLiteral") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + break; + case 'P': // External PUBLIC id or previously defined PUBLIC id. + if (this->parse_token (ACE_TEXT ("UBLIC")) < 0 || + this->skip_whitespace_count () < 1) + { + this->fatal_error(ACE_TEXT ("Expecing keyword PUBLIC") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + if (this->parse_pubid_literal (publicId) != 0) + { + this->fatal_error(ACE_TEXT ("Invalid PubidLiteral") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + this->skip_whitespace_count(&fwd); + if (fwd == '\'' || fwd == '"') + { + if (this->parse_system_literal (systemId) != 0) + { + this->fatal_error(ACE_TEXT ("Invalid systemLiteral") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + } + else if (this->ref_state_ != ACEXML_ParserInt::IN_NOTATION) + { + this->fatal_error(ACE_TEXT ("Expecting systemLiteral after a " + "PUBLIC keyword") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + break; + default: + this->fatal_error(ACE_TEXT ("Invalid system/public Literal") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } + return 0; +} - if (this->skip_whitespace (0) != '>') +ACEXML_Char* +ACEXML_Parser::normalize_systemid (const char* systemId) +{ + if (ACE_OS::strstr (systemId, ACE_TEXT("ftp://")) != 0 || + ACE_OS::strstr (systemId, ACE_TEXT ("http://")) != 0 || + ACE_OS::strstr (systemId, ACE_TEXT ("file://")) != 0) + return 0; + else { - this->report_fatal_error(ACE_TEXT ("Internal error") ACEXML_ENV_ARG_PARAMETER); - return -1; + ACEXML_Char* normalized_uri = 0; + const char* baseURI = this->current_->getLocator()->getSystemId(); + if (!baseURI) + return 0; + if (ACE_OS::strstr (baseURI, ACE_TEXT ("http://")) != 0) + { + // baseURI is a HTTP URL and systemId is relative. Note that this + // is not compliant with RFC2396. Caveat Emptor ! + const ACEXML_Char* temp = ACE_OS::strrchr (baseURI, '/'); + size_t pos = temp - baseURI + 1; + size_t len = pos + ACE_OS::strlen (systemId) + 1; + ACE_NEW_RETURN (normalized_uri, ACEXML_Char[len], 0); + ACE_OS::strncpy (normalized_uri, baseURI, pos); + ACE_OS::strcpy (normalized_uri + pos + 1, systemId); + return normalized_uri; + } + else + { + const ACEXML_Char* + temp = ACE_OS::strrchr (baseURI,ACE_DIRECTORY_SEPARATOR_CHAR); + // baseURI is a local file and systemId is relative + // Unlike the HTTP one, this will work always. + if (temp) + { + size_t pos = temp - baseURI + 1; + size_t len = pos + ACE_OS::strlen (systemId) + 1; + ACE_NEW_RETURN (normalized_uri, ACEXML_Char[len], 0); + ACE_OS::strncpy (normalized_uri, baseURI, pos); + ACE_OS::strcpy (normalized_uri + pos + 1, systemId); + return normalized_uri; + } + return 0; + } } - return 0; } void ACEXML_Parser::parse_element (int is_root ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) + ACE_THROW_SPEC ((ACEXML_SAXException)) { // Parse STag. - const ACEXML_Char *startname = this->read_name (); + const ACEXML_Char *startname = this->parse_name (); if (startname == 0) { - this->report_fatal_error (ACE_TEXT ("Unexpected EOF") ACEXML_ENV_ARG_PARAMETER); + this->fatal_error (ACE_TEXT ("Unexpected end-of-file") + ACEXML_ENV_ARG_PARAMETER); return; } if (is_root && this->doctype_ != 0 && ACE_OS::strcmp (startname, this->doctype_) != 0) { - this->report_fatal_error (ACE_TEXT ("Root element missing") ACEXML_ENV_ARG_PARAMETER); - return; + this->fatal_error (ACE_TEXT ("Root element different from DOCTYPE") + ACEXML_ENV_ARG_PARAMETER); + return ; } ACEXML_AttributesImpl attributes; ACEXML_Char ch; - int new_namespace = 0; - const ACEXML_Char *endname = 0; - const ACEXML_Char *ns_uri, *ns_lname; // namespace URI and localName - ACEXML_Char* prefix = 0; - ACEXML_Char* name = 0; + const ACEXML_Char* ns_uri = 0; + const ACEXML_Char* ns_lname = 0; // namespace URI and localName for (int start_element_done = 0; start_element_done == 0;) { - ch = this->skip_whitespace (0); + ch = this->skip_whitespace (); switch (ch) { - case 0: - this->report_fatal_error(ACE_TEXT ("Internal error") ACEXML_ENV_ARG_PARAMETER); - return; - case '/': - if (this->get () != '>') - { - this->report_fatal_error(ACE_TEXT ("Expecting '>'") ACEXML_ENV_ARG_PARAMETER); - return; - } - else - { - this->xml_namespace_.processName(startname, ns_uri, ns_lname, 0); - prefix = ACE_const_cast (ACEXML_Char*, - this->xml_namespace_.getPrefix(ns_uri)); - this->report_prefix_mapping (prefix, ns_uri, ns_lname, 1 ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK; - this->content_handler_->startElement (ns_uri, ns_lname, - startname, &attributes ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK; - this->content_handler_->endElement (ns_uri, ns_lname, startname ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK; - this->report_prefix_mapping (prefix, ns_uri, ns_lname, 0 ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK; - } - if (new_namespace != 0) - this->xml_namespace_.popContext (); - return; - - case '>': - { - this->xml_namespace_.processName (startname, ns_uri, ns_lname, 0); - prefix = ACE_const_cast (ACEXML_Char*, - this->xml_namespace_.getPrefix (ns_uri)); - this->report_prefix_mapping (prefix, ns_uri, ns_lname, 1 ACEXML_ENV_ARG_PARAMETER); + case 0: + this->fatal_error(ACE_TEXT ("Internal Parser error") + ACEXML_ENV_ARG_PARAMETER); + return; + case '/': + if (this->get () != '>') + { + this->fatal_error(ACE_TEXT ("Expecting '>' at end of element " + "definition") + ACEXML_ENV_ARG_PARAMETER); + return; + } + else + { + this->xml_namespace_.processName(startname, ns_uri, + ns_lname, 0); + this->prefix_mapping (this->xml_namespace_.getPrefix(ns_uri), + ns_uri, ns_lname, 1 + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK; + this->content_handler_->startElement(ns_uri, ns_lname, + startname, &attributes + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK; + this->content_handler_->endElement (ns_uri, ns_lname, startname + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK; + this->prefix_mapping (this->xml_namespace_.getPrefix(ns_uri), + ns_uri, ns_lname, 0 + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK; + } + if (this->nested_namespace_ != 0) + this->xml_namespace_.popContext (); + return; + + case '>': + this->xml_namespace_.processName (startname, ns_uri, + ns_lname, 0); + this->prefix_mapping (this->xml_namespace_.getPrefix(ns_uri), + ns_uri, ns_lname, 1 + ACEXML_ENV_ARG_PARAMETER); ACEXML_CHECK; - this->content_handler_->startElement (ns_uri, ns_lname, startname, - &attributes ACEXML_ENV_ARG_PARAMETER); + this->content_handler_->startElement(ns_uri, ns_lname, startname, + &attributes + ACEXML_ENV_ARG_PARAMETER); ACEXML_CHECK; start_element_done = 1; break; - } - default: - ACEXML_Char *attvalue = 0; - ACEXML_Char *attname = this->read_name (ch); + default: + ACEXML_Char *attvalue = 0; + ACEXML_Char *attname = this->parse_name (ch); - if (attname == 0 || - this->skip_equal () != 0 || - this->get_quoted_string (attvalue) != 0) - { - this->report_fatal_error(ACE_TEXT ("Error reading attribute") ACEXML_ENV_ARG_PARAMETER); - return; - } + if (attname == 0 || + this->skip_equal () != 0 || + this->parse_attvalue (attvalue ACEXML_ENV_ARG_PARAMETER) != 0) + { + this->fatal_error(ACE_TEXT ("Error reading attribute value") + ACEXML_ENV_ARG_PARAMETER); + return; + } - // Handling new namespace if any. Notice that the order of - // namespace declaration does matter. - if (ACE_OS::strncmp (attname, ACE_TEXT("xmlns"), 5) == 0) - { - if (this->namespaces_) - { - if (new_namespace == 0) - { - this->xml_namespace_.pushContext (); - new_namespace = 1; - } - name = ACE_OS::strchr (attname, ':'); - const ACEXML_Char* ns_name = (name == 0)?empty_string:name+1; - if (this->xml_namespace_.declarePrefix (ns_name, - attvalue) == -1) - { - this->report_fatal_error(ACE_TEXT ("Duplicate namespace prefix") ACEXML_ENV_ARG_PARAMETER); - return; - } - } - if (this->namespace_prefixes_) - { - // Namespace_prefixes_feature_ is required. So add the - // xmlns:foo to the list of attributes. - if (attributes.addAttribute (0, 0, attname, - default_attribute_type, - attvalue) == -1) - { - this->report_fatal_error(ACE_TEXT ("Duplicate attribute found") ACEXML_ENV_ARG_PARAMETER); - return; - } - } - if (!this->namespaces_ && !this->namespace_prefixes_) - { - this->report_fatal_error(ACE_TEXT ("Both namespaces feature and namespace_prefixes feature are false. Illegal Mode") ACEXML_ENV_ARG_PARAMETER); - return; - } - } - else - { - const ACEXML_Char *uri, *lName; - this->xml_namespace_.processName (attname, uri, lName, 1); - if (attributes.addAttribute (uri, lName, attname, - default_attribute_type, - attvalue) == -1) - { - this->report_fatal_error(ACE_TEXT ("Duplicate attribute found") ACEXML_ENV_ARG_PARAMETER); - return; - } - } - break; + // Handling new namespace if any. Notice that the order of + // namespace declaration does matter. + if (ACE_OS::strncmp (attname, ACE_TEXT("xmlns"), 5) == 0) + { + if (this->namespaces_) + { + if (this->nested_namespace_ == 0) + { + this->xml_namespace_.pushContext (); + this->nested_namespace_ = 1; + } + ACEXML_Char* name = ACE_OS::strchr (attname, ':'); + const ACEXML_Char* ns_name = (name == 0)? + empty_string:name+1; + if (this->xml_namespace_.declarePrefix (ns_name, + attvalue) == -1) + { + this->fatal_error(ACE_TEXT ("Duplicate definition of " + "prefix") + ACEXML_ENV_ARG_PARAMETER); + return; + } + } + if (this->namespace_prefixes_) + { + // Namespace_prefixes_feature_ is required. So add the + // xmlns:foo to the list of attributes. + if (attributes.addAttribute (0, 0, attname, + default_attribute_type, + attvalue) == -1) + { + this->fatal_error(ACE_TEXT ("Duplicate attribute " + "definition. Hint: Try " + "setting namespace_prefix" + "es feature to 0") + ACEXML_ENV_ARG_PARAMETER); + return; + } + } + if (!this->namespaces_ && !this->namespace_prefixes_) + { + this->fatal_error(ACE_TEXT ("One of namespaces or " + "namespace_prefixes should be" + " declared") + ACEXML_ENV_ARG_PARAMETER); + return; + } + } + else + { + const ACEXML_Char *uri, *lName; + this->xml_namespace_.processName (attname, uri, lName, 1); + if (attributes.addAttribute (uri, lName, attname, + default_attribute_type, + attvalue) == -1) + { + this->fatal_error(ACE_TEXT ("Duplicate attribute " + "definition") + ACEXML_ENV_ARG_PARAMETER); + return; + } + } + break; } } + if (this->parse_content (startname, ns_uri, ns_lname + ACEXML_ENV_ARG_PARAMETER) != 0) + return; +} + +int +ACEXML_Parser::parse_content (const ACEXML_Char* startname, + const ACEXML_Char* ns_uri, + const ACEXML_Char* ns_lname ACEXML_ENV_ARG_DECL) +{ ACEXML_Char *cdata; size_t cdata_length = 0; @@ -633,518 +939,204 @@ ACEXML_Parser::parse_element (int is_root ACEXML_ENV_ARG_DECL) while (1) { ACEXML_Char ch = this->get (); - switch (ch) { - case 0: - this->report_fatal_error(ACE_TEXT ("Internal error") ACEXML_ENV_ARG_PARAMETER); - return; - case '<': - // Push out old 'characters' event. - if (cdata_length != 0) - { - cdata = this->obstack_.freeze (); - this->content_handler_->characters (cdata, 0, cdata_length ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK; - this->obstack_.unwind (cdata); - cdata_length = 0; - } + case 0: + this->pop_context (1 ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + case '<': + // Push out old 'characters' event. + if (cdata_length != 0) + { + cdata = this->obstack_.freeze (); + this->content_handler_->characters (cdata, 0, cdata_length + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + this->obstack_.unwind (cdata); + cdata_length = 0; + } - switch (this->peek ()) - { - case '!': // a comment or a CDATA section. - this->get (); // consume '!' - ch = this->peek (); - if (ch == '-') // a comment - { - if (this->grok_comment () < 0) + switch (this->peek ()) + { + case '!': // a comment or a CDATA section. + this->get (); // consume '!' + ch = this->peek (); + if (ch == '-') // a comment { - this->report_fatal_error(ACE_TEXT ("Error parsing comment") ACEXML_ENV_ARG_PARAMETER); - return; + if (this->parse_comment () < 0) + { + this->fatal_error(ACE_TEXT ("Invalid comment in " + "document") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } } - } - else if (ch == '[') // a CDATA section. - { - this->parse_cdata (ACEXML_ENV_SINGLE_ARG_PARAMETER); - ACEXML_CHECK; - } - else - { - this->report_fatal_error(ACE_TEXT ("Unexpected character") ACEXML_ENV_ARG_PARAMETER); - return; - } - break; - case '?': // a PI. - this->parse_processing_instruction (ACEXML_ENV_SINGLE_ARG_PARAMETER); - ACEXML_CHECK; - break; - case '/': // an ETag. - { - this->get (); // consume '/' - endname = this->read_name (); - if (endname == 0 || - ACE_OS::strcmp (startname, endname) != 0) - { - this->report_fatal_error(ACE_TEXT ("Mismatched End-tag encountered") ACEXML_ENV_ARG_PARAMETER); - return ; - } - if (this->skip_whitespace (0) != '>') + else if (ch == '[') // a CDATA section. + { + this->parse_cdata (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + else + { + this->fatal_error(ACE_TEXT ("Expecting a CDATA section " + "or a comment section") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + break; + case '?': // a PI. + this->get(); // consume the '?' + this->parse_processing_instruction + (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + case '/': // an ETag. { - this->report_fatal_error(ACE_TEXT ("Expecting '>' in an end-tag") ACEXML_ENV_ARG_PARAMETER); - return; + this->get (); // consume '/' + ACEXML_Char* endname = this->parse_name (); + if (endname == 0 || + ACE_OS::strcmp (startname, endname) != 0) + { + this->fatal_error(ACE_TEXT ("Name in ETag doesn't " + "match name in STag") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + if (this->skip_whitespace () != '>') + { + this->fatal_error(ACE_TEXT ("Expecting '>' at end " + "of element") + ACEXML_ENV_ARG_PARAMETER); + return -1; + } + this->content_handler_->endElement (ns_uri, ns_lname, + endname + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + this->prefix_mapping (this->xml_namespace_. getPrefix(ns_uri), + ns_uri, ns_lname, 0 + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + if (this->nested_namespace_ != 0) + this->xml_namespace_.popContext (); + return 0; } - this->content_handler_->endElement (ns_uri, ns_lname, endname ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK; - prefix = ACE_const_cast (ACEXML_Char*, - this->xml_namespace_.getPrefix(ns_uri)); - this->report_prefix_mapping (prefix, ns_uri, ns_lname, 0 ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK; - if (new_namespace != 0) - this->xml_namespace_.popContext (); - return; + default: // a new nested element? + this->parse_element (0 ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; } - default: // a new nested element? - this->parse_element (0 ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK; - break; - } - break; - case '&': - { - const ACEXML_String *replace = 0; - ACEXML_String charval; - ACEXML_Char buffer[6]; + break; + case '&': if (this->peek () == '#') { - if (this->parse_char_reference (buffer, 6) != 0) + ACEXML_Char buf[7]; + size_t len = sizeof (buf); + if (this->parse_char_reference (buf, len) != 0) { - // not referring to any character exception? - return; + // [WFC: Legal Character] + this->fatal_error (ACE_TEXT ("Invalid CharacterRef") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } - charval.set (buffer, 0); - replace = &charval; + cdata_length += len; } else - replace = this->parse_reference (); - - if (replace == 0) { - this->report_fatal_error(ACE_TEXT ("Internal error") ACEXML_ENV_ARG_PARAMETER); - return; + this->ref_state_ = ACEXML_ParserInt::IN_CONTENT; + this->parse_entity_reference(ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } -// if (this->try_grow_cdata (replace->length (), -// cdata_length, xmlenv) == 0) -// { - cdata_length = replace->length (); - for (size_t i = 0; i < replace->length (); ++i) - this->obstack_.grow ((*replace)[i]); -// } -// else -// return; - } - break; - case 0x0D: // End-of-Line handling - ch = (this->peek () == 0x0A ? this->get () : 0x0A); - // Fall thru... - case 0x0A: - // Fall thru... - default: - ++cdata_length; - cdata = this->obstack_.grow (ch); - if (cdata == 0) - { - cdata = this->obstack_.freeze (); - this->content_handler_->characters (cdata, - 0, - cdata_length ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK; - this->obstack_.grow (ch); - cdata_length = 1; // the missing char. - } - } - } - ACE_NOTREACHED (return;) -} - -int -ACEXML_Parser::parse_char_reference (ACEXML_Char *buf, size_t len) -{ - if (this->get () != '#') - { - // Internal error. - return -1; - } - - int hex = 0; - - if (this->peek () == 'x') - { - hex = 1; - this->get (); - } - - int more_digit = 0; - ACEXML_UCS4 sum = 0; - - while (1) - { - ACEXML_Char ch = this->get (); - switch (ch) - { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - sum = sum * (hex ? 16 : 10) + (ch - '0'); - break; - case 'a': - case 'A': - if (!hex) - return -1; - sum = sum * 16 + 10; - break; - case 'b': - case 'B': - if (!hex) - return -1; - sum = sum * 16 + 11; - break; - case 'c': - case 'C': - if (!hex) - return -1; - sum = sum * 16 + 12; - break; - case 'd': - case 'D': - if (!hex) - return -1; - sum = sum * 16 + 13; - break; - case 'e': - case 'E': - if (!hex) - return -1; - sum = sum * 16 + 14; - break; - case 'f': - case 'F': - if (!hex) - return -1; - sum = sum * 16 + 15; - break; - case ';': - if (more_digit == 0) // no digit exist??? - return -1; - int clen; -#if defined (ACE_USES_WCHAR) // UTF-16 - if ((clen = ACEXML_Transcoder::ucs42utf16 (sum, buf, len)) < 0) - return -1; - -#elif 1 // or UTF-8 - if ((clen = ACEXML_Transcoder::ucs42utf8 (sum, buf, len)) < 0) - return -1; - // #elif 0 // UCS 4, not likely - // buf [0] = sum; - // buf [1] = 0; -#endif - buf [clen] = 0; - return 0; - default: - return -1; + break; + case '\x20': case '\x0D': case '\x0A': case '\x09': + if (this->validate_) + { + // Flush out any non-whitespace characters + if (cdata_length != 0) + { + cdata = this->obstack_.freeze (); + this->content_handler_->characters(cdata, 0, cdata_length + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + this->obstack_.unwind (cdata); + cdata_length = 0; + } + ++cdata_length; + this->obstack_.grow (ch); + while (1) + { + ch = this->peek(); + if (ch == '\x20' || ch == '\x0D' || ch == '\x0A' || + ch == '\x09') + { + ch = this->get(); + this->obstack_.grow (ch); + continue; + } + break; + } + cdata = this->obstack_.freeze (); + this->content_handler_->ignorableWhitespace (cdata, 0, + cdata_length + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + this->obstack_.unwind (cdata); + cdata_length = 0; + break; + } + // Fall thru... + default: + ++cdata_length; + this->obstack_.grow (ch); } - more_digit = 1; } - ACE_NOTREACHED (return -1); + return 0; } -const ACEXML_String * -ACEXML_Parser::parse_reference (void) -{ - // @@ We'll use a temporary buffer here as the Obstack is most likely in - // use when we are here. This puts a limit on the max length of a - // reference. - ACEXML_Char ref[MAXPATHLEN]; - - size_t loc = 0; - - while (loc < MAXPATHLEN -1) - { - ACEXML_Char ch = this->get (); - if (ch == ';') - { - ref[loc] = 0; - break; - } - else - ref[loc++] = ch; - } - - return this->entities_.resolve_entity (ref); -} int ACEXML_Parser::parse_cdata (ACEXML_ENV_SINGLE_ARG_DECL) { if (this->parse_token (ACE_TEXT ("[CDATA[")) < 0) { - this->report_fatal_error(ACE_TEXT ("'[CDATA[' expected") ACEXML_ENV_ARG_PARAMETER); - return -1; + this->fatal_error(ACE_TEXT ("Expecting '[CDATA[' at beginning of CDATA " + "section") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } - int parse_state = 0; - size_t datalen = 0; - + ACEXML_Char ch; + int datalen = 0; + ACEXML_Char *cdata = 0; while (1) { - ACEXML_Char ch; - ACEXML_Char *cdata; - ch = this->get (); // Anything goes except the sequence "]]>". - switch (parse_state) + if (ch == ']' && this->peek() == ']') { - case 2: - if (ch == ']') - { - parse_state = 3; - continue; - } - break; - case 3: - if (ch == '>') // Yay! + ACEXML_Char temp = ch; + ch = this->get(); + if (ch == ']' && this->peek() == '>') { + ch = this->get(); cdata = this->obstack_.freeze (); - this->content_handler_->characters (cdata, - 0, - datalen ACEXML_ENV_ARG_PARAMETER); - // ACEXML_CHECK_RETURN (-1); + this->content_handler_->characters (cdata, 0, datalen + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); this->obstack_.unwind(cdata); return 0; } - break; - default: - if (ch == ']') - { - parse_state = 2; - continue; - } - else - parse_state = 1; - } - while (parse_state > 0) - { - if (this->try_grow_cdata (1, datalen ACEXML_ENV_ARG_PARAMETER) < 0) - return -1; - - if (parse_state != 1) - this->obstack_.grow (']'); - else - { - if (ch == 0x0D) - ch = (this->peek () == 0x0A ? this->get () : 0x0A); - this->obstack_.grow (ch); - } + this->obstack_.grow (temp); ++datalen; - --parse_state; } + this->obstack_.grow (ch); + ++datalen; }; ACE_NOTREACHED (return -1); } -int -ACEXML_Parser::try_grow_cdata (size_t size, size_t &len ACEXML_ENV_ARG_DECL) -{ - if (this->obstack_.request (size) != 0) - { - if (len != 0) - { - ACEXML_Char *cdata = this->obstack_.freeze (); - if (cdata == 0) - { - this->report_fatal_error(ACE_TEXT ("Internal Error growing CDATA buffer") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - this->content_handler_->characters (cdata, - 0, - len ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK_RETURN (-1); - len = 0; // reset counter - if (this->obstack_.request (size) == 0) - return 0; - } - this->report_fatal_error(ACE_TEXT ("Internal Error, buffer overflowed") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - return 0; -} - - -int -ACEXML_Parser::parse_internal_dtd (ACEXML_ENV_SINGLE_ARG_DECL) -{ - ACEXML_Char nextch = this->skip_whitespace (0); - - do { - switch (nextch) - { - case '<': // Start of markup Decl. - nextch = this->peek (); - switch (nextch) - { - case '!': - this->get (); // Discard '!' - nextch = this->peek (); - switch (nextch) - { - case 'E': // An ELEMENT or ENTITY decl - this->get (); - nextch = this->peek (); - switch (nextch) - { - case 'L': - if (this->parse_element_decl (ACEXML_ENV_SINGLE_ARG_PARAMETER) < 0) - return -1; - break; - - case 'N': - if (this->parse_entity_decl (ACEXML_ENV_SINGLE_ARG_PARAMETER) < 0) - return -1; - break; - - default: - this->report_fatal_error(ACE_TEXT ("Invalid keyword in decl spec") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - break; - - case 'A': // An ATTLIST decl - if (this->parse_attlist_decl (ACEXML_ENV_SINGLE_ARG_PARAMETER) < 0) - return -1; - break; - - case 'N': // A NOTATION decl - if (this->parse_notation_decl (ACEXML_ENV_SINGLE_ARG_PARAMETER) < 0) - return -1; - break; - - case '-': // a comment. - if (this->grok_comment () < 0) - { - this->report_fatal_error(ACE_TEXT ("Error parsing comment") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - break; - case 0: - this->report_fatal_error (ACE_TEXT ("Unexpected EOF") ACEXML_ENV_ARG_PARAMETER); - return -1; - default: - this->report_fatal_error (ACE_TEXT ("Invalid char. follows '<!' in markupdecl") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - break; - - case '?': // PI - this->parse_processing_instruction (ACEXML_ENV_SINGLE_ARG_PARAMETER); - ACEXML_CHECK_RETURN (-1); - break; - - case 0: - this->report_fatal_error (ACE_TEXT ("Unexpected EOF") ACEXML_ENV_ARG_PARAMETER); - return -1; - default: - this->report_fatal_error (ACE_TEXT ("Invalid char. follows '<!' in markupdecl") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - break; - - case '%': // DeclSep. Define new PEreference... - break; - - case ']': // End of internal definitions. - return 0; // Not applicable when parsing external DTD spec. - - case 0: // This may not be an error if we decide - // to generalize this function to handle both - // internal and external DTD definitions. - this->report_fatal_error (ACE_TEXT ("Unexpected EOF") ACEXML_ENV_ARG_PARAMETER); - return -1; - - default: - this->report_fatal_error (ACE_TEXT ("Expecting markupdecl or DecSep") ACEXML_ENV_ARG_PARAMETER); - return -1; - }; - - // To fully conform with the spec., whitespaces are only allowed - // following a 'DeclSep' section. However, I found it - // hard/impossible to eliminate all the whitespaces between - // markupdecls. - - nextch = this->skip_whitespace (0); - - } while (1); - - ACE_NOTREACHED (return -1); -} - -int -ACEXML_Parser::parse_element_decl (ACEXML_ENV_SINGLE_ARG_DECL) -{ - if ((this->parse_token (ACE_TEXT ("LEMENT")) < 0) || - this->skip_whitespace_count () == 0) - { - this->report_fatal_error (ACE_TEXT ("Expecting keyword `ELEMENT'") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - - ACEXML_Char *element_name = this->read_name (); - if (element_name == 0) - { - this->report_fatal_error (ACE_TEXT ("Error reading element name while defining ELEMENT.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - - ACEXML_Char nextch ; - this->skip_whitespace_count (&nextch); - - switch (nextch) - { - case 'E': // EMPTY - if (this->parse_token (ACE_TEXT ("EMPTY")) < 0) - { - this->report_fatal_error (ACE_TEXT ("Expecting keyword `EMPTY' in ELEMENT definition.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - break; - case 'A': // ANY - if (this->parse_token (ACE_TEXT ("ANY")) < 0) - { - this->report_fatal_error (ACE_TEXT ("Expecting keyword `ANY' in ELEMENT definition.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - break; - case '(': // children - this->parse_children_definition (ACEXML_ENV_SINGLE_ARG_PARAMETER); - ACEXML_CHECK_RETURN (-1); - break; - default: // error - this->report_fatal_error (ACE_TEXT ("Error reading ELEMENT definition.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - if (this->skip_whitespace (0) != '>') - { - this->report_fatal_error (ACE_TEXT ("Expecting '>' in ELEMENT definition.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - return 0; -} int ACEXML_Parser::parse_entity_decl (ACEXML_ENV_SINGLE_ARG_DECL) @@ -1154,8 +1146,9 @@ ACEXML_Parser::parse_entity_decl (ACEXML_ENV_SINGLE_ARG_DECL) if ((this->parse_token (ACE_TEXT ("NTITY")) < 0) || this->skip_whitespace_count (&nextch) == 0) { - this->report_fatal_error (ACE_TEXT ("Expecting keyword `ENTITY'") ACEXML_ENV_ARG_PARAMETER); - return -1; + this->fatal_error (ACE_TEXT ("Expecting keyword ENTITY followed by a " + "space") ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } int is_GEDecl = 1; @@ -1165,101 +1158,146 @@ ACEXML_Parser::parse_entity_decl (ACEXML_ENV_SINGLE_ARG_DECL) this->get (); // consume the '%' if (this->skip_whitespace_count (&nextch) == 0) { - this->report_fatal_error (ACE_TEXT ("Can't use a reference when defining entity name") ACEXML_ENV_ARG_PARAMETER); - return -1; + this->fatal_error (ACE_TEXT ("Expecting space between % and " + "entity name") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } } - ACEXML_Char *entity_name = this->read_name (); + ACEXML_Char *entity_name = this->parse_name (); if (entity_name == 0) { - this->report_fatal_error (ACE_TEXT ("Error reading ENTITY name.") ACEXML_ENV_ARG_PARAMETER); - return -1; + this->fatal_error (ACE_TEXT ("Invalid entity name") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } - this->skip_whitespace_count (&nextch); - + if (this->skip_whitespace_count (&nextch) == 0) + { + this->fatal_error (ACE_TEXT ("Expecting space between entity name and " + "entityDef") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + int retval = 0; if (nextch == '\'' || nextch == '"') { ACEXML_Char *entity_value = 0; - - if (this->get_quoted_string (entity_value) != 0) + if (this->parse_entity_value (entity_value + ACEXML_ENV_ARG_PARAMETER) != 0) { - this->report_fatal_error(ACE_TEXT("Error reading ENTITY value.") ACEXML_ENV_ARG_PARAMETER); - return -1; + this->fatal_error(ACE_TEXT ("Invalid EntityValue") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } - if (is_GEDecl) + retval = this->internal_GE_.add_entity (entity_name, + entity_value); + else + retval = this->internal_PE_.add_entity (entity_name, + entity_value); + if (retval < 0) { - if (this->entities_.add_entity (entity_name, entity_value) != 0) - { - this->report_fatal_error(ACE_TEXT("Error storing entity definition (duplicate definition?)") ACEXML_ENV_ARG_PARAMETER); - return -1; - } + this->fatal_error (ACE_TEXT ("Internal Parser Error in adding" + "Entity to map") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } - else + else if (retval == 1) { - // @@ need to implement PEdecl lookup mechanism - ACEXML_THROW_RETURN (ACEXML_SAXNotSupportedException (), -1); + this->warning (ACE_TEXT ("Duplicate entity found") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } } else { ACEXML_Char *systemid, *publicid; - this->parse_external_id_and_ref (publicid, systemid ACEXML_ENV_ARG_PARAMETER); + this->parse_external_id (publicid, systemid + ACEXML_ENV_ARG_PARAMETER); ACEXML_CHECK_RETURN (-1); if (systemid == 0) { - this->report_fatal_error(ACE_TEXT("Invalid ExternalID definition (system ID missing.)") ACEXML_ENV_ARG_PARAMETER); - return -1; + this->fatal_error(ACE_TEXT ("Invalid SystemLiteral") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } this->skip_whitespace_count (&nextch); if (nextch == 'N') // NDATA section followed { if (is_GEDecl == 0) { - this->report_fatal_error(ACE_TEXT("Unexpected keyword NDATA in PEDecl.") ACEXML_ENV_ARG_PARAMETER); - return -1; + this->fatal_error(ACE_TEXT ("Invalid NDataDecl in PEDef") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } if ((this->parse_token (ACE_TEXT ("NDATA")) < 0) || this->skip_whitespace_count (&nextch) == 0) { - this->report_fatal_error(ACE_TEXT("Expecting keyword NDATA") ACEXML_ENV_ARG_PARAMETER); - return -1; + this->fatal_error(ACE_TEXT ("Expecting keyword NDATA followed " + "by a space") ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } - ACEXML_Char *ndata = this->read_name (); - this->dtd_handler_->unparsedEntityDecl (entity_name, - publicid, - systemid, - ndata ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK_RETURN (-1); + ACEXML_Char *ndata = this->parse_name (); + if (this->validate_) // [VC: Notation Declared] + { + if (!this->notations_.resolve_entity (ndata)) + { + this->fatal_error (ACE_TEXT ("Undeclared Notation name") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + this->dtd_handler_->unparsedEntityDecl(entity_name, publicid, + systemid, ndata + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } } else { - // @@ Need to support external CharStream sources - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("ENTITY: (%s) "), - entity_name)); - - if (publicid == 0) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("SYSTEM %s\n"), - systemid)); + if (is_GEDecl) + retval = this->external_GE_.add_entity (entity_name, + systemid); + else + retval = this->external_PE_.add_entity (entity_name, + systemid); + if (retval < 0) + { + this->fatal_error(ACE_TEXT ("Internal Parser Error") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + else if (retval == 1) + this->warning(ACE_TEXT ("Duplicate external entity") + ACEXML_ENV_ARG_PARAMETER); + if (is_GEDecl) + retval = this->external_GE_.add_entity (entity_name, + publicid); else - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("PUBLIC %s %s\n"), - publicid, systemid)); + retval = this->external_PE_.add_entity (entity_name, + publicid); + if (retval < 0) + { + this->fatal_error(ACE_TEXT ("Internal Parser Error") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + else if (retval == 1) + this->warning (ACE_TEXT ("Duplicate entity definition") + ACEXML_ENV_ARG_PARAMETER); } } // End of ENTITY definition - if (this->skip_whitespace (0) != '>') + if (this->skip_whitespace() != '>') { - this->report_fatal_error(ACE_TEXT("Expecting end of ENTITY definition.") ACEXML_ENV_ARG_PARAMETER); - return -1; + this->fatal_error(ACE_TEXT ("Expecting '>' at end of entityDef") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } return 0; } @@ -1267,224 +1305,145 @@ ACEXML_Parser::parse_entity_decl (ACEXML_ENV_SINGLE_ARG_DECL) int ACEXML_Parser::parse_attlist_decl (ACEXML_ENV_SINGLE_ARG_DECL) { - if ((this->parse_token (ACE_TEXT ("ATTLIST")) < 0) || - this->skip_whitespace_count () == 0) + if (this->parse_token (ACE_TEXT ("ATTLIST")) < 0) { - this->report_fatal_error(ACE_TEXT("Expecting keyword `ATTLIST'") ACEXML_ENV_ARG_PARAMETER); - return -1; + this->fatal_error(ACE_TEXT ("Expecting keyword 'ATTLIST'") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + int count = check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + if (!count) + { + this->fatal_error(ACE_TEXT ("Expecting space between ATTLIST and " + "element name") ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } - ACEXML_Char *element_name = this->read_name (); + ACEXML_Char *element_name = this->parse_name (); if (element_name == 0) { - this->report_fatal_error(ACE_TEXT("Error reading element name while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; + this->fatal_error(ACE_TEXT ("Invalid element Name in attlistDecl") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } - - ACEXML_Char nextch = this->skip_whitespace (0); - + ACEXML_Char fwd = 0; + ACEXML_Char* attname = 0; + count = this->skip_whitespace_count (&fwd); // Parse AttDef* - while (nextch != '>') + while (fwd != '>') { - // Parse attribute name - ACEXML_Char *att_name = this->read_name (nextch); - if (att_name == 0) + if (!this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER) + && !count) + this->fatal_error(ACE_TEXT ("Expecting space between element " + "name and AttDef") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + attname = this->parse_attname (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + + count = this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + if (!count) { - this->report_fatal_error(ACE_TEXT("Error reading attribute name while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; + this->fatal_error(ACE_TEXT ("Expecting space between AttName and " + "AttType") ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } + this->parse_atttype (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); - /* - Parse AttType: - Possible keywords: - CDATA // StringType - ID // TokenizedType - IDREF - IDREFS - ENTITY - ENTITIES - NMTOKEN - NMTOKENS - NOTATION // EnumeratedType - NotationTYpe - ( // EnumeratedType - Enumeration - */ - nextch = this->skip_whitespace (0); - switch (nextch) + count = this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + if (!count) { - case 'C': // CDATA - if ((this->parse_token (ACE_TEXT ("DATA")) < 0) || - this->skip_whitespace_count () == 0) - { - this->report_fatal_error(ACE_TEXT("Expecting keyword `CDATA' while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - // Else, we have successfully identified the type of the - // attribute as CDATA - // @@ Set up validator appropriately here. - break; - case 'I': // ID, IDREF, or, IDREFS - if (this->get () == 'D') - { - if (this->skip_whitespace_count (&nextch) > 0) - { - // We have successfully identified the type of the - // attribute as ID @@ Set up validator as such. - break; - } - if (this->parse_token (ACE_TEXT ("REF")) == 0) - { - if (this->skip_whitespace_count (&nextch) > 0) - { - // We have successfully identified the type of - // the attribute as IDREF - // @@ Set up validator as such. - break; - } - else if (nextch == 'S' && - this->get () && // consume the 'S' - this->skip_whitespace_count () != 0) - { - // We have successfully identified the type of - // the attribute as IDREFS - // @@ Set up validator as such. - break; - } - } - } - // Admittedly, this error message is not precise enough - this->report_fatal_error(ACE_TEXT("Expecting keyword `ID', `IDREF', or `IDREFS' while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - case 'E': // ENTITY or ENTITIES - if (this->parse_token (ACE_TEXT ("NTIT")) == 0) - { - nextch = this->get (); - if (nextch == 'Y') - { - // We have successfully identified the type of - // the attribute as ENTITY - // @@ Set up validator as such. - } - else if (nextch == 'I'&& this->get () == 'E' && - this->get () == 'S') - { - // We have successfully identified the type of - // the attribute as ENTITIES - // @@ Set up validator as such. - } - if (this->skip_whitespace_count () > 0) - { - // success - break; - } - } - // Admittedly, this error message is not precise enough - this->report_fatal_error(ACE_TEXT("Expecting keyword `ENTITY', or `ENTITIES' while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - case 'N': // NMTOKEN, NMTOKENS, or, NOTATION - nextch = this->get (); - if (nextch != 'M' || nextch != 'O') - { - this->report_fatal_error(ACE_TEXT("Expecting keyword `NMTOKEN', `NMTOKENS', or `NOTATION' while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - if (nextch == 'M') - { - if (this->parse_token (ACE_TEXT ("TOKEN")) == 0) - { - if (this->skip_whitespace_count (&nextch) > 0) - { - // We have successfully identified the type of - // the attribute as NMTOKEN - // @@ Set up validator as such. - break; - } - else if (nextch == 'S' && this->skip_whitespace_count () > 0) - { - // We have successfully identified the type of - // the attribute as NMTOKENS - // @@ Set up validator as such. - break; - } - } - this->report_fatal_error(ACE_TEXT("Expecting keyword `NMTOKEN' or `NMTOKENS' while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - else // NOTATION - { - if ((this->parse_token (ACE_TEXT ("TATION")) < 0) || - this->skip_whitespace_count () == 0) - { - this->report_fatal_error(ACE_TEXT("Expecting keyword `NOTATION' while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - - if (this->get () != '(') - { - this->report_fatal_error(ACE_TEXT("Expecting `(' following NOTATION while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - - this->skip_whitespace_count (); + this->fatal_error(ACE_TEXT ("Expecting space between AttType and" + " DefaultDecl") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + this->parse_defaultdecl (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); - do { - ACEXML_Char *notation_name = this->read_name (); - if (notation_name == 0) - { - this->report_fatal_error(ACE_TEXT("Error reading NOTATION name while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - // @@ get another notation name, set up validator as such - this->skip_whitespace_count (&nextch); - } while (nextch != ')'); + count = this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + this->skip_whitespace_count(&fwd); + } + this->get (); // consume closing '>' + return 0; +} - this->get (); // consume the closing paren. - this->skip_whitespace_count (); - } - break; - case '(': // EnumeratedType - Enumeration - this->skip_whitespace_count (); +int +ACEXML_Parser::check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_DECL) +{ + ACEXML_Char fwd = '\xFF'; + // Skip any leading whitespaces and store the number of such chars skipped + int count = this->skip_whitespace_count (&fwd); + if (fwd == 0) + { + this->get(); // Consume the 0 + this->pop_context (0 ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + fwd = this->peek(); + } + if (fwd == '%') + { + this->get(); // Consume the % + if (this->external_subset_) + { + this->parse_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + else + { + this->fatal_error(ACE_TEXT ("Illegal PERef within markupDecl") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + } + if (count) + { + // We have atleast one whitespace. So just skip any more whitespaces + // and return the count + this->skip_whitespace_count(); + return count; + } + return this->skip_whitespace_count(); +} - do { - ACEXML_Char *token_name = this->read_name (); // @@ need a special read_nmtoken? - if (token_name == 0) - { - this->report_fatal_error(ACE_TEXT("Error reading enumerated nmtoken name while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - // @@ get another nmtoken, set up validator as such - this->skip_whitespace_count (&nextch); - } while (nextch != ')'); +ACEXML_Char* +ACEXML_Parser::parse_attname (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)) +{ + // Parse attribute name + ACEXML_Char *att_name = this->parse_name (); + if (att_name == 0) + { + this->fatal_error(ACE_TEXT ("Invalid AttName") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (0); + } + return att_name; +} - this->get (); // consume the closing paren. - this->skip_whitespace_count (); - break; - default: +int +ACEXML_Parser::parse_defaultdecl (ACEXML_ENV_SINGLE_ARG_DECL) +{ + // DefaultDecl ::= '#REQUIRED' | '#IMPLIED' | (('#FIXED' S)? AttValue) + ACEXML_Char nextch = this->peek (); + ACEXML_Char *fixed_attr = 0; + switch (nextch) + { + case '#': + this->get (); // consume the '#' + switch (this->get ()) { - this->report_fatal_error(ACE_TEXT("Invalid Attribute Type while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - ACE_NOTREACHED (break); - } - - /* - Parse DefaultDecl: - #REQUIRED - #IMPLIED - #FIXED - quoted string // #FIXED - */ - nextch = this->peek (); - switch (nextch) - { - case '#': - this->get (); // consume the '#' - switch (this->get ()) - { case 'R': if (this->parse_token (ACE_TEXT ("EQUIRED")) < 0) { - this->report_fatal_error(ACE_TEXT("Expecting keyword `#REQUIRED' while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; + this->fatal_error(ACE_TEXT ("Expecting keyword REQUIRED") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } // We now know this attribute is required // @@ Set up the validator as such. @@ -1492,8 +1451,9 @@ ACEXML_Parser::parse_attlist_decl (ACEXML_ENV_SINGLE_ARG_DECL) case 'I': if (this->parse_token (ACE_TEXT ("MPLIED")) < 0) { - this->report_fatal_error(ACE_TEXT("Expecting keyword `#IMPLIED' while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; + this->fatal_error(ACE_TEXT ("Expecting keyword IMPLIED") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } // We now know this attribute is impleid. // @@ Set up the validator as such. @@ -1502,186 +1462,494 @@ ACEXML_Parser::parse_attlist_decl (ACEXML_ENV_SINGLE_ARG_DECL) if (this->parse_token (ACE_TEXT ("IXED")) < 0 || this->skip_whitespace_count () == 0) { - this->report_fatal_error(ACE_TEXT("Expecting keyword `#FIXED' while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; + this->fatal_error(ACE_TEXT ("Expecting keyword FIXED") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } // We now know this attribute is fixed. - - ACEXML_Char *fixed_attr; - if (this->get_quoted_string (fixed_attr) != 0) + if (this->parse_attvalue (fixed_attr + ACEXML_ENV_ARG_PARAMETER) != 0) { - this->report_fatal_error(ACE_TEXT("Error parsing `#FIXED' attribute value while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; + this->fatal_error(ACE_TEXT ("Invalid Default AttValue") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } // @@ set up validator break; default: - break; - } - break; - case '\'': - case '"': - ACEXML_Char *fixed_attr; - if (this->get_quoted_string (fixed_attr) != 0) + this->fatal_error (ACE_TEXT ("Invalid DefaultDecl") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + break; + case '\'': + case '"': + if (this->parse_attvalue (fixed_attr ACEXML_ENV_ARG_PARAMETER) != 0) + { + this->fatal_error(ACE_TEXT ("Invalid AttValue") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + // @@ set up validator + break; + default: + this->fatal_error (ACE_TEXT ("Invalid DefaultDecl") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + } + return 0; +} + +int +ACEXML_Parser::parse_tokenized_type (ACEXML_ENV_SINGLE_ARG_DECL) +{ + ACEXML_Char ch = this->get(); + switch (ch) + { + case 'I': + if (this->get () == 'D') + { + if (this->peek() != 'R' && this->is_whitespace (this->peek())) + { + // We have successfully identified the type of the + // attribute as ID + // @@ Set up validator as such. + break; + } + if (this->parse_token (ACE_TEXT ("REF")) == 0) + { + if (this->peek() != 'S' && this->is_whitespace (this->peek())) + { + // We have successfully identified the type of + // the attribute as IDREF + // @@ Set up validator as such. + break; + } + else if (this->peek() == 'S' + && this->get() // consume the 'S' + && this->is_whitespace (this->peek())) + { + // We have successfully identified the type of + // the attribute as IDREFS + // @@ Set up validator as such. + break; + } + } + } + // Admittedly, this error message is not precise enough + this->fatal_error(ACE_TEXT ("Expecting keyword `ID', `IDREF', or" + "`IDREFS'") ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + case 'E': // ENTITY or ENTITIES + if (this->parse_token (ACE_TEXT ("NTIT")) == 0) + { + ACEXML_Char nextch = this->get (); + if (nextch == 'Y') + { + // We have successfully identified the type of + // the attribute as ENTITY + // @@ Set up validator as such. + } + else if (this->parse_token (ACE_TEXT ("IES")) == 0) + { + // We have successfully identified the type of + // the attribute as ENTITIES + // @@ Set up validator as such. + } + if (this->is_whitespace (this->peek())) + { + // success + break; + } + } + // Admittedly, this error message is not precise enough + this->fatal_error(ACE_TEXT ("Expecting keyword `ENTITY', or" + "`ENTITIES'") ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + case 'M': + if (this->parse_token (ACE_TEXT ("TOKEN")) == 0) + { + if (this->is_whitespace (this->peek())) + { + // We have successfully identified the type of + // the attribute as NMTOKEN + // @@ Set up validator as such. + break; + } + else if (this->peek() == 'S' + && this->get() + && this->is_whitespace (this->peek())) + { + // We have successfully identified the type of + // the attribute as NMTOKENS + // @@ Set up validator as such. + break; + } + } + this->fatal_error(ACE_TEXT ("Expecting keyword `NMTOKEN' or `NMTO" + "KENS'") ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + default: + this->fatal_error (ACE_TEXT ("Internal Parser Error") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + } + return 0; +} + + +/** + * AttType ::= StringType | TokenizedType | EnumeratedType + * StringType ::= 'CDATA' + * TokenizedType ::= 'ID' [VC: ID] + * [VC: One ID per Element Type] + * [VC: ID Attribute Default] + * | 'IDREF' [VC: IDREF] + * | 'IDREFS' [VC: IDREF] + * | 'ENTITY' [VC: Entity Name] + * | 'ENTITIES' [VC: Entity Name] + * | 'NMTOKEN' [VC: Name Token] + * | 'NMTOKENS' + * + * EnumeratedType ::= NotationType | Enumeration + * NotationType ::= 'NOTATION' S '(' S? Name (S? '|' S? Name)* S? ')' + * [VC: Notation Attributes] + * [VC: One Notation Per Element Type] + * [VC: No Notation on Empty Element] + * Enumeration ::= '(' S? Nmtoken (S? '|' S? Nmtoken)* S? ')' + * [VC: Enumeration] + */ +int +ACEXML_Parser::parse_atttype (ACEXML_ENV_SINGLE_ARG_DECL) +{ + ACEXML_Char nextch = this->peek(); + switch (nextch) + { + case 'C': // CDATA + if (this->parse_token (ACE_TEXT ("CDATA")) < 0) + { + this->fatal_error(ACE_TEXT ("Expecting keyword 'CDATA'") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + // Else, we have successfully identified the type of the + // attribute as CDATA + // @@ Set up validator appropriately here. + break; + case 'I': case 'E': // ID, IDREF, IDREFS, ENTITY or ENTITIES + this->parse_tokenized_type (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + case 'N': // NMTOKEN, NMTOKENS, or NOTATION + this->get(); + nextch = this->peek(); + if (nextch != 'M' && nextch != 'O') + { + this->fatal_error (ACE_TEXT ("Expecting keyword 'NMTOKEN', " + "'NMTOKENS' or 'NOTATION'") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + if (nextch == 'M') + { + this->parse_tokenized_type (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + } + else // NOTATION + { + if (this->parse_token (ACE_TEXT ("OTATION")) < 0) + { + this->fatal_error(ACE_TEXT ("Expecting keyword `NOTATION'") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + int count = this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + if (!count) + { + this->fatal_error (ACE_TEXT ("Expecting space between keyword " + "NOTATION and '('") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + if (this->get () != '(') + { + this->fatal_error(ACE_TEXT ("Expecting '(' in NotationType") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + do { + this->skip_whitespace_count(); + ACEXML_Char *notation_name = this->parse_name (); + if (notation_name == 0) + { + this->fatal_error(ACE_TEXT ("Invalid notation name") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + // @@ get another notation name, set up validator as such + this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + nextch = this->get(); + } while (nextch == '|'); + if (nextch != ')') + { + this->fatal_error (ACE_TEXT ("Expecting a ')' after a " + "NotationType declaration") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + } + break; + case '(': // EnumeratedType - Enumeration + this->get(); + this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + do { + this->skip_whitespace_count(); + ACEXML_Char *token_name = this->parse_nmtoken (); + if (token_name == 0) { - this->report_fatal_error(ACE_TEXT("Error parsing `#FIXED' attribute value while defining ATTLIST.") ACEXML_ENV_ARG_PARAMETER); - return -1; + this->fatal_error(ACE_TEXT ("Invalid enumeration name") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } - // @@ set up validator - break; - default: - break; + // @@ get another nmtoken, set up validator as such + this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + nextch = this->get(); + } while (nextch == '|'); + if (nextch != ')') + { + this->fatal_error (ACE_TEXT ("Expecting a ')' after a " + "Enumeration declaration") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + break; + default: + { + this->fatal_error(ACE_TEXT ("Invalid AttType") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } - this->skip_whitespace_count (&nextch); + ACE_NOTREACHED (break); } - - this->get (); // consume closing '>' - return 0; } int ACEXML_Parser::parse_notation_decl (ACEXML_ENV_SINGLE_ARG_DECL) { - if (this->parse_token (ACE_TEXT ("NOTATION")) < 0 || - this->skip_whitespace_count () == 0) + if (this->parse_token (ACE_TEXT ("NOTATION")) < 0) { - this->report_fatal_error(ACE_TEXT("Expecting keyword `NOTATION'") ACEXML_ENV_ARG_PARAMETER); - return -1; + this->fatal_error(ACE_TEXT ("Expecting Keyword 'NOTATION'") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } - - ACEXML_Char *notation = this->read_name (); + int count = this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + if (!count) + { + this->fatal_error (ACE_TEXT ("Expecting a space between keyword NOTATION" + " and notation name") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + ACEXML_Char *notation = this->parse_name (); if (notation == 0) { - this->report_fatal_error(ACE_TEXT("Invalid notation name.") ACEXML_ENV_ARG_PARAMETER); - return -1; + this->fatal_error(ACE_TEXT ("Invalid Notation name") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + count = this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + if (!count) + { + this->fatal_error (ACE_TEXT ("Expecting a space between notation name " + "and ExternalID/PublicID") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } - this->skip_whitespace_count (); ACEXML_Char *systemid, *publicid; - this->parse_external_id_and_ref (publicid, systemid ACEXML_ENV_ARG_PARAMETER); + // Gross hack but otherwise we need to go around a lot of loops to parse, + // When the ExternalID starts with 'PUBLIC' we cannot distinguish a + // PublicId from a ExternalID by looking using a one character read-ahead + ACEXML_ParserInt::ReferenceState temp = this->ref_state_; + this->ref_state_ = ACEXML_ParserInt::IN_NOTATION; + + this->parse_external_id (publicid, systemid + ACEXML_ENV_ARG_PARAMETER); ACEXML_CHECK_RETURN (-1); + // Restore the original value. + this->ref_state_ = temp; - if (this->get () != '>') + // [VC: Unique Notation Name] + if (systemid && this->notations_.add_entity (notation, systemid) != 0 + && this->validate_) { - this->report_fatal_error(ACE_TEXT("Expecting NOTATION closing '>'.") ACEXML_ENV_ARG_PARAMETER); - return -1; + this->fatal_error(ACE_TEXT ("Internal Parser Error") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + if (publicid) + { + int retval = this->notations_.add_entity (notation, publicid); + if (retval != 0 && !systemid && this->validate_) + { + this->fatal_error(ACE_TEXT ("Internal Parser Error") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } } - this->dtd_handler_->notationDecl (notation, - publicid, - systemid ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK_RETURN (-1); + if (this->skip_whitespace() != '>') + { + this->fatal_error(ACE_TEXT ("Expecting '>' at end of NotationDecl") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + if (this->validate_ && this->dtd_handler_) + { + this->dtd_handler_->notationDecl (notation, + publicid, + systemid ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } return 0; } int -ACEXML_Parser::parse_external_id_and_ref (ACEXML_Char *&publicId, - ACEXML_Char *&systemId ACEXML_ENV_ARG_DECL) +ACEXML_Parser::parse_element_decl (ACEXML_ENV_SINGLE_ARG_DECL) { - publicId = systemId = 0; - ACEXML_Char nextch = this->get (); - + if (this->parse_token (ACE_TEXT ("LEMENT")) < 0) + { + this->fatal_error (ACE_TEXT ("Expecting keyword ELEMENT") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + int count = this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + if (!count) + { + this->fatal_error (ACE_TEXT ("Expecting a space between keyword ELEMENT" + " and element name") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + ACEXML_Char *element_name = this->parse_name (); + if (element_name == 0) + { + this->fatal_error (ACE_TEXT ("Invalid element name") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + count = this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + if (!count) + { + this->fatal_error (ACE_TEXT ("Expecting a space between element name " + "and element definition") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + ACEXML_Char nextch = this->peek(); switch (nextch) { - case 'S': // External SYSTEM id. - if (this->parse_token (ACE_TEXT ("YSTEM")) < 0 || - this->skip_whitespace_count () == 0) - { - this->report_fatal_error(ACE_TEXT("Expecting keyword 'SYSTEM'") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - if (this->get_quoted_string (systemId) != 0) - { - this->report_fatal_error(ACE_TEXT("Error while parsing SYSTEM literal for SYSTEM id.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - this->locator_.setSystemId (systemId); - break; - case 'P': // External PUBLIC id or previously defined PUBLIC id. - if (this->parse_token (ACE_TEXT ("UBLIC")) < 0 || - this->skip_whitespace_count () == 0) - { - this->report_fatal_error(ACE_TEXT("Expecting keyword 'PUBLIC'") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - if (this->get_quoted_string (publicId) != 0) - { - this->report_fatal_error(ACE_TEXT("Error while parsing public literal for PUBLIC id.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - this->locator_.setPublicId (publicId); - - this->skip_whitespace_count (&nextch); - if (nextch == '\'' || nextch == '"') // not end of NOTATION yet. - { - if (this->get_quoted_string (systemId) != 0) - { - this->report_fatal_error(ACE_TEXT("Error while parsing system literal for PUBLIC id.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - this->locator_.setSystemId (systemId); - } - break; - default: - this->report_fatal_error(ACE_TEXT("Expecting either keyword `SYSTEM' or `PUBLIC'.") ACEXML_ENV_ARG_PARAMETER); - return -1; + case 'E': // EMPTY + if (this->parse_token (ACE_TEXT ("EMPTY")) < 0) + { + this->fatal_error (ACE_TEXT ("Expecting keyword EMPTY") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + break; + case 'A': // ANY + if (this->parse_token (ACE_TEXT ("ANY")) < 0) + { + this->fatal_error (ACE_TEXT ("Expecting keyword ANY") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + break; + case '(': // children + this->parse_children_definition (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + default: // error + this->fatal_error (ACE_TEXT ("Invalid element definition") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + count = this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + if (this->skip_whitespace () != '>') + { + this->fatal_error (ACE_TEXT ("Expecting '>' after element defintion") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } return 0; } + int ACEXML_Parser::parse_children_definition (ACEXML_ENV_SINGLE_ARG_DECL) { this->get (); // consume the '(' - - ACEXML_Char nextch; + this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); int subelement_number = 0; - this->skip_whitespace_count (&nextch); - + ACEXML_Char nextch = this->peek(); switch (nextch) { - case '#': // Mixed element, - if (this->parse_token (ACE_TEXT ("#PCDATA")) < 0) - { - this->report_fatal_error(ACE_TEXT("Expecting keyword `#PCDATA' while defining an element.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - - this->skip_whitespace_count (&nextch); - - while (nextch != ')') - { - if (this->get () != '|') - { - this->report_fatal_error(ACE_TEXT("Expecting end of Mixed section while defining an element.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - this->skip_whitespace_count (); - - ACEXML_Char *name = this->read_name (); - // @@ name will be used in the Validator later. - ACE_UNUSED_ARG (name); - ++subelement_number; - // @@ Install Mixed element name into the validator. - this->skip_whitespace_count (&nextch); - } - - if (this->get () != ')' || - (subelement_number && this->get () != '*')) - { - this->report_fatal_error(ACE_TEXT("Expecting closing `)*' or ')' while defining an element.") ACEXML_ENV_ARG_PARAMETER); + case '#': // Mixed element, + if (this->parse_token (ACE_TEXT ("#PCDATA")) < 0) + { + this->fatal_error(ACE_TEXT ("Expecting keyword '#PCDATA'") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + nextch = this->get(); + while (nextch == '|') + { + this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + ACEXML_Char *name = this->parse_name (); + // @@ name will be used in the Validator later. + ACE_UNUSED_ARG (name); + ++subelement_number; + // @@ Install Mixed element name into the validator. + this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + nextch = this->skip_whitespace(); + } + if (nextch != ')' || + (subelement_number && this->get () != '*')) + { + this->fatal_error(ACE_TEXT ("Expecing ')' or ')*' at end of Mixed" + " element") ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + // @@ close the element definition in the validator. + break; + default: + int status = this->parse_child (1 ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + if (status != 0) return -1; - } - // @@ close the element definition in the validator. - break; - default: - int status = this->parse_child (1 ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK_RETURN (-1); - if (status != 0) - return -1; } return 0; @@ -1691,270 +1959,1289 @@ int ACEXML_Parser::parse_child (int skip_open_paren ACEXML_ENV_ARG_DECL) { // Conditionally consume the open paren. - if (skip_open_paren == 0 && - this->get () != '(') + if (skip_open_paren == 0 && this->get () != '(') { - this->report_fatal_error(ACE_TEXT("Expecting opening `(' while defining an element.") ACEXML_ENV_ARG_PARAMETER); - return -1; + this->fatal_error(ACE_TEXT ("Expecting '(' at beginning of children") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } ACEXML_Char node_type = 0; ACEXML_Char nextch; do { + this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); this->skip_whitespace_count (&nextch); switch (nextch) { - case '(': - this->parse_child (0 ACEXML_ENV_ARG_PARAMETER); - ACEXML_CHECK_RETURN (-1); - break; - default: - // must be an element name here. - ACEXML_Char *subelement = this->read_name (); - if (subelement == 0) - { - this->report_fatal_error(ACE_TEXT("Error reading sub-element name while defining an element.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - // @@ Inform validator of the new element here. - break; - } + case '(': + this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + this->parse_child (0 ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + default: + this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + // must be an element name here. + ACEXML_Char *subelement = this->parse_name (); + if (subelement == 0) + { + this->fatal_error(ACE_TEXT ("Invalid subelement name") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + // Check for trailing '?', '*', '+' + nextch = this->peek (); + switch (nextch) + { + case '?': + // @@ Consume the character and inform validator as such, + this->get (); + break; + case '*': + // @@ Consume the character and inform validator as such, + this->get (); + break; + case '+': + // @@ Consume the character and inform validator as such, + this->get (); + break; + default: + break; // not much to do. + } + // @@ Inform validator of the new element here. + break; + } + this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); this->skip_whitespace_count (&nextch); switch (nextch) { - case '|': - switch (node_type) - { - case 0: - node_type = '|'; - // @@ inform validator of this new type?? - break; - case '|': - break; - default: - this->report_fatal_error(ACE_TEXT("Expecting `,', `|', or `)' while defining an element.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - break; - case ',': - switch (node_type) - { - case 0: - node_type = ','; - // @@ inform validator of this new type?? - break; - case ',': - break; - default: - this->report_fatal_error(ACE_TEXT("Expecting `,', `|', or `)'while defining an element.") ACEXML_ENV_ARG_PARAMETER); - return -1; - } - case ')': - break; - default: - this->report_fatal_error(ACE_TEXT("Expecting `,', `|', or `)' while defining an element.") ACEXML_ENV_ARG_PARAMETER); - return -1; + case '|': + switch (node_type) + { + case 0: + node_type = '|'; + // @@ inform validator of this new type?? + break; + case '|': + break; + default: + this->fatal_error (ACE_TEXT ("Expecting `,', `|', or `)' " + "while defining an element") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + break; + case ',': + switch (node_type) + { + case 0: + node_type = ','; + // @@ inform validator of this new type?? + break; + case ',': + break; + default: + this->fatal_error (ACE_TEXT ("Expecting `,', `|', or `)' " + "while defining an element") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + break; + case ')': + break; + default: + this->fatal_error (ACE_TEXT ("Expecting `,', `|', or `)' " + "while defining an element") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } - this->get (); // consume , | or ) + nextch = this->get(); // Consume the `,' or `|' or `)' + if (nextch == ')') + break; + this->check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + this->skip_whitespace_count (&nextch); } while (nextch != ')'); + // Check for trailing '?', '*', '+' nextch = this->peek (); switch (nextch) { - case '?': - // @@ Consume the character and inform validator as such, - this->get (); - break; - case '*': - // @@ Consume the character and inform validator as such, - this->get (); - break; - case '+': - // @@ Consume the character and inform validator as such, + case '?': + // @@ Consume the character and inform validator as such, + this->get (); + break; + case '*': + // @@ Consume the character and inform validator as such, + this->get (); + break; + case '+': + // @@ Consume the character and inform validator as such, + this->get (); + break; + default: + break; // not much to do. + } + return 0; +} + +int +ACEXML_Parser::parse_char_reference (ACEXML_Char *buf, size_t& len) +{ + if (len < 7) // Max size of a CharRef plus terminating '\0' + return -1; + ACEXML_Char ch = this->get(); + if (ch != '#') // Internal error. + return -1; + int hex = 0; + ch = this->peek(); + if (ch == 'x') + { + hex = 1; this->get (); - break; - default: - break; // not much to do. } + size_t i = 0; + int more_digit = 0; + ch = this->get (); + for ( ; i < len && + (this->isNormalDigit (ch) && (hex ? this->isCharRef(ch): 1)); ++i) + { + buf[i] = ch; + ch = this->get(); + ++more_digit; + } + if (ch != ';' || !more_digit) + return -1; + buf[i] = 0; + ACEXML_UCS4 sum = (ACEXML_UCS4) ACE_OS::strtol (buf, 0, (hex ? 16 : 10)); + // [WFC: Legal Character] + if (!this->isChar (sum)) + return -1; + int clen; +#if defined (ACE_USES_WCHAR) // UTF-16 + if ((clen = ACEXML_Transcoder::ucs42utf16 (sum, buf, len)) < 0) + return -1; +#else // or UTF-8 + if ((clen = ACEXML_Transcoder::ucs42utf8 (sum, buf, len)) < 0) + return -1; +#endif + buf [clen] = 0; + len = clen; + for (int j = 0; j < clen; ++j) + this->obstack_.grow (buf[j]); return 0; } -ACEXML_Char -ACEXML_Parser::skip_whitespace (ACEXML_Char **whitespace) +ACEXML_Char* +ACEXML_Parser::parse_reference_name (void) { ACEXML_Char ch = this->get (); + if (!this->isLetter (ch) && ch != '_' && ch != ':') + return 0; + int numchars = 0; + while (ch) { + this->alt_stack_.grow (ch); + numchars++; + ch = this->peek (); + if (!this->isNameChar (ch)) + break; + ch = this->get (); + }; + if (ch != ';') + return 0; + ch = this->get(); + return this->alt_stack_.freeze (); +} + +int +ACEXML_Parser::parse_attvalue (ACEXML_Char *&str ACEXML_ENV_ARG_DECL) +{ + ACEXML_Char quote = this->get (); + if (quote != '\'' && quote != '"') // Not a quoted string. + return -1; + ACEXML_Char ch = this->get (); + while (1) + { + if (ch == quote) + { + ACEXML_Char* temp = this->obstack_.freeze (); + // If the attribute type is not CDATA, then the XML processor + // must further process the normalized attribute value by + // discarding any leading and trailing space (#x20) characters, + // and by replacing sequences of space (#x20) characters by a + // single space (#x20) character. + + // if (atttype != CDATA) { + // ACEXML_Char* start = temp; + // ACEXML_Char* end = temp + ACE_OS::strlen (temp); + // while (*start == '\x20') + // start++; + // if (start == end) // String which is all spaces + // str = start; + // while (*start != 0) + // { + // this->obstack_.grow (*start); + // start++; + // while (*start == '\x20') + // start++; + // } + // str = this->obstack_.freeze(); + // } + str = temp; + return 0; + } + switch (ch) + { + case '&': + if (this->peek () == '#') + { + ACEXML_Char buf[7]; + size_t len = sizeof (buf); + if (this->parse_char_reference (buf, len) != 0) + { + // [WFC: Legal Character] + this->fatal_error (ACE_TEXT ("Invalid CharacterRef") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + } + else + { + this->ref_state_ = ACEXML_ParserInt::IN_ATT_VALUE; + this->parse_entity_reference (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + break; + case '\x20': case '\x0D': case '\x0A': case '\x09': + this->obstack_.grow ('\x20'); + break; + case '<': // [WFC: No < in Attribute Values] + this->fatal_error (ACE_TEXT ("Illegal '<' in AttValue") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + case 0: + this->pop_context (0 ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + default: + this->obstack_.grow (ch); + break; + } + ch = this->get(); + } +} + - if (this->is_whitespace (ch) == 0) + +int +ACEXML_Parser::parse_entity_reference (ACEXML_ENV_SINGLE_ARG_DECL) +{ + ACEXML_Char* replace = this->parse_reference_name (); + if (replace == 0) { - if (whitespace != 0) - *whitespace = 0; - return ch; + this->fatal_error (ACE_TEXT ("Invalid Reference name") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); } - do + // [WFC: Parsed Entity] + if (this->unparsed_entities_.resolve_entity (replace)) { + this->fatal_error (ACE_TEXT ("EntityRef refers to unparsed entity") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + // Look in the internal general entities set first. + const ACEXML_Char* entity = this->internal_GE_.resolve_entity(replace); + + // Look in the predefined entities. + if (!entity && !this->validate_) { - if (whitespace != 0) - this->obstack_.grow (ch); - ch = this->get (); + entity = this->predef_entities_.resolve_entity (replace); + if (!entity) + { + this->fatal_error (ACE_TEXT ("Undefined Entity reference") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } } - while (this->is_whitespace (ch)); - if (whitespace != 0) - *whitespace = this->obstack_.freeze (); + if (!entity && // No match in internal + (!(this->internal_dtd_ || this->external_dtd_) || // or No DTDs + // or Only Internal DTD and no parameter entity references + (this->internal_dtd_ && !this->external_dtd_ && !this->has_pe_refs_) || + this->standalone_)) // or Standalone = 'yes' + { + // [WFC: Entity Declared] + this->fatal_error (ACE_TEXT ("Undeclared EntityRef") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } - return ch; + ACEXML_Char* systemId = 0; + ACEXML_Char* publicId = 0; + if (!entity && this->validate_) + { + if (this->external_GE_.resolve_entity (replace, systemId, publicId) < 0) + { + this->fatal_error (ACE_TEXT ("Undefined Entity reference") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + if (this->ref_state_ == ACEXML_ParserInt::IN_ATT_VALUE) + { + this->fatal_error (ACE_TEXT ("External EntityRef in Attribute Value") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + this->external_entity_++; + } + + // [WFC: No Recursion] + ACEXML_String ref_name (replace); + int present = this->GE_reference_.insert (ref_name); + if (present == 1 || present == -1) + { + while (this->GE_reference_.pop(ref_name) != -1) + ; + this->fatal_error (ACE_TEXT ("Recursion in resolving entity") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + if (!this->external_entity_) + { + ACEXML_StrCharStream* str = 0; + // ACE_DEBUG ((LM_DEBUG, + // ACE_TEXT ("Entity is %s\n Replacement Text is : %s\n"), + // replace, entity)); + ACE_NEW_RETURN (str, ACEXML_StrCharStream (entity), 0); + if (str) + { + if (this->switch_input (str, replace) != 0) + { + this->fatal_error (ACE_TEXT ("Unable to create internal input " + "stream") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + return 0; + } + } + else if (this->validate_) + { + ACEXML_Char* uri = this->normalize_systemid (systemId); + ACE_Auto_Basic_Array_Ptr<ACEXML_Char> cleanup_uri (uri); + ACEXML_InputSource* ip = 0; + if (this->entity_resolver_) + { + ip = this->entity_resolver_->resolveEntity (publicId, + (uri ? uri : systemId) + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + if (ip) + { + if (this->switch_input (ip, (uri ? uri : systemId), publicId) != 0) + { + this->fatal_error (ACE_TEXT ("Internal Parser Error") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + return 0; + } + else + { + ACEXML_StreamFactory factory; + ACEXML_CharStream* cstream = factory.create_stream (uri ? uri: systemId); + if (!cstream) { + this->fatal_error (ACE_TEXT ("Invalid input source") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + if (this->switch_input (cstream, systemId, publicId) != 0) + { + this->fatal_error (ACE_TEXT ("Internal Parser Error") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + return 0; + } + } + this->fatal_error (ACE_TEXT ("Undefined Entity reference") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + return -1; } int -ACEXML_Parser::skip_whitespace_count (ACEXML_Char *peeky) +ACEXML_Parser::parse_PE_reference (ACEXML_ENV_SINGLE_ARG_DECL) { - int wscount = 0; - ACEXML_Char dummy; - ACEXML_Char &forward = (peeky == 0 ? dummy : *peeky); + ACEXML_Char* replace = this->parse_reference_name (); + if (replace == 0) + { + this->fatal_error (ACE_TEXT ("Invalid PEReference name") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } - for (;this->is_whitespace ((forward = this->peek ())); ++wscount) - this->get (); + // Look in the internal general entities set first. + const ACEXML_Char* entity = this->internal_PE_.resolve_entity(replace); + + if (!entity && // No match in internal + (!this->external_dtd_ || // or No External DTDs + this->standalone_)) // or Standalone + { + // [VC: Entity Declared] + this->fatal_error (ACE_TEXT ("Undefined Internal PEReference") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + + ACEXML_Char* systemId = 0; + ACEXML_Char* publicId = 0; + if (!entity && this->validate_) + { + if (this->external_PE_.resolve_entity (replace, systemId, publicId) < 0) + { + this->fatal_error (ACE_TEXT ("Undefined PEReference") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + this->external_entity_++; + } + + // [WFC: No Recursion] + ACEXML_String ref_name (replace); + int present = this->PE_reference_.insert (ref_name); + if (present == 1 || present == -1) + { + while (this->PE_reference_.pop(ref_name) != -1) + ; + this->fatal_error (ACE_TEXT ("Recursion in resolving entity") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } - return wscount; + if (entity && !this->external_entity_) + { + ACEXML_StrCharStream* sstream = 0; + ACEXML_String str (entity); + if (this->ref_state_ != ACEXML_ParserInt::IN_ENTITY_VALUE) + { + const ACEXML_Char ch = '\x20'; + str = ch + str + ch; + } + // ACE_DEBUG ((LM_DEBUG, + // ACE_TEXT ("Entity is %s\n Replacement Text is : %s\n"), + // replace, str.c_str())); + ACE_NEW_RETURN (sstream, ACEXML_StrCharStream (str.c_str()), 0); + if (sstream) + { + if (this->switch_input (sstream, replace) != 0) + { + this->fatal_error (ACE_TEXT ("Error in switching InputSource") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + return 0; + } + } + else if (this->external_entity_ && this->validate_) + { + ACEXML_Char* uri = this->normalize_systemid (systemId); + ACE_Auto_Basic_Array_Ptr<ACEXML_Char> cleanup_uri (uri); + ACEXML_InputSource* ip = 0; + if (this->entity_resolver_) + { + ip = this->entity_resolver_->resolveEntity (publicId, + (uri ? uri : systemId) + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + if (ip) + { + if (this->switch_input (ip, (uri ? uri : systemId), publicId) != 0) + { + this->fatal_error (ACE_TEXT ("Error in switching InputSource") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + return 0; + } + else + { + ACEXML_StreamFactory factory; + ACEXML_CharStream* cstream = factory.create_stream (uri ? uri: systemId); + if (!cstream) { + this->fatal_error (ACE_TEXT ("Invalid input source") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + if (this->switch_input (cstream, systemId, publicId) != 0) + { + this->fatal_error (ACE_TEXT ("Error in switching InputSource") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + if (this->ref_state_ == ACEXML_ParserInt::IN_ENTITY_VALUE) + { + ACEXML_Char less, mark; + if (this->peek() == '<') + { + less = this->get(); + if (this->peek() == '?') + { + mark = this->get(); + if (this->peek() == 'x') + { + this->parse_text_decl (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + else + { + this->obstack_.grow (less); + this->obstack_.grow (mark); + } + } + this->obstack_.grow (less); + } + } + return 0; + } + } + this->fatal_error (ACE_TEXT ("Undefined PEReference") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + return -1; } int -ACEXML_Parser::parse_token (const ACEXML_Char* keyword) +ACEXML_Parser::parse_entity_value (ACEXML_Char *&str + ACEXML_ENV_ARG_DECL) { - if (keyword == 0) + ACEXML_ParserInt::ReferenceState temp = this->ref_state_; + ACEXML_Char quote = this->get (); + if (quote != '\'' && quote != '"') // Not a quoted string. return -1; - const ACEXML_Char* ptr = keyword; - ACEXML_Char ch; - for (; *ptr != 0 && ((ch = this->get()) == *ptr); ++ptr) + ACEXML_Char ch = this->get (); + while (1) { - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ch = %c : ptr = %c"), ch, *ptr)); + if (ch == quote) + { + str = this->obstack_.freeze (); + this->ref_state_ = temp; + return 0; + } + switch (ch) + { + case '&': + if (this->peek () == '#') + { + if (!this->external_entity_) + { + ACEXML_Char buf[7]; + size_t len = sizeof (buf); + if (this->parse_char_reference (buf, len) != 0) + { + // [WFC: Legal Character] + this->fatal_error (ACE_TEXT ("Invalid character " + "reference") + ACEXML_ENV_ARG_PARAMETER); + return -1; + } + break; + } + } + this->obstack_.grow (ch); + break; + case '%': + if (!this->external_entity_) + { + this->ref_state_ = ACEXML_ParserInt::IN_ENTITY_VALUE; + this->parse_PE_reference(ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + } + this->obstack_.grow (ch); + break; + case 0: + this->pop_context (0 ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + break; + default: + this->obstack_.grow (ch); + break; + } + ch = this->get(); } - if (*ptr == 0) - return 0; - else - return -1; } -int -ACEXML_Parser::skip_equal (void) +ACEXML_Char * +ACEXML_Parser::parse_name (ACEXML_Char ch) { - if (this->skip_whitespace (0) != '=') - return -1; + if (ch == 0) + ch = this->get (); + if (!this->isLetter (ch) && ch != '_' && ch != ':') + return 0; + while (ch) { + this->obstack_.grow (ch); + ch = this->peek (); + if (!this->isNameChar (ch)) + break; + ch = this->get (); + }; + return this->obstack_.freeze (); +} - while (this->is_whitespace (this->peek ())) - this->get (); - return 0; +ACEXML_Char* +ACEXML_Parser::parse_nmtoken (ACEXML_Char ch) +{ + if (ch == 0) + ch = this->get (); + if (!this->isNameChar (ch)) + return 0; + while (ch) { + this->obstack_.grow (ch); + ch = this->peek (); + if (!this->isNameChar (ch)) + break; + ch = this->get (); + }; + return this->obstack_.freeze (); } int -ACEXML_Parser::get_quoted_string (ACEXML_Char *&str) +ACEXML_Parser::parse_version_num (ACEXML_Char*& str) { ACEXML_Char quote = this->get (); if (quote != '\'' && quote != '"') // Not a quoted string. return -1; - + int numchars = 0; while (1) { ACEXML_Char ch = this->get (); + if (ch == quote && !numchars) + return -1; + else if (ch == quote) + { + str = this->obstack_.freeze (); + return 0; + } + // [26] VersionNum ::= ([a-zA-Z0-9_.:] | '-')+ + if (ch == '-' || ((ch >= 'a' && ch <= 'z') || + (ch >= 'A' && ch <= 'Z') || + (ch >= '0' && ch <= '9') || + (ch == '_' || ch == '.' || ch == ':'))) + { + this->obstack_.grow (ch); + numchars++; + } + else + return -1; + } +} - // @@ Deoes not handle buffer overflow yet. +int +ACEXML_Parser::parse_system_literal (ACEXML_Char*& str) +{ + const ACEXML_Char quote = this->get(); + if (quote != '\'' && quote != '"') // Not a quoted string. + return -1; + while (1) + { + ACEXML_Char ch = this->get (); if (ch == quote) { str = this->obstack_.freeze (); return 0; } - - const ACEXML_String *replace = 0; - ACEXML_String charval; - ACEXML_Char buffer[6]; - size_t i = 0; - switch (ch) { - case '&': - if (this->peek () == '#') - { - if (this->parse_char_reference (buffer, 6) != 0) - { -// xmlenv.exception (new ACEXML_SAXParseException -// (ACE_TEXT ("CharRef does not resolves to a valid character"))); - return -1; - } - charval.set (buffer, 0); - replace = &charval; - } - else - replace = this->parse_reference (); - - if (replace == 0) - { - // xmlenv.exception (new ACEXML_SAXParseException - // (ACE_TEXT ("Undefined reference"))); - return -1; - } - for (i = 0; i < replace->length (); ++i) - this->obstack_.grow ((*replace)[i]); - // handle reference here. - break; - case 0x0D: // End-of-Line handling - ch = (this->peek () == 0x0A ? this->get () : 0x0A); - // Fall thru... - case 0x0A: - // Fall thru... - default: - this->obstack_.grow (ch); - break; + case '\x00': case '\x01': case '\x02': case '\x03': case '\x04': + case '\x05': case '\x06': case '\x07': case '\x08': case '\x09': + case '\x0A': case '\x0B': case '\x0C': case '\x0D': case '\x0E': + case '\x0F': case '\x10': case '\x11': case '\x12': case '\x13': + case '\x14': case '\x15': case '\x16': case '\x17': case '\x18': + case '\x19': case '\x1A': case '\x1B': case '\x1C': case '\x1D': + case '\x1E': case '\x1F': case '\x7F': case '\x20': case '<': + case '>': case '#': case '%': + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Invalid char %c in SystemLiteral\n"), ch)); + return -1; + default: + this->obstack_.grow (ch); } } } -ACEXML_Char * -ACEXML_Parser::read_name (ACEXML_Char ch) +int +ACEXML_Parser::parse_pubid_literal (ACEXML_Char*& str) { - if (ch == 0) + const ACEXML_Char quote = this->get(); + if (quote != '\'' && quote != '"') // Not a quoted string. + return -1; + while (1) { - ch = this->get (); - - if (this->is_whitespace (ch)) - // No white space is allowed here. - return 0; + ACEXML_Char ch = this->get (); + if (ch == quote) + { + str = this->obstack_.freeze (); + return 0; + } + else if (this->isPubidChar (ch)) + this->obstack_.grow (ch); + else + return -1; } - else if (this->is_nonname (ch)) - return 0; +} +int +ACEXML_Parser::parse_encname (ACEXML_Char*& str) +{ + const ACEXML_Char quote = this->get (); + if (quote != '\'' && quote != '"') // Not a quoted string. + return -1; + int numchars = 0; while (1) { - this->obstack_.grow (ch); - ch = this->peek (); - if (this->is_nonname (ch)) - break; - ch = this->get (); - }; + ACEXML_Char ch = this->get (); + if (ch == quote && !numchars) + return -1; + else if (ch == quote) + { + str = this->obstack_.freeze (); + return 0; + } + // [81] EncName ::= [A-Za-z] ([A-Za-z0-9._] | '-')* + if (!((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')) + && !numchars) + return -1; + if (ch == '-' || ((ch >= 'a' && ch <= 'z') || + (ch >= 'A' && ch <= 'Z') || + (ch >= '0' && ch <= '9') || + (ch == '_' || ch == '.'))) + { + this->obstack_.grow (ch); + numchars++; + } + else + return -1; + } +} - return this->obstack_.freeze (); +int +ACEXML_Parser::parse_sddecl (ACEXML_Char*& str) +{ + ACEXML_Char quote = this->get (); + if (quote != '\'' && quote != '"') // Not a quoted string. + return -1; + int numchars = 0; + while (1) + { + ACEXML_Char ch = this->get (); + if (ch == quote && numchars < 2) + return -1; + else if (ch == quote) + { + str = this->obstack_.freeze (); + return 0; + } + // [32] SDDecl ::= S 'standalone' Eq (("'" ('yes' | 'no') "'") + // | ('"' ('yes' | 'no') '"')) + switch (ch) + { + case 'y': case 'e': case 's': case 'n': case 'o': + this->obstack_.grow (ch); + numchars++; + break; + default: + return -1; + } + } } void -ACEXML_Parser::report_prefix_mapping (const ACEXML_Char* prefix, - const ACEXML_Char* uri, - const ACEXML_Char* name, - int start ACEXML_ENV_ARG_DECL) +ACEXML_Parser::prefix_mapping (const ACEXML_Char* prefix, + const ACEXML_Char* uri, + const ACEXML_Char* name, + int start ACEXML_ENV_ARG_DECL) { if (this->namespaces_) { const ACEXML_Char* temp = (name == 0) ? empty_string : prefix; if (start) { - this->content_handler_->startPrefixMapping (temp, uri ACEXML_ENV_ARG_PARAMETER); + this->content_handler_->startPrefixMapping (temp, uri + ACEXML_ENV_ARG_PARAMETER); ACEXML_CHECK; } else { - this->content_handler_->endPrefixMapping(temp ACEXML_ENV_ARG_PARAMETER); + this->content_handler_->endPrefixMapping(temp + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK; + } + } +} + +int +ACEXML_Parser::switch_input (ACEXML_CharStream* cstream, + const ACEXML_Char* systemId, + const ACEXML_Char* publicId) +{ + ACEXML_InputSource* input = 0; + ACE_NEW_RETURN (input, ACEXML_InputSource (cstream), -1); + return this->switch_input (input, systemId, publicId); +} + +int +ACEXML_Parser::switch_input (ACEXML_InputSource* input, + const ACEXML_Char* systemId, + const ACEXML_Char* publicId) +{ + ACEXML_LocatorImpl* locator = 0; + ACE_NEW_RETURN (locator, ACEXML_LocatorImpl (systemId, publicId), -1); + ACEXML_Parser_Context* new_context = 0; + ACE_NEW_RETURN (new_context, ACEXML_Parser_Context(input, locator), -1); + if (this->push_context (new_context) != 0) + { + ACE_ERROR ((LM_ERROR, "Unable to switch input streams")); + return -1; + } + this->current_ = new_context; + // Set up Locator. + if (this->content_handler_) + this->content_handler_->setDocumentLocator (this->current_->getLocator()); + return 0; +} + +int +ACEXML_Parser::push_context (ACEXML_Parser_Context* context) +{ + if (this->ctx_stack_.push (context) < 0) + { + ACE_ERROR ((LM_ERROR, "Unable to push input source onto the stack")); + return -1; + } + return 0; +} + +int +ACEXML_Parser::pop_context (int GE_ref ACEXML_ENV_ARG_DECL) +{ + ACEXML_Parser_Context* temp = 0; + int retval = this->ctx_stack_.pop (temp); + if (retval != 0) + { + this->fatal_error (ACE_TEXT ("Unable to pop element of the input stack") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + delete temp; + if (this->ctx_stack_.top (this->current_) != 0) + { + this->fatal_error (ACE_TEXT ("Unable to read top element of input stack") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + ACEXML_String reference; + if (GE_ref && this->GE_reference_.size() > 0) + { + if (this->GE_reference_.pop (reference) < 0) + { + this->fatal_error (ACE_TEXT ("Internal Parser Error") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + } + else if (this->PE_reference_.size() > 0) + { + if (this->PE_reference_.pop (reference) < 0) + { + this->fatal_error (ACE_TEXT ("Internal Parser Error") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + } + + int nrelems = this->ctx_stack_.size(); + if (nrelems >= 1) + { + if (this->external_entity_) + this->external_entity_--; + } + else + { + this->fatal_error(ACE_TEXT ("Unexpected end-of-file") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + // Set up Locator. + if (this->content_handler_) + this->content_handler_->setDocumentLocator (this->current_->getLocator()); + return nrelems; +} + +int +ACEXML_Parser::getFeature (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, + ACEXML_SAXNotSupportedException)) +{ + if (ACE_OS::strcmp (name, ACEXML_Parser::simple_parsing_feature_) == 0) + { + return this->simple_parsing_; + } + else if (ACE_OS::strcmp (name, ACEXML_Parser::namespaces_feature_) == 0) + { + return this->namespaces_; + } + else if (ACE_OS::strcmp (name, + ACEXML_Parser::namespace_prefixes_feature_) == 0) + { + return this->namespace_prefixes_; + } + else if (ACE_OS::strcmp (name, ACEXML_Parser::validation_feature_) == 0) + { + return this->validate_; + } + ACEXML_THROW_RETURN (ACEXML_SAXNotRecognizedException (name), -1); +} + + + +void +ACEXML_Parser::setFeature (const ACEXML_Char *name, + int boolean_value ACEXML_ENV_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, + ACEXML_SAXNotSupportedException)) +{ + if (ACE_OS::strcmp (name, ACEXML_Parser::simple_parsing_feature_) == 0) + { + this->simple_parsing_ = (boolean_value == 0 ? 0 : 1); + return; + } + else if (ACE_OS::strcmp (name, ACEXML_Parser::namespaces_feature_) == 0) + { + this->namespaces_ = (boolean_value == 0 ? 0 : 1); + return; + } + else if (ACE_OS::strcmp (name, + ACEXML_Parser::namespace_prefixes_feature_) == 0) + { + this->namespace_prefixes_ = (boolean_value == 0 ? 0 : 1); + return; + } + else if (ACE_OS::strcmp (name, ACEXML_Parser::validation_feature_) == 0) + { + this->validate_ = (boolean_value == 0 ? 0 : 1); + return; + } + + ACEXML_THROW (ACEXML_SAXNotRecognizedException (name)); +} + +void * +ACEXML_Parser::getProperty (const ACEXML_Char *name ACEXML_ENV_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, + ACEXML_SAXNotSupportedException)) +{ + ACEXML_THROW_RETURN (ACEXML_SAXNotSupportedException (name), 0); +} + +void +ACEXML_Parser::setProperty (const ACEXML_Char *name, + void *value ACEXML_ENV_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXNotRecognizedException, + ACEXML_SAXNotSupportedException)) +{ + ACE_UNUSED_ARG (value); + + ACEXML_THROW (ACEXML_SAXNotSupportedException (name)); +} + +void +ACEXML_Parser::error (const ACEXML_Char* msg ACEXML_ENV_ARG_DECL) +{ + ACEXML_SAXParseException* exception = 0; + ACE_NEW_NORETURN (exception, ACEXML_SAXParseException (msg)); + if (this->error_handler_) + this->error_handler_->error (*exception ACEXML_ENV_ARG_PARAMETER); + else + ACEXML_ENV_RAISE (exception); + return; +} + +void +ACEXML_Parser::warning (const ACEXML_Char* msg ACEXML_ENV_ARG_DECL) +{ + ACEXML_SAXParseException* exception = 0; + ACE_NEW_NORETURN (exception, ACEXML_SAXParseException (msg)); + if (this->error_handler_) + this->error_handler_->warning (*exception ACEXML_ENV_ARG_PARAMETER); + return; +} + +void +ACEXML_Parser::fatal_error (const ACEXML_Char* msg ACEXML_ENV_ARG_DECL) +{ + ACEXML_SAXParseException* exception = 0; + ACE_NEW_NORETURN (exception, ACEXML_SAXParseException (msg)); + if (this->error_handler_) + this->error_handler_->fatalError (*exception ACEXML_ENV_ARG_PARAMETER); + ACEXML_ENV_RAISE (exception); + return; +} + +void +ACEXML_Parser::parse_version_info (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)) +{ + ACEXML_Char* astring; + if (this->parse_token (ACE_TEXT("ersion")) < 0 + || this->skip_equal () != 0 + || this->parse_version_num (astring) != 0) + { + this->fatal_error (ACE_TEXT ("Invalid VersionInfo specification") + ACEXML_ENV_ARG_PARAMETER); + return; + } + if (ACE_OS::strcmp (astring, ACE_TEXT ("1.0")) != 0) + { + this->fatal_error (ACE_TEXT ("ACEXML Parser supports XML version 1.0 " + "documents only") ACEXML_ENV_ARG_PARAMETER); + return; + } +} + +void +ACEXML_Parser::parse_encoding_decl (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)) +{ + ACEXML_Char* astring; + if ((this->parse_token (ACE_TEXT("ncoding")) < 0) + || this->skip_equal () != 0 + || this->parse_encname (astring) != 0) + { + this->fatal_error (ACE_TEXT ("Invalid EncodingDecl specification") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK; + } + const ACEXML_Char* encoding = this->current_->getInputSource()->getEncoding(); + if (ACE_OS::strcmp (astring, encoding) != 0) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Detected Encoding is %s " + ": Declared Encoding is %s\n"), + encoding, astring)); + this->warning (ACE_TEXT ("Declared encoding differs from detected " + "encoding") ACEXML_ENV_ARG_PARAMETER); + } +} + +int +ACEXML_Parser::parse_text_decl (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)) +{ + // Read xml + if (this->parse_token (ACE_TEXT("xml")) < 0) + { + this->fatal_error(ACE_TEXT ("Expecting keyword 'xml' in TextDecl") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + + ACEXML_Char fwd = this->skip_whitespace(); + // Read version + if (fwd == 'v') + { + this->parse_version_info (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + fwd = this->skip_whitespace(); + } + + if (fwd == 'e') + { + this->parse_encoding_decl (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + fwd = this->skip_whitespace(); + } + else + { + this->fatal_error (ACE_TEXT ("Missing encodingDecl in TextDecl") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + + if (fwd == '?' && this->get() == '>') + return 0; + // All the rules fail. So return an error. + this->fatal_error (ACE_TEXT ("Invalid TextDecl") ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + return -1; +} + +void +ACEXML_Parser::parse_xml_decl (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)) +{ + // Read <?xml + if (this->parse_token (ACE_TEXT("xml")) < 0) + { + this->fatal_error(ACE_TEXT ("Expecting keyword xml in XMLDecl") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK; + } + + ACEXML_Char fwd = this->skip_whitespace(); + + // Read version + if (fwd != 'v') + { + this->fatal_error (ACE_TEXT ("Expecting VersionInfo declaration") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK; + } + + this->parse_version_info (ACEXML_ENV_SINGLE_ARG_PARAMETER); + ACEXML_CHECK; + + fwd = this->skip_whitespace(); + if (fwd != '?') + { + if (fwd == 'e') + { + this->parse_encoding_decl (ACEXML_ENV_SINGLE_ARG_PARAMETER); ACEXML_CHECK; + fwd = this->skip_whitespace(); + } + if (fwd == 's') + { + ACEXML_Char* astring; + if ((this->parse_token (ACE_TEXT("tandalone")) == 0) && + this->skip_equal () == 0 && + this->parse_sddecl (astring) == 0) + { + if (ACE_OS::strcmp (astring, ACE_TEXT ("yes")) == 0) + this->standalone_ = 1; + fwd = this->skip_whitespace(); + } } } + if (fwd == '?' && this->get() == '>') + return; + // All the rules fail. So return an error. + this->fatal_error (ACE_TEXT ("Invalid XMLDecl declaration") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK; +} + +int +ACEXML_Parser::parse_comment (void) +{ + int state = 0; + + if (this->get () != '-' || // Skip the opening "<!--" + this->get () != '-' || // completely. + this->get () == '-') // and at least something not '-'. + return -1; + + while (state < 3) + // Waiting for the trailing three character '-->'. Notice that + // according to the spec, '--->' is not a valid closing comment + // sequence. But we'll let it pass anyway. + { + ACEXML_Char fwd = this->get (); + if ((fwd == '-' && state < 2) || + (fwd == '>' && state == 2)) + state += 1; + else + state = 0; // Reset parse state. + } + return 0; +} + +int +ACEXML_Parser::parse_processing_instruction (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)) +{ + const ACEXML_Char *pitarget = this->parse_name (); + ACEXML_Char *instruction = 0; + + if (!ACE_OS::strcasecmp (ACE_TEXT ("xml"), pitarget)) + { + // Invalid PITarget name. + this->fatal_error(ACE_TEXT ("PI can't have 'xml' in PITarget") + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + } + + int state = 0; + + ACEXML_Char ch = this->skip_whitespace(); + while (state < 2) + { + switch (ch) + { + case '?': + if (state == 0) + state = 1; + break; + case '>': + if (state == 1) + { + instruction = this->obstack_.freeze (); + this->content_handler_->processingInstruction (pitarget, + instruction + ACEXML_ENV_ARG_PARAMETER); + ACEXML_CHECK_RETURN (-1); + this->obstack_.unwind (ACE_const_cast (ACEXML_Char*, pitarget)); + return 0; + } + break; + case 0x0A: + // Fall thru... + default: + if (state == 1) + this->obstack_.grow ('?'); + this->obstack_.grow (ch); + state = 0; + } + ch = this->get (); + } + return -1; +} + +void +ACEXML_Parser::reset (void) +{ + if (this->ctx_stack_.pop (this->current_) == -1) + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Mismatched push/pop of Context stack"))); + delete this->current_; + ACEXML_String temp; + while (this->GE_reference_.pop (temp) != -1) + ; + while (this->PE_reference_.pop (temp) != -1) + ; + this->obstack_.release(); + this->xml_namespace_.reset(); + this->nested_namespace_ = 0; + this->internal_GE_.reset(); + this->external_GE_.reset(); + this->unparsed_entities_.reset(); + this->predef_entities_.reset(); + this->internal_PE_.reset(); + this->external_PE_.reset(); + this->notations_.reset(); + this->ref_state_ = ACEXML_ParserInt::INVALID; + this->external_subset_ = 0; + this->external_entity_ = 0; + this->has_pe_refs_ = 0; + this->standalone_ = 0; + this->external_dtd_ = 0; + this->internal_dtd_ = 0; } diff --git a/ACEXML/parser/parser/Parser.dsp b/ACEXML/parser/parser/Parser.dsp index 838bc6d306d..f70361682b0 100644 --- a/ACEXML/parser/parser/Parser.dsp +++ b/ACEXML/parser/parser/Parser.dsp @@ -100,6 +100,14 @@ SOURCE=.\Entity_Manager.cpp SOURCE=.\Parser.cpp
# End Source File
+# Begin Source File
+
+SOURCE=.\ParserContext.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ParserInternals.cpp
+# End Source File
# End Group
# Begin Group "Header Files"
@@ -116,6 +124,18 @@ SOURCE=.\Parser.h SOURCE=.\Parser_export.h
# End Source File
+# Begin Source File
+
+SOURCE=.\ParserContext.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ParserContext.inl
+# End Source File
+# Begin Source File
+
+SOURCE=.\ParserInternals.h
+# End Source File
# End Group
# Begin Group "Resource Files"
diff --git a/ACEXML/parser/parser/Parser.h b/ACEXML/parser/parser/Parser.h index e45e290ca79..c92af489869 100644 --- a/ACEXML/parser/parser/Parser.h +++ b/ACEXML/parser/parser/Parser.h @@ -7,6 +7,7 @@ * $Id$ * * @author Nanbor Wang <nanbor@cs.wustl.edu> + * @author Krishnakumar B <kitty@cs.wustl.edu> */ //============================================================================= @@ -28,9 +29,12 @@ #include "ace/Functor.h" #include "ace/SString.h" #include "ace/Hash_Map_Manager.h" +#include "ace/Unbounded_Set.h" #include "ace/Containers_T.h" #include "ace/Auto_Ptr.h" #include "ACEXML/parser/parser/Entity_Manager.h" +#include "ACEXML/parser/parser/ParserInternals.h" +#include "ACEXML/parser/parser/ParserContext.h" /** * @class ACEXML_Parser Parser.h "ACEXML/parser/parser/Parser.h" @@ -47,7 +51,14 @@ public: /// Destructor. virtual ~ACEXML_Parser (void); - /* + /** + * Initialize the parser state. + * + * @retval 0 if parser was initialized correctly else -1. + */ + int initialize (ACEXML_InputSource* input); + + /** * Return the current content handler. */ virtual ACEXML_ContentHandler *getContentHandler (void) const; @@ -132,80 +143,41 @@ public: */ virtual void setErrorHandler (ACEXML_ErrorHandler *handler); - // *** Helper functions for parsing XML - /** - * Skip any whitespaces encountered until the first non-whitespace - * character is encountered and consumed from the current input - * CharStream. - * - * @param whitespace Return a pointer to the string of skipped - * whitespace after proper conversion. Null if there's no - * whitespace found. - * - * @return The first none-white space characters (which will be - * consumed from the CharStream.) If no whitespace is found, it - * returns 0. - * - * @sa skip_whitespace_count - */ - ACEXML_Char skip_whitespace (ACEXML_Char **whitespace); +protected: /** - * Skip any whitespaces encountered until the first non-whitespace - * character. The first non-whitespace character is not consumed. - * This method does peek into the input CharStream and therefore - * is more expensive than @ref skip_whitespace. - * - * @param peek If non-null, @a peek points to a ACEXML_Char where - * skip_whitespace_count stores the first non-whitespace - * character it sees (character is not removed from the stream.) - * - * @return The number of whitespace characters consumed. - * - * @sa skip_whitespace + * Parse XML Prolog. */ - int skip_whitespace_count (ACEXML_Char *peek = 0); + void parse_xml_prolog (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); /** - * Check if a character @a c is a whitespace. + * Parse VersionInfo declaration. * - * @retval 1 if @a c is a valid white space character. 0 otherwise. */ - int is_whitespace (ACEXML_Char c); + void parse_version_info (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); /** - * Check if a character @a c is a whitespace or '='. + * Parse a EncodingDecl declaration. * - * @retval 1 if true, 0 otherwise. */ - int is_whitespace_or_equal (ACEXML_Char c); + void parse_encoding_decl (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); /** - * Check if a character @a c is a valid character for nonterminal NAME. + * Parse a XMLDecl declaration. * - * @retval 1 if true, 0 otherwise. */ - int is_nonname (ACEXML_Char c); + void parse_xml_decl (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); /** - * Skip an equal sign. - * - * @retval 0 when succeeds, -1 if no equal sign is found. + * Parse a TextDecl declaration. */ - int skip_equal (void); - - /** - * Get a quoted string. Quoted strings are used to specify - * attribute values and this routine will replace character and - * entity references on-the-fly. Parameter entities are not allowed - * (or replaced) in this function. (But regular entities are.) - * - * @param str returns the un-quoted string. - * - * @retval 0 on success, -1 otherwise. - */ - int get_quoted_string (ACEXML_Char *&str); + int parse_text_decl (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); /** * Parse a PI statement. The first character encountered @@ -213,33 +185,15 @@ public: * * @retval 0 on success, -1 otherwise. */ - int parse_processing_instruction (ACEXML_ENV_SINGLE_ARG_DECL); - - /** - * Skip over a comment. The first character encountered - * should always be the first '-' in the comment prefix - * "@<@!--". - */ - int grok_comment (); - - /** - * Read a name from the input CharStream (until white space). - * If @a ch @!= 0, then we have already consumed the first name - * character from the input CharStream, otherwise, read_name - * will use this->get() to acquire the initial character. - * - * @return A pointer to the string in the obstack, 0 if it's not - * a valid name. - */ - ACEXML_Char *read_name (ACEXML_Char ch = 0); + int parse_processing_instruction (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); /** * Parse the DOCTYPE declaration. The first character encountered * should always be 'D' in doctype prefix: "@<@!DOCTYPE". */ int parse_doctypedecl (ACEXML_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; + ACE_THROW_SPEC ((ACEXML_SAXException)); /** * Parse an XML element. The first character encountered should @@ -255,35 +209,39 @@ public: * can be used in a validator. */ void parse_element (int is_root ACEXML_ENV_ARG_DECL) - ACE_THROW_SPEC ((ACEXML_SAXException)) - ; + ACE_THROW_SPEC ((ACEXML_SAXException)); /** - * Parse XML Prolog. + * Parse a content declaration. + * */ - void parse_xml_prolog (ACEXML_ENV_SINGLE_ARG_DECL) + int parse_content (const ACEXML_Char* startname, const ACEXML_Char* ns_uri, + const ACEXML_Char* ns_lname + ACEXML_ENV_ARG_DECL) ACE_THROW_SPEC ((ACEXML_SAXException)); - /** * Parse a character reference, i.e., " " or "". The first * character encountered should be the '#' char. * * @param buf points to a character buffer for the result. - * @param len specifies the capacities of the buffer. + * + * @param len In/out argument which initially specifies the size of the + * buffer and is later set to the no. of characters in the reference. * * @retval 0 on success and -1 otherwise. */ - int parse_char_reference (ACEXML_Char *buf, size_t len); + int parse_char_reference (ACEXML_Char *buf, size_t& len); /** - * Parse an entity reference, i.e., "&". The first character - * encountered should be the character following '&'. + * Parse a reference name, i.e., foo in "&foo;" or "%foo;". The first + * character encountered should be the character following '&' or '%'. + * Effectively the same as @sa parse_name but we don't use the parser's + * obstack. Caller is responsible for deleting the memory. * - * @return A pointer to the resolved const ACEXML_String if success - * (previously defined), 0 otherwise. + * @retval A pointer to name of reference, 0 otherwise. */ - const ACEXML_String *parse_reference (void); + ACEXML_Char* parse_reference_name (void); /** * Parse a CDATA section. The first character should always be the first @@ -292,13 +250,21 @@ public: * @retval 0 on success. * @retval -1 if fail. */ - int parse_cdata (ACEXML_ENV_SINGLE_ARG_DECL); + int parse_cdata (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); /** * Parse a "markupdecl" section, this includes both "markupdecl" and * "DeclSep" sections in XML specification */ - int parse_internal_dtd (ACEXML_ENV_SINGLE_ARG_DECL); + int parse_internal_dtd (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); + + /** + * Skip over a comment. The first character encountered should always be + * the first '-' in the comment prefix "@<@!--". + */ + int parse_comment (void); /** * Parse an "ELEMENT" decl. The first character this method @@ -307,7 +273,8 @@ public: * * @retval 0 on success, -1 otherwise. */ - int parse_element_decl (ACEXML_ENV_SINGLE_ARG_DECL); + int parse_element_decl (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); /** * Parse an "ENTITY" decl. The first character this method expects @@ -315,7 +282,8 @@ public: * * @retval 0 on success, -1 otherwise. */ - int parse_entity_decl (ACEXML_ENV_SINGLE_ARG_DECL); + int parse_entity_decl (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); /** * Parse an "ATTLIST" decl. Thse first character this method @@ -324,7 +292,15 @@ public: * * @retval 0 on success, -1 otherwise. */ - int parse_attlist_decl (ACEXML_ENV_SINGLE_ARG_DECL); + int parse_attlist_decl (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); + + /** + * Parse a AttType declaration. + * + */ + int parse_atttype (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); /** *Parse a "NOTATION" decl. The first character this method @@ -333,7 +309,8 @@ public: * * @retval 0 on success, -1 otherwise. */ - int parse_notation_decl (ACEXML_ENV_SINGLE_ARG_DECL); + int parse_notation_decl (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); /** * Parse an ExternalID or a reference to PUBLIC ExternalID. @@ -355,8 +332,81 @@ public: * * @retval 0 on success, -1 otherwise. */ - int parse_external_id_and_ref (ACEXML_Char *&publicId, - ACEXML_Char *&systemId ACEXML_ENV_ARG_DECL); + int parse_external_id (ACEXML_Char *&publicId, ACEXML_Char *&systemId + ACEXML_ENV_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); + + /** + * Parse an external DTD. + * + */ + int parse_external_dtd (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); + + /** + * Parse an external subset. This does the actual parsing of an external + * subset and is called by @sa parse_external_dtd. + * + */ + int parse_external_subset (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); + + /** + * Parse a markupDecl section. + * + */ + int parse_markup_decl (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); + + /** + * Parse a conditionalSect declaration. + * + */ + int parse_conditional_section (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); + + /** + * Parse a includeSect declaration. + * + */ + int parse_includesect (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); + + /** + * + * Parse a ignoreSect declaration. + */ + int parse_ignoresect (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); + + /** + * Parse a PEReference. + * + */ + int parse_PE_reference (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); + + /** + * Parse a Reference. + * + */ + int parse_entity_reference (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); + + /** + * Parse an entityValue. + * + */ + int parse_entity_value (ACEXML_Char *&str ACEXML_ENV_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); + + /** + * Parse a DefaultDecl specification. + * + */ + int parse_defaultdecl (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); + /** * Parse the "children" and "Mixed" non-terminals in contentspec. @@ -366,7 +416,8 @@ public: * * @retval 0 on success, -1 otherwise. */ - int parse_children_definition (ACEXML_ENV_SINGLE_ARG_DECL); + int parse_children_definition (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); /** * Parse a @c cp non-terminal. @c cp can either be a @c seq or a @c choice. @@ -378,81 +429,259 @@ public: * * @retval 0 on success, -1 otherwise. */ - int parse_child (int skip_open_paren ACEXML_ENV_ARG_DECL); + int parse_child (int skip_open_paren ACEXML_ENV_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); -protected: - /// Get a character. - ACEXML_Char get (void); + /** + * Parse a name from the input CharStream. If @a ch @!= 0, then we have + * already consumed the first name character from the input CharStream, + * otherwise, parse_name will use this->get() to acquire the initial + * character. + * + * @return A pointer to the string in the obstack, 0 if it's not a + * valid name. + */ + ACEXML_Char *parse_name (ACEXML_Char ch = 0); - /// Peek a character. - ACEXML_Char peek (void); + /** + * Parse a NMTOKEN from the input stream. + * + * @return A pointer to the string in the obstack, 0 if it's not a valid + * NMTOKEN. + */ + ACEXML_Char* parse_nmtoken (ACEXML_Char ch = 0); /** - * Check if more data can be added to a character buffer in obstack. - * If not, the existing data in the buffer will be cleared out by - * freezing the segment and pass it out thru a content_handler_->characters () - * call. @a counter records the length of the existing data in - * obstack. + * Parse the version string in an XML Prolog section. + * + * @param str String containing the version number if successful. + * @return 0 if the string was read successfully, 0 otherwise. */ - int try_grow_cdata (size_t size, size_t &len ACEXML_ENV_ARG_DECL); + int parse_version (ACEXML_Char*& str); - // Feature names: + /** + * Parse the version number in a VersionInfo declaration. + */ + int parse_version_num (ACEXML_Char*& str); /** - * \addtogroup acexml_parser_features - * @{ + * Parse the encoding name in an XML Prolog section. + * + * @param str String containing the encoding name if successful. + * @return 0 if the string was read successfully, 0 otherwise. */ + int parse_encname (ACEXML_Char*& str); /** - * @var simple_parsing_feature_ + * Parse a SDDecl string. * - * This constant string defines the name of "simple XML parsing" - * feature. When this feature is enabled, ACEXML parser is allowed - * to parse a simple XML stream without mandated XML prolog - * and no DTD defintion. + * @param str String containing the encoding name if successful. + * @return 0 if the string was read successfully, -1 otherwise. */ - static const ACEXML_Char simple_parsing_feature_[]; + int parse_sddecl (ACEXML_Char*& str); /** - * @var namespaces_feature_ + * Parse an attribute name. * - * This constant string defines the SAX XML Namespace feature. When this - * feature is enabled, ACEXML parser allows access by namespace qualified - * names. + * @retval str String containing the value of the attribute name + * if successful. + * @retval 0 otherwise. */ - static const ACEXML_Char namespaces_feature_[]; + ACEXML_Char* parse_attname (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); /** - * @var namespace_prefixes_feature_ + * Parse an attribute value. * - * This constant string defines the SAX XML Namespace prefixes feature. - * Normally the list of attributes returned by the parser will not - * contain attributes used as namespace declarations (xmlns*). When this - * feature is enabled, the list of attributes contains the namespace - * declarations also. + * @param str String containing the value of the attribute if successful. + * @return 0 if attribute value was read successfully, -1 otherwise. */ - static const ACEXML_Char namespace_prefixes_feature_[]; + int parse_attvalue (ACEXML_Char*& str ACEXML_ENV_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); - /* @} */ + /** + * Parse a tokenized type attribute. + * + * @return 0 if attribute type was read successfully, -1 otherwise. + */ + int parse_tokenized_type (ACEXML_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); + + /** + * Parse a SystemLiteral. + * + * @param str String containing the SystemLiteral if successful. + * @return 0 if the string was read successfully, 0 otherwise. + */ + int parse_system_literal (ACEXML_Char*& str); + + /** + * Parse a PubidLiteral. + * + * @param str String containing the PubidLiteral if successful. + * @return 0 if the string was read successfully, 0 otherwise. + */ + int parse_pubid_literal (ACEXML_Char*& str); + + /** + * Check if a character @a c is a whitespace. + * + * @retval 1 if @a c is a valid white space character. 0 otherwise. + */ + int is_whitespace (const ACEXML_Char c) const; + + /** + * Check if a character @a c is a valid Char. + * + * @retval 1 if @a c is a valid character. 0 otherwise. + */ + int isChar (ACEXML_UCS4 c) const; + + /** + * Check if a character @a c is a valid CharRef character. + * + * @retval 1 if @a c is a valid character reference character, 0 otherwise. + */ + int isCharRef (const ACEXML_Char c) const; + + /** + * Check if a character @a c is a BaseChar. + * + * @retval 1 if @a c is a valid BaseChar character, 0 otherwise. + */ + int isBasechar (const ACEXML_Char c) const; + + /** + * Check if a character @a c is a Ideographic. + * + * @retval 1 if @a c is a valid Ideographic character, 0 otherwise. + */ + int isIdeographic (const ACEXML_Char c) const; + + /** + * Check if a character @a c is a CombiningChar. + * + * @retval 1 if @a c is a valid CombiningChar character, 0 otherwise. + */ + int isCombiningchar (const ACEXML_Char c) const; + + /** + * Check if a character @a c is a Digit. + * + * @retval 1 if @a c is a valid Digit character, 0 otherwise. + */ + int isDigit (const ACEXML_Char c) const; + + /** + * Check if a character @a c is an Extender. + * + * @retval 1 if @a c is a valid Extender character, 0 otherwise. + */ + int isExtender (const ACEXML_Char c) const; + + /** + * Check if a character @a c is a Letter. + * + * @retval 1 if @a c is a valid Letter character, 0 otherwise. + */ + int isLetter (const ACEXML_Char c) const; + + /** + * Check if a character is an acceptable NameChar. + * + * @retval 1 if @a c is a valid NameChar character, 0 otherwise. + */ + int isNameChar (const ACEXML_Char c) const; + + /** + * Check if a character is a PubidChar. + * + * @retval 1 if @a c is a valid PubidChar character, 0 otherwise. + */ + int isPubidChar (const ACEXML_Char c) const; + + /// Get a character. + virtual ACEXML_Char get (void); + + /// Peek a character. + virtual ACEXML_Char peek (void); private: + + // *** Helper functions for parsing XML + + /** + * Skip any whitespaces encountered until the first non-whitespace + * character is encountered. + * + * @return The next non-whitespace character from the CharStream. + * + * @sa skip_whitespace_count + */ + ACEXML_Char skip_whitespace (void); + + /** + * Skip any whitespaces encountered until the first non-whitespace + * character. The first non-whitespace character is not consumed. + * This method does peek into the input CharStream and therefore + * is more expensive than @ref skip_whitespace. + * + * @param peek If non-null, @a peek points to a ACEXML_Char where + * skip_whitespace_count stores the first non-whitespace + * character it sees (character is not removed from the stream.) + * + * @return The number of whitespace characters consumed. + * + * @sa skip_whitespace + */ + int skip_whitespace_count (ACEXML_Char *peek = 0); + + /** + * Skip an equal sign. + * + * @retval 0 when succeeds, -1 if no equal sign is found. + */ + int skip_equal (void); + + /** + * Get a quoted string. Quoted strings are used to specify + * attribute values and this routine will replace character and + * entity references on-the-fly. Parameter entities are not allowed + * (or replaced) in this function. (But regular entities are.) + * + * @param str returns the un-quoted string. + * + * @retval 0 on success, -1 otherwise. + */ + int get_quoted_string (ACEXML_Char *&str); + + /** + * Check if a character @a c is a Digit. + * + * @retval 1 if @a c is a valid Digit character, 0 otherwise. + */ + int isNormalDigit (const ACEXML_Char c) const; + /** * Dispatch errors to ErrorHandler. * */ - void report_error (const ACEXML_Char* message ACEXML_ENV_ARG_DECL); + void error (const ACEXML_Char* msg ACEXML_ENV_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); /** * Dispatch warnings to ErrorHandler. * */ - void report_warning (const ACEXML_Char* message ACEXML_ENV_ARG_DECL); + void warning (const ACEXML_Char* msg ACEXML_ENV_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); /** * Dispatch fatal errors to ErrorHandler. * */ - void report_fatal_error (const ACEXML_Char* message ACEXML_ENV_ARG_DECL); + void fatal_error (const ACEXML_Char* msg ACEXML_ENV_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); /** * Dispatch prefix mapping calls to the ContentHandler. @@ -462,15 +691,112 @@ private: * @param name Local name * @param start 1 => startPrefixMapping 0 => endPrefixMapping */ - void report_prefix_mapping (const ACEXML_Char* prefix, + void prefix_mapping (const ACEXML_Char* prefix, const ACEXML_Char* uri, const ACEXML_Char* name, - int start ACEXML_ENV_ARG_DECL); + int start ACEXML_ENV_ARG_DECL) + ACE_THROW_SPEC ((ACEXML_SAXException)); /** * Parse a keyword. */ int parse_token (const ACEXML_Char* keyword); + /** + * Push the current context on to the stack. + * + */ + int push_context (ACEXML_Parser_Context* context); + + /** + * Pop the top element in the stack and replace current context with that. + */ + int pop_context (int GE_ref ACEXML_ENV_ARG_DECL); + + /** + * Create a new ACEXML_CharStream from @a systemId and @a publicId and + * replace the current input stream with the newly created stream. + */ + virtual int switch_input (ACEXML_CharStream* cstream, + const ACEXML_Char* systemId = 0, + const ACEXML_Char* publicId = 0); + /** + * Create a new ACEXML_InputSource from @a systemId and @a publicId and + * replace the current input source with the newly created InputSource. + */ + virtual int switch_input (ACEXML_InputSource* input, + const ACEXML_Char* systemId = 0, + const ACEXML_Char* publicId = 0); + + /** + * Check for a parameter entity reference. This is used to check for the + * occurence of a PE Reference withing markupDecl. Additionally this + * function consumes any leading or trailing whitespace around the PE + * Reference. + * + * @retval Number of whitespace characters skipped. + */ + int check_for_PE_reference (ACEXML_ENV_SINGLE_ARG_DECL); + + /** + * Reset the parser state. + * + */ + void reset (void); + + /** + * Very trivial, non-conformant normalization of a systemid. + * + */ + ACEXML_Char* normalize_systemid (const char* systemId); + + // Feature names: + + /** + * \addtogroup acexml_parser_features + * @{ + */ + + /** + * @var simple_parsing_feature_ + * + * This constant string defines the name of "simple XML parsing" + * feature. When this feature is enabled, ACEXML parser is allowed + * to parse a simple XML stream without mandated XML prolog + * and no DTD defintion. + */ + static const ACEXML_Char simple_parsing_feature_[]; + + /** + * @var namespaces_feature_ + * + * This constant string defines the SAX XML Namespace feature. When this + * feature is enabled, ACEXML parser allows access by namespace qualified + * names. + */ + static const ACEXML_Char namespaces_feature_[]; + + /** + * @var namespace_prefixes_feature_ + * + * This constant string defines the SAX XML Namespace prefixes feature. + * Normally the list of attributes returned by the parser will not + * contain attributes used as namespace declarations (xmlns*). When this + * feature is enabled, the list of attributes contains the namespace + * declarations also. + */ + static const ACEXML_Char namespace_prefixes_feature_[]; + + /** + * @var validation_feature_ + * + * This constant string defines the SAX XML Validation feature. When + * this feature is enabled, the parser validates the document in + * addition to checking for well-formedness. + */ + static const ACEXML_Char validation_feature_[]; + + /* @} */ + /// Keeping track of the handlers. We do not manage the memory for /// handlers. ACEXML_DTDHandler *dtd_handler_; @@ -478,33 +804,96 @@ private: ACEXML_ContentHandler *content_handler_; ACEXML_ErrorHandler *error_handler_; - /// @@ Feature and properties management structure here. - /// Current input char stream. - ACEXML_CharStream *instream_; - - /// My doctype, if any. + /// Document Type ACEXML_Char *doctype_; - /// External DTD System Literal, if any. - ACEXML_Char *dtd_system_; + /// Current parser context + ACEXML_Parser_Context* current_; + + /// Stack used to hold the Parser_Context + ACE_Unbounded_Stack<ACEXML_Parser_Context*> ctx_stack_; + + /* + * The following two are essentially chains of references and is used by + * the parser to determine if there is any recursion. We keep two of + * these one for general entities and one for parameter entities, as they + * both fall under different namespaces. + * + */ + /// Set used to hold the general entity references that are active. + ACE_Unbounded_Stack<ACEXML_String> GE_reference_; - /// External DTD Public Literal, if any. - ACEXML_Char *dtd_public_; + /// Set used to hold the parameter entity references that are active. + ACE_Unbounded_Stack<ACEXML_String> PE_reference_; + /// Obstack used by the parser to hold all the strings parsed ACE_Obstack_T<ACEXML_Char> obstack_; + /// Alternative obstack used to hold any strings when the original is in use + ACE_Obstack_T<ACEXML_Char> alt_stack_; + + /// Namespace stack used by the parser to implement support for Namespaces ACEXML_NamespaceSupport xml_namespace_; - ACEXML_Entity_Manager entities_; + /// T => We are processing a nested namespace + int nested_namespace_; + + /// Set of internal parsed general entities in the document + ACEXML_Entity_Manager internal_GE_; + + /// Set of external parsed general entities in the document + ACEXML_Entity_Manager external_GE_; + + /// Set of unparsed entities in the document + ACEXML_Entity_Manager unparsed_entities_; + + /// Set of predefined entities used by the parser + ACEXML_Entity_Manager predef_entities_; + + /// Set of internal parsed parameter entities in the document + ACEXML_Entity_Manager internal_PE_; - // Locator - ACEXML_LocatorImpl locator_; + /// Set of external parsed parameter entities in the document + ACEXML_Entity_Manager external_PE_; - // Feature flags & + /// Set of notations declared in the document + ACEXML_Entity_Manager notations_; + + /// State of the parser when it encounters a reference. + ACEXML_ParserInt::ReferenceState ref_state_; + + /// T => We are parsing an external subset + int external_subset_; + + /// T => We are parsing an external entity value + int external_entity_; + + /// T => Internal DTD has parameter entity references + int has_pe_refs_; + + /// Feature flags + /// If set, the parser should parse a document without a prolog int simple_parsing_; + + /// If set, the parser should also validate + int validate_; + + /// If set, the parser should allow access by namespace qualified names. int namespaces_; + + /// If set, the parser should include namespace declarations in the list + /// of attributes of an element. int namespace_prefixes_; + /// If set, the document is a standalone XML document + int standalone_; + + /// If set, the document has an external DTD subset + int external_dtd_; + + /// If set, the document has an internal DTD + int internal_dtd_; + }; #if defined (__ACEXML_INLINE__) diff --git a/ACEXML/parser/parser/Parser.i b/ACEXML/parser/parser/Parser.i index 5b6f072fba0..dd6231c8a90 100644 --- a/ACEXML/parser/parser/Parser.i +++ b/ACEXML/parser/parser/Parser.i @@ -57,49 +57,113 @@ ACEXML_Parser::setErrorHandler (ACEXML_ErrorHandler *handler) } ACEXML_INLINE int -ACEXML_Parser::is_whitespace (ACEXML_Char c) +ACEXML_Parser::isChar (const ACEXML_UCS4 c) const { - switch (c) + return (c == 0x9 || c == 0xA || c == 0xD || + c >= 0x20 && c <= 0xD7FF || + c >= 0xE000 && c <= 0xFFFD || + c >= 0x10000 && c <= 0x10FFFF); +} + +ACEXML_INLINE int +ACEXML_Parser::isCharRef (const ACEXML_Char c) const { - case 0xa: - case 0x20: - case 0x9: - case 0xd: - return 1; - default: + return ((c >= 'a' && c <= 'f') || + (c >= 'A' && c <= 'F')); +} + +ACEXML_INLINE int +ACEXML_Parser::isNormalDigit (const ACEXML_Char c) const +{ + return (c >= '\x30' && c <= '\x39'); +} + +ACEXML_INLINE int +ACEXML_Parser::isBasechar (const ACEXML_Char c) const +{ +#if defined (ACE_USES_WCHAR) + return ACEXML_ParserInt::isBasechar_i (c); +#else + return ACEXML_ParserInt::base_char_table_[c]; +#endif /* ACE_USES_WCHAR */ +} + +ACEXML_INLINE int +ACEXML_Parser::isIdeographic (const ACEXML_Char c) const +{ +#if defined (ACE_USES_WCHAR) + return ACEXML_ParserInt::isIdeographic_i (c); +#else + ACE_UNUSED_ARG (c); + return 0; +#endif /* ACE_USES_WCHAR */ +} + +ACEXML_INLINE int +ACEXML_Parser::isCombiningchar (const ACEXML_Char c) const +{ +#if defined (ACE_USES_WCHAR) + return ACEXML_ParserInt::isCombiningchar_i (c); +#else + ACE_UNUSED_ARG (c); return 0; +#endif /* ACE_USES_WCHAR */ } + +ACEXML_INLINE int +ACEXML_Parser::isDigit (const ACEXML_Char c) const +{ +#if defined (ACE_USES_WCHAR) + return ACEXML_ParserInt::isDigit_i (c); +#else + return (this->isNormalDigit (c)); +#endif /* ACE_USES_WCHAR */ +} + +ACEXML_INLINE int +ACEXML_Parser::isExtender (const ACEXML_Char c) const +{ +#if defined (ACE_USES_WCHAR) + return ACEXML_ParserInt::isExtender_i (c); +#else + return (c == '\xB7'); +#endif /* ACE_USES_WCHAR */ } +ACEXML_INLINE int +ACEXML_Parser::isLetter (const ACEXML_Char c) const +{ + return (this->isBasechar (c) || this->isIdeographic (c)); +} ACEXML_INLINE int -ACEXML_Parser::is_whitespace_or_equal (ACEXML_Char c) +ACEXML_Parser::isNameChar (const ACEXML_Char c) const { - return (is_whitespace (c) || c == '=') ? 1 : 0; + return (this->isLetter (c) || this->isDigit (c) || c == '.' || c == '-' || + c == '_' || c == ':' || this->isCombiningchar (c) || + this->isExtender (c)); } ACEXML_INLINE int -ACEXML_Parser::is_nonname (ACEXML_Char c) +ACEXML_Parser::isPubidChar (const ACEXML_Char c) const { - // Handle this separately as doing so avoids code duplication and enables - // setting of line and column numbers in one place. - if (is_whitespace_or_equal (c)) - return 1; + return (c == '\x20' || c == '\x0D' || c == '\x0A' || + (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || + (c >= '0' && c <= '9') || c == '-' || c == '\'' || c == '(' || + c == ')' || c == '+' || c == ',' || c == '.' || c == '/' || + c == ':' || c == '=' || c == '?' || c == ';' || c == '!' || + c == '*' || c == '#' || c == '@' || c == '$' || c == '_' || + c == '%'); +} + +ACEXML_INLINE int +ACEXML_Parser::is_whitespace (const ACEXML_Char c) const +{ switch (c) { - case '/': - case '?': - case '>': - case '<': - case ')': - case '(': - case '+': - case '*': - case '\'': - case '"': - case ',': - case '|': + case '\x0A': case '\x20': + case '\x09': case '\x0D': return 1; default: return 0; @@ -107,19 +171,59 @@ ACEXML_Parser::is_nonname (ACEXML_Char c) } ACEXML_INLINE ACEXML_Char +ACEXML_Parser::skip_whitespace (void) +{ + ACEXML_Char ch = this->get(); + while (this->is_whitespace (ch)) + ch = this->get (); + return ch; +} + + +ACEXML_INLINE int +ACEXML_Parser::skip_whitespace_count (ACEXML_Char *peeky) +{ + int wscount = 0; + ACEXML_Char dummy; + ACEXML_Char &forward = (peeky == 0 ? dummy : *peeky); + + for (;this->is_whitespace ((forward = this->peek ())); ++wscount) + this->get (); + return wscount; +} + +ACEXML_INLINE int +ACEXML_Parser::skip_equal (void) +{ + if (this->skip_whitespace() != '=') + return -1; + while (this->is_whitespace (this->peek())) + this->get(); + return 0; +} + +ACEXML_INLINE ACEXML_Char ACEXML_Parser::get (void) { - // Using an extra level of indirection so we can - // manage document location in the future. + ACEXML_Char ch = 0; + const ACEXML_InputSource* ip = this->current_->getInputSource(); + ACEXML_CharStream* instream = ip->getCharStream(); - if (this->instream_ != 0) + if (instream->get (ch) != -1) { - ACEXML_Char ch; - this->instream_->get (ch); - this->locator_.incrColumnNumber(); - if (ch == 0x0A) { - this->locator_.incrLineNumber(); - this->locator_.setColumnNumber (0); + this->current_->getLocator()->incrColumnNumber(); + // Normalize white-space + if (ch == '\x0D') + { + if (instream->peek() == 0x0A) + instream->get (ch); + ch = '\x0A'; + } + if (ch == '\x0A') + { + // Reset column number and increment Line Number. + this->current_->getLocator()->incrLineNumber(); + this->current_->getLocator()->setColumnNumber (0); } return ch; } @@ -131,9 +235,24 @@ ACEXML_Parser::peek (void) { // Using an extra level of indirection so we can // manage document location in the future. + ACEXML_Char ch = 0; + const ACEXML_InputSource* ip = this->current_->getInputSource(); + ACEXML_CharStream* instream = ip->getCharStream(); + ch = instream->peek (); + return (ch == -1 ? 0 : ch); +} - if (this->instream_ != 0) - return this->instream_->peek (); +ACEXML_INLINE int +ACEXML_Parser::parse_token (const ACEXML_Char* keyword) +{ + if (keyword == 0) + return -1; + const ACEXML_Char* ptr = keyword; + ACEXML_Char ch; + for (; *ptr != 0 && ((ch = this->get()) == *ptr); ++ptr) + ; + if (*ptr == 0) return 0; - + else + return -1; } diff --git a/ACEXML/parser/parser/ParserContext.cpp b/ACEXML/parser/parser/ParserContext.cpp new file mode 100644 index 00000000000..fd0792677fb --- /dev/null +++ b/ACEXML/parser/parser/ParserContext.cpp @@ -0,0 +1,15 @@ +// $Id$ + +#include "ACEXML/parser/parser/ParserContext.h" + +#if !defined (__ACEXML_INLINE__) +# include "ACEXML/parser/parser/ParserContext.inl" +#endif /* __ACEXML_INLINE__ */ + +ACEXML_Parser_Context::~ACEXML_Parser_Context() +{ + delete this->instream_; + this->instream_ = 0; + delete this->locator_; + this->locator_ = 0; +} diff --git a/ACEXML/parser/parser/ParserContext.h b/ACEXML/parser/parser/ParserContext.h new file mode 100644 index 00000000000..3e62e8f532b --- /dev/null +++ b/ACEXML/parser/parser/ParserContext.h @@ -0,0 +1,78 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file ParserContext.h + * + * $Id$ + * + * @author Krishnakumar B <kitty@cs.wustl.edu> + */ +//============================================================================= + +#ifndef ACEXML_PARSER_CONTEXT_H +#define ACEXML_PARSER_CONTEXT_H + +#include "ace/pre.h" +#include "ACEXML/parser/parser/Parser_export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "ACEXML/common/XML_Types.h" +#include "ACEXML/common/InputSource.h" +#include "ACEXML/common/Locator.h" +#include "ACEXML/common/LocatorImpl.h" +#include "ace/Functor.h" +#include "ace/Containers_T.h" + +class ACEXML_PARSER_Export ACEXML_Parser_Context +{ +public: + /// Default constructor + ACEXML_Parser_Context(); + + /// Constructor which initializes the context + ACEXML_Parser_Context (ACEXML_InputSource* instream, + ACEXML_LocatorImpl* locator); + + /// Copy constructor + ACEXML_Parser_Context (const ACEXML_Parser_Context& src); + + /// Assignment operator + ACEXML_Parser_Context& operator= (const ACEXML_Parser_Context& src); + + /// Comparison operator + int operator!= (const ACEXML_Parser_Context& src); + + /// Destructor + virtual ~ACEXML_Parser_Context(); + + /// Reset the parser context. This does not free up the memory. Only sets + /// it to zero. Meant to be called after a context is pushed on to a + /// stack. + void reset (void); + + /// Get the underlying input source. + virtual ACEXML_InputSource* getInputSource(void); + + /// Get the underlying locator. + virtual ACEXML_LocatorImpl* getLocator(void); + +private: + + /// Current input char stream. + ACEXML_InputSource *instream_; + + /// Current Locator which provides line no., column no. systemId and publicId + ACEXML_LocatorImpl* locator_; +}; + +#if defined (__ACEXML_INLINE__) +# include "ACEXML/parser/parser/ParserContext.inl" +#endif /* __ACEXML_INLINE__ */ + +#include "ace/post.h" + +#endif /* ACEXML_PARSER_CONTEXT_H */ diff --git a/ACEXML/parser/parser/ParserContext.inl b/ACEXML/parser/parser/ParserContext.inl new file mode 100644 index 00000000000..adbfe099bc2 --- /dev/null +++ b/ACEXML/parser/parser/ParserContext.inl @@ -0,0 +1,67 @@ +// $Id$ + + +ACEXML_INLINE +ACEXML_Parser_Context::ACEXML_Parser_Context() + : instream_ (0), + locator_ (0) +{ + +} + +ACEXML_INLINE +ACEXML_Parser_Context::ACEXML_Parser_Context (ACEXML_InputSource* instream, + ACEXML_LocatorImpl* locator) + : instream_ (instream), + locator_ (locator) +{ + +} + +ACEXML_INLINE +ACEXML_Parser_Context::ACEXML_Parser_Context (const ACEXML_Parser_Context& src) + : instream_ (src.instream_), + locator_ (src.locator_) +{ + +} + +ACEXML_INLINE int +ACEXML_Parser_Context::operator!= (const ACEXML_Parser_Context& src) +{ + return (this->instream_ != src.instream_ && this->locator_ != src.locator_); +} + +ACEXML_INLINE ACEXML_Parser_Context& +ACEXML_Parser_Context::operator= (const ACEXML_Parser_Context& src) +{ + if (*this != src) + { + delete this->instream_; + delete this->locator_; + this->instream_ = src.instream_; + this->locator_ = src.locator_; + } + return *this; +} + + + +ACEXML_INLINE ACEXML_InputSource* +ACEXML_Parser_Context::getInputSource (void) +{ + return this->instream_; +}; + +ACEXML_INLINE ACEXML_LocatorImpl* +ACEXML_Parser_Context::getLocator (void) +{ + return this->locator_; +} + +ACEXML_INLINE void +ACEXML_Parser_Context::reset (void) +{ + this->instream_ = 0; + this->locator_ = 0; +} diff --git a/ACEXML/parser/parser/ParserInternals.cpp b/ACEXML/parser/parser/ParserInternals.cpp new file mode 100644 index 00000000000..e6a75bd6d3f --- /dev/null +++ b/ACEXML/parser/parser/ParserInternals.cpp @@ -0,0 +1,394 @@ +// $Id$ + +#include "ACEXML/parser/parser/ParserInternals.h" + + +const ACEXML_Char* ACEXML_ParserInt::predef_ent_[] = { + ACE_TEXT ("amp"), + ACE_TEXT ("lt"), + ACE_TEXT ("gt"), + ACE_TEXT ("apos"), + ACE_TEXT ("quot") +}; + +const ACEXML_Char* ACEXML_ParserInt::predef_val_[] = { + ACE_TEXT ("&"), + ACE_TEXT ("<"), + ACE_TEXT (">"), + ACE_TEXT ("'"), + ACE_TEXT ("\"") +}; + +// Optimize away the most common cases. Any compiler worth it's salt should +// give generate a single memory access. + +const ACEXML_Char ACEXML_ParserInt::base_char_table_[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0000 - 0x000F */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0010 - 0x001F */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0020 - 0x002F */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0030 - 0x003F */ + 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x0040 - 0x004F */ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, /* 0x0050 - 0x005F */ + 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x0060 - 0x006F */ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, /* 0x0070 - 0x007F */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0080 - 0x008F */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x0090 - 0x009F */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x00A0 - 0x00AF */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x00B0 - 0x00BF */ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x00C0 - 0x00CF */ + 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x00D0 - 0x00DF */ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x00E0 - 0x00EF */ + 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x00F0 - 0x00FF */ +}; + +#if defined (ACE_USES_WCHAR) + +int +ACEXML_ParserInt::isBasechar_i (const ACEXML_Char c) const +{ + if (c < 0x0100) + return ACEXML_ParserInt::base_char_table_[c]; + else if (c < 0x0905) + return ((c >= 0x0100 && c <= 0x0131) || + (c >= 0x0134 && c <= 0x013E) || + (c >= 0x0141 && c <= 0x0148) || + (c >= 0x014A && c <= 0x017E) || + (c >= 0x0180 && c <= 0x01C3) || + (c >= 0x01CD && c <= 0x01F0) || + (c >= 0x01F4 && c <= 0x01F5) || + (c >= 0x01FA && c <= 0x0217) || + (c >= 0x0250 && c <= 0x02A8) || + (c >= 0x02BB && c <= 0x02C1) || + (c == 0x0386) || + (c >= 0x0388 && c <= 0x038A) || + (c == 0x038C) || + (c >= 0x038E && c <= 0x03A1) || + (c >= 0x03A3 && c <= 0x03CE) || + (c >= 0x03D0 && c <= 0x03D6) || + (c == 0x03DA) || + (c == 0x03DC) || + (c == 0x03DE) || + (c == 0x03E0) || + (c >= 0x03E2 && c <= 0x03F3) || + (c >= 0x0401 && c <= 0x040C) || + (c >= 0x040E && c <= 0x044F) || + (c >= 0x0451 && c <= 0x045C) || + (c >= 0x045E && c <= 0x0481) || + (c >= 0x0490 && c <= 0x04C4) || + (c >= 0x04C7 && c <= 0x04C8) || + (c >= 0x04CB && c <= 0x04CC) || + (c >= 0x04D0 && c <= 0x04EB) || + (c >= 0x04EE && c <= 0x04F5) || + (c >= 0x04F8 && c <= 0x04F9) || + (c >= 0x0531 && c <= 0x0556) || + (c == 0x0559) || + (c >= 0x0561 && c <= 0x0586) || + (c >= 0x05D0 && c <= 0x05EA) || + (c >= 0x05F0 && c <= 0x05F2) || + (c >= 0x0621 && c <= 0x063A) || + (c >= 0x0641 && c <= 0x064A) || + (c >= 0x0671 && c <= 0x06B7) || + (c >= 0x06BA && c <= 0x06BE) || + (c >= 0x06C0 && c <= 0x06CE) || + (c >= 0x06D0 && c <= 0x06D3) || + (c == 0x06D5) || + (c >= 0x06E5 && c <= 0x06E6)); + else if (c < 0x10A0) + return ((c >= 0x0905 && c <= 0x0939) || + (c == 0x093D) || + (c >= 0x0958 && c <= 0x0961) || + (c >= 0x0985 && c <= 0x098C) || + (c >= 0x098F && c <= 0x0990) || + (c >= 0x0993 && c <= 0x09A8) || + (c >= 0x09AA && c <= 0x09B0) || + (c == 0x09B2) || + (c >= 0x09B6 && c <= 0x09B9) || + (c >= 0x09DC && c <= 0x09DD) || + (c >= 0x09DF && c <= 0x09E1) || + (c >= 0x09F0 && c <= 0x09F1) || + (c >= 0x0A05 && c <= 0x0A0A) || + (c >= 0x0A0F && c <= 0x0A10) || + (c >= 0x0A13 && c <= 0x0A28) || + (c >= 0x0A2A && c <= 0x0A30) || + (c >= 0x0A32 && c <= 0x0A33) || + (c >= 0x0A35 && c <= 0x0A36) || + (c >= 0x0A38 && c <= 0x0A39) || + (c >= 0x0A59 && c <= 0x0A5C) || + (c == 0x0A5E) || + (c >= 0x0A72 && c <= 0x0A74) || + (c >= 0x0A85 && c <= 0x0A8B) || + (c == 0x0A8D) || + (c >= 0x0A8F && c <= 0x0A91) || + (c >= 0x0A93 && c <= 0x0AA8) || + (c >= 0x0AAA && c <= 0x0AB0) || + (c >= 0x0AB2 && c <= 0x0AB3) || + (c >= 0x0AB5 && c <= 0x0AB9) || + (c == 0x0ABD || c == 0x0AE0) || + (c >= 0x0B05 && c <= 0x0B0C) || + (c >= 0x0B0F && c <= 0x0B10) || + (c >= 0x0B13 && c <= 0x0B28) || + (c >= 0x0B2A && c <= 0x0B30) || + (c >= 0x0B32 && c <= 0x0B33) || + (c >= 0x0B36 && c <= 0x0B39) || + (c == 0x0B3D) || + (c >= 0x0B5C && c <= 0x0B5D) || + (c >= 0x0B5F && c <= 0x0B61) || + (c >= 0x0B85 && c <= 0x0B8A) || + (c >= 0x0B8E && c <= 0x0B90) || + (c >= 0x0B92 && c <= 0x0B95) || + (c >= 0x0B99 && c <= 0x0B9A) || + (c == 0x0B9C) || + (c >= 0x0B9E && c <= 0x0B9F) || + (c >= 0x0BA3 && c <= 0x0BA4) || + (c >= 0x0BA8 && c <= 0x0BAA) || + (c >= 0x0BAE && c <= 0x0BB5) || + (c >= 0x0BB7 && c <= 0x0BB9) || + (c >= 0x0C05 && c <= 0x0C0C) || + (c >= 0x0C0E && c <= 0x0C10) || + (c >= 0x0C12 && c <= 0x0C28) || + (c >= 0x0C2A && c <= 0x0C33) || + (c >= 0x0C35 && c <= 0x0C39) || + (c >= 0x0C60 && c <= 0x0C61) || + (c >= 0x0C85 && c <= 0x0C8C) || + (c >= 0x0C8E && c <= 0x0C90) || + (c >= 0x0C92 && c <= 0x0CA8) || + (c >= 0x0CAA && c <= 0x0CB3) || + (c >= 0x0CB5 && c <= 0x0CB9) || + (c == 0x0CDE) || + (c >= 0x0CE0 && c <= 0x0CE1) || + (c >= 0x0D05 && c <= 0x0D0C) || + (c >= 0x0D0E && c <= 0x0D10) || + (c >= 0x0D12 && c <= 0x0D28) || + (c >= 0x0D2A && c <= 0x0D39) || + (c >= 0x0D60 && c <= 0x0D61) || + (c >= 0x0E01 && c <= 0x0E2E) || + (c == 0x0E30) || + (c >= 0x0E32 && c <= 0x0E33) || + (c >= 0x0E40 && c <= 0x0E45) || + (c >= 0x0E81 && c <= 0x0E82) || + (c == 0x0E84) || + (c >= 0x0E87 && c <= 0x0E88) || + (c == 0x0E8A || c == 0x0E8D) || + (c >= 0x0E94 && c <= 0x0E97) || + (c >= 0x0E99 && c <= 0x0E9F) || + (c >= 0x0EA1 && c <= 0x0EA3) || + (c == 0x0EA5 || c == 0x0EA7) || + (c >= 0x0EAA && c <= 0x0EAB) || + (c >= 0x0EAD && c <= 0x0EAE) || + (c == 0x0EB0) || + (c >= 0x0EB2 && c <= 0x0EB3) || + (c == 0x0EBD) || + (c >= 0x0EC0 && c <= 0x0EC4) || + (c >= 0x0F40 && c <= 0x0F47) || + (c >= 0x0F49 && c <= 0x0F69)); + else + return ((c >= 0x10A0 && c <= 0x10C5) || + (c >= 0x10D0 && c <= 0x10F6) || + (c == 0x1100) || + (c >= 0x1102 && c <= 0x1103) || + (c >= 0x1105 && c <= 0x1107) || + (c == 0x1109) || + (c >= 0x110B && c <= 0x110C) || + (c >= 0x110E && c <= 0x1112) || + (c == 0x113C || c == 0x113E || c == 0x1140) || + (c == 0x114C || c == 0x114E | c == 0x1150) || + (c >= 0x1154 && c <= 0x1155) || + (c == 0x1159) || + (c >= 0x115F && c <= 0x1161) || + (c == 0x1163) || + (c == 0x1165) || + (c == 0x1167) || + (c == 0x1169) || + (c >= 0x116D && c <= 0x116E) || + (c >= 0x1172 && c <= 0x1173) || + (c == 0x1175) || + (c == 0x119E) || + (c == 0x11A8) || + (c == 0x11AB) || + (c >= 0x11AE && c <= 0x11AF) || + (c >= 0x11B7 && c <= 0x11B8) || + (c == 0x11BA) || + (c >= 0x11BC && c <= 0x11C2) || + (c == 0x11EB) || + (c == 0x11F0) || + (c == 0x11F9) || + (c >= 0x1E00 && c <= 0x1E9B) || + (c >= 0x1EA0 && c <= 0x1EF9) || + (c >= 0x1F00 && c <= 0x1F15) || + (c >= 0x1F18 && c <= 0x1F1D) || + (c >= 0x1F20 && c <= 0x1F45) || + (c >= 0x1F48 && c <= 0x1F4D) || + (c >= 0x1F50 && c <= 0x1F57) || + (c == 0x1F59) || + (c == 0x1F5B) || + (c == 0x1F5D) || + (c >= 0x1F5F && c <= 0x1F7D) || + (c >= 0x1F80 && c <= 0x1FB4) || + (c >= 0x1FB6 && c <= 0x1FBC) || + (c == 0x1FBE) || + (c >= 0x1FC2 && c <= 0x1FC4) || + (c >= 0x1FC6 && c <= 0x1FCC) || + (c >= 0x1FD0 && c <= 0x1FD3) || + (c >= 0x1FD6 && c <= 0x1FDB) || + (c >= 0x1FE0 && c <= 0x1FEC) || + (c >= 0x1FF2 && c <= 0x1FF4) || + (c >= 0x1FF6 && c <= 0x1FFC) || + (c == 0x2126) || + (c >= 0x212A && c <= 0x212B) || + (c == 0x212E) || + (c >= 0x2180 && c <= 0x2182) || + (c >= 0x3041 && c <= 0x3094) || + (c >= 0x30A1 && c <= 0x30FA) || + (c >= 0x3105 && c <= 0x312C) || + (c >= 0xAC00 && c <= 0xD7A3)); +}; + +int +ACEXML_ParserInt::isIdeographic_i (const ACEXML_Char c) const +{ + return ((c >= 0x4E00 && c <= 0x9FA5) || + (c == 3007) || + (c >= 0x3021 && c <= 0x3029)); +} + +int +ACEXML_ParserInt::isCombiningchar_i (const ACEXML_Char c) const +{ + if (c < 0x0901) + return ((c >= 0x0300 && c <= 0x0345) || + (c >= 0x0360 && c <= 0x0361) || + (c >= 0x0483 && c <= 0x0486) || + (c >= 0x0591 && c <= 0x05A1) || + (c >= 0x05A3 && c <= 0x05B9) || + (c >= 0x05BB && c <= 0x05BD) || + (c == 0x05BF) || + (c >= 0x05C1 && c <= 0x05C2) || + (c == 0x05C4) || + (c >= 0x064B && c <= 0x0652) || + (c == 0x0670) || + (c >= 0x06D6 && c <= 0x06DC) || + (c >= 0x06DD && c <= 0x06DF) || + (c >= 0x06E0 && c <= 0x06E4) || + (c >= 0x06E7 && c <= 0x06E8) || + (c >= 0x06EA && c <= 0x06ED)); + else + return ((c >= 0x0901 && c <= 0x0903) || + (c == 0x093C) || + (c >= 0x093E && c <= 0x094C) || + (c == 0x094D) || + (c >= 0x0951 && c <= 0x0954) || + (c >= 0x0962 && c <= 0x0963) || + (c >= 0x0981 && c <= 0x0983) || + (c == 0x09BC) || + (c == 0x09BE) || + (c == 0x09BF) || + (c >= 0x09C0 && c <= 0x09C4) || + (c >= 0x09C7 && c <= 0x09C8) || + (c >= 0x09CB && c <= 0x09CD) || + (c == 0x09D7) || + (c >= 0x09E2 && c <= 0x09E3) || + (c == 0x0A02) || + (c == 0x0A3C) || + (c == 0x0A3E) || + (c == 0x0A3F) || + (c >= 0x0A40 && c <= 0x0A42) || + (c >= 0x0A47 && c <= 0x0A48) || + (c >= 0x0A4B && c <= 0x0A4D) || + (c >= 0x0A70 && c <= 0x0A71) || + (c >= 0x0A81 && c <= 0x0A83) || + (c == 0x0ABC) || + (c >= 0x0ABE && c <= 0x0AC5) || + (c >= 0x0AC7 && c <= 0x0AC9) || + (c >= 0x0ACB && c <= 0x0ACD) || + (c >= 0x0B01 && c <= 0x0B03) || + (c == 0x0B3C) || + (c >= 0x0B3E && c <= 0x0B43) || + (c >= 0x0B47 && c <= 0x0B48) || + (c >= 0x0B4B && c <= 0x0B4D) || + (c >= 0x0B56 && c <= 0x0B57) || + (c >= 0x0B82 && c <= 0x0B83) || + (c >= 0x0BBE && c <= 0x0BC2) || + (c >= 0x0BC6 && c <= 0x0BC8) || + (c >= 0x0BCA && c <= 0x0BCD) || + (c == 0x0BD7) || + (c >= 0x0C01 && c <= 0x0C03) || + (c >= 0x0C3E && c <= 0x0C44) || + (c >= 0x0C46 && c <= 0x0C48) || + (c >= 0x0C4A && c <= 0x0C4D) || + (c >= 0x0C55 && c <= 0x0C56) || + (c >= 0x0C82 && c <= 0x0C83) || + (c >= 0x0CBE && c <= 0x0CC4) || + (c >= 0x0CC6 && c <= 0x0CC8) || + (c >= 0x0CCA && c <= 0x0CCD) || + (c >= 0x0CD5 && c <= 0x0CD6) || + (c >= 0x0D02 && c <= 0x0D03) || + (c >= 0x0D3E && c <= 0x0D43) || + (c >= 0x0D46 && c <= 0x0D48) || + (c >= 0x0D4A && c <= 0x0D4D) || + (c == 0x0D57) || + (c == 0x0E31) || + (c >= 0x0E34 && c <= 0x0E3A) || + (c >= 0x0E47 && c <= 0x0E4E) || + (c == 0x0EB1) || + (c >= 0x0EB4 && c <= 0x0EB9) || + (c >= 0x0EBB && c <= 0x0EBC) || + (c >= 0x0EC8 && c <= 0x0ECD) || + (c >= 0x0F18 && c <= 0x0F19) || + (c == 0x0F35) || + (c == 0x0F37) || + (c == 0x0F39) || + (c == 0x0F3E) || + (c == 0x0F3F) || + (c >= 0x0F71 && c <= 0x0F84) || + (c >= 0x0F86 && c <= 0x0F8B) || + (c >= 0x0F90 && c <= 0x0F95) || + (c == 0x0F97) || + (c >= 0x0F99 && c <= 0x0FAD) || + (c >= 0x0FB1 && c <= 0x0FB7) || + (c == 0x0FB9) || + (c >= 0x20D0 && c <= 0x20DC) || + (c == 0x20E1) || + (c >= 0x302A && c <= 0x302F) || + (c == 0x3099) || + (c == 0x309A)); +} + +int +ACEXML_ParserInt::isDigit_i (const ACEXML_Char c) const +{ + if (c < 0x0040) + return (c >= 0x0030 && c <= 0x0039); + else + return ((c >= 0x0660 && c <= 0x0669) || + (c >= 0x06F0 && c <= 0x06F9) || + (c >= 0x0966 && c <= 0x096F) || + (c >= 0x09E6 && c <= 0x09EF) || + (c >= 0x0A66 && c <= 0x0A6F) || + (c >= 0x0AE6 && c <= 0x0AEF) || + (c >= 0x0B66 && c <= 0x0B6F) || + (c >= 0x0BE7 && c <= 0x0BEF) || + (c >= 0x0C66 && c <= 0x0C6F) || + (c >= 0x0CE6 && c <= 0x0CEF) || + (c >= 0x0D66 && c <= 0x0D6F) || + (c >= 0x0E50 && c <= 0x0E59) || + (c >= 0x0ED0 && c <= 0x0ED9) || + (c >= 0x0F20 && c <= 0x0F29)); +} + +int +ACEXML_ParserInt::isExtender_i (const ACEXML_Char c) const +{ + // The compiler should generate a jump table and index into it directly. + switch (c) + { + case 0x00B7: case 0x02D0: case 0x02D1: case 0x0387: case 0x0640: + case 0x0E46: case 0x0EC6: case 0x3005: case 0x3031: case 0x3032: + case 0x3033: case 0x3034: case 0x3035: case 0x309D: case 0x309E: + case 0x30FC: case 0x30FD: case 0x30FE: + return 1; + default: + return 0; + } +} + +#endif /* ACE_USES_WCHAR */ diff --git a/ACEXML/parser/parser/ParserInternals.h b/ACEXML/parser/parser/ParserInternals.h new file mode 100644 index 00000000000..9afecf93daa --- /dev/null +++ b/ACEXML/parser/parser/ParserInternals.h @@ -0,0 +1,104 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file ParserInternals.h + * + * $Id$ + * + * @author Krishnakumar B <kitty@cs.wustl.edu> + */ +//============================================================================= + +#ifndef _ACEXML_PARSER_INTERNALS_H_ +#define _ACEXML_PARSER_INTERNALS_H_ + +#include "ace/pre.h" +#include "ACEXML/parser/parser/Parser_export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "ACEXML/common/XML_Types.h" + +/** + * @class ACEXML_ParserInt ParserInternals.h "ACEXML/parser/parser/ParserInternals.h" + * + * @brief A class to hide some of the internal implementation details of + * the parser. + * + */ +class ACEXML_PARSER_Export ACEXML_ParserInt +{ + +public: +#if defined (ACE_USES_WCHAR) + + /** + * Check if a character @a c is a BaseChar. This method checks for the + * complete set of characters allowed when WCHAR support is enabled. + * + * @retval 1 if @a c is a valid XML Character, 0 otherwise. + */ + static int isBasechar_i (const ACEXML_Char c) const; + + /** + * Check if a character @a c is a Ideographic. This method checks for the + * complete set of characters allowed when WCHAR support is enabled. + * + * @retval 1 if @a c is a valid XML Character, 0 otherwise. + */ + static int isIdeographic_i (const ACEXML_Char c) const; + + /** + * Check if a character @a c is a CombiningChar. This method checks for the + * complete set of characters allowed when WCHAR support is enabled. + * + * @retval 1 if @a c is a valid XML Character, 0 otherwise. + */ + static int isCombiningchar_i (const ACEXML_Char c) const; + + /** + * Check if a character @a c is a Digit. This method checks for the + * complete set of characters allowed when WCHAR support is enabled. + * + * @retval 1 if @a c is a valid XML Character, 0 otherwise. + */ + static int isDigit_i (const ACEXML_Char c) const; + + /** + * Check if a character @a c is an Extender. This method checks for the + * complete set of characters allowed when WCHAR support is enabled. + * + * @retval 1 if @a c is a valid XML Character, 0 otherwise. + */ + static int isExtender_i (const ACEXML_Char c) const; + +#endif /* ACE_USES_WCHAR */ + + static const ACEXML_Char base_char_table_[256]; + + static const ACEXML_Char* msg_[]; + + static const ACEXML_Char* predef_ent_[]; + + static const ACEXML_Char* predef_val_[]; + + // Enum describing the position in a document when a reference occurs. + enum ReferenceState { + IN_CONTENT, + IN_ATT_VALUE, + AS_ATT_VALUE, + IN_ENTITY_VALUE, + IN_INT_DTD, + IN_EXT_DTD, + IN_NOTATION, + INVALID = -1 + }; + +}; + +#include "ace/post.h" + +#endif /* _ACEXML_PARSER_INTERNALS_H_ */ diff --git a/ACEXML/parser/parser/parser.mpc b/ACEXML/parser/parser/parser.mpc new file mode 100644 index 00000000000..aeaf39079f3 --- /dev/null +++ b/ACEXML/parser/parser/parser.mpc @@ -0,0 +1,6 @@ +project (Parser) : acelib { + depends = XML_Common + sharedname = ACEXML_Parser + dllflags = ACEXML_PARSER_BUILD + libs = ACEXML +} diff --git a/ACEXML/tests/Makefile b/ACEXML/tests/Makefile deleted file mode 100644 index 3e60bf3faa7..00000000000 --- a/ACEXML/tests/Makefile +++ /dev/null @@ -1,505 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for repeating token client application -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -LDLIBS = -lACEXML -BIN = Transcoder_Test \ - NamespaceSupport_Test \ - HttpCharStream_Test - -LSRC = $(addsuffix .cpp,$(BIN)) -LOBJ = $(LSRC:%.cpp=$(VDIR)%.o) -#SHOBJ = $(addsuffix .so,$(BIN)) - -BUILD = $(VBIN) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - -.obj/Transcoder_Test.o .obj/Transcoder_Test.so .shobj/Transcoder_Test.o .shobj/Transcoder_Test.so: Transcoder_Test.cpp \ - $(ACE_ROOT)/ACEXML/common/Transcode.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/Transcode.i - -.obj/NamespaceSupport_Test.o .obj/NamespaceSupport_Test.so .shobj/NamespaceSupport_Test.o .shobj/NamespaceSupport_Test.so: NamespaceSupport_Test.cpp \ - $(ACE_ROOT)/ACEXML/common/NamespaceSupport.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Types.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 \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ACEXML/common/NamespaceSupport.i - -.obj/HttpCharStream_Test.o .obj/HttpCharStream_Test.so .shobj/HttpCharStream_Test.o .shobj/HttpCharStream_Test.so: HttpCharStream_Test.cpp \ - $(ACE_ROOT)/ACEXML/common/HttpCharStream.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ACEXML/common/ACEXML_Export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ACEXML/common/CharStream.h \ - $(ACE_ROOT)/ACEXML/common/XML_Types.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ACEXML/common/URL_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ACEXML/common/URL_Addr.inl \ - $(ACE_ROOT)/ACEXML/common/Mem_Map_Stream.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Types.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 \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/XML_Svc_Conf.h \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ - $(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 \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component.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/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(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/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/Recyclable.h \ - $(ACE_ROOT)/ace/Recyclable.inl \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Refcountable.h \ - $(ACE_ROOT)/ace/Refcountable.inl \ - $(ACE_ROOT)/ace/Hashable.h \ - $(ACE_ROOT)/ace/Hashable.inl \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Connector.cpp - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/tests/Makefile.HttpCharStream_Test b/ACEXML/tests/Makefile.HttpCharStream_Test new file mode 100644 index 00000000000..2a9f8a7fadf --- /dev/null +++ b/ACEXML/tests/Makefile.HttpCharStream_Test @@ -0,0 +1,48 @@ +#---------------------------------------------------------------------------- +# GNU Makefile +#---------------------------------------------------------------------------- + +MAKEFILE = Makefile.HttpCharStream_Test +DEPENDENCY_FILE = .depend.Makefile.HttpCharStream_Test +BIN_UNCHECKED = HttpCharStream_Test + + + +FILES = \ + HttpCharStream_Test + +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU + +BIN = $(BIN_UNCHECKED) + +OBJS = $(addsuffix .o, $(notdir $(FILES))) +SRC = $(addsuffix .cpp, $(FILES)) +ACELIB = -lACE + +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU + +CPPFLAGS += -I../.. +LDFLAGS += -L../../ace + +LDLIBS = -lACEXML + +#---------------------------------------------------------------------------- +# Local targets +#---------------------------------------------------------------------------- + +$(BIN): $(addprefix $(VDIR), $(OBJS)) + $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) $(POSTLINK) + +#---------------------------------------------------------------------------- +# Dependencies +#---------------------------------------------------------------------------- +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/tests/Makefile.NamespaceSupport_Test b/ACEXML/tests/Makefile.NamespaceSupport_Test new file mode 100644 index 00000000000..f418135f6ec --- /dev/null +++ b/ACEXML/tests/Makefile.NamespaceSupport_Test @@ -0,0 +1,48 @@ +#---------------------------------------------------------------------------- +# GNU Makefile +#---------------------------------------------------------------------------- + +MAKEFILE = Makefile.NamespaceSupport_Test +DEPENDENCY_FILE = .depend.Makefile.NamespaceSupport_Test +BIN_UNCHECKED = NamespaceSupport_Test + + + +FILES = \ + NamespaceSupport_Test + +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU + +BIN = $(BIN_UNCHECKED) + +OBJS = $(addsuffix .o, $(notdir $(FILES))) +SRC = $(addsuffix .cpp, $(FILES)) +ACELIB = -lACE + +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU + +CPPFLAGS += -I../.. +LDFLAGS += -L../../ace + +LDLIBS = -lACEXML + +#---------------------------------------------------------------------------- +# Local targets +#---------------------------------------------------------------------------- + +$(BIN): $(addprefix $(VDIR), $(OBJS)) + $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) $(POSTLINK) + +#---------------------------------------------------------------------------- +# Dependencies +#---------------------------------------------------------------------------- +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/tests/Makefile.Transcoder_Test b/ACEXML/tests/Makefile.Transcoder_Test new file mode 100644 index 00000000000..d85fdbcdb11 --- /dev/null +++ b/ACEXML/tests/Makefile.Transcoder_Test @@ -0,0 +1,48 @@ +#---------------------------------------------------------------------------- +# GNU Makefile +#---------------------------------------------------------------------------- + +MAKEFILE = Makefile.Transcoder_Test +DEPENDENCY_FILE = .depend.Makefile.Transcoder_Test +BIN_UNCHECKED = Transcoder_Test + + + +FILES = \ + Transcoder_Test + +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU + +BIN = $(BIN_UNCHECKED) + +OBJS = $(addsuffix .o, $(notdir $(FILES))) +SRC = $(addsuffix .cpp, $(FILES)) +ACELIB = -lACE + +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU + +CPPFLAGS += -I../.. +LDFLAGS += -L../../ace + +LDLIBS = -lACEXML + +#---------------------------------------------------------------------------- +# Local targets +#---------------------------------------------------------------------------- + +$(BIN): $(addprefix $(VDIR), $(OBJS)) + $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) $(POSTLINK) + +#---------------------------------------------------------------------------- +# Dependencies +#---------------------------------------------------------------------------- +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ACEXML/tests/tests.mpc b/ACEXML/tests/tests.mpc new file mode 100644 index 00000000000..90162e99d21 --- /dev/null +++ b/ACEXML/tests/tests.mpc @@ -0,0 +1,29 @@ +project(HttpCharStream_Test) : aceexe { + exename = HttpCharStream_Test + libs = ACEXML + Source_Files { + HttpCharStream_Test.cpp + } + Header_Files { + } +} + +project(Transcoder_Test) : aceexe { + exename = Transcoder_Test + libs = ACEXML + Source_Files { + Transcoder_Test.cpp + } + Header_Files { + } +} + +project(NamespaceSupport_Test) : aceexe { + exename = NamespaceSupport_Test + libs = ACEXML + Source_Files { + NamespaceSupport_Test + } + Header_Files { + } +} diff --git a/ChangeLog b/ChangeLog index 016db0b6bb5..c563f103e32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,813 +1,280 @@ -Mon Nov 18 20:49:33 2002 Nanbor Wang <nanbor@cs.wustl.edu> +Mon Nov 18 22:29:39 2002 Krishnakumar B <kitty@cs.wustl.edu> - * examples/IPC_SAP/FILE_SAP/client.cpp (ACE_TMAIN): Changed to use - predefined ACE_DEFAULT_FILE_PERMS instead of the non-portable 0666. + * ACEXML/Makefile: -Mon Nov 18 12:27:46 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + Deleted this file in the previous check-in. Re-add it. - * ace/Dev_Poll_Reactor.cpp (handler): - * ace/WFMO_Reactor.i (handler): - * ace/Select_Reactor_Base_T.cpp (handler_i): The methods that - returns a signal handler associated with a certain type of - signal, does restrictive sanity checks. One of the checks that - it performs is to see whether a pointer to an event_handler is 0 - just before assigning a new event handler pointer. This check - was not required at all and hence it is now removed. Thanks to - Edan Ayal for reporting this. +Mon Nov 18 22:19:47 2002 Krishnakumar B <kitty@cs.wustl.edu> -Sat Nov 16 09:38:38 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + * ACEXML/common/common.mpc: + * ACEXML/parser/parser/parser.mpc: + * ACEXML/parser/debug_validator/validator.mpc: + * ACEXML/apps/svcconf/svcconf.mpc: + * ACEXML/examples/svcconf/Svcconf.mpc: + * ACEXML/examples/SAXPrint/saxprint.mpc: + * ACEXML/tests/tests.mpc: + * ACEXML/ACEXML.mwc: - * ace/*/Makefile: - * tests/Makefile: - * examples/*/Makefile: - * performance-tests/*/Makefile: - * ACEXML/*/Makefile: Updated dependencies. + New MPC files and Workspace file. -Fri Nov 15 20:33:02 UTC 2002 Don Hinton <dhinton@ieee.org> + * ACEXML/common/Makefile.XML_Common: + * ACEXML/apps/svcconf/Makefile.XML_Svc_Conf_Parser: + * ACEXML/parser/parser/Makefile.Parser: + * ACEXML/parser/debug_validator/Makefile.Validator: + * ACEXML/examples/SAXPrint/Makefile.SAXPrint: + * ACEXML/examples/svcconf/Makefile.Svcconf: + * ACEXML/tests/Makefile.HttpCharStream_Test: + * ACEXML/tests/Makefile.NamespaceSupport_Test: + * ACEXML/tests/Makefile.Transcoder_Test: - * ace/SOCK_Dgram_Mcast.h: - * ace/config-all.h: Added new macro for platforms that don't yet - implement the new IGMPv3, perfect multicast filtering, and - replaced the #ifdef linux in the ACE_SOCK_Dgram_Mcast::ctor - with the new macro, since this isn't just a linux thing. + New Makefiles generated by MPC. - * ace/config-aix-4.x.h: - * ace/config-freebsd.h: - * ace/config-linux-common.h: - * ace/config-netbsd.h: - * ace/config-openbsd.h: - Defined ACE_LACKS_PERFECT_MULTICAST_FILTERING for these platforms. - - * ace/SOCK_Dgram_Mcast.cpp (open_i): Removed redundant call to - ACE_SOCK::set_option() to set SO_REUSEADDR, since it's set in - the call to ACE_SOCK::open(). This fixes [bug 1111]. - - * tests/Multicast_Test.cpp: Enhanced test by adding new options - control the wait time when running test as a CONSUMER only, - and contol the TTL so the test could be used over routers. - Also cleaned up the code a bit to make it more readable. Thanks - to Bill Fulton for motivating these enhancements. - -Fri Nov 15 14:16:10 2002 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/Thread_Exit.h: - * ace/Thread_Exit.cpp (cleanup): Changed the type of the argument - <cleanup> takes to the generic (void*) and avoid including - <Synch.h> in Thread_Exit.h. This eliminated the circular header - dependencies when ACE_LEGACY_MODE is define. - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Removed some template files from the build - lists and make sure all template files are not being built. - -Fri Nov 15 13:22:41 2002 Steve Huston <shuston@riverace.com> - - * tests/Proactor_Test.cpp: On Win32, check for canceled I/O using - ERROR_OPERATION_ABORTED instead of ECANCELED. - -Fri Nov 15 16:51:11 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> - - * ace/POSIX_CB_Proactor.h: - * ace/POSIX_CB_Proactor.cpp: - Do not build on Lynx. - -Fri Nov 15 14:14:39 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> + * ACEXML/common/Makefile: + * ACEXML/parser/parser/Makefile: + * ACEXML/parser/Makefile: + * ACEXML/examples/Makefile: + * ACEXML/apps/Makefile: + * ACEXML/apps/svcconf/Makefile: + * ACEXML/examples/SAXPrint/Makefile: + * ACEXML/tests/Makefile: - * ace/POSIX_CB_Proactor.h: - * ace/POSIX_CB_Proactor.cpp: - Do not build on Sun. + Removed old Makefiles. -Fri Nov 15 14:08:11 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> + * ACEXML/parser/parser/Parser.cpp: + * ACEXML/common/StreamFactory.cpp: + * ACEXML/common/ZipCharStream.cpp: + * ACEXML/common/ZipCharStream.h: - * include/makeinclude/platform_linux.GNU: - Linux glibc has aio_ and pthread_ calls in librt.so. - Add fix so that librt.so is linked in if threads=0. + Fixed compilation errors. -Fri Nov 15 07:48:37 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> +Mon Nov 18 20:30:30 2002 Krishnakumar B <kitty@cs.wustl.edu> - * tests/OS_Test.cpp: Added the test cases for itoa from - Joseph Sarbak <joseph.sarbak@csfb.com>. + * ACEXML/common/CharStream.h: + * ACEXML/common/Encoding.cpp: + * ACEXML/common/FileCharStream.cpp: + * ACEXML/common/FileCharStream.h: + * ACEXML/common/StrCharStream.cpp: + * ACEXML/common/StrCharStream.h: + * ACEXML/common/HttpCharStream.cpp: + * ACEXML/common/HttpCharStream.h: -Fri Nov 15 07:08:46 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + Fixed a number of minor typos and debugging statements. - * bin/auto_run_tests.lst: Fixed a few minor problems that showed - up in the daily builds. + * ACEXML/common/LocatorImpl.cpp: Check for a valid string before + assigning it to the new Locator. -Thu Nov 14 22:08:49 2002 Steve Huston <shuston@riverace.com> + * ACEXML/common/NamespaceSupport.cpp: - * tests/Proactor_Test.cpp: Make this test behave better: - - At the end of running time, close all the Senders. This should - cancel all the Sender outstanding operations and trip all the - Receivers into finishing their receives and closing themselves. - - Change the default Sender/Receiver count from 20 to 10. This - shrinks the log a bit without sacrificing test quality. - - Change the "inferior platforms" default Sender/Receiver count - from 1 to 3. With Proactor improvements made so far, let's give - these platforms some more exercise and see what happens. + Make sure that we don't have a null prefix before trying to + dereference the prefix. -Thu Nov 14 23:10:32 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> + * ACEXML/common/ZipCharStream.cpp: + * ACEXML/common/ZipCharStream.h: - * ace/POSIX_CB_Proactor.cpp: - * ace/POSIX_CB_Proactor.h: - * ace/POSIX_CB_Proactor.i: - * ace/POSIX_Proactor.cpp: - * ace/POSIX_Proactor.h: - * ace/POSIX_Proactor.i: - * ace/Proactor.cpp: - * tests/Proactor_Test.cpp: - Fixed Proactor so that on platforms that support POSIX IO, - but not POSIX RT signals, it will compile. Use the new - ACE_HAS_POSIX_REALTIME_SIGNALS macro. + New stream which reads files from a ZIP archive. -Thu Nov 14 22:47:45 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> - - * include/makeinclude/platform_freebsd.GNU: Merged with the - pthread version of this file. To compile without threads, - set, do make threads=0, or set threads=0 in this file. - * include/makeinclude/platform_freebsd_pthread.GNU: Removed. - * ace/config-freebsd.h: Merge with pthread version of this file. - * ace/config-freebsd-pthread.h: Removed. - * ace/OS.h: Use new ACE_HAS_POSIX_REALTIME_SIGNALS macro for - POSIX RT signals stuff, instead of ACE_HAS_AIO_CALLS. - FreeBSD has POSIX AIO, but not POSIX RT signals. - * ace/config-sunos5.6.h: Define ACE_HAS_POSIX_REALTIME_SIGNALS, - ACE_HAS_POSIX_MESSAGE_PASSING. - * ace/config-linux-common.h: Define ACE_HAS_POSIX_REALTIME_SIGNALS, - ACE_HAS_AIO_CALLS. + * ACEXML/common/StreamFactory.cpp: -Thu Nov 14 16:19:57 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + Modified to accomodate ZipCharStream. - * bin/auto_run_tests.lst: Added two tests, Bug_1269_Regression and - Bug_1270_Regression into the daily regression suite. They will - not run on Win32. + * ACEXML/examples/SAXPrint/Print_Handler.cpp: + * ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp: + * ACEXML/examples/SAXPrint/main.cpp: -Thu Nov 14 13:35:44 2002 Nanbor Wang <nanbor@cs.wustl.edu> + Commented out a lot of unnecessary debug statements. - * ace/Containers_T.cpp: Changed to deallocate internal nodes in - ACE_Double_Linked_List with the allocator. Thanks to Eugene - Alterman <EugeneA@bremer-inc.com> for reporting the problem. + * ACEXML/parser/parser/Parser.cpp: + * ACEXML/parser/parser/Parser.h: -Thu Nov 14 10:57:47 2002 Carlos O'Ryan <coryan@atdesk.com> + Lots of bugfixes. Finally we parse the XML version of XHTML + specification without dumping core. - * ace/OS.h (ace_timezone): +Sat Nov 16 21:18:55 2002 Krishnakumar B <kitty@cs.wustl.edu> - Fixed broken implementation for Linux. Call tzset() and then - return the global "timezone" variable instead. [Bug 1359] + * ACEXML/parser/parser/Parser.cpp: + * ACEXML/parser/parser/Parser.h: -Thu Nov 14 12:19:51 2002 Chad Elliott <elliott_c@ociweb.com> + More bugs fixed. Add support for parsing PE references within + attribute list declarations and clean up the same. Add support + for parsing PE references within element declarations. - * bin/MakeProjectCreator/modules/Creator.pm: +Tue Nov 12 19:48:34 2002 Krishnakumar B <kitty@cs.wustl.edu> - Modify the way projects are created on windows. If using - cygwin perl then use \n instead of \r\n. + * ACEXML/parser/parser/ParserContext.cpp: + * ACEXML/parser/parser/ParserContext.h: + * ACEXML/parser/parser/ParserContext.inl: - * bin/MakeProjectCreator/modules/VC7WorkspaceCreator.pm: + New files which hold the ParserContext needed to handle the + switching of input streams on the fly. - Sort the list of projects to make the generated solution file more - similar to actual solution files. + * ACEXML/parser/parser/ParserInternals.cpp: + * ACEXML/parser/parser/ParserInternals.h: -Thu Nov 14 06:16:51 2002 Chad Elliott <elliott_c@ociweb.com> + Moved some generic code from Parser.cpp to here. - * bin/MakeProjectCreator/modules/Parser.pm: + * ACEXML/apps/svcconf/Makefile: + * ACEXML/common/Makefile: + * ACEXML/parser/parser/Makefile: - Take into account relative directories in the cd() method. - The original optimization overlooked this. + Updated dependencies. -Thu Nov 14 06:59:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> + * ACEXML/common/Attributes_Def_Builder.h: - * ace/Date_Time.{h,i}: - Added update() method with which it is possible to set the values - in ACE_Date_Time based on a passed ACE_Time_Value. + No need to typedef in C++. - * ace/Time_Request_Reply.{h,cpp}: - Made the argument of the timeout method const&. Updated doxygen - documentation and marked init() as deprecated because it is a no-op. + * ACEXML/common/DefaultHandler.cpp: -Wed Nov 13 18:28:39 2002 Steve Huston <shuston@riverace.com> + Minor typos. - * tests/FIFO_Test.cpp: Changed to both clarify the usage of - ACE_FIFO_(Send|Recv)_Msg with and without ACE_HAS_STREAM_PIPES - and test that usage. + * ACEXML/common/Encoding.cpp: -Wed Nov 13 17:39:41 2002 Steve Huston <shuston@riverace.com> + If auto-detection of encoding fails, assume that it is UTF-8. - * ace/POSIX_Proactor.{h cpp}: - * ace/SUN_Proactor.{h cpp}: Leave two handle_events() methods - available; one with a timeout, one without. Each proactor's - implementations calls an internal handle_events_i() method - that does the right thing. - (start_aio): This is a virtual method used to start an asynch I/O - request from outside the proactor (such as from an asynch read - stream). When the actual operation is to start, start_aio calls - start_aio_i(), implemented differently for the different proactors. - Similar arrangement for cancel_aio(). + * ACEXML/common/Exception.cpp: - * tests/Proactor_Test.cpp: Cancel all outstanding operations before - trying to abruptly stop everything. + Change the error message from ACE_DEBUG to ACE_ERROR. -Wed Nov 13 17:29:31 2002 Steve Huston <shuston@riverace.com> + * ACEXML/common/FileCharStream.cpp: Handle BOM of UTF-8 in + addition to UTF-16. Cleanup unnecessary parens. - * ace/WIN32_Asynch_IO.h (cancel_uncompleted): Filled in - description of the 'set' parameter. Thanks to Craig - Rodrigues for noticing its omission. + * ACEXML/common/HttpCharStream.cpp: + * ACEXML/common/HttpCharStream.h: -Wed Nov 13 16:52:04 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> + Add support for auto-detection of encoding. - * ace/Lib_Find.cpp (ldname): MacOS X prepends an underscore to - symbols in shared libaries. + * ACEXML/common/InputSource.cpp: + * ACEXML/common/InputSource.h: - * ace/config-macosx.h: - * include/makeinclude/platform_macosx.GNU: + Fixes for use with ACEXML_Parser_Context. - - add support for dlcompat, a third party package which provides - dlopen(), dlsym(), dlcose() functions + * ACEXML/common/LocatorImpl.cpp: + * ACEXML/common/LocatorImpl.h: - - Define ACE_LD_SEARCH_PATH to DYLD_LIBRARY_PATH and - ACE_LD_SUFFIX to .dylib + Fixed bug in copy constructor which resulted in locator + information not getting set properly. -Tue Nov 12 14:12:59 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + * ACEXML/common/NamespaceSupport.cpp: + * ACEXML/common/NamespaceSupport.h: - This is a hackish fix for BUG 1361. Please see - http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1361 - for details of this problem + Implement reset() method. - * ace/TP_Reactor.cpp (handle_socket_events): A hack to prevent - BUG 1361 from surfacing for applications like TAO, using the - TP_Reactor. This fix basically ensures that resume_i () is - not called naively. + * ACEXML/common/SAXExceptions.cpp: - * ace/Event_Handler.h: Added a enum type which could be could be - used by the TP_Reactor. + Change the error message from ACE_DEBUG to ACE_ERROR. -Tue Nov 12 11:53:29 2002 Steve Huston <shuston@riverace.com> + * ACEXML/common/StrCharStream.cpp: - * tests/run_test.lst: Change FIFO_Test from !MSVC to !Win32 to - prevent it from running with Borland on Windows. Thanks to - Johnny Willemsen for pointing this out. + Handle copying of bytes according to sizeof (ACE_WCHAR). -Tue Nov 12 14:11:33 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> + * ACEXML/common/StreamFactory.cpp: Create the appropriate stream + given an URI. We don't try to normalize the URI here. It is done + in the Parser. - * ace/Time_Value.h: - Doxygen documentation improvements. + * ACEXML/common/Transcode.cpp: + * ACEXML/common/Transcode.i: -Tue Nov 12 13:15:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> + Moved some very big functions from .i to .cpp. - * ace/Message_Queue_T.h: - Doxygen documentation improvements. + * ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp: + * ACEXML/examples/SAXPrint/main.cpp: -Mon Nov 11 20:37:18 2002 Ossama Othman <ossama@uci.edu> + Updates to reflect the new calling convention in the Parser. - * bin/auto_run_tests.lst: + * ACEXML/parser/parser/Entity_Manager.cpp: + * ACEXML/parser/parser/Entity_Manager.h: + * ACEXML/parser/parser/Entity_Manager.i: - Added Jai's application-controlled membership load balancing - test to the list of regression tests to be run. + Implemented support for resolving SYSTEM and PUBLIC ids from + the Entity_Manager. -Mon Nov 11 17:57:12 2002 Ossama Othman <ossama@uci.edu> + * ACEXML/parser/parser/Parser.cpp: + * ACEXML/parser/parser/Parser.h: + * ACEXML/parser/parser/Parser.i: - * bin/auto_run_tests.lst: + Implemented support for external parameter and entity + references. Rewrote a lot of the basic parsing functionality to + adhere to the standard. Implment partial support for validation + of XML files. - Added Carlos' new PortableInterceptor AMI test to the list of - regression tests to be run. -Mon Nov 11 16:17:59 2002 Nanbor Wang <nanbor@cs.wustl.edu> +Fri Oct 25 15:44:04 2002 Krishnakumar B <kitty@cs.wustl.edu> - * bin/MakeProjectCreator/modules/TemplateParser.pm (relative): - Changed to invoke slash_to_backslash from $self. The original - code only runs on some specific version of perl. + * ACEXML/parser/parser/Parser.i: Handle end-of-line as required by + the spec. Specifically any sequence of 0x0D or 0x0D 0x0A should + be normalized to a 0x0A before passing to the XML processor. -Mon Nov 11 13:35:53 2002 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + * ACEXML/parser/parser/Parser.cpp: Remove checks for 0x0D as it is + handled tranparently now. - * ace/Hash_Map_Manager_T.h: Updated - comments on the class ACE_Hash_Map_Bucket_Iterator. Thanks to - Kitty and Irfan for helping with this. +Thu Oct 24 21:06:44 2002 Krishnakumar B <kitty@cs.wustl.edu> -Mon Nov 11 12:52:41 2002 Steve Huston <shuston@riverace.com> + * ACEXML/common/NamespaceSupport.cpp: Define strings normally and + not as an array. - * docs/ACE-subsets.html: Added the Timer component to the list of - buildable pieces. Thanks to Jason Pasion <J.Pasion@motorola.com> - for reporting this problem. + * ACEXML/common/Attributes_Def_Builder.h: No need to typedef in C++. - * THANKS: Added Jason Pasion to the Hall of Fame. +Thu Oct 24 01:52:46 2002 Krishnakumar B <kitty@cs.wustl.edu> -Mon Nov 11 12:39:18 2002 Steve Huston <shuston@riverace.com> + * ACEXML\parser\parser\Parser.cpp: Moved out the declaration of + variables outside case labels. MSVC doesn't like it. - * ace/FIFO_Send_Msg.cpp (send): When setting iovec length, - static_cast the int length to size_t; the target is not an - int (as the strbuf length is). When returning the sent byte - count, don't include any additional bytes added internally - for record framing. +Wed Oct 23 22:24:59 2002 Krishnakumar B <kitty@cs.wustl.edu> - * tests/FIFO_Test.cpp: New test to exercise basic and overflow - message-based FIFO I/O. + * ACEXML/parser/parser/Parser.cpp: Fixed a stupid thinko in array + initialization. - * tests/Makefile: - * tests/run_test.lst: Added FIFO_Test. Disabled on MSVC builds - since Windows doesn't have FIFOs. - -Mon Nov 11 09:58:13 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> - - * ace/CDR_Stream.{i,cpp} Add casts to ACE_CDR::Octet and - ACE_CDR::Boolean to prevent warnings when run with MSVC++ level - 4 warnings. Thanks to Lukas Gruetzmacher - <gruetzmacher@ais-dresden.de> for motivating this fix. - - * ace/OS_String.cpp (itoa_emulation): Updated the code so that it'll - work correctly with negative numbers. Thanks to Joseph Sarbak - <joseph.sarbak@csfb.com> for reporting this and providing a fix. - -Sun Nov 10 19:38:45 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - - * ace/Message_Block.cpp(copy): The copy () methods were copying - data till the end_ pointer. This is a wrong assumption, - especially in places where the alloted bytes are less than the - allocated bytes. Now we use the space () method to find out the - amount of space available in the data block for copying. Thanks - to Edan Ayal for finding this and providing a patch. - - * ace/Simple_Message_Block_Test.cpp: Added a test which tests - copying in a case where the alloted space is less than the - allocated space. Thanks to Edan Ayal for this test case. - -Sat Nov 9 12:37:54 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * docs/ACE-guidelines.html: Updated the ACE guidelines to - refer to the correct Doxygen links. Thanks to - Johnny Willemsen for reporting this. - -Sat Nov 9 21:48:31 2002 Steve Huston <shuston@riverace.com> - - * tests/Proactor_Test.cpp: When disabling Nagle's, use IPPROTO_TCP, - not SOL_SOCKET, for the setsockopt level. Fixes set_option errors - in this test log. - -Sat Nov 9 18:49:11 2002 Steve Huston <shuston@riverace.com> - - * ace/POSIX_Proactor.{h cpp i} (create_asynch_read_stream, - create_asynch_write_stream, create_asynch_read_dgram, - create_asynch_write_dgram, create_asynch_read_file, - create_asynch_write_file, create_asynch_accept, - create_asynch_connect, create_asynch_transmit_file): - Refactored all the factory creation methods from - ACE_POSIX_AIOCB_Proactor to ACE_POSIX_Proactor. - Moved the pseudo task from ACE_POSIX_AIOCB_Proactor to - ACE_POSIX_Proactor as well. - - (handle_events, cancel_aio): - Added these methods to ACE_POSIX_Proactor as pure virtual, - forcing their definition in the specific implementations. - - (start_aio): This is now a pure virtual function that all - more specific proactors need to implement. The old start_aio() - is now start_aio_i(). What used to be ACE_POSIX_AIOCB_Proactor:: - register_and_start_aio() is now ACE_POSIX_AIOCB_Proactor::start_aio. - Which type of I/O to start is now defined by an enum Opcode - that's passed to start_aio(). - - * ace/POSIX_Asynch_IO.{h cpp} (ACE_POSIX_Asynch_Operation): - Replace references to ACE_POSIX_AIOCB_Proactor with - ACE_POSIX_Proactor. Refactoring things out of specific proactor - types. - (ACE_POSIX_Asynch_Read_Stream, ACE_POSIX_Write_Stream, - ACE_POSIX_Asynch_Read_File, ACE_POSIX_Asynch_Write_File, - ACE_POSIX_Asynch_Accept, ACE_POSIX_Asynch_Connect, - ACE_POSIX_Asynch_Transmit_File, ACE_POSIX_Asynch_Transmit_Handler, - ACE_POSIX_Asynch_Read_Dgram, ACE_POSIX_Asynch_Write_Dgram): - Replace args of type ACE_POSIX_AIOCB_Proactor with - ACE_POSIX_Proactor. Matches POSIX_Proactor.* changes above. - Removed all the methods that said they were only there to kill - dominance warnings. These are not needed. - - These things all simplify the proactor framework code. Thanks to - Alex Libman for these ideas. - -Sat Nov 9 13:16:50 2002 Balachandran Natarajan <bala@cs.wustl.edu> - - * THANKS: Added Simon McQueen to the hall of fame. - -Fri Nov 8 13:04:10 2002 Chad Elliott <elliott_c@ociweb.com> +Wed Oct 23 17:27:14 2002 Krishnakumar B <kitty@cs.wustl.edu> - * bin/MakeProjectCreator/modules/ProjectCreator.pm: + * ACEXML/common/Encoding.cpp: + * ACEXML/common/Encoding.h: - Fixed a bug in MPC where the idl file name could cause - an error on Windows if it had a slash in it. It would be - converted to a back slash and then interpreted inside a - regular expression which would cause MPC to abort. + Use UTF-16 instead of UTF-16LE/UTF-16BE as the specification + doesn't require mentioning the endianness of the input. -Fri Nov 8 13:00:56 2002 Chad Elliott <elliott_c@ociweb.com> + * ACEXML/common/Transcode.h: Fixed some minor typos. - * bin/MakeProjectCreator/modules/BorlandProjectCreator.pm: - * bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/Creator.pm: - * bin/MakeProjectCreator/modules/Driver.pm: - * bin/MakeProjectCreator/modules/EM3ProjectCreator.pm: - * bin/MakeProjectCreator/modules/EM3WorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/GHSProjectCreator.pm: - * bin/MakeProjectCreator/modules/GHSWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/GNUProjectCreator.pm: - * bin/MakeProjectCreator/modules/GNUWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/GUID.pm: - * bin/MakeProjectCreator/modules/NMakeProjectCreator.pm: - * bin/MakeProjectCreator/modules/NMakeWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/Parser.pm: - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - * bin/MakeProjectCreator/modules/TemplateInputReader.pm: - * bin/MakeProjectCreator/modules/TemplateParser.pm: - * bin/MakeProjectCreator/modules/VA4ProjectCreator.pm: - * bin/MakeProjectCreator/modules/VA4WorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/VC6ProjectCreator.pm: - * bin/MakeProjectCreator/modules/VC6WorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/VC7ProjectCreator.pm: - * bin/MakeProjectCreator/modules/VC7WorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/WorkspaceCreator.pm: + * ACEXML/examples/SAXPrint/namespaces.xml: New file which tests + out the namespaces feature much better. - Performed various optimization which dramatically decreased the - amount of time to generate projects for the entire ACE tree. In - tests, the time went from 2 minutes to 1 minute. + * ACEXML/apps/svcconf/Makefile: + * ACEXML/parser/parser/Makefile: -Fri Nov 8 12:57:57 2002 Chad Elliott <elliott_c@ociweb.com> + Updated dependencies. - * bin/MakeProjectCreator/README: + * ACEXML/parser/parser/ParserErrors.h: New file which contains the + error codes of all the error spit out by the parser. - Added documentation for the new verbatim keyword. + * ACEXML/examples/SAXPrint/Print_Handler.cpp: + * ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp: - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - * bin/MakeProjectCreator/modules/TemplateParser.pm: + Make sure that the characters() function describes the arguments + as start and length instead of start and end. - Added functionality to place test verbatim into a generated + * ACEXML/parser/parser/Parser.dsp: Added ParserErrors.h to the project file. - * bin/MakeProjectCreator/templates/gnu.mpd: - - Added verbatim markers top, macros, local and bottom. - -Fri Nov 8 12:52:16 2002 Chad Elliott <elliott_c@ociweb.com> - - * bin/MakeProjectCreator/README: - - Added documentation about the new idlgendir keyword. - - * bin/MakeProjectCreator/modules/GHSWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/Parser.pm: - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - * bin/MakeProjectCreator/modules/TemplateParser.pm: - * bin/MakeProjectCreator/modules/VC6WorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/VC7WorkspaceCreator.pm: - - Modified flag_overrides to work with both idlflags and idlgendir. - - * bin/MakeProjectCreator/templates/bor.mpd: - * bin/MakeProjectCreator/templates/em3vcp.mpd: - * bin/MakeProjectCreator/templates/gnu.mpd: - * bin/MakeProjectCreator/templates/nmake.mpd: - * bin/MakeProjectCreator/templates/vc6dsp.mpd: - * bin/MakeProjectCreator/templates/vc7.mpd: - - Modified all templates that deal with idl files to utilize the - idlgendir keyword. - -Fri Nov 8 04:03:29 UTC 2002 Don Hinton <dhinton@ieee.org> - - * tests/Multicast_Test.cpp: Cleaned up error messages and - error handling and insure that errors are returned. Added - 2 second timeout to call to ACE_Thread_Manager::wait() so - that lost messages won't cause test to hang. - -Wed Nov 6 18:55:22 2002 Steve Huston <shuston@riverace.com> - - * ace/OS.{h i} (recursive_mutex_cond_unlock, - recursive_mutex_cond_relock): For Windows, don't try to save/restore - CRITICAL_SECTION members individually - there are undocumented - details at work there. Instead, release and acquire the mutex - one fewer times than the recursion count, letting Windows take - care of its internals. Fixes the hung Recursive_Condition_Test on - Windows. This also neatly removes the WinCE conditional code in - this area. - - * tests/Recursive_Condition_Test.cpp: Fix a const error that gcc - pointed out. - -Wed Nov 6 11:12:28 2002 Steve Huston <shuston@riverace.com> - - * tests/Recursive_Condition_Test.cpp: Replaced ACE_TRACE with - ACE_DEBUG so the log gets all the info. Re-enabled the timer queue - part of the test and added a check to be sure "enough" expirations - are recorded. Added a piece of data protected by the mutex/condition - to be sure threads aren't released too early. - -Tue Nov 5 21:54:40 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - - * tests/run_tests.lst: - * tests/run_tests_remote.lst: Removed these files, since they - served no purpose other than adding to the noise. - -Tue Nov 5 15:51:29 2002 Steve Huston <shuston@riverace.com> - - * ace/INET_Addr.cpp (set_addr): Add missing ';' in the IPv6 case. - -Tue Nov 5 20:26:33 UTC 2002 Don Hinton <dhinton@ieee.org> - - * tests/tests.mpc: Added Multicast_Test entry. - - * tests/README: Upadate instructions for adding new tests. - -Tue Nov 5 12:12:05 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - - * tests/Multicast_Test.cpp: Fixed compile errors in single threaded - builds. - -Tue Nov 5 11:24:03 2002 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/Process.h: - * ace/Process.i: Added a new method <return_value> which returns - the actual value returned or <exit>'ed by the child process. - The <exit_code> accessor returns the raw exit status returned by - the system APIs and the value is OS dependent. Changed the - <exit_code> mutator to be a proctected method and declare - ACE_Process_Manager a fried of ACE_Process as <exit_code> - mutator should only be used by ACE_Process_Manager. - - Thanks to Stephen Blake <sblake@speakeasy.net> for reporting the - problem. - -Tue Nov 5 05:12:16 2002 Ossama Othman <ossama@uci.edu> - - * ace/Acceptor.h: - * ace/Connector.h: - * ace/Strategies_T.h: - - Added missing STL-style template traits found in C++NPv2 - including the following: - - addr_type - acceptor_type - connector_type - handler_type - stream_type - base_type - accept_strategy_type - connect_strategy_type - creation_strategy_type - concurrency_strategy_type - recycling_strategy_type - scheduling_strategy_type - - where applicable. The old traits are still available and remain - unchanged. - -Tue Nov 5 05:54:16 UTC 2002 Don Hinton <dhinton@ieee.org> - - * tests/Multicast_Test.cpp: Fixed typo in pragma instantiation, - and replaced an instance of char* with ACE_TCHAR* to fix unicode - builds. Added #ifdef for ACE_HAS_THREADS, since it uses - ACE_Task as an active object. - - * tests/run_test.lst: Turned off Multicast_Test and - Token_Stategy_Test for single threaded builds. - -Mon Nov 4 18:01:25 UTC 2002 Don Hinton <dhinton@ieee.org> - - * tests/Makefile.bor: Added new Multicast_Test. Thanks to - Johnny Willemsen <jwillemsen@remedy.nl> for noticing this. - -Mon Nov 4 16:14:21 UTC 2002 Don Hinton <dhinton@ieee.org> - - * tests/Multicast_Test.cpp (get_handle): Made return type of - definition ACE_HANDLE to match the declaration. Thanks to - Ed Skees <eskees@dctd.saic.com> for reporting this. - - * tests/Multicast_Test.dsp: - * tests/tests.dsw: Added new dsp. Thanks again to Ed Skees - for providing this. - - * THANKS: Added Ed Skees to hall of fame... - -Mon Nov 4 09:28:34 UTC 2002 Don Hinton <dhinton@ieee.org> - - * ace/SOCK_Dgram.cpp (recv): Corrected method signature in .cpp to - match the one in the .h. The .h version specified iovec*, but - the .cpp had iovec[] which confused doxygen. This fixes bug [1353]. - -Sun Nov 3 19:41:30 UTC 2002 Don Hinton <dhinton@ieee.org> - - * tests/Multicast_Test.cpp: - * tests/Makefile: - * tests/run_test.lst: Added a new test to exercise some of the new - functionality of ACE_SOCK_Dgram_Mcast. - -Sun Nov 3 10:36:50 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - - * tests/run_test.lst: Prevented SV_Shared_Memory test from running - in RH_7.1 configurations. Please see BUGID 1351 for details. - -Sat Nov 2 17:44:00 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - - * ace/Select_Reactor_Base.h: - * ace/Select_Reactor_Base.cpp: Fixed a subtle bug in the - Select_Reactor. The following were performed during the bind () - operation, which binds a handle with interested mask to an - event_handler, - - - The new masks were added to the existing wait_set - - and the new masks were also removed from the suspend_set. - - Though the above steps were fine, there exists a possibility - when the reactor could land up with a state when the handle - could be both in the wait_set and suspend_set. If suppose a - handle is initially registered for READ and EXCEPTION with the - reactor and then suspended. If the user calls register_handler - () to register the same handle for READ and WRITE, things could - go totally bizzare. - - The present fix does the following - - - If the handle is suspended, the masks are added to the - suspend_set - - else the masks are added to the wait_set and the flag that - indicates state changes within the reactor is set to 1. - - A pure virtual call is_suspended_i () was added to the - ACE_Select_Reactor_Base class to make the check for a suspended - handle possible within the bind () call. Thanks to Irfan - Pyarali<irfan@oomworks.com> who reported this problem. This - should fix the problem reported in [BUG 1305]. - -Fri Nov 1 07:35:10 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - - * bin/auto_run_tests.lst: Added the new - MProfile_Connection_Timeout test to the daily regression tests. - -Thu Oct 31 19:15:49 2002 Nanbor Wang <nanbor@cs.wustl.edu> - - * ACEXML/common/Attributes.h: Added the missing inclusion of - ACEXML_Export.h and the #pragma once directive. Thanks to Paul - Marquis <pmarquis@pobox.com> for reporting this. - -Thu Oct 31 12:57:10 2002 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/OS.i (fstat): Added check for FILE_ATTRIBUTE_DIRECTORY on - Win32 to set the file type in the st_mode so one can determine - if it's a file or a directory. Thanks to Paul Marquis - <pmarquis@pobox.com> for submitting the patch. - -Wed Oct 30 13:47:14 2002 Steve Huston <shuston@riverace.com> - - * ace/Thread_Exit.cpp: Add #include "ace/Managed_Object.h" to get - the definition of ACE_Managed_Object. - -Wed Oct 30 11:38:36 2002 Irfan Pyarali <irfan@oomworks.com> - - * ace/Timeprobe.h: Fixed formatting of comments that somehow got - messed up in: - - http://cvs.doc.wustl.edu/viewcvs.cgi/ace/Timeprobe.h.diff?r1=4.29&r2=4.30 - -Tue Oct 29 22:27:24 2002 Frank Hunleth <frank@hunleth.com> - - * apps/gperf/src/Key_List.cpp: Added cast to int on UCHAR_MAX and - USHRT_MAX to remove warnings of comparing signed and unsigned - values under OpenBSD. - - * ace/config-openbsd.h: - * ace/config-openbsd-pthread.h: Added ACE_HAS_MKSTEMP since - OpenBSD has the mkstemp() function, and it helps clear up - linker warnings. Also added ACE_HAS_ALT_CUSERID to clear - up errors due to _cuserid(). Thanks to Craig Rodrigues - for the latter patch. - -Tue Oct 29 15:45:06 2002 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/Thread_Exit.h: - * ace/Thread_Exit.cpp: - * ace/Thread_Manager.h: - * ace/Thread_Manager.cpp: Changed to use ACE_Thread_Manager to - clean up the global TSS ACE_Thread_Exit object instead of - depending on the more general ACE_Object_Manager::at_exit method - so we can better control the order of destruction. The change - makes sure the global TSS ACE_Thread_Exit object will only get - deleted *after* ACE_Thread_Manager has cleaned up all threads - and destroyed itself. - - Thanks to Patrick McNerthney <pat@mcnerthney.com> for reporting - the problem. - -Tue Oct 29 16:19:54 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> - - * ace/INET_Addr.cpp: - * ace/INET_Addr.i: - * ace/INET_Addr.h: - - Added a reset() method to initialize the underlying sockaddr_in - or sockaddr_in6 structure, and set the address family. Changed - all constructors to use this reset() method. [Bug 1342] - - (INET_Addr::set_addr) the port number was not being set, - so set it. [Bug 1329] - * tests/INET_Addr_Test.cpp: Add test to verify that address family - is being set. - * THANKS: Added Thomas Devanneaux <tdevanne@akamai.com> who provided - these fixes. - -Mon Oct 28 20:46:33 2002 Steve Huston <shuston@riverace.com> - - * ace/SOCK_Dgram_Mcast.cpp (ACE_SDM_helpers::addr_to_string): Use - the "<?>" string in place rather than try to declare it a static. - gcc reports the original usage won't do what you think (keep one - copy for the method) but will duplicate it in each generated - method. Use it as a literal and let the compiler try to place a - single copy in a read-only section. - -Mon Oct 28 20:38:27 2002 Steve Huston <shuston@riverace.com> - - * ace/Asynch_IO.cpp (ACE_Service_Handler::addresses()): Don't - print addresses from here. It's inappropriate for a framework - to be printing things out without being asked to. - - * ace/POSIX_Asynch_IO.cpp (ACE_POSIX_Asynch_Read_Stream::read): - * ace/WIN32_Asynch_IO.cpp (ACE_WIN32_Asynch_Read_Stream::read): - Don't print a message for a 0-byte/no space read - set errno to - ENOSPC so the caller can figure out what's going on. - - * ace/SUN_Proactor.{h cpp}: - * ace/POSIX_Proactor.{h cpp} (ACE_POSIX_AIOCB_Proactor):Change - 'return_status' arg to get_result_status(), find_completed_aio() - from int to size_t and rename transfer_count; get_result_status() - takes care of sensing -1 count and changing to 0. Passing back - a size_t smooths the path from here through to the result object. - Removed application_specific_code() - reuse the one from - ACE_POSIX_Proactor - this one called it; remove the middle-man. - - * tests/Proactor_Test.cpp: Added addresses() method implementations - to print address with session IDs; helps to match Sender/Receiver - pairs in the log. Also added some logging of basic send/recv info - to help try to track down why this facility doesn't work well. - Added a check for comparable sends/receives when a session ends. - Added a warning if there are outstanding I/O when the session - ends. This probably should be an error, but I haven't thought - through it enough to go that far. For the SUN Proactor, use one - thread by default (not 3) - aiosuspend() is not MT safe. - -Mon Oct 28 12:48:14 2002 Nanbor Wang <nanbor@cs.wustl.edu> - - * bin/PerlACE/Process_Unix.pm (Spawn): Return 0 when the function - complete successfully. Thanks to Charles F. Frasch - <cfrasch@spawar.navy.mil> for reporting and suggesting the fix. - -Sun Oct 27 07:44:32 2002 John Aughey <jha@aughey.com> - - * ace/INET_Addr.cpp: Changed the default constructor to only - set the address family rather than doing a full set. This - should exhibit the same behavior without additional overhead. - -Sat Oct 26 21:49:15 2002 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/Process.cpp (wait): - * ace/Process.i (wait): Changed to always update this->exit_code_ - when waiting on a child process to allow <exit_code> method to - function properly. Removed the use of the macro - ACE_OSCALL_RETURN on ACE_OS::waitpid since ACE_OS::waitpid is - already signal safe. - - * ace/Process.h: Changed the type of this->exit_code_ from int to - ACE_exitcode. Updated documentation for mutator method - <exit_code> to better reflect the intention for using this - method. - - Thanks to Artashes Ghazaryan <arty@unicad.am>, Jaroslaw Nozderko - <jaroslaw.nozderko@polkomtel.com.pl>, and Stephen Blake - <sblake@speakeasy.net> for reporting the problem. - -Sat Oct 26 11:42:04 UTC 2002 John Aughey <jha@aughey.com> - - * ace/INET_Addr.cpp: Changed default behavior to set 0 - port and INADDR_ANY address. - -Sat Oct 26 09:45:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Timer_Heap_T.h: - Doxygen documentation fix - - * ace/OS.h: - The BCB4 header files don't define ENOTEMPTY, so define this when - detecting the BCB4 compiler. Thanks to Mike Curtis <mcurtis@wt.net> - for reporting this. - - * examples/Reactor/Proactor/test_proactor2.cpp: - Removed not needed return. Fixes a BCB4 build error - - * THANKS: Added Mike Curtis + * ACEXML/parser/parser/Parser.cpp: + * ACEXML/parser/parser/Parser.h: -Wed Oct 23 16:37:15 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + Use minor codes when reporting error in the parser. This cleans + up a lot of repeated error messages and indenting so that we + don't need to spill over 80 columns and have a standardized way + of reporting errors. Rewrote parse_cdata() so that is is much + simpler. Removed try_grow_cdata() as it is no longer needed. + Handle the case when the parser was accepting invalid character + references(). - * THANKS: Added Sandeep to the Hall of Fame. Wed Oct 23 17:20:18 UTC 2002 Don Hinton <dhinton@ieee.org> - * ace/Service_Object.{h,cpp} (suspend, resume, fini): - Changed return value from void to int so that the - return value of the contained ACE_Service_Type could be - propagated. + * ace/Service_Object.{h,cpp} (suspend, resume, fini): + Changed return value from void to int so that the + return value of the contained ACE_Service_Type could be + propagated. - * ace/Service_Repository.cpp (suspend, resume, fini): - Changed to propagate the return value from the - ACE_Service_Type instead of always 0. + * ace/Service_Repository.cpp (suspend, resume, fini): + Changed to propagate the return value from the + ACE_Service_Type instead of always 0. Tue Oct 22 16:26:56 2002 Rich Seibel <seibel_r@ociweb.com> @@ -824,44 +291,44 @@ Tue Oct 22 16:26:56 2002 Rich Seibel <seibel_r@ociweb.com> Tue Oct 22 13:11:42 2002 Nanbor Wang <nanbor@cs.wustl.edu> - * ace/OS.cpp (DllMain): Added code to invoke - DisableThreadLibraryCalls during PROCESS_ATTACH when - ACE_DISABLES_THREAD_LIBRARY_CALLS is defined to 1 as described - below. This should enhance performance of applications that - spawn a lot of threads. Thanks to Patrick McNerthney - <pat@mcnerthney.com> for suggesting the change. + * ace/OS.cpp (DllMain): Added code to invoke + DisableThreadLibraryCalls during PROCESS_ATTACH when + ACE_DISABLES_THREAD_LIBRARY_CALLS is defined to 1 as described + below. This should enhance performance of applications that + spawn a lot of threads. Thanks to Patrick McNerthney + <pat@mcnerthney.com> for suggesting the change. - We should probably apply the same optimization for the core TAO - libraries. + We should probably apply the same optimization for the core TAO + libraries. - * ace/config-win32-common.h: Defined a Win32-only new macros - ACE_DISABLES_THREAD_LIBRARY_CALLS which is default to 0 if not - defined by users. + * ace/config-win32-common.h: Defined a Win32-only new macros + ACE_DISABLES_THREAD_LIBRARY_CALLS which is default to 0 if not + defined by users. Mon Oct 21 17:26:15 2002 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - * ace/SPIPE_Acceptor.cpp: Modified - SPIPE_Acceptor::create_new_instance to manually signal the event - used in the ConnectNamedPipe call when an ERROR_PIPE_CONNECTED - status is returned. Also added the handling of the status of - ERROR_NO_DATA to the same logic as ERROR_PIPE_CONNECTED. Thanks - to Patrick J. McNerthney <pat@mcnerthney.com> for contributing - this. + * ace/SPIPE_Acceptor.cpp: Modified + SPIPE_Acceptor::create_new_instance to manually signal the event + used in the ConnectNamedPipe call when an ERROR_PIPE_CONNECTED + status is returned. Also added the handling of the status of + ERROR_NO_DATA to the same logic as ERROR_PIPE_CONNECTED. Thanks + to Patrick J. McNerthney <pat@mcnerthney.com> for contributing + this. Tue Oct 22 10:20:41 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * examples/C++NPv2/Reactor_Logging_Server_T.cpp: Fixed a typo that - broke the builds. My bad :( + * examples/C++NPv2/Reactor_Logging_Server_T.cpp: Fixed a typo that + broke the builds. My bad :( Mon Oct 21 20:13:27 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * examples/C++NPv2/Reactor_Logging_Server_T.cpp: - * examples/C++NPv1/Logging_Server.cpp: - * examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp: - * examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp: - * examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp: - Fix for compile errors on Lynx platform. Thanks to Craig - Rodrigues for supplying the patches. + * examples/C++NPv2/Reactor_Logging_Server_T.cpp: + * examples/C++NPv1/Logging_Server.cpp: + * examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp: + * examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp: + * examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp: + Fix for compile errors on Lynx platform. Thanks to Craig + Rodrigues for supplying the patches. Tue Oct 22 12:36:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> @@ -873,21 +340,21 @@ Tue Oct 22 12:36:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> Mon Oct 21 22:30:51 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * tests/SString_Test.cpp (ACE_TMAIN): Fixed a warning in Win32 builds. + * tests/SString_Test.cpp (ACE_TMAIN): Fixed a warning in Win32 builds. Mon Oct 21 20:04:12 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * ace/WIN32_Asynch_IO.h: - * ace/WIN32_Asynch_IO.cpp: Integrated the latest patches from Eric - Frias <efrias@syncad.com>. + * ace/WIN32_Asynch_IO.h: + * ace/WIN32_Asynch_IO.cpp: Integrated the latest patches from Eric + Frias <efrias@syncad.com>. Mon Oct 21 06:54:12 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * tests/Recursive_Condition_Test.cpp (test_4): - * tests/RB_Tree_Test.cpp: Fixed compile errors arising out of M$ - quirks. The scoping rules for 'for' loops are busted and hence - these fixes. These fixes basically change the variable names for - the different for loops inside the same scope. + * tests/Recursive_Condition_Test.cpp (test_4): + * tests/RB_Tree_Test.cpp: Fixed compile errors arising out of M$ + quirks. The scoping rules for 'for' loops are busted and hence + these fixes. These fixes basically change the variable names for + the different for loops inside the same scope. Sun Oct 20 21:40:13 2002 Krishnakumar B <kitty@cse.wustl.edu> @@ -901,74 +368,74 @@ Sun Oct 20 14:06:36 2002 Krishnakumar B <kitty@cse.wustl.edu> Sun Oct 20 11:36:34 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * ACEXML/common/FileCharStream.cpp: Fixed a compile error in - Borland builds. The compile error is due to strict enforcement - of scoping rules in a for loop by Borland compiler. + * ACEXML/common/FileCharStream.cpp: Fixed a compile error in + Borland builds. The compile error is due to strict enforcement + of scoping rules in a for loop by Borland compiler. Sun Oct 20 11:31:45 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * ACEXML/common/Makefile.bor: Added Encoding.obj to the list of - object files. Thanks to Johnny for pointing this out. + * ACEXML/common/Makefile.bor: Added Encoding.obj to the list of + object files. Thanks to Johnny for pointing this out. Sun Oct 20 11:30:04 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * tests/SPIPE_Test.cpp: Fixed compile errors in Borland builds. + * tests/SPIPE_Test.cpp: Fixed compile errors in Borland builds. Sun Oct 20 10:16:23 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * examples/C++NPv2/display_logfile.cpp: Fix for single threaded - builds. + * examples/C++NPv2/display_logfile.cpp: Fix for single threaded + builds. Sun Oct 20 10:12:42 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * tests/Recursive_Condition_Test.cpp: Fix for single threaded - builds. The ACE_HAS_THREADS were improperly placed. + * tests/Recursive_Condition_Test.cpp: Fix for single threaded + builds. The ACE_HAS_THREADS were improperly placed. Sun Oct 20 09:26:58 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * examples/C++NPv1/Makefile: Added changes from "Fri Oct 18 - 21:01:25 UTC 2002 Craig Rodrigues <crodrigu@bbn.com>" back - since the changes are fine. Thanks to Craig for pointing that - out. + * examples/C++NPv1/Makefile: Added changes from "Fri Oct 18 + 21:01:25 UTC 2002 Craig Rodrigues <crodrigu@bbn.com>" back + since the changes are fine. Thanks to Craig for pointing that + out. Sun Oct 20 13:34:45 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> - * examples/C++NPv2/Makefile: Replace with recursive Makefile which + * examples/C++NPv2/Makefile: Replace with recursive Makefile which does not use for loops. Add .NOTPARALLEL target to fix - build errors on parallel builds. + build errors on parallel builds. Sun Oct 20 08:10:43 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * tests/Recursive_Condition_Test.cpp: Fixed a unused variable warning. + * tests/Recursive_Condition_Test.cpp: Fixed a unused variable warning. Sun Oct 20 00:27:02 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * tests/Recursive_Condition_Test.cpp: Fixed a fuzz error. + * tests/Recursive_Condition_Test.cpp: Fixed a fuzz error. Sun Oct 20 00:14:32 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * examples/C++NPv1/Makefile: Reverted the change "Fri Oct 18 - 21:01:25 UTC 2002 Craig Rodrigues <crodrigu@bbn.com>" since - this opens up some problems. Craig will look into it later and - provide a clean fix. Till then.. + * examples/C++NPv1/Makefile: Reverted the change "Fri Oct 18 + 21:01:25 UTC 2002 Craig Rodrigues <crodrigu@bbn.com>" since + this opens up some problems. Craig will look into it later and + provide a clean fix. Till then.. Sat Oct 19 20:00:00 2002 Stephen Torri <storri@cse.wustl.edu> - * tests/Recursive_Condition_Test.cpp: + * tests/Recursive_Condition_Test.cpp: - Added test to check nesting_level after requiring a Recursive - Condition Mutex multiple times. Also after releasing for the - same number of times. + Added test to check nesting_level after requiring a Recursive + Condition Mutex multiple times. Also after releasing for the + same number of times. - * tests/SString_Test.cpp: - * ace/String_Base.i: + * tests/SString_Test.cpp: + * ace/String_Base.i: - Bug 1323 (Reported by Wayne Erchak <wayne@stentor.com>): Fixed. - In the effort to protect from memory problems with non-null - terminated strings the operators '<' and '>' where - rendered useless. Now the comparions use memcmp instead of - strncmp. A series of tests have been added to SString_Test.cpp - to ensure this does not happen again. + Bug 1323 (Reported by Wayne Erchak <wayne@stentor.com>): Fixed. + In the effort to protect from memory problems with non-null + terminated strings the operators '<' and '>' where + rendered useless. Now the comparions use memcmp instead of + strncmp. A series of tests have been added to SString_Test.cpp + to ensure this does not happen again. Sat Oct 19 21:58:00 2002 Krishnakumar B <kitty@cse.wustl.edu> @@ -1130,16 +597,16 @@ Sat Oct 19 16:47:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> Sat Oct 19 10:09:38 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * examples/C++NPv2/Makefile: Reverted the change "Fri Oct 18 - 21:01:25 UTC 2002 Craig Rodrigues <crodrigu@bbn.com>" since - this opens up some problems. Craig will look into it later and - provide a clean fix. Till then.. + * examples/C++NPv2/Makefile: Reverted the change "Fri Oct 18 + 21:01:25 UTC 2002 Craig Rodrigues <crodrigu@bbn.com>" since + this opens up some problems. Craig will look into it later and + provide a clean fix. Till then.. Sat Oct 19 09:25:52 2002 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - * examples/Reactor/Misc/test_timer_queue.cpp, - * tests/Timer_Queue_Test.cpp: Fixed warnings with G++. - Thanks to Bala for reporting this. + * examples/Reactor/Misc/test_timer_queue.cpp, + * tests/Timer_Queue_Test.cpp: Fixed warnings with G++. + Thanks to Bala for reporting this. Fri Oct 18 22:07:31 2002 Steve Huston <shuston@riverace.com> @@ -1165,13 +632,13 @@ Fri Oct 18 20:13:29 2002 Steve Huston <shuston@riverace.com> Fri Oct 18 17:12:03 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * examples/C++NPv2/display_logfile.cpp: - * examples/C++NPv2/Client_Logging_Daemon.cpp: - * examples/C++NPv2/TP_Logging_Server.h: - * examples/C++NPv2/TP_Logging_Server.cpp: Fixed compile errors in - single threaded builds. All they needed was the usage of the - right macros like ACE_SYNCH instead of ACE_MT_SYNCH and - ACE_SYNCH_MUTEX instead of ACE_Thread_Mutex. + * examples/C++NPv2/display_logfile.cpp: + * examples/C++NPv2/Client_Logging_Daemon.cpp: + * examples/C++NPv2/TP_Logging_Server.h: + * examples/C++NPv2/TP_Logging_Server.cpp: Fixed compile errors in + single threaded builds. All they needed was the usage of the + right macros like ACE_SYNCH instead of ACE_MT_SYNCH and + ACE_SYNCH_MUTEX instead of ACE_Thread_Mutex. Fri Oct 18 16:25:09 2002 Yuanfang Zhang <yfzhang@cse.wustl.edu> @@ -1182,20 +649,20 @@ Fri Oct 18 16:25:09 2002 Yuanfang Zhang <yfzhang@cse.wustl.edu> Fri Oct 18 21:01:25 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> - * examples/C++NPv1/Makefile: Fix comment. - * examples/C++NPv1/Makefile: Replace with recursive Makefile which - does not use for loops. + * examples/C++NPv1/Makefile: Fix comment. + * examples/C++NPv1/Makefile: Replace with recursive Makefile which + does not use for loops. Fri Oct 18 15:44:19 2002 Priyanka Gontla <pgontla@ociweb.com> - * THANKS: - Added Christian Barheine <cbarheine@sympatec.com> to the hall - of fame. + * THANKS: + Added Christian Barheine <cbarheine@sympatec.com> to the hall + of fame. Fri Oct 18 19:37:20 GMT 2002 Craig Rodrigues <crodrigu@bbn.com> - * ace/config-macosx.h: Define ACE_HAS_NONSTATIC_OBJECT_MANAGER - for gperf. + * ace/config-macosx.h: Define ACE_HAS_NONSTATIC_OBJECT_MANAGER + for gperf. Fri Oct 18 14:52:37 2002 Steve Huston <shuston@riverace.com> @@ -1207,43 +674,43 @@ Fri Oct 18 14:52:37 2002 Steve Huston <shuston@riverace.com> Fri Oct 18 13:21:05 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - * tests/Timer_Queue_Test.cpp, - * examples/Reactor/Misc/test_timer_queue.cpp: - Fixed these tests so that it passes dynamically allocated memory - rather that values via the "act" parameter to - ACE_Timer_Queue::schedule(). This ensures the test will work - properly on strange OS platforms, such as Win64 where pointers - and longs/ints are different sizes. Thanks to Cristian - Ungureanu <cristian.ungureanu@amdocs.com> for motivating this. + * tests/Timer_Queue_Test.cpp, + * examples/Reactor/Misc/test_timer_queue.cpp: + Fixed these tests so that it passes dynamically allocated memory + rather that values via the "act" parameter to + ACE_Timer_Queue::schedule(). This ensures the test will work + properly on strange OS platforms, such as Win64 where pointers + and longs/ints are different sizes. Thanks to Cristian + Ungureanu <cristian.ungureanu@amdocs.com> for motivating this. -Fri Oct 18 17:20:02 UTC 2002 Don Hinton <dhinton@ieee.org> +Fri Oct 18 17:20:02 UTC 2002 Don Hinton <dhinton@iee.org> - * ace/SOCK_Dgram_Mcast.{h,cpp}: + * ace/SOCK_Dgram_Mcast.{h,cpp}: - Factored out common code to an open_i() method that open() - can call at this level and in inherited classes. + Factored out common code to an open_i() method that open() + can call at this level and in inherited classes. - * ace/QoS/SOCK_Dgram_Mcast_QoS.{h.cpp}: + * ace/QoS/SOCK_Dgram_Mcast_QoS.{h.cpp}: - Modified ctor to take same default param as base class and - invoke the base class ctor. + Modified ctor to take same default param as base class and + invoke the base class ctor. - Removed duplicate code in open() and have it call base::open_i() - after opening the socket with QoS. Changed 1st parameter from - ACE_Addr to ACE_INET_Addr to match base classes. + Removed duplicate code in open() and have it call base::open_i() + after opening the socket with QoS. Changed 1st parameter from + ACE_Addr to ACE_INET_Addr to match base classes. - Removed duplicate code from subscribe by having it call base - class methods. + Removed duplicate code from subscribe by having it call base + class methods. Fri Oct 18 11:51:44 2002 Nanbor Wang <nanbor@cs.wustl.edu> * bin/PerlACE/Run_Test.pm: Created a new variable $PerlACE::svcconf_ext which defines the canonical svc.conf file extention used by various run_test scripts. By - default, this is defined to ".conf". It can be overwritten - using the environment variable ACE_RUNTEST_SVCCONF_EXT. For - example, you can define ACE_RUNTEST_SVCCONF_EXT to ".conf.xml" - if you have built your ACE with XML-based service configurator. + default, this is defined to ".conf". It can be overwritten + using the environment variable ACE_RUNTEST_SVCCONF_EXT. For + example, you can define ACE_RUNTEST_SVCCONF_EXT to ".conf.xml" + if you have built your ACE with XML-based service configurator. Fri Oct 18 11:55:33 2002 Steve Huston <shuston@riverace.com> @@ -1265,56 +732,56 @@ Fri Oct 18 11:39:29 2002 Steve Huston <shuston@riverace.com> together. Fri Oct 18 03:55:51 UTC 2002 Don Hinton <dhinton@objectsciences.com> - Bill Fulton <Bill_A_Fulton@raytheon.com> - - * ace/SOCK_Dgram_Mcast.{h,i,cpp}: - - Enhanced support for join()'ing multiple multicast groups. Ctor - now offers finer control over a bind()'ing to an address or - interface. Appropriate default behavior has been specified, - but note that due to issues on Linux, portable code should not - join() more than one multicast group per instance. - - An open() method has been added/exposed. If not explicitely - called, it will be implicitely called by the first join(), and - will bind() the address if the OPT_BINDADDR_YES options was - specified in the ctor. - - Error handling has also been enhanced. For instance, if - OPT_BINDADDR_YES has been specified (the default on Linux), - additional join()'s will fail since the socket gets bound on - the first call to open() or join(). Previously, subsequent - calls to join() would silently fail, i.e., the call succeeded - but only datagrams sent to the first, bound address where - actually delivered. - - If ACE_SOCK_DGRAM_MCAST_DUMPABLE is defined, a list of all - subscribed groups is maintained and can be dump()'ed, although - access to this list is not public. - - Added new join()/leave() methods that remove unused, deprecated - protocol_family and protocol arguments. These values can be - determined on the fly. The old subscribe()/unsubscribe() - methods have been deprecated and are now implemented in terms - of join()/leave() respectively. - - The unsubscribe(void) method has also been deprecated. It was - designed to allow the caller to unsubscribe/leave() all - groups at once, but since a list was never kept (and still - isn't unless ACE_SOCK_DGRAM_MCAST_DUMPABLE is defined) only - the last group join()'ed was ever left. A better way would - be to either keep track of you own groups and call leave() - for each, or let the dtor close() the socket which automatically - unsubscribes from all groups. - - Some IPv6 support has been added either directly or by removing - the need for the caller to handle it (see join()/leave() above), - although the internal calls to setsockopt() are still hard wired - for IPv4. + Bill Fulton <Bill_A_Fulton@raytheon.com> + + * ace/SOCK_Dgram_Mcast.{h,i,cpp}: + + Enhanced support for join()'ing multiple multicast groups. Ctor + now offers finer control over a bind()'ing to an address or + interface. Appropriate default behavior has been specified, + but note that due to issues on Linux, portable code should not + join() more than one multicast group per instance. + + An open() method has been added/exposed. If not explicitely + called, it will be implicitely called by the first join(), and + will bind() the address if the OPT_BINDADDR_YES options was + specified in the ctor. + + Error handling has also been enhanced. For instance, if + OPT_BINDADDR_YES has been specified (the default on Linux), + additional join()'s will fail since the socket gets bound on + the first call to open() or join(). Previously, subsequent + calls to join() would silently fail, i.e., the call succeeded + but only datagrams sent to the first, bound address where + actually delivered. + + If ACE_SOCK_DGRAM_MCAST_DUMPABLE is defined, a list of all + subscribed groups is maintained and can be dump()'ed, although + access to this list is not public. + + Added new join()/leave() methods that remove unused, deprecated + protocol_family and protocol arguments. These values can be + determined on the fly. The old subscribe()/unsubscribe() + methods have been deprecated and are now implemented in terms + of join()/leave() respectively. + + The unsubscribe(void) method has also been deprecated. It was + designed to allow the caller to unsubscribe/leave() all + groups at once, but since a list was never kept (and still + isn't unless ACE_SOCK_DGRAM_MCAST_DUMPABLE is defined) only + the last group join()'ed was ever left. A better way would + be to either keep track of you own groups and call leave() + for each, or let the dtor close() the socket which automatically + unsubscribes from all groups. + + Some IPv6 support has been added either directly or by removing + the need for the caller to handle it (see join()/leave() above), + although the internal calls to setsockopt() are still hard wired + for IPv4. Fri Oct 18 06:51:07 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - * ace/String_Base.{i,cpp}: Fixed the formatting in these files... + * ace/String_Base.{i,cpp}: Fixed the formatting in these files... Thu Oct 17 20:02:39 2002 Steve Huston <shuston@riverace.com> @@ -1336,24 +803,24 @@ Thu Oct 17 17:32:39 2002 Krishnakumar B <kitty@cse.wustl.edu> Thu Oct 17 19:18:02 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> - * ace/config-macosx.h: - - Remove define of __MACOSX__, and use constant __APPLE__ - instead defined by Apple's gcc. - - Removed definitions: - ACE_HAS_MACOSX_DYLIB, ACE_LACKS_SEMBUF_T - - Added definitions: - ACE_HAS_SEMUN, ACE_HAS_SIGINFO_T, ACE_LACKS_SIGINFO_H, - ACE_HAS_UCONTEXT_T, ACE_HAS_GETIFADDRS, + * ace/config-macosx.h: + - Remove define of __MACOSX__, and use constant __APPLE__ + instead defined by Apple's gcc. + - Removed definitions: + ACE_HAS_MACOSX_DYLIB, ACE_LACKS_SEMBUF_T + - Added definitions: + ACE_HAS_SEMUN, ACE_HAS_SIGINFO_T, ACE_LACKS_SIGINFO_H, + ACE_HAS_UCONTEXT_T, ACE_HAS_GETIFADDRS, ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES - - Defined ACE_HAS_POSITION_INDEPENDENT_POINTERS to 0 for temporary - Apple gcc bug workaround. + - Defined ACE_HAS_POSITION_INDEPENDENT_POINTERS to 0 for temporary + Apple gcc bug workaround. - * ace/Log_Msg.cpp (ACE_Log_Msg::log): Add check for __APPLE__ to catch - right prototype for sys_errlist. + * ace/Log_Msg.cpp (ACE_Log_Msg::log): Add check for __APPLE__ to catch + right prototype for sys_errlist. - * ace/OS.h: Remove unnecessary __MACOSX__ check. + * ace/OS.h: Remove unnecessary __MACOSX__ check. - * include/makeinclude/platform_macosx.GNU: Minor cleanups. + * include/makeinclude/platform_macosx.GNU: Minor cleanups. Thu Oct 17 13:47:39 2002 Steve Huston <shuston@riverace.com> @@ -1362,19 +829,19 @@ Thu Oct 17 13:47:39 2002 Steve Huston <shuston@riverace.com> Thu Oct 17 16:28:05 UTC 2002 Don Hinton <dhinton@ieee.org> - * THANKS: Added Jon Franklin <jfranklin@dctd.saic.com> - to the hall of fame. + * THANKS: Added Jon Franklin <jfranklin@dctd.saic.com> + to the hall of fame. Thu Oct 17 10:26:59 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * examples/C++NPv2/display_logfile.cpp (ACE_MT_SYNCH>): Fixed a - uninitialized member usage warning. + * examples/C++NPv2/display_logfile.cpp (ACE_MT_SYNCH>): Fixed a + uninitialized member usage warning. Thu Oct 17 00:26:13 2002 Nanbor Wang <nanbor@cs.wustl.edu> - * ace/Malloc_T.i (release): Instead of releasing the memory_pool_ - explicitly, changed to use remove () to make sure all resources - are removed properly. + * ace/Malloc_T.i (release): Instead of releasing the memory_pool_ + explicitly, changed to use remove () to make sure all resources + are removed properly. Wed Oct 16 20:23:09 2002 Krishnakumar B <kitty@cse.wustl.edu> @@ -1387,16 +854,16 @@ Wed Oct 16 20:23:09 2002 Krishnakumar B <kitty@cse.wustl.edu> Wed Oct 16 18:47:44 2002 Stephen Torri <storri@cse.wustl.edu> - * examples/C++NPv1/Makefile: + * examples/C++NPv1/Makefile: - Replaced Makefile with non-for-loop version provided by - Craig Rodrigues. + Replaced Makefile with non-for-loop version provided by + Craig Rodrigues. Wed Oct 16 16:52:52 2002 Nanbor Wang <nanbor@cs.wustl.edu> - * ace/MEM_SAP.cpp (close_shm_malloc): Fixed a memory leak that I - added last time when I fixed a race condition in removing mmap - file. + * ace/MEM_SAP.cpp (close_shm_malloc): Fixed a memory leak that I + added last time when I fixed a race condition in removing mmap + file. Wed Oct 16 15:35:22 2002 Steve Huston <shuston@riverace.com> @@ -1404,45 +871,45 @@ Wed Oct 16 15:35:22 2002 Steve Huston <shuston@riverace.com> Wed Oct 16 14:02:27 2002 Yuanfang Zhang <yfzhang@cse.wustl.edu> - * ace/RB_Tree.cpp: - * ace/RB_Tree.h: + * ace/RB_Tree.cpp: + * ace/RB_Tree.h: - forward and reverse partial tree traversal. - Changed the find_i method by adding a parameter "find_Exact". + forward and reverse partial tree traversal. + Changed the find_i method by adding a parameter "find_Exact". Wed Oct 16 12:18:03 2002 Stephen Torri <storri@cse.wustl.edu> - * examples/C++v1/Makefile: - * examples/C++NPv1/Makefile.Iterative_Logging_Server: - * examples/C++NPv1/Makefile.Logging_Client: - * examples/C++NPv1/Makefile.Reactive_Logging_Server: - * examples/C++NPv1/Makefile.Reactive_Logging_Server_Ex: - * examples/C++NPv1/Makefile.RT_Thread_Per_Connection_Logging_Server: - * examples/C++NPv1/Makefile.Thread_Per_Connection_Logging_Server: - * examples/C++NPv1/Makefile.wProcess_Per_Connection_Logging_Server: + * examples/C++v1/Makefile: + * examples/C++NPv1/Makefile.Iterative_Logging_Server: + * examples/C++NPv1/Makefile.Logging_Client: + * examples/C++NPv1/Makefile.Reactive_Logging_Server: + * examples/C++NPv1/Makefile.Reactive_Logging_Server_Ex: + * examples/C++NPv1/Makefile.RT_Thread_Per_Connection_Logging_Server: + * examples/C++NPv1/Makefile.Thread_Per_Connection_Logging_Server: + * examples/C++NPv1/Makefile.wProcess_Per_Connection_Logging_Server: Renamed from *.mak to Makefile.* to avoid looking like an exported MSVC project NMAKE file. (Following Steve Huston's - change to examples/C++v2). + change to examples/C++v2). - Fixed Make error that make realclean was not in Makefile. + Fixed Make error that make realclean was not in Makefile. - * tests/Recursive_Condition_Test.cpp: + * tests/Recursive_Condition_Test.cpp: - Changed function call of signal() to broadcast() to awaken - multiple threads waiting on a shared condition variable. + Changed function call of signal() to broadcast() to awaken + multiple threads waiting on a shared condition variable. Oct 16 11:44:27 2002 Nanbor Wang <nanbor@cs.wustl.edu> - * ace/Thread_Manager.cpp (check_state): Changed to return 0 if - the thread id is not managed by the Thread_Manager. + * ace/Thread_Manager.cpp (check_state): Changed to return 0 if + the thread id is not managed by the Thread_Manager. - * ace/Thread_Manager.h: Updated documentation for testcancel(), - testsuspend(), and testresume (). They all return false now if - the you try to test the status of a tid that is not managed by - the Thread_Manager. + * ace/Thread_Manager.h: Updated documentation for testcancel(), + testsuspend(), and testresume (). They all return false now if + the you try to test the status of a tid that is not managed by + the Thread_Manager. - Thanks to Giovanni Zito <g.zito@acsys.it> for reporting it. + Thanks to Giovanni Zito <g.zito@acsys.it> for reporting it. Wed Oct 16 12:41:29 2002 Steve Huston <shuston@riverace.com> @@ -1478,33 +945,33 @@ Wed Oct 16 12:08:21 2002 Steve Huston <shuston@riverace.com> Wed Oct 16 11:02:41 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - * ace/High_Res_Timer.cpp (get_cpuinfo): Removed the recalibration of - the scale factor every time the application is launched. Thanks - to Bo Balder <bba@post.utfors.se> for reporting this. + * ace/High_Res_Timer.cpp (get_cpuinfo): Removed the recalibration of + the scale factor every time the application is launched. Thanks + to Bo Balder <bba@post.utfors.se> for reporting this. Wed Oct 16 10:55:11 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * ace/config-linux-common.h: Added support for ACE_CC_NAME, - ACE_CC_MAJOR_VERSION and ACE_CC_MINOR_VERSION for linux. Thanks - to Jaroslaw Nozderko <jaroslaw.nozderko@polkomtel.com.pl> for - suggesting this. + * ace/config-linux-common.h: Added support for ACE_CC_NAME, + ACE_CC_MAJOR_VERSION and ACE_CC_MINOR_VERSION for linux. Thanks + to Jaroslaw Nozderko <jaroslaw.nozderko@polkomtel.com.pl> for + suggesting this. Wed Oct 16 10:55:44 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * ace/config-win32-msvc.h (ACE_HAS_ALLOCA): Enabled alloca support - for MSVC. Thanks to Pat McNertney <pat@mcnerthney.com> for - providing the patch. + * ace/config-win32-msvc.h (ACE_HAS_ALLOCA): Enabled alloca support + for MSVC. Thanks to Pat McNertney <pat@mcnerthney.com> for + providing the patch. Tue Oct 15 18:49:25 2002 Stephen Torri <storri@cse.wustl.edu> - * tests/Recursive_Condition_Test.cpp: + * tests/Recursive_Condition_Test.cpp: - Added two tests. - Test 2: repeat of test 1 but with a 2 second delay - after main thread signals the waiting thread. (Works) - Test 3: repeat of test 1 but with 4 threads waiting - on the condition variable. (Broken - no threads - awaken). + Added two tests. + Test 2: repeat of test 1 but with a 2 second delay + after main thread signals the waiting thread. (Works) + Test 3: repeat of test 1 but with 4 threads waiting + on the condition variable. (Broken - no threads + awaken). Tue Oct 15 17:27:34 2002 Krishnakumar B <kitty@cse.wustl.edu> @@ -1564,90 +1031,90 @@ Tue Oct 15 17:15:41 2002 Steve Huston <shuston@riverace.com> Tue Oct 15 11:43:27 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * ace/SPIPE_Connector.cpp (connect): Convert the first argument in - the ::WaitNamedPipe () call to char * always using the macro - defined. This shold fix compilation errors in WCHAR builds. + * ace/SPIPE_Connector.cpp (connect): Convert the first argument in + the ::WaitNamedPipe () call to char * always using the macro + defined. This shold fix compilation errors in WCHAR builds. Tue Oct 15 16:19:33 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> - [Bug 1090] - * ace/config-freebsd-pthread.h: Add ACE_HAS_GETIFADDRS. This fixes - Bugzilla bug 1090. + [Bug 1090] + * ace/config-freebsd-pthread.h: Add ACE_HAS_GETIFADDRS. This fixes + Bugzilla bug 1090. Tue Oct 15 10:47:20 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * ace/SPIPE_Connector.cpp: Fixed a unused variable warning. + * ace/SPIPE_Connector.cpp: Fixed a unused variable warning. Tue Oct 15 06:56:18 2002 Patrick J. McNerthney <ace@mcnerthney.com> - * tests/SPIPE_Test.cpp: Added support for testing the new Windows - bytestream mode. + * tests/SPIPE_Test.cpp: Added support for testing the new Windows + bytestream mode. Mon Oct 14 20:47:21 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - * ace/SPIPE_Acceptor.cpp (open): Changed "mode" to "pipe_mode", - which is the name of the parameter. Thanks to Don Hinton for - reporting this. + * ace/SPIPE_Acceptor.cpp (open): Changed "mode" to "pipe_mode", + which is the name of the parameter. Thanks to Don Hinton for + reporting this. Mon Oct 14 19:20:35 2002 Frank Hunleth <frank@hunleth.com> - * ACE-INSTALL.html: Added installation notes for the OpenBSD port. + * ACE-INSTALL.html: Added installation notes for the OpenBSD port. - * ace/config-openbsd.h: - * ace/config-openbsd-pthread.h: - * include/makeinclude/platform_openbsd.GNU: - * include/makeinclude/platform_openbsd_pthread.GNU: Configuration - files for OpenBSD. + * ace/config-openbsd.h: + * ace/config-openbsd-pthread.h: + * include/makeinclude/platform_openbsd.GNU: + * include/makeinclude/platform_openbsd_pthread.GNU: Configuration + files for OpenBSD. - * ace/ACE.cpp: Added OpenBSD-specific error code to ACE::out_of_handles + * ace/ACE.cpp: Added OpenBSD-specific error code to ACE::out_of_handles - * ace/OS.h: Added #define for OpenBSD-specific path to siginfo.h and - ACE_LACKS_CLEARERR guards around clearerr() for OpenBSD. + * ace/OS.h: Added #define for OpenBSD-specific path to siginfo.h and + ACE_LACKS_CLEARERR guards around clearerr() for OpenBSD. - * ace/OS.i: Added support for getifaddrs() with ACE_HAS_GETIFADDRS + * ace/OS.i: Added support for getifaddrs() with ACE_HAS_GETIFADDRS and fix for segfault when calling dlsym with a null handle. Added - guards on clearerr using ACE_LACKS_CLEARERR. (All only affect - OpenBSD.) + guards on clearerr using ACE_LACKS_CLEARERR. (All only affect + OpenBSD.) - * ace/POSIX_Proactor.cpp: - * ace/POSIX_Proactor.h: Added SystemType family for OpenBSD. + * ace/POSIX_Proactor.cpp: + * ace/POSIX_Proactor.h: Added SystemType family for OpenBSD. - * ace/README: Added new ACE #defines to support OpenBSD. These include: - ACE_HAS_GETIFADDRS - for support of the getifaddrs() system call - ACE_HAS_DLSYM_SEGFAULT_ON_INVALID_HANDLE - add check to dlsym call - to protect against NULL. OpenBSD 3.1 needs this. - ACE_LACKS_CLEARERR - #define to remove clearerr definition due - to bogus syntax error on OpenBSD. + * ace/README: Added new ACE #defines to support OpenBSD. These include: + ACE_HAS_GETIFADDRS - for support of the getifaddrs() system call + ACE_HAS_DLSYM_SEGFAULT_ON_INVALID_HANDLE - add check to dlsym call + to protect against NULL. OpenBSD 3.1 needs this. + ACE_LACKS_CLEARERR - #define to remove clearerr definition due + to bogus syntax error on OpenBSD. - * ace/Sock_Connect.cpp: Added code to get_ip_interfaces to use + * ace/Sock_Connect.cpp: Added code to get_ip_interfaces to use getifaddrs() if it is supported. OpenBSD is the only platform to - use this currently. Under OpenBSD, the code to parse the return - values from the corresponding ioctl calls gets confused when IPv6 - interfaces are present. + use this currently. Under OpenBSD, the code to parse the return + values from the corresponding ioctl calls gets confused when IPv6 + interfaces are present. - * tests/Malloc_Test.cpp: Added OpenBSD to the list of platforms that - can't handle the remap of fault part of the test. + * tests/Malloc_Test.cpp: Added OpenBSD to the list of platforms that + can't handle the remap of fault part of the test. - * tests/Reactor_Dispatch_Order_Test.cpp: Added code for OpenBSD to - clear the write mask after handle_output is called, since OpenBSD - calls handle_output more than once before the data is received - over the pipe. + * tests/Reactor_Dispatch_Order_Test.cpp: Added code for OpenBSD to + clear the write mask after handle_output is called, since OpenBSD + calls handle_output more than once before the data is received + over the pipe. Mon Oct 14 18:21:40 2002 Patrick J. McNerthney <ace@mcnerthney.com> * ace/OS.h: Added FILE_FLAG_WRITE_THROUGH defines for - non-supporting operating systems and added various PIPE_* - defines for non-supporting operating systems. + non-supporting operating systems and added various PIPE_* + defines for non-supporting operating systems. * ace/SPIPE_Connector.{h,cpp}: Added support to enable the - selection of whether bytestream or message mode is used on - Windows. Also added support for both blocking and timeout - connections on Windows, only non-blocking connections where - support before. + selection of whether bytestream or message mode is used on + Windows. Also added support for both blocking and timeout + connections on Windows, only non-blocking connections where + support before. * ace/SPIPE_Acceptor.{h.cpp}: Added support to enable the - selection of whether bytestream or message mode is used on - Windows. + selection of whether bytestream or message mode is used on + Windows. Mon Oct 14 20:19:51 2002 Steve Huston <shuston@riverace.com> @@ -1664,11 +1131,11 @@ Mon Oct 14 20:19:51 2002 Steve Huston <shuston@riverace.com> Mon Oct 14 17:23:43 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * ace/CDR_Base.cpp (consolidate): Reverted the optimization - performed in "Tue Mar 12 17:43:32 2002 Balachandran Natarajan - <bala@cs.wustl.edu>". This optimizations created problems for - CORBA::Any implementation which assumes that the data is totally - contained within the Any. Using the optimization created problems + * ace/CDR_Base.cpp (consolidate): Reverted the optimization + performed in "Tue Mar 12 17:43:32 2002 Balachandran Natarajan + <bala@cs.wustl.edu>". This optimizations created problems for + CORBA::Any implementation which assumes that the data is totally + contained within the Any. Using the optimization created problems for Any's that are copied between different threads. Thanks to Jian Chen <jchen@huawei.com> for reporting this problem. @@ -1719,27 +1186,27 @@ Sun Oct 13 19:38:35 2002 Krishnakumar B <kitty@cse.wustl.edu> Sun Oct 13 18:50:53 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - * ace/SPIPE_Stream.h: Enhanced the documentation of ACE_SPIPE_Stream. - Thanks to Pat McNerthney <ace@mcnerthney.com> for motivating - this. + * ace/SPIPE_Stream.h: Enhanced the documentation of ACE_SPIPE_Stream. + Thanks to Pat McNerthney <ace@mcnerthney.com> for motivating + this. Sun Oct 13 15:57:04 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * ace/Asynch_IO.cpp: - * ace/Asynch_IO.h: Protected ACE_Asynch_Read_File::readv () and - ACE_Asynch_Write_File::writev () from being called when - ACE_HAS_WINNT4 == 0. - * ace/WIN32_Asynch_IO.cpp: - * ace/WIN32_Asynch_IO.h: Protected - ACE_WIN32_Asynch_Read_File::readv () and - ACE_WIN32_Asynch_Write_File::writev () from being called when - ACE_HAS_WINNT4 == 0. + * ace/Asynch_IO.cpp: + * ace/Asynch_IO.h: Protected ACE_Asynch_Read_File::readv () and + ACE_Asynch_Write_File::writev () from being called when + ACE_HAS_WINNT4 == 0. + * ace/WIN32_Asynch_IO.cpp: + * ace/WIN32_Asynch_IO.h: Protected + ACE_WIN32_Asynch_Read_File::readv () and + ACE_WIN32_Asynch_Write_File::writev () from being called when + ACE_HAS_WINNT4 == 0. - Thanks to Eric Frias <efrias@syncad.com> for reporting the - problem and Alex Libman for suggesting the fix. + Thanks to Eric Frias <efrias@syncad.com> for reporting the + problem and Alex Libman for suggesting the fix. - * THANKS: Added Eric Frias <efrias@syncad.com> to the hall of - fame. + * THANKS: Added Eric Frias <efrias@syncad.com> to the hall of + fame. Sun Oct 13 15:54:59 2002 Krishnakumar B <kitty@cse.wustl.edu> @@ -1853,11 +1320,11 @@ Sat Oct 12 22:50:02 2002 Krishnakumar B <kitty@cse.wustl.edu> Fri Oct 11 12:44:58 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> - * RTJava/*: Removed. Angelo Corsaro <corsaro@ece.uci.edu> - keeps RTJperf related files in another CVS repository. + * RTJava/*: Removed. Angelo Corsaro <corsaro@ece.uci.edu> + keeps RTJperf related files in another CVS repository. - * ace/config-freebsd-pthread.h: Improved check of - _POSIX_REALTIME_SIGNALS preprocessor constant. + * ace/config-freebsd-pthread.h: Improved check of + _POSIX_REALTIME_SIGNALS preprocessor constant. Thu Oct 10 16:02:20 2002 Ossama Othman <othman@cs.wustl.edu> @@ -1865,19 +1332,19 @@ Thu Oct 10 16:02:20 2002 Ossama Othman <othman@cs.wustl.edu> Thu Oct 10 13:56:35 2002 Ossama Othman <ossama@uci.edu> - * bin/make_release (check_workspace): + * bin/make_release (check_workspace): - Ignore platform_macros.GNU and config.h files. They are - needed when cutting the beta/release. This isn't a problem - since the ACE/TAO kits are created from a "cvs export"ed - workspace that doesn't include those files. + Ignore platform_macros.GNU and config.h files. They are + needed when cutting the beta/release. This isn't a problem + since the ACE/TAO kits are created from a "cvs export"ed + workspace that doesn't include those files. Thu Oct 10 15:11:07 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * bin/make_release: A pattern matching issue. The cvs server now - gives a message starting with "cvs server:.." instead of "cvs - checkout:..". This created problems for Ossama when he was - trying to cut the beta. + * bin/make_release: A pattern matching issue. The cvs server now + gives a message starting with "cvs server:.." instead of "cvs + checkout:..". This created problems for Ossama when he was + trying to cut the beta. Wed Oct 9 23:43:51 2002 Steve Huston <shuston@riverace.com> @@ -1897,12 +1364,12 @@ Wed Oct 9 23:08:19 2002 Steve Huston <shuston@riverace.com> Wed Oct 09 12:19:40 2002 Nanbor Wang <nanbor@cs.wustl.edu> - * bin/PerlACE/Process_Win32.pm: Added hack to purify a process. - This will allow us to purify all the examples, tests much - easier. It is, however, tightly coupled to Purify 6.0. The - script automaticaly switch to purifying the process if the - ACE_RUN_PURIFY_CMD environment variable is defined. See the - comments in this file for more details. + * bin/PerlACE/Process_Win32.pm: Added hack to purify a process. + This will allow us to purify all the examples, tests much + easier. It is, however, tightly coupled to Purify 6.0. The + script automaticaly switch to purifying the process if the + ACE_RUN_PURIFY_CMD environment variable is defined. See the + comments in this file for more details. Tue Oct 8 21:06:23 2002 Steve Huston <shuston@riverace.com> @@ -1923,47 +1390,47 @@ Tue Oct 8 09:22:41 2002 Steve Huston <shuston@riverace.com> Mon Oct 7 17:29:14 2002 Ossama Othman <ossama@uci.edu> - * tests/Proactor_Scatter_Gather_Test.cpp (initiate_read_file): + * tests/Proactor_Scatter_Gather_Test.cpp (initiate_read_file): - Cast one of the operands in a subtraction operation to a size_t - to address a problem exhibited by Borland C++ where the ACE_MIN - template expects two parameters of the same type, but was - getting two parameter of different types. This problem occurred - on platforms where "unsigned int" and "unsigned long" are - different types. + Cast one of the operands in a subtraction operation to a size_t + to address a problem exhibited by Borland C++ where the ACE_MIN + template expects two parameters of the same type, but was + getting two parameter of different types. This problem occurred + on platforms where "unsigned int" and "unsigned long" are + different types. Mon Oct 07 15:21:44 2002 Nanbor Wang <nanbor@cs.wustl.edu> - * ACEXML/apps/svcconf/XML_Svc_Conf_Parser.dsp: - * ACEXML/common/XML_Common.dsp: - * ACEXML/parser/debug_validator/Debug_Validator.dsp: - * ACEXML/parser/parser/Parser.dsp: - * ACEXML/tests/HttpCharStream_Test.dsp: - * ACEXML/tests/NamespaceSupport_Test.dsp: - * ACEXML/tests/Transcoder_Test.dsp: - * apps/JAWS2/server.dsp: - * examples/Export/test.dsp: - * examples/IPC_SAP/FILE_SAP/client.dsp: - * examples/Logger/client/client.dsp: - * examples/Logger/simple-server/server_loggerd.dsp: - * examples/QOS/Simple/receiver.dsp: - * examples/QOS/Simple/sender.dsp: - * examples/Reactor/Multicast/client.dsp: - * examples/Reactor/Multicast/server.dsp: - * examples/Reactor/Proactor/test_udp_proactor.dsp: - * examples/Synch/proc_sema.dsp: - * tests/DLL_Test_Impl.dsp: - * tests/Framework_Component_DLL.dsp: Disabled the generation - of precompiled headers. They were taking up too much disk space - on the nightly build machines. Thanks to Ossama for noticing - this. + * ACEXML/apps/svcconf/XML_Svc_Conf_Parser.dsp: + * ACEXML/common/XML_Common.dsp: + * ACEXML/parser/debug_validator/Debug_Validator.dsp: + * ACEXML/parser/parser/Parser.dsp: + * ACEXML/tests/HttpCharStream_Test.dsp: + * ACEXML/tests/NamespaceSupport_Test.dsp: + * ACEXML/tests/Transcoder_Test.dsp: + * apps/JAWS2/server.dsp: + * examples/Export/test.dsp: + * examples/IPC_SAP/FILE_SAP/client.dsp: + * examples/Logger/client/client.dsp: + * examples/Logger/simple-server/server_loggerd.dsp: + * examples/QOS/Simple/receiver.dsp: + * examples/QOS/Simple/sender.dsp: + * examples/Reactor/Multicast/client.dsp: + * examples/Reactor/Multicast/server.dsp: + * examples/Reactor/Proactor/test_udp_proactor.dsp: + * examples/Synch/proc_sema.dsp: + * tests/DLL_Test_Impl.dsp: + * tests/Framework_Component_DLL.dsp: Disabled the generation + of precompiled headers. They were taking up too much disk space + on the nightly build machines. Thanks to Ossama for noticing + this. Sun Oct 6 09:03:28 2002 Ossama Othman <ossama@uci.edu> - * ace/UPIPE_Stream.cpp (send): + * ace/UPIPE_Stream.cpp (send): - Silenced a signed/unsigned conversion warning using a - static_cast<> until a better solution presents itself. + Silenced a signed/unsigned conversion warning using a + static_cast<> until a better solution presents itself. Sat Oct 5 17:04:38 2002 Steve Huston <shuston@riverace.com> @@ -2091,7 +1558,7 @@ Fri Oct 4 20:22:41 2002 Steve Huston <shuston@riverace.com> * ace/Memory_Pool.cpp: Adjust usage of size_t/off_t, usually with casts where needed. - (map): For Win64, allow full 64-bit range of file mapping size. + (map): For Win64, allow full 64-bit range of file mapping size. * ace/Message_Queue.{h i cpp} (ACE_Message_Queue_NT): Changed max_threads arg (ctor and open()) and max_cthrs_/cur_thrs_ from @@ -2279,10 +1746,10 @@ Fri Oct 4 18:39:19 2002 Steve Huston <shuston@riverace.com> Thu Oct 3 17:29:36 2002 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - * ace/OS_Dirent.cpp (readdir_emulation): Don't do a FindNextFile() - right after FindFirstFile() to avoid overwriting the existing - data! Thanks to Dmitry Botcharnikov <dimab@garant.ru> for - reporting this. + * ace/OS_Dirent.cpp (readdir_emulation): Don't do a FindNextFile() + right after FindFirstFile() to avoid overwriting the existing + data! Thanks to Dmitry Botcharnikov <dimab@garant.ru> for + reporting this. Wed Oct 2 20:44:19 2002 Steve Huston <shuston@riverace.com> @@ -2294,35 +1761,35 @@ Wed Oct 2 20:44:19 2002 Steve Huston <shuston@riverace.com> Wed Oct 2 10:50:49 2002 Ossama Othman <ossama@uci.edu> - * ace/Basic_Types.h: - * ace/Basic_Types.cpp: + * ace/Basic_Types.h: + * ace/Basic_Types.cpp: - Do not rely on the u_int and u_long typedefs. They are not - always defined in system headers. Addresses a compile-time - issue when _XOPEN_SOURCE is explicitly set to 600 on Glibc - platforms, such as Linux. + Do not rely on the u_int and u_long typedefs. They are not + always defined in system headers. Addresses a compile-time + issue when _XOPEN_SOURCE is explicitly set to 600 on Glibc + platforms, such as Linux. - * ace/OS.h: + * ace/OS.h: - Explicitly define the u_{char,short,int,long} typedefs on Glibc - platforms when _BSD_SOURCE is not defined. Addresses a - compile-time issue when _BSD_SOURCE is not defined. + Explicitly define the u_{char,short,int,long} typedefs on Glibc + platforms when _BSD_SOURCE is not defined. Addresses a + compile-time issue when _BSD_SOURCE is not defined. - * ace/config-linux.h: + * ace/config-linux.h: - If ACE_HAS_PTHREADS_UNIX98_EXT is not defined, do not define - ACE_LACKS_RWLOCK_T. Addresses a compile-time issue when - _XOPEN_SOURCE is not set to a value >= 600. + If ACE_HAS_PTHREADS_UNIX98_EXT is not defined, do not define + ACE_LACKS_RWLOCK_T. Addresses a compile-time issue when + _XOPEN_SOURCE is not set to a value >= 600. - * ace/config-linux-common.h: + * ace/config-linux-common.h: - Reverted change that explicitly defined _XOPEN_SOURCE to 600. - Explicitly defining _XOPEN_SOURCE to 600 causes many - compile-time errors and warnings to occur. + Reverted change that explicitly defined _XOPEN_SOURCE to 600. + Explicitly defining _XOPEN_SOURCE to 600 causes many + compile-time errors and warnings to occur. - Moved the check for (_XOPEN_SOURCE >= 600) after the - <features.h> include. That header may define _XOPEN_SOURCE when - other macros, such as _GNU_SOURCE, are defined. + Moved the check for (_XOPEN_SOURCE >= 600) after the + <features.h> include. That header may define _XOPEN_SOURCE when + other macros, such as _GNU_SOURCE, are defined. Wed Oct 2 01:08:51 2002 Krishnakumar B <kitty@cs.wustl.edu> @@ -2361,17 +1828,17 @@ Tue Oct 1 19:49:36 2002 Krishnakumar B <kitty@cs.wustl.edu> Tue Oct 1 05:06:18 2002 Balachandran Natarajan <bala@cs.wustl.edu> - * ace/WIN32_Asynch_IO.cpp: Minor cosmetic changes. + * ace/WIN32_Asynch_IO.cpp: Minor cosmetic changes. Mon Sep 30 12:21:32 2002 Ossama Othman <ossama@uci.edu> - From Christophe Juniet <cjuniet@entreview.com> - * ace/Sock_Connect.cpp (get_bcast_addr, get_ip_interfaces) - (count_interfaces): + From Christophe Juniet <cjuniet@entreview.com> + * ace/Sock_Connect.cpp (get_bcast_addr, get_ip_interfaces) + (count_interfaces): - The ifr_addr.sa_len field was not taken into account when - incrementing the ifreq pointer on FreeBSD. Addresses network - interface enumeration problems in FreeBSD builds. + The ifr_addr.sa_len field was not taken into account when + incrementing the ifreq pointer on FreeBSD. Addresses network + interface enumeration problems in FreeBSD builds. Mon Sep 30 09:33:42 2002 Christopher Kohlhoff <chris@kohlhoff.com> @@ -2412,13 +1879,13 @@ Mon Sep 30 10:19:33 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> Sun Sep 29 08:19:09 2002 Nanbor Wang <nanbor@cs.wustl.edu> - * ACEXML/examples/SAXPrint/Makefile: Removed inclusion of - rules.lib.GNU to allow mingw compilation to proceed. Thanks to - Vince Mounts <vince@mounts.cc> for reporting this. + * ACEXML/examples/SAXPrint/Makefile: Removed inclusion of + rules.lib.GNU to allow mingw compilation to proceed. Thanks to + Vince Mounts <vince@mounts.cc> for reporting this. - * ace/SString.h: Moved the ACE_INLINE before ACE_Export in - declaration of operator+ to resolved a mingw warning. Thanks to - Vince Mounts <vince@mounts.cc> for reporting this. + * ace/SString.h: Moved the ACE_INLINE before ACE_Export in + declaration of operator+ to resolved a mingw warning. Thanks to + Vince Mounts <vince@mounts.cc> for reporting this. Fri Sep 27 12:49:33 2002 Johnny Willemsen <jwillemsen@remedy.nl> @@ -2427,27 +1894,27 @@ Fri Sep 27 12:49:33 2002 Johnny Willemsen <jwillemsen@remedy.nl> Thu Sep 26 21:52:05 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * THANKS: Added Erich Hochmuth" <erich_hochmuth@hotmail.com> to - the hall of fame. + * THANKS: Added Erich Hochmuth" <erich_hochmuth@hotmail.com> to + the hall of fame. Thu Sep 26 13:48:26 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * ace/TP_Reactor.cpp (remove_handler): Make a check for the return - value from the remove_handler_i () call before calling - handle_close (). Thanks to Eric Malenfant - <EMalenfant@interstarinc.com> for suggesting this. + * ace/TP_Reactor.cpp (remove_handler): Make a check for the return + value from the remove_handler_i () call before calling + handle_close (). Thanks to Eric Malenfant + <EMalenfant@interstarinc.com> for suggesting this. - Eric mentions that doesnt show up the BUG 1020 problem. But - local testing here doesnt tell so. I still see some core dumps - with a test, albeit slowly! The patch cannot do any harm and - hence this is checked in. + Eric mentions that doesnt show up the BUG 1020 problem. But + local testing here doesnt tell so. I still see some core dumps + with a test, albeit slowly! The patch cannot do any harm and + hence this is checked in. Thu Sep 26 07:16:56 2002 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - * ace/Local_Name_Space.h (ACE_NS_String): Removed the comment - about ACE_NS_String not having a destructor since this seems to - have been overtaken by events. Thanks to Vladislav Zverev - <vladislav@gtss.spb.ru> for reporting this inconsistency. + * ace/Local_Name_Space.h (ACE_NS_String): Removed the comment + about ACE_NS_String not having a destructor since this seems to + have been overtaken by events. Thanks to Vladislav Zverev + <vladislav@gtss.spb.ru> for reporting this inconsistency. Thu Sep 26 09:18:55 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> @@ -2479,13 +1946,13 @@ Wed Sep 25 17:58:43 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> Wed Sep 25 08:44:13 2002 Ossama Othman <ossama@uci.edu> - * tests/Notify_Performance_Test.cpp: + * tests/Notify_Performance_Test.cpp: - Do not explicitly instantiate an ACE_Atomic_Op<ACE_Thread_Mutex, - long> template if ACE_HAS_BUILTIN_ATOMIC_OP is defined. - Defining it causes template specialization with the same - parameters to be declared. Fixes a compile-time problem in - explicit template instantiation builds. + Do not explicitly instantiate an ACE_Atomic_Op<ACE_Thread_Mutex, + long> template if ACE_HAS_BUILTIN_ATOMIC_OP is defined. + Defining it causes template specialization with the same + parameters to be declared. Fixes a compile-time problem in + explicit template instantiation builds. Wed Sep 25 14:49:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> @@ -2537,14 +2004,14 @@ Tue Sep 24 06:30:31 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Map_T.i (find, unbind): * ace/Timer_Hash_T.cpp: Made arguments in method definition and implementation the - same. + same. * ace/Future.h: Improved doxygen documentation. * ace/POSIX_CB_Proactor.i: Added same ifdef as in the header file around the code in this - file, so that doxygen doesn't parse it. + file, so that doxygen doesn't parse it. Mon Sep 23 13:43:11 2002 Chad Elliott <elliott_c@ociweb.com> @@ -2554,9 +2021,9 @@ Mon Sep 23 13:43:11 2002 Chad Elliott <elliott_c@ociweb.com> Mon Sep 23 13:00:13 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> - * ace/Log_Msg_NT_Event_Log.{h,cpp}: Made the #ifdefs consistent - in both the *.h and *.cpp files. Thanks to Johnny Willemsen for - reporting this. + * ace/Log_Msg_NT_Event_Log.{h,cpp}: Made the #ifdefs consistent + in both the *.h and *.cpp files. Thanks to Johnny Willemsen for + reporting this. Mon Sep 23 13:14:28 2002 Steve Huston <shuston@riverace.com> diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 016db0b6bb5..c563f103e32 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,813 +1,280 @@ -Mon Nov 18 20:49:33 2002 Nanbor Wang <nanbor@cs.wustl.edu> +Mon Nov 18 22:29:39 2002 Krishnakumar B <kitty@cs.wustl.edu> - * examples/IPC_SAP/FILE_SAP/client.cpp (ACE_TMAIN): Changed to use - predefined ACE_DEFAULT_FILE_PERMS instead of the non-portable 0666. + * ACEXML/Makefile: -Mon Nov 18 12:27:46 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + Deleted this file in the previous check-in. Re-add it. - * ace/Dev_Poll_Reactor.cpp (handler): - * ace/WFMO_Reactor.i (handler): - * ace/Select_Reactor_Base_T.cpp (handler_i): The methods that - returns a signal handler associated with a certain type of - signal, does restrictive sanity checks. One of the checks that - it performs is to see whether a pointer to an event_handler is 0 - just before assigning a new event handler pointer. This check - was not required at all and hence it is now removed. Thanks to - Edan Ayal for reporting this. +Mon Nov 18 22:19:47 2002 Krishnakumar B <kitty@cs.wustl.edu> -Sat Nov 16 09:38:38 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + * ACEXML/common/common.mpc: + * ACEXML/parser/parser/parser.mpc: + * ACEXML/parser/debug_validator/validator.mpc: + * ACEXML/apps/svcconf/svcconf.mpc: + * ACEXML/examples/svcconf/Svcconf.mpc: + * ACEXML/examples/SAXPrint/saxprint.mpc: + * ACEXML/tests/tests.mpc: + * ACEXML/ACEXML.mwc: - * ace/*/Makefile: - * tests/Makefile: - * examples/*/Makefile: - * performance-tests/*/Makefile: - * ACEXML/*/Makefile: Updated dependencies. + New MPC files and Workspace file. -Fri Nov 15 20:33:02 UTC 2002 Don Hinton <dhinton@ieee.org> + * ACEXML/common/Makefile.XML_Common: + * ACEXML/apps/svcconf/Makefile.XML_Svc_Conf_Parser: + * ACEXML/parser/parser/Makefile.Parser: + * ACEXML/parser/debug_validator/Makefile.Validator: + * ACEXML/examples/SAXPrint/Makefile.SAXPrint: + * ACEXML/examples/svcconf/Makefile.Svcconf: + * ACEXML/tests/Makefile.HttpCharStream_Test: + * ACEXML/tests/Makefile.NamespaceSupport_Test: + * ACEXML/tests/Makefile.Transcoder_Test: - * ace/SOCK_Dgram_Mcast.h: - * ace/config-all.h: Added new macro for platforms that don't yet - implement the new IGMPv3, perfect multicast filtering, and - replaced the #ifdef linux in the ACE_SOCK_Dgram_Mcast::ctor - with the new macro, since this isn't just a linux thing. + New Makefiles generated by MPC. - * ace/config-aix-4.x.h: - * ace/config-freebsd.h: - * ace/config-linux-common.h: - * ace/config-netbsd.h: - * ace/config-openbsd.h: - Defined ACE_LACKS_PERFECT_MULTICAST_FILTERING for these platforms. - - * ace/SOCK_Dgram_Mcast.cpp (open_i): Removed redundant call to - ACE_SOCK::set_option() to set SO_REUSEADDR, since it's set in - the call to ACE_SOCK::open(). This fixes [bug 1111]. - - * tests/Multicast_Test.cpp: Enhanced test by adding new options - control the wait time when running test as a CONSUMER only, - and contol the TTL so the test could be used over routers. - Also cleaned up the code a bit to make it more readable. Thanks - to Bill Fulton for motivating these enhancements. - -Fri Nov 15 14:16:10 2002 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/Thread_Exit.h: - * ace/Thread_Exit.cpp (cleanup): Changed the type of the argument - <cleanup> takes to the generic (void*) and avoid including - <Synch.h> in Thread_Exit.h. This eliminated the circular header - dependencies when ACE_LEGACY_MODE is define. - - * ace/ace_dll.dsp: - * ace/ace_lib.dsp: Removed some template files from the build - lists and make sure all template files are not being built. - -Fri Nov 15 13:22:41 2002 Steve Huston <shuston@riverace.com> - - * tests/Proactor_Test.cpp: On Win32, check for canceled I/O using - ERROR_OPERATION_ABORTED instead of ECANCELED. - -Fri Nov 15 16:51:11 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> - - * ace/POSIX_CB_Proactor.h: - * ace/POSIX_CB_Proactor.cpp: - Do not build on Lynx. - -Fri Nov 15 14:14:39 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> + * ACEXML/common/Makefile: + * ACEXML/parser/parser/Makefile: + * ACEXML/parser/Makefile: + * ACEXML/examples/Makefile: + * ACEXML/apps/Makefile: + * ACEXML/apps/svcconf/Makefile: + * ACEXML/examples/SAXPrint/Makefile: + * ACEXML/tests/Makefile: - * ace/POSIX_CB_Proactor.h: - * ace/POSIX_CB_Proactor.cpp: - Do not build on Sun. + Removed old Makefiles. -Fri Nov 15 14:08:11 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> + * ACEXML/parser/parser/Parser.cpp: + * ACEXML/common/StreamFactory.cpp: + * ACEXML/common/ZipCharStream.cpp: + * ACEXML/common/ZipCharStream.h: - * include/makeinclude/platform_linux.GNU: - Linux glibc has aio_ and pthread_ calls in librt.so. - Add fix so that librt.so is linked in if threads=0. + Fixed compilation errors. -Fri Nov 15 07:48:37 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> +Mon Nov 18 20:30:30 2002 Krishnakumar B <kitty@cs.wustl.edu> - * tests/OS_Test.cpp: Added the test cases for itoa from - Joseph Sarbak <joseph.sarbak@csfb.com>. + * ACEXML/common/CharStream.h: + * ACEXML/common/Encoding.cpp: + * ACEXML/common/FileCharStream.cpp: + * ACEXML/common/FileCharStream.h: + * ACEXML/common/StrCharStream.cpp: + * ACEXML/common/StrCharStream.h: + * ACEXML/common/HttpCharStream.cpp: + * ACEXML/common/HttpCharStream.h: -Fri Nov 15 07:08:46 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + Fixed a number of minor typos and debugging statements. - * bin/auto_run_tests.lst: Fixed a few minor problems that showed - up in the daily builds. + * ACEXML/common/LocatorImpl.cpp: Check for a valid string before + assigning it to the new Locator. -Thu Nov 14 22:08:49 2002 Steve Huston <shuston@riverace.com> + * ACEXML/common/NamespaceSupport.cpp: - * tests/Proactor_Test.cpp: Make this test behave better: - - At the end of running time, close all the Senders. This should - cancel all the Sender outstanding operations and trip all the - Receivers into finishing their receives and closing themselves. - - Change the default Sender/Receiver count from 20 to 10. This - shrinks the log a bit without sacrificing test quality. - - Change the "inferior platforms" default Sender/Receiver count - from 1 to 3. With Proactor improvements made so far, let's give - these platforms some more exercise and see what happens. + Make sure that we don't have a null prefix before trying to + dereference the prefix. -Thu Nov 14 23:10:32 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> + * ACEXML/common/ZipCharStream.cpp: + * ACEXML/common/ZipCharStream.h: - * ace/POSIX_CB_Proactor.cpp: - * ace/POSIX_CB_Proactor.h: - * ace/POSIX_CB_Proactor.i: - * ace/POSIX_Proactor.cpp: - * ace/POSIX_Proactor.h: - * ace/POSIX_Proactor.i: - * ace/Proactor.cpp: - * tests/Proactor_Test.cpp: - Fixed Proactor so that on platforms that support POSIX IO, - but not POSIX RT signals, it will compile. Use the new - ACE_HAS_POSIX_REALTIME_SIGNALS macro. + New stream which reads files from a ZIP archive. -Thu Nov 14 22:47:45 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> - - * include/makeinclude/platform_freebsd.GNU: Merged with the - pthread version of this file. To compile without threads, - set, do make threads=0, or set threads=0 in this file. - * include/makeinclude/platform_freebsd_pthread.GNU: Removed. - * ace/config-freebsd.h: Merge with pthread version of this file. - * ace/config-freebsd-pthread.h: Removed. - * ace/OS.h: Use new ACE_HAS_POSIX_REALTIME_SIGNALS macro for - POSIX RT signals stuff, instead of ACE_HAS_AIO_CALLS. - FreeBSD has POSIX AIO, but not POSIX RT signals. - * ace/config-sunos5.6.h: Define ACE_HAS_POSIX_REALTIME_SIGNALS, - ACE_HAS_POSIX_MESSAGE_PASSING. - * ace/config-linux-common.h: Define ACE_HAS_POSIX_REALTIME_SIGNALS, - ACE_HAS_AIO_CALLS. + * ACEXML/common/StreamFactory.cpp: -Thu Nov 14 16:19:57 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + Modified to accomodate ZipCharStream. - * bin/auto_run_tests.lst: Added two tests, Bug_1269_Regression and - Bug_1270_Regression into the daily regression suite. They will - not run on Win32. + * ACEXML/examples/SAXPrint/Print_Handler.cpp: + * ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp: + * ACEXML/examples/SAXPrint/main.cpp: -Thu Nov 14 13:35:44 2002 Nanbor Wang <nanbor@cs.wustl.edu> + Commented out a lot of unnecessary debug statements. - * ace/Containers_T.cpp: Changed to deallocate internal nodes in - ACE_Double_Linked_List with the allocator. Thanks to Eugene - Alterman <EugeneA@bremer-inc.com> for reporting the problem. + * ACEXML/parser/parser/Parser.cpp: + * ACEXML/parser/parser/Parser.h: -Thu Nov 14 10:57:47 2002 Carlos O'Ryan <coryan@atdesk.com> + Lots of bugfixes. Finally we parse the XML version of XHTML + specification without dumping core. - * ace/OS.h (ace_timezone): +Sat Nov 16 21:18:55 2002 Krishnakumar B <kitty@cs.wustl.edu> - Fixed broken implementation for Linux. Call tzset() and then - return the global "timezone" variable instead. [Bug 1359] + * ACEXML/parser/parser/Parser.cpp: + * ACEXML/parser/parser/Parser.h: -Thu Nov 14 12:19:51 2002 Chad Elliott <elliott_c@ociweb.com> + More bugs fixed. Add support for parsing PE references within + attribute list declarations and clean up the same. Add support + for parsing PE references within element declarations. - * bin/MakeProjectCreator/modules/Creator.pm: +Tue Nov 12 19:48:34 2002 Krishnakumar B <kitty@cs.wustl.edu> - Modify the way projects are created on windows. If using - cygwin perl then use \n instead of \r\n. + * ACEXML/parser/parser/ParserContext.cpp: + * ACEXML/parser/parser/ParserContext.h: + * ACEXML/parser/parser/ParserContext.inl: - * bin/MakeProjectCreator/modules/VC7WorkspaceCreator.pm: + New files which hold the ParserContext needed to handle the + switching of input streams on the fly. - Sort the list of projects to make the generated solution file more - similar to actual solution files. + * ACEXML/parser/parser/ParserInternals.cpp: + * ACEXML/parser/parser/ParserInternals.h: -Thu Nov 14 06:16:51 2002 Chad Elliott <elliott_c@ociweb.com> + Moved some generic code from Parser.cpp to here. - * bin/MakeProjectCreator/modules/Parser.pm: + * ACEXML/apps/svcconf/Makefile: + * ACEXML/common/Makefile: + * ACEXML/parser/parser/Makefile: - Take into account relative directories in the cd() method. - The original optimization overlooked this. + Updated dependencies. -Thu Nov 14 06:59:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> + * ACEXML/common/Attributes_Def_Builder.h: - * ace/Date_Time.{h,i}: - Added update() method with which it is possible to set the values - in ACE_Date_Time based on a passed ACE_Time_Value. + No need to typedef in C++. - * ace/Time_Request_Reply.{h,cpp}: - Made the argument of the timeout method const&. Updated doxygen - documentation and marked init() as deprecated because it is a no-op. + * ACEXML/common/DefaultHandler.cpp: -Wed Nov 13 18:28:39 2002 Steve Huston <shuston@riverace.com> + Minor typos. - * tests/FIFO_Test.cpp: Changed to both clarify the usage of - ACE_FIFO_(Send|Recv)_Msg with and without ACE_HAS_STREAM_PIPES - and test that usage. + * ACEXML/common/Encoding.cpp: -Wed Nov 13 17:39:41 2002 Steve Huston <shuston@riverace.com> + If auto-detection of encoding fails, assume that it is UTF-8. - * ace/POSIX_Proactor.{h cpp}: - * ace/SUN_Proactor.{h cpp}: Leave two handle_events() methods - available; one with a timeout, one without. Each proactor's - implementations calls an internal handle_events_i() method - that does the right thing. - (start_aio): This is a virtual method used to start an asynch I/O - request from outside the proactor (such as from an asynch read - stream). When the actual operation is to start, start_aio calls - start_aio_i(), implemented differently for the different proactors. - Similar arrangement for cancel_aio(). + * ACEXML/common/Exception.cpp: - * tests/Proactor_Test.cpp: Cancel all outstanding operations before - trying to abruptly stop everything. + Change the error message from ACE_DEBUG to ACE_ERROR. -Wed Nov 13 17:29:31 2002 Steve Huston <shuston@riverace.com> + * ACEXML/common/FileCharStream.cpp: Handle BOM of UTF-8 in + addition to UTF-16. Cleanup unnecessary parens. - * ace/WIN32_Asynch_IO.h (cancel_uncompleted): Filled in - description of the 'set' parameter. Thanks to Craig - Rodrigues for noticing its omission. + * ACEXML/common/HttpCharStream.cpp: + * ACEXML/common/HttpCharStream.h: -Wed Nov 13 16:52:04 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> + Add support for auto-detection of encoding. - * ace/Lib_Find.cpp (ldname): MacOS X prepends an underscore to - symbols in shared libaries. + * ACEXML/common/InputSource.cpp: + * ACEXML/common/InputSource.h: - * ace/config-macosx.h: - * include/makeinclude/platform_macosx.GNU: + Fixes for use with ACEXML_Parser_Context. - - add support for dlcompat, a third party package which provides - dlopen(), dlsym(), dlcose() functions + * ACEXML/common/LocatorImpl.cpp: + * ACEXML/common/LocatorImpl.h: - - Define ACE_LD_SEARCH_PATH to DYLD_LIBRARY_PATH and - ACE_LD_SUFFIX to .dylib + Fixed bug in copy constructor which resulted in locator + information not getting set properly. -Tue Nov 12 14:12:59 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + * ACEXML/common/NamespaceSupport.cpp: + * ACEXML/common/NamespaceSupport.h: - This is a hackish fix for BUG 1361. Please see - http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1361 - for details of this problem + Implement reset() method. - * ace/TP_Reactor.cpp (handle_socket_events): A hack to prevent - BUG 1361 from surfacing for applications like TAO, using the - TP_Reactor. This fix basically ensures that resume_i () is - not called naively. + * ACEXML/common/SAXExceptions.cpp: - * ace/Event_Handler.h: Added a enum type which could be could be - used by the TP_Reactor. + Change the error message from ACE_DEBUG to ACE_ERROR. -Tue Nov 12 11:53:29 2002 Steve Huston <shuston@riverace.com> + * ACEXML/common/StrCharStream.cpp: - * tests/run_test.lst: Change FIFO_Test from !MSVC to !Win32 to - prevent it from running with Borland on Windows. Thanks to - Johnny Willemsen for pointing this out. + Handle copying of bytes according to sizeof (ACE_WCHAR). -Tue Nov 12 14:11:33 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> + * ACEXML/common/StreamFactory.cpp: Create the appropriate stream + given an URI. We don't try to normalize the URI here. It is done + in the Parser. - * ace/Time_Value.h: - Doxygen documentation improvements. + * ACEXML/common/Transcode.cpp: + * ACEXML/common/Transcode.i: -Tue Nov 12 13:15:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> + Moved some very big functions from .i to .cpp. - * ace/Message_Queue_T.h: - Doxygen documentation improvements. + * ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp: + * ACEXML/examples/SAXPrint/main.cpp: -Mon Nov 11 20:37:18 2002 Ossama Othman <ossama@uci.edu> + Updates to reflect the new calling convention in the Parser. - * bin/auto_run_tests.lst: + * ACEXML/parser/parser/Entity_Manager.cpp: + * ACEXML/parser/parser/Entity_Manager.h: + * ACEXML/parser/parser/Entity_Manager.i: - Added Jai's application-controlled membership load balancing - test to the list of regression tests to be run. + Implemented support for resolving SYSTEM and PUBLIC ids from + the Entity_Manager. -Mon Nov 11 17:57:12 2002 Ossama Othman <ossama@uci.edu> + * ACEXML/parser/parser/Parser.cpp: + * ACEXML/parser/parser/Parser.h: + * ACEXML/parser/parser/Parser.i: - * bin/auto_run_tests.lst: + Implemented support for external parameter and entity + references. Rewrote a lot of the basic parsing functionality to + adhere to the standard. Implment partial support for validation + of XML files. - Added Carlos' new PortableInterceptor AMI test to the list of - regression tests to be run. -Mon Nov 11 16:17:59 2002 Nanbor Wang <nanbor@cs.wustl.edu> +Fri Oct 25 15:44:04 2002 Krishnakumar B <kitty@cs.wustl.edu> - * bin/MakeProjectCreator/modules/TemplateParser.pm (relative): - Changed to invoke slash_to_backslash from $self. The original - code only runs on some specific version of perl. + * ACEXML/parser/parser/Parser.i: Handle end-of-line as required by + the spec. Specifically any sequence of 0x0D or 0x0D 0x0A should + be normalized to a 0x0A before passing to the XML processor. -Mon Nov 11 13:35:53 2002 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + * ACEXML/parser/parser/Parser.cpp: Remove checks for 0x0D as it is + handled tranparently now. - * ace/Hash_Map_Manager_T.h: Updated - comments on the class ACE_Hash_Map_Bucket_Iterator. Thanks to - Kitty and Irfan for helping with this. +Thu Oct 24 21:06:44 2002 Krishnakumar B <kitty@cs.wustl.edu> -Mon Nov 11 12:52:41 2002 Steve Huston <shuston@riverace.com> + * ACEXML/common/NamespaceSupport.cpp: Define strings normally and + not as an array. - * docs/ACE-subsets.html: Added the Timer component to the list of - buildable pieces. Thanks to Jason Pasion <J.Pasion@motorola.com> - for reporting this problem. + * ACEXML/common/Attributes_Def_Builder.h: No need to typedef in C++. - * THANKS: Added Jason Pasion to the Hall of Fame. +Thu Oct 24 01:52:46 2002 Krishnakumar B <kitty@cs.wustl.edu> -Mon Nov 11 12:39:18 2002 Steve Huston <shuston@riverace.com> + * ACEXML\parser\parser\Parser.cpp: Moved out the declaration of + variables outside case labels. MSVC doesn't like it. - * ace/FIFO_Send_Msg.cpp (send): When setting iovec length, - static_cast the int length to size_t; the target is not an - int (as the strbuf length is). When returning the sent byte - count, don't include any additional bytes added internally - for record framing. +Wed Oct 23 22:24:59 2002 Krishnakumar B <kitty@cs.wustl.edu> - * tests/FIFO_Test.cpp: New test to exercise basic and overflow - message-based FIFO I/O. + * ACEXML/parser/parser/Parser.cpp: Fixed a stupid thinko in array + initialization. - * tests/Makefile: - * tests/run_test.lst: Added FIFO_Test. Disabled on MSVC builds - since Windows doesn't have FIFOs. - -Mon Nov 11 09:58:13 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> - - * ace/CDR_Stream.{i,cpp} Add casts to ACE_CDR::Octet and - ACE_CDR::Boolean to prevent warnings when run with MSVC++ level - 4 warnings. Thanks to Lukas Gruetzmacher - <gruetzmacher@ais-dresden.de> for motivating this fix. - - * ace/OS_String.cpp (itoa_emulation): Updated the code so that it'll - work correctly with negative numbers. Thanks to Joseph Sarbak - <joseph.sarbak@csfb.com> for reporting this and providing a fix. - -Sun Nov 10 19:38:45 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - - * ace/Message_Block.cpp(copy): The copy () methods were copying - data till the end_ pointer. This is a wrong assumption, - especially in places where the alloted bytes are less than the - allocated bytes. Now we use the space () method to find out the - amount of space available in the data block for copying. Thanks - to Edan Ayal for finding this and providing a patch. - - * ace/Simple_Message_Block_Test.cpp: Added a test which tests - copying in a case where the alloted space is less than the - allocated space. Thanks to Edan Ayal for this test case. - -Sat Nov 9 12:37:54 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - - * docs/ACE-guidelines.html: Updated the ACE guidelines to - refer to the correct Doxygen links. Thanks to - Johnny Willemsen for reporting this. - -Sat Nov 9 21:48:31 2002 Steve Huston <shuston@riverace.com> - - * tests/Proactor_Test.cpp: When disabling Nagle's, use IPPROTO_TCP, - not SOL_SOCKET, for the setsockopt level. Fixes set_option errors - in this test log. - -Sat Nov 9 18:49:11 2002 Steve Huston <shuston@riverace.com> - - * ace/POSIX_Proactor.{h cpp i} (create_asynch_read_stream, - create_asynch_write_stream, create_asynch_read_dgram, - create_asynch_write_dgram, create_asynch_read_file, - create_asynch_write_file, create_asynch_accept, - create_asynch_connect, create_asynch_transmit_file): - Refactored all the factory creation methods from - ACE_POSIX_AIOCB_Proactor to ACE_POSIX_Proactor. - Moved the pseudo task from ACE_POSIX_AIOCB_Proactor to - ACE_POSIX_Proactor as well. - - (handle_events, cancel_aio): - Added these methods to ACE_POSIX_Proactor as pure virtual, - forcing their definition in the specific implementations. - - (start_aio): This is now a pure virtual function that all - more specific proactors need to implement. The old start_aio() - is now start_aio_i(). What used to be ACE_POSIX_AIOCB_Proactor:: - register_and_start_aio() is now ACE_POSIX_AIOCB_Proactor::start_aio. - Which type of I/O to start is now defined by an enum Opcode - that's passed to start_aio(). - - * ace/POSIX_Asynch_IO.{h cpp} (ACE_POSIX_Asynch_Operation): - Replace references to ACE_POSIX_AIOCB_Proactor with - ACE_POSIX_Proactor. Refactoring things out of specific proactor - types. - (ACE_POSIX_Asynch_Read_Stream, ACE_POSIX_Write_Stream, - ACE_POSIX_Asynch_Read_File, ACE_POSIX_Asynch_Write_File, - ACE_POSIX_Asynch_Accept, ACE_POSIX_Asynch_Connect, - ACE_POSIX_Asynch_Transmit_File, ACE_POSIX_Asynch_Transmit_Handler, - ACE_POSIX_Asynch_Read_Dgram, ACE_POSIX_Asynch_Write_Dgram): - Replace args of type ACE_POSIX_AIOCB_Proactor with - ACE_POSIX_Proactor. Matches POSIX_Proactor.* changes above. - Removed all the methods that said they were only there to kill - dominance warnings. These are not needed. - - These things all simplify the proactor framework code. Thanks to - Alex Libman for these ideas. - -Sat Nov 9 13:16:50 2002 Balachandran Natarajan <bala@cs.wustl.edu> - - * THANKS: Added Simon McQueen to the hall of fame. - -Fri Nov 8 13:04:10 2002 Chad Elliott <elliott_c@ociweb.com> +Wed Oct 23 17:27:14 2002 Krishnakumar B <kitty@cs.wustl.edu> - * bin/MakeProjectCreator/modules/ProjectCreator.pm: + * ACEXML/common/Encoding.cpp: + * ACEXML/common/Encoding.h: - Fixed a bug in MPC where the idl file name could cause - an error on Windows if it had a slash in it. It would be - converted to a back slash and then interpreted inside a - regular expression which would cause MPC to abort. + Use UTF-16 instead of UTF-16LE/UTF-16BE as the specification + doesn't require mentioning the endianness of the input. -Fri Nov 8 13:00:56 2002 Chad Elliott <elliott_c@ociweb.com> + * ACEXML/common/Transcode.h: Fixed some minor typos. - * bin/MakeProjectCreator/modules/BorlandProjectCreator.pm: - * bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/Creator.pm: - * bin/MakeProjectCreator/modules/Driver.pm: - * bin/MakeProjectCreator/modules/EM3ProjectCreator.pm: - * bin/MakeProjectCreator/modules/EM3WorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/GHSProjectCreator.pm: - * bin/MakeProjectCreator/modules/GHSWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/GNUProjectCreator.pm: - * bin/MakeProjectCreator/modules/GNUWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/GUID.pm: - * bin/MakeProjectCreator/modules/NMakeProjectCreator.pm: - * bin/MakeProjectCreator/modules/NMakeWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/Parser.pm: - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - * bin/MakeProjectCreator/modules/TemplateInputReader.pm: - * bin/MakeProjectCreator/modules/TemplateParser.pm: - * bin/MakeProjectCreator/modules/VA4ProjectCreator.pm: - * bin/MakeProjectCreator/modules/VA4WorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/VC6ProjectCreator.pm: - * bin/MakeProjectCreator/modules/VC6WorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/VC7ProjectCreator.pm: - * bin/MakeProjectCreator/modules/VC7WorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/WorkspaceCreator.pm: + * ACEXML/examples/SAXPrint/namespaces.xml: New file which tests + out the namespaces feature much better. - Performed various optimization which dramatically decreased the - amount of time to generate projects for the entire ACE tree. In - tests, the time went from 2 minutes to 1 minute. + * ACEXML/apps/svcconf/Makefile: + * ACEXML/parser/parser/Makefile: -Fri Nov 8 12:57:57 2002 Chad Elliott <elliott_c@ociweb.com> + Updated dependencies. - * bin/MakeProjectCreator/README: + * ACEXML/parser/parser/ParserErrors.h: New file which contains the + error codes of all the error spit out by the parser. - Added documentation for the new verbatim keyword. + * ACEXML/examples/SAXPrint/Print_Handler.cpp: + * ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp: - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - * bin/MakeProjectCreator/modules/TemplateParser.pm: + Make sure that the characters() function describes the arguments + as start and length instead of start and end. - Added functionality to place test verbatim into a generated + * ACEXML/parser/parser/Parser.dsp: Added ParserErrors.h to the project file. - * bin/MakeProjectCreator/templates/gnu.mpd: - - Added verbatim markers top, macros, local and bottom. - -Fri Nov 8 12:52:16 2002 Chad Elliott <elliott_c@ociweb.com> - - * bin/MakeProjectCreator/README: - - Added documentation about the new idlgendir keyword. - - * bin/MakeProjectCreator/modules/GHSWorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/Parser.pm: - * bin/MakeProjectCreator/modules/ProjectCreator.pm: - * bin/MakeProjectCreator/modules/TemplateParser.pm: - * bin/MakeProjectCreator/modules/VC6WorkspaceCreator.pm: - * bin/MakeProjectCreator/modules/VC7WorkspaceCreator.pm: - - Modified flag_overrides to work with both idlflags and idlgendir. - - * bin/MakeProjectCreator/templates/bor.mpd: - * bin/MakeProjectCreator/templates/em3vcp.mpd: - * bin/MakeProjectCreator/templates/gnu.mpd: - * bin/MakeProjectCreator/templates/nmake.mpd: - * bin/MakeProjectCreator/templates/vc6dsp.mpd: - * bin/MakeProjectCreator/templates/vc7.mpd: - - Modified all templates that deal with idl files to utilize the - idlgendir keyword. - -Fri Nov 8 04:03:29 UTC 2002 Don Hinton <dhinton@ieee.org> - - * tests/Multicast_Test.cpp: Cleaned up error messages and - error handling and insure that errors are returned. Added - 2 second timeout to call to ACE_Thread_Manager::wait() so - that lost messages won't cause test to hang. - -Wed Nov 6 18:55:22 2002 Steve Huston <shuston@riverace.com> - - * ace/OS.{h i} (recursive_mutex_cond_unlock, - recursive_mutex_cond_relock): For Windows, don't try to save/restore - CRITICAL_SECTION members individually - there are undocumented - details at work there. Instead, release and acquire the mutex - one fewer times than the recursion count, letting Windows take - care of its internals. Fixes the hung Recursive_Condition_Test on - Windows. This also neatly removes the WinCE conditional code in - this area. - - * tests/Recursive_Condition_Test.cpp: Fix a const error that gcc - pointed out. - -Wed Nov 6 11:12:28 2002 Steve Huston <shuston@riverace.com> - - * tests/Recursive_Condition_Test.cpp: Replaced ACE_TRACE with - ACE_DEBUG so the log gets all the info. Re-enabled the timer queue - part of the test and added a check to be sure "enough" expirations - are recorded. Added a piece of data protected by the mutex/condition - to be sure threads aren't released too early. - -Tue Nov 5 21:54:40 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - - * tests/run_tests.lst: - * tests/run_tests_remote.lst: Removed these files, since they - served no purpose other than adding to the noise. - -Tue Nov 5 15:51:29 2002 Steve Huston <shuston@riverace.com> - - * ace/INET_Addr.cpp (set_addr): Add missing ';' in the IPv6 case. - -Tue Nov 5 20:26:33 UTC 2002 Don Hinton <dhinton@ieee.org> - - * tests/tests.mpc: Added Multicast_Test entry. - - * tests/README: Upadate instructions for adding new tests. - -Tue Nov 5 12:12:05 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - - * tests/Multicast_Test.cpp: Fixed compile errors in single threaded - builds. - -Tue Nov 5 11:24:03 2002 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/Process.h: - * ace/Process.i: Added a new method <return_value> which returns - the actual value returned or <exit>'ed by the child process. - The <exit_code> accessor returns the raw exit status returned by - the system APIs and the value is OS dependent. Changed the - <exit_code> mutator to be a proctected method and declare - ACE_Process_Manager a fried of ACE_Process as <exit_code> - mutator should only be used by ACE_Process_Manager. - - Thanks to Stephen Blake <sblake@speakeasy.net> for reporting the - problem. - -Tue Nov 5 05:12:16 2002 Ossama Othman <ossama@uci.edu> - - * ace/Acceptor.h: - * ace/Connector.h: - * ace/Strategies_T.h: - - Added missing STL-style template traits found in C++NPv2 - including the following: - - addr_type - acceptor_type - connector_type - handler_type - stream_type - base_type - accept_strategy_type - connect_strategy_type - creation_strategy_type - concurrency_strategy_type - recycling_strategy_type - scheduling_strategy_type - - where applicable. The old traits are still available and remain - unchanged. - -Tue Nov 5 05:54:16 UTC 2002 Don Hinton <dhinton@ieee.org> - - * tests/Multicast_Test.cpp: Fixed typo in pragma instantiation, - and replaced an instance of char* with ACE_TCHAR* to fix unicode - builds. Added #ifdef for ACE_HAS_THREADS, since it uses - ACE_Task as an active object. - - * tests/run_test.lst: Turned off Multicast_Test and - Token_Stategy_Test for single threaded builds. - -Mon Nov 4 18:01:25 UTC 2002 Don Hinton <dhinton@ieee.org> - - * tests/Makefile.bor: Added new Multicast_Test. Thanks to - Johnny Willemsen <jwillemsen@remedy.nl> for noticing this. - -Mon Nov 4 16:14:21 UTC 2002 Don Hinton <dhinton@ieee.org> - - * tests/Multicast_Test.cpp (get_handle): Made return type of - definition ACE_HANDLE to match the declaration. Thanks to - Ed Skees <eskees@dctd.saic.com> for reporting this. - - * tests/Multicast_Test.dsp: - * tests/tests.dsw: Added new dsp. Thanks again to Ed Skees - for providing this. - - * THANKS: Added Ed Skees to hall of fame... - -Mon Nov 4 09:28:34 UTC 2002 Don Hinton <dhinton@ieee.org> - - * ace/SOCK_Dgram.cpp (recv): Corrected method signature in .cpp to - match the one in the .h. The .h version specified iovec*, but - the .cpp had iovec[] which confused doxygen. This fixes bug [1353]. - -Sun Nov 3 19:41:30 UTC 2002 Don Hinton <dhinton@ieee.org> - - * tests/Multicast_Test.cpp: - * tests/Makefile: - * tests/run_test.lst: Added a new test to exercise some of the new - functionality of ACE_SOCK_Dgram_Mcast. - -Sun Nov 3 10:36:50 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - - * tests/run_test.lst: Prevented SV_Shared_Memory test from running - in RH_7.1 configurations. Please see BUGID 1351 for details. - -Sat Nov 2 17:44:00 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - - * ace/Select_Reactor_Base.h: - * ace/Select_Reactor_Base.cpp: Fixed a subtle bug in the - Select_Reactor. The following were performed during the bind () - operation, which binds a handle with interested mask to an - event_handler, - - - The new masks were added to the existing wait_set - - and the new masks were also removed from the suspend_set. - - Though the above steps were fine, there exists a possibility - when the reactor could land up with a state when the handle - could be both in the wait_set and suspend_set. If suppose a - handle is initially registered for READ and EXCEPTION with the - reactor and then suspended. If the user calls register_handler - () to register the same handle for READ and WRITE, things could - go totally bizzare. - - The present fix does the following - - - If the handle is suspended, the masks are added to the - suspend_set - - else the masks are added to the wait_set and the flag that - indicates state changes within the reactor is set to 1. - - A pure virtual call is_suspended_i () was added to the - ACE_Select_Reactor_Base class to make the check for a suspended - handle possible within the bind () call. Thanks to Irfan - Pyarali<irfan@oomworks.com> who reported this problem. This - should fix the problem reported in [BUG 1305]. - -Fri Nov 1 07:35:10 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - - * bin/auto_run_tests.lst: Added the new - MProfile_Connection_Timeout test to the daily regression tests. - -Thu Oct 31 19:15:49 2002 Nanbor Wang <nanbor@cs.wustl.edu> - - * ACEXML/common/Attributes.h: Added the missing inclusion of - ACEXML_Export.h and the #pragma once directive. Thanks to Paul - Marquis <pmarquis@pobox.com> for reporting this. - -Thu Oct 31 12:57:10 2002 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/OS.i (fstat): Added check for FILE_ATTRIBUTE_DIRECTORY on - Win32 to set the file type in the st_mode so one can determine - if it's a file or a directory. Thanks to Paul Marquis - <pmarquis@pobox.com> for submitting the patch. - -Wed Oct 30 13:47:14 2002 Steve Huston <shuston@riverace.com> - - * ace/Thread_Exit.cpp: Add #include "ace/Managed_Object.h" to get - the definition of ACE_Managed_Object. - -Wed Oct 30 11:38:36 2002 Irfan Pyarali <irfan@oomworks.com> - - * ace/Timeprobe.h: Fixed formatting of comments that somehow got - messed up in: - - http://cvs.doc.wustl.edu/viewcvs.cgi/ace/Timeprobe.h.diff?r1=4.29&r2=4.30 - -Tue Oct 29 22:27:24 2002 Frank Hunleth <frank@hunleth.com> - - * apps/gperf/src/Key_List.cpp: Added cast to int on UCHAR_MAX and - USHRT_MAX to remove warnings of comparing signed and unsigned - values under OpenBSD. - - * ace/config-openbsd.h: - * ace/config-openbsd-pthread.h: Added ACE_HAS_MKSTEMP since - OpenBSD has the mkstemp() function, and it helps clear up - linker warnings. Also added ACE_HAS_ALT_CUSERID to clear - up errors due to _cuserid(). Thanks to Craig Rodrigues - for the latter patch. - -Tue Oct 29 15:45:06 2002 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/Thread_Exit.h: - * ace/Thread_Exit.cpp: - * ace/Thread_Manager.h: - * ace/Thread_Manager.cpp: Changed to use ACE_Thread_Manager to - clean up the global TSS ACE_Thread_Exit object instead of - depending on the more general ACE_Object_Manager::at_exit method - so we can better control the order of destruction. The change - makes sure the global TSS ACE_Thread_Exit object will only get - deleted *after* ACE_Thread_Manager has cleaned up all threads - and destroyed itself. - - Thanks to Patrick McNerthney <pat@mcnerthney.com> for reporting - the problem. - -Tue Oct 29 16:19:54 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> - - * ace/INET_Addr.cpp: - * ace/INET_Addr.i: - * ace/INET_Addr.h: - - Added a reset() method to initialize the underlying sockaddr_in - or sockaddr_in6 structure, and set the address family. Changed - all constructors to use this reset() method. [Bug 1342] - - (INET_Addr::set_addr) the port number was not being set, - so set it. [Bug 1329] - * tests/INET_Addr_Test.cpp: Add test to verify that address family - is being set. - * THANKS: Added Thomas Devanneaux <tdevanne@akamai.com> who provided - these fixes. - -Mon Oct 28 20:46:33 2002 Steve Huston <shuston@riverace.com> - - * ace/SOCK_Dgram_Mcast.cpp (ACE_SDM_helpers::addr_to_string): Use - the "<?>" string in place rather than try to declare it a static. - gcc reports the original usage won't do what you think (keep one - copy for the method) but will duplicate it in each generated - method. Use it as a literal and let the compiler try to place a - single copy in a read-only section. - -Mon Oct 28 20:38:27 2002 Steve Huston <shuston@riverace.com> - - * ace/Asynch_IO.cpp (ACE_Service_Handler::addresses()): Don't - print addresses from here. It's inappropriate for a framework - to be printing things out without being asked to. - - * ace/POSIX_Asynch_IO.cpp (ACE_POSIX_Asynch_Read_Stream::read): - * ace/WIN32_Asynch_IO.cpp (ACE_WIN32_Asynch_Read_Stream::read): - Don't print a message for a 0-byte/no space read - set errno to - ENOSPC so the caller can figure out what's going on. - - * ace/SUN_Proactor.{h cpp}: - * ace/POSIX_Proactor.{h cpp} (ACE_POSIX_AIOCB_Proactor):Change - 'return_status' arg to get_result_status(), find_completed_aio() - from int to size_t and rename transfer_count; get_result_status() - takes care of sensing -1 count and changing to 0. Passing back - a size_t smooths the path from here through to the result object. - Removed application_specific_code() - reuse the one from - ACE_POSIX_Proactor - this one called it; remove the middle-man. - - * tests/Proactor_Test.cpp: Added addresses() method implementations - to print address with session IDs; helps to match Sender/Receiver - pairs in the log. Also added some logging of basic send/recv info - to help try to track down why this facility doesn't work well. - Added a check for comparable sends/receives when a session ends. - Added a warning if there are outstanding I/O when the session - ends. This probably should be an error, but I haven't thought - through it enough to go that far. For the SUN Proactor, use one - thread by default (not 3) - aiosuspend() is not MT safe. - -Mon Oct 28 12:48:14 2002 Nanbor Wang <nanbor@cs.wustl.edu> - - * bin/PerlACE/Process_Unix.pm (Spawn): Return 0 when the function - complete successfully. Thanks to Charles F. Frasch - <cfrasch@spawar.navy.mil> for reporting and suggesting the fix. - -Sun Oct 27 07:44:32 2002 John Aughey <jha@aughey.com> - - * ace/INET_Addr.cpp: Changed the default constructor to only - set the address family rather than doing a full set. This - should exhibit the same behavior without additional overhead. - -Sat Oct 26 21:49:15 2002 Nanbor Wang <nanbor@cs.wustl.edu> - - * ace/Process.cpp (wait): - * ace/Process.i (wait): Changed to always update this->exit_code_ - when waiting on a child process to allow <exit_code> method to - function properly. Removed the use of the macro - ACE_OSCALL_RETURN on ACE_OS::waitpid since ACE_OS::waitpid is - already signal safe. - - * ace/Process.h: Changed the type of this->exit_code_ from int to - ACE_exitcode. Updated documentation for mutator method - <exit_code> to better reflect the intention for using this - method. - - Thanks to Artashes Ghazaryan <arty@unicad.am>, Jaroslaw Nozderko - <jaroslaw.nozderko@polkomtel.com.pl>, and Stephen Blake - <sblake@speakeasy.net> for reporting the problem. - -Sat Oct 26 11:42:04 UTC 2002 John Aughey <jha@aughey.com> - - * ace/INET_Addr.cpp: Changed default behavior to set 0 - port and INADDR_ANY address. - -Sat Oct 26 09:45:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> - - * ace/Timer_Heap_T.h: - Doxygen documentation fix - - * ace/OS.h: - The BCB4 header files don't define ENOTEMPTY, so define this when - detecting the BCB4 compiler. Thanks to Mike Curtis <mcurtis@wt.net> - for reporting this. - - * examples/Reactor/Proactor/test_proactor2.cpp: - Removed not needed return. Fixes a BCB4 build error - - * THANKS: Added Mike Curtis + * ACEXML/parser/parser/Parser.cpp: + * ACEXML/parser/parser/Parser.h: -Wed Oct 23 16:37:15 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + Use minor codes when reporting error in the parser. This cleans + up a lot of repeated error messages and indenting so that we + don't need to spill over 80 columns and have a standardized way + of reporting errors. Rewrote parse_cdata() so that is is much + simpler. Removed try_grow_cdata() as it is no longer needed. + Handle the case when the parser was accepting invalid character + references(). - * THANKS: Added Sandeep to the Hall of Fame. Wed Oct 23 17:20:18 UTC 2002 Don Hinton <dhinton@ieee.org> - * ace/Service_Object.{h,cpp} (suspend, resume, fini): - Changed return value from void to int so that the - return value of the contained ACE_Service_Type could be - propagated. + * ace/Service_Object.{h,cpp} (suspend, resume, fini): + Changed return value from void to int so that the + return value of the contained ACE_Service_Type could be + propagated. - * ace/Service_Repository.cpp (suspend, resume, fini): - Changed to propagate the return value from the - ACE_Service_Type instead of always 0. + * ace/Service_Repository.cpp (suspend, resume, fini): + Changed to propagate the return value from the + ACE_Service_Type instead of always 0. Tue Oct 22 16:26:56 2002 Rich Seibel <seibel_r@ociweb.com> @@ -824,44 +291,44 @@ Tue Oct 22 16:26:56 2002 Rich Seibel <seibel_r@ociweb.com> Tue Oct 22 13:11:42 2002 Nanbor Wang <nanbor@cs.wustl.edu> - * ace/OS.cpp (DllMain): Added code to invoke - DisableThreadLibraryCalls during PROCESS_ATTACH when - ACE_DISABLES_THREAD_LIBRARY_CALLS is defined to 1 as described - below. This should enhance performance of applications that - spawn a lot of threads. Thanks to Patrick McNerthney - <pat@mcnerthney.com> for suggesting the change. + * ace/OS.cpp (DllMain): Added code to invoke + DisableThreadLibraryCalls during PROCESS_ATTACH when + ACE_DISABLES_THREAD_LIBRARY_CALLS is defined to 1 as described + below. This should enhance performance of applications that + spawn a lot of threads. Thanks to Patrick McNerthney + <pat@mcnerthney.com> for suggesting the change. - We should probably apply the same optimization for the core TAO - libraries. + We should probably apply the same optimization for the core TAO + libraries. - * ace/config-win32-common.h: Defined a Win32-only new macros - ACE_DISABLES_THREAD_LIBRARY_CALLS which is default to 0 if not - defined by users. + * ace/config-win32-common.h: Defined a Win32-only new macros + ACE_DISABLES_THREAD_LIBRARY_CALLS which is default to 0 if not + defined by users. Mon Oct 21 17:26:15 2002 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - * ace/SPIPE_Acceptor.cpp: Modified - SPIPE_Acceptor::create_new_instance to manually signal the event - used in the ConnectNamedPipe call when an ERROR_PIPE_CONNECTED - status is returned. Also added the handling of the status of - ERROR_NO_DATA to the same logic as ERROR_PIPE_CONNECTED. Thanks - to Patrick J. McNerthney <pat@mcnerthney.com> for contributing - this. + * ace/SPIPE_Acceptor.cpp: Modified + SPIPE_Acceptor::create_new_instance to manually signal the event + used in the ConnectNamedPipe call when an ERROR_PIPE_CONNECTED + status is returned. Also added the handling of the status of + ERROR_NO_DATA to the same logic as ERROR_PIPE_CONNECTED. Thanks + to Patrick J. McNerthney <pat@mcnerthney.com> for contributing + this. Tue Oct 22 10:20:41 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * examples/C++NPv2/Reactor_Logging_Server_T.cpp: Fixed a typo that - broke the builds. My bad :( + * examples/C++NPv2/Reactor_Logging_Server_T.cpp: Fixed a typo that + broke the builds. My bad :( Mon Oct 21 20:13:27 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * examples/C++NPv2/Reactor_Logging_Server_T.cpp: - * examples/C++NPv1/Logging_Server.cpp: - * examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp: - * examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp: - * examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp: - Fix for compile errors on Lynx platform. Thanks to Craig - Rodrigues for supplying the patches. + * examples/C++NPv2/Reactor_Logging_Server_T.cpp: + * examples/C++NPv1/Logging_Server.cpp: + * examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp: + * examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp: + * examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp: + Fix for compile errors on Lynx platform. Thanks to Craig + Rodrigues for supplying the patches. Tue Oct 22 12:36:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> @@ -873,21 +340,21 @@ Tue Oct 22 12:36:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> Mon Oct 21 22:30:51 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * tests/SString_Test.cpp (ACE_TMAIN): Fixed a warning in Win32 builds. + * tests/SString_Test.cpp (ACE_TMAIN): Fixed a warning in Win32 builds. Mon Oct 21 20:04:12 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * ace/WIN32_Asynch_IO.h: - * ace/WIN32_Asynch_IO.cpp: Integrated the latest patches from Eric - Frias <efrias@syncad.com>. + * ace/WIN32_Asynch_IO.h: + * ace/WIN32_Asynch_IO.cpp: Integrated the latest patches from Eric + Frias <efrias@syncad.com>. Mon Oct 21 06:54:12 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * tests/Recursive_Condition_Test.cpp (test_4): - * tests/RB_Tree_Test.cpp: Fixed compile errors arising out of M$ - quirks. The scoping rules for 'for' loops are busted and hence - these fixes. These fixes basically change the variable names for - the different for loops inside the same scope. + * tests/Recursive_Condition_Test.cpp (test_4): + * tests/RB_Tree_Test.cpp: Fixed compile errors arising out of M$ + quirks. The scoping rules for 'for' loops are busted and hence + these fixes. These fixes basically change the variable names for + the different for loops inside the same scope. Sun Oct 20 21:40:13 2002 Krishnakumar B <kitty@cse.wustl.edu> @@ -901,74 +368,74 @@ Sun Oct 20 14:06:36 2002 Krishnakumar B <kitty@cse.wustl.edu> Sun Oct 20 11:36:34 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * ACEXML/common/FileCharStream.cpp: Fixed a compile error in - Borland builds. The compile error is due to strict enforcement - of scoping rules in a for loop by Borland compiler. + * ACEXML/common/FileCharStream.cpp: Fixed a compile error in + Borland builds. The compile error is due to strict enforcement + of scoping rules in a for loop by Borland compiler. Sun Oct 20 11:31:45 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * ACEXML/common/Makefile.bor: Added Encoding.obj to the list of - object files. Thanks to Johnny for pointing this out. + * ACEXML/common/Makefile.bor: Added Encoding.obj to the list of + object files. Thanks to Johnny for pointing this out. Sun Oct 20 11:30:04 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * tests/SPIPE_Test.cpp: Fixed compile errors in Borland builds. + * tests/SPIPE_Test.cpp: Fixed compile errors in Borland builds. Sun Oct 20 10:16:23 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * examples/C++NPv2/display_logfile.cpp: Fix for single threaded - builds. + * examples/C++NPv2/display_logfile.cpp: Fix for single threaded + builds. Sun Oct 20 10:12:42 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * tests/Recursive_Condition_Test.cpp: Fix for single threaded - builds. The ACE_HAS_THREADS were improperly placed. + * tests/Recursive_Condition_Test.cpp: Fix for single threaded + builds. The ACE_HAS_THREADS were improperly placed. Sun Oct 20 09:26:58 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * examples/C++NPv1/Makefile: Added changes from "Fri Oct 18 - 21:01:25 UTC 2002 Craig Rodrigues <crodrigu@bbn.com>" back - since the changes are fine. Thanks to Craig for pointing that - out. + * examples/C++NPv1/Makefile: Added changes from "Fri Oct 18 + 21:01:25 UTC 2002 Craig Rodrigues <crodrigu@bbn.com>" back + since the changes are fine. Thanks to Craig for pointing that + out. Sun Oct 20 13:34:45 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> - * examples/C++NPv2/Makefile: Replace with recursive Makefile which + * examples/C++NPv2/Makefile: Replace with recursive Makefile which does not use for loops. Add .NOTPARALLEL target to fix - build errors on parallel builds. + build errors on parallel builds. Sun Oct 20 08:10:43 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * tests/Recursive_Condition_Test.cpp: Fixed a unused variable warning. + * tests/Recursive_Condition_Test.cpp: Fixed a unused variable warning. Sun Oct 20 00:27:02 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * tests/Recursive_Condition_Test.cpp: Fixed a fuzz error. + * tests/Recursive_Condition_Test.cpp: Fixed a fuzz error. Sun Oct 20 00:14:32 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * examples/C++NPv1/Makefile: Reverted the change "Fri Oct 18 - 21:01:25 UTC 2002 Craig Rodrigues <crodrigu@bbn.com>" since - this opens up some problems. Craig will look into it later and - provide a clean fix. Till then.. + * examples/C++NPv1/Makefile: Reverted the change "Fri Oct 18 + 21:01:25 UTC 2002 Craig Rodrigues <crodrigu@bbn.com>" since + this opens up some problems. Craig will look into it later and + provide a clean fix. Till then.. Sat Oct 19 20:00:00 2002 Stephen Torri <storri@cse.wustl.edu> - * tests/Recursive_Condition_Test.cpp: + * tests/Recursive_Condition_Test.cpp: - Added test to check nesting_level after requiring a Recursive - Condition Mutex multiple times. Also after releasing for the - same number of times. + Added test to check nesting_level after requiring a Recursive + Condition Mutex multiple times. Also after releasing for the + same number of times. - * tests/SString_Test.cpp: - * ace/String_Base.i: + * tests/SString_Test.cpp: + * ace/String_Base.i: - Bug 1323 (Reported by Wayne Erchak <wayne@stentor.com>): Fixed. - In the effort to protect from memory problems with non-null - terminated strings the operators '<' and '>' where - rendered useless. Now the comparions use memcmp instead of - strncmp. A series of tests have been added to SString_Test.cpp - to ensure this does not happen again. + Bug 1323 (Reported by Wayne Erchak <wayne@stentor.com>): Fixed. + In the effort to protect from memory problems with non-null + terminated strings the operators '<' and '>' where + rendered useless. Now the comparions use memcmp instead of + strncmp. A series of tests have been added to SString_Test.cpp + to ensure this does not happen again. Sat Oct 19 21:58:00 2002 Krishnakumar B <kitty@cse.wustl.edu> @@ -1130,16 +597,16 @@ Sat Oct 19 16:47:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> Sat Oct 19 10:09:38 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * examples/C++NPv2/Makefile: Reverted the change "Fri Oct 18 - 21:01:25 UTC 2002 Craig Rodrigues <crodrigu@bbn.com>" since - this opens up some problems. Craig will look into it later and - provide a clean fix. Till then.. + * examples/C++NPv2/Makefile: Reverted the change "Fri Oct 18 + 21:01:25 UTC 2002 Craig Rodrigues <crodrigu@bbn.com>" since + this opens up some problems. Craig will look into it later and + provide a clean fix. Till then.. Sat Oct 19 09:25:52 2002 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - * examples/Reactor/Misc/test_timer_queue.cpp, - * tests/Timer_Queue_Test.cpp: Fixed warnings with G++. - Thanks to Bala for reporting this. + * examples/Reactor/Misc/test_timer_queue.cpp, + * tests/Timer_Queue_Test.cpp: Fixed warnings with G++. + Thanks to Bala for reporting this. Fri Oct 18 22:07:31 2002 Steve Huston <shuston@riverace.com> @@ -1165,13 +632,13 @@ Fri Oct 18 20:13:29 2002 Steve Huston <shuston@riverace.com> Fri Oct 18 17:12:03 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * examples/C++NPv2/display_logfile.cpp: - * examples/C++NPv2/Client_Logging_Daemon.cpp: - * examples/C++NPv2/TP_Logging_Server.h: - * examples/C++NPv2/TP_Logging_Server.cpp: Fixed compile errors in - single threaded builds. All they needed was the usage of the - right macros like ACE_SYNCH instead of ACE_MT_SYNCH and - ACE_SYNCH_MUTEX instead of ACE_Thread_Mutex. + * examples/C++NPv2/display_logfile.cpp: + * examples/C++NPv2/Client_Logging_Daemon.cpp: + * examples/C++NPv2/TP_Logging_Server.h: + * examples/C++NPv2/TP_Logging_Server.cpp: Fixed compile errors in + single threaded builds. All they needed was the usage of the + right macros like ACE_SYNCH instead of ACE_MT_SYNCH and + ACE_SYNCH_MUTEX instead of ACE_Thread_Mutex. Fri Oct 18 16:25:09 2002 Yuanfang Zhang <yfzhang@cse.wustl.edu> @@ -1182,20 +649,20 @@ Fri Oct 18 16:25:09 2002 Yuanfang Zhang <yfzhang@cse.wustl.edu> Fri Oct 18 21:01:25 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> - * examples/C++NPv1/Makefile: Fix comment. - * examples/C++NPv1/Makefile: Replace with recursive Makefile which - does not use for loops. + * examples/C++NPv1/Makefile: Fix comment. + * examples/C++NPv1/Makefile: Replace with recursive Makefile which + does not use for loops. Fri Oct 18 15:44:19 2002 Priyanka Gontla <pgontla@ociweb.com> - * THANKS: - Added Christian Barheine <cbarheine@sympatec.com> to the hall - of fame. + * THANKS: + Added Christian Barheine <cbarheine@sympatec.com> to the hall + of fame. Fri Oct 18 19:37:20 GMT 2002 Craig Rodrigues <crodrigu@bbn.com> - * ace/config-macosx.h: Define ACE_HAS_NONSTATIC_OBJECT_MANAGER - for gperf. + * ace/config-macosx.h: Define ACE_HAS_NONSTATIC_OBJECT_MANAGER + for gperf. Fri Oct 18 14:52:37 2002 Steve Huston <shuston@riverace.com> @@ -1207,43 +674,43 @@ Fri Oct 18 14:52:37 2002 Steve Huston <shuston@riverace.com> Fri Oct 18 13:21:05 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - * tests/Timer_Queue_Test.cpp, - * examples/Reactor/Misc/test_timer_queue.cpp: - Fixed these tests so that it passes dynamically allocated memory - rather that values via the "act" parameter to - ACE_Timer_Queue::schedule(). This ensures the test will work - properly on strange OS platforms, such as Win64 where pointers - and longs/ints are different sizes. Thanks to Cristian - Ungureanu <cristian.ungureanu@amdocs.com> for motivating this. + * tests/Timer_Queue_Test.cpp, + * examples/Reactor/Misc/test_timer_queue.cpp: + Fixed these tests so that it passes dynamically allocated memory + rather that values via the "act" parameter to + ACE_Timer_Queue::schedule(). This ensures the test will work + properly on strange OS platforms, such as Win64 where pointers + and longs/ints are different sizes. Thanks to Cristian + Ungureanu <cristian.ungureanu@amdocs.com> for motivating this. -Fri Oct 18 17:20:02 UTC 2002 Don Hinton <dhinton@ieee.org> +Fri Oct 18 17:20:02 UTC 2002 Don Hinton <dhinton@iee.org> - * ace/SOCK_Dgram_Mcast.{h,cpp}: + * ace/SOCK_Dgram_Mcast.{h,cpp}: - Factored out common code to an open_i() method that open() - can call at this level and in inherited classes. + Factored out common code to an open_i() method that open() + can call at this level and in inherited classes. - * ace/QoS/SOCK_Dgram_Mcast_QoS.{h.cpp}: + * ace/QoS/SOCK_Dgram_Mcast_QoS.{h.cpp}: - Modified ctor to take same default param as base class and - invoke the base class ctor. + Modified ctor to take same default param as base class and + invoke the base class ctor. - Removed duplicate code in open() and have it call base::open_i() - after opening the socket with QoS. Changed 1st parameter from - ACE_Addr to ACE_INET_Addr to match base classes. + Removed duplicate code in open() and have it call base::open_i() + after opening the socket with QoS. Changed 1st parameter from + ACE_Addr to ACE_INET_Addr to match base classes. - Removed duplicate code from subscribe by having it call base - class methods. + Removed duplicate code from subscribe by having it call base + class methods. Fri Oct 18 11:51:44 2002 Nanbor Wang <nanbor@cs.wustl.edu> * bin/PerlACE/Run_Test.pm: Created a new variable $PerlACE::svcconf_ext which defines the canonical svc.conf file extention used by various run_test scripts. By - default, this is defined to ".conf". It can be overwritten - using the environment variable ACE_RUNTEST_SVCCONF_EXT. For - example, you can define ACE_RUNTEST_SVCCONF_EXT to ".conf.xml" - if you have built your ACE with XML-based service configurator. + default, this is defined to ".conf". It can be overwritten + using the environment variable ACE_RUNTEST_SVCCONF_EXT. For + example, you can define ACE_RUNTEST_SVCCONF_EXT to ".conf.xml" + if you have built your ACE with XML-based service configurator. Fri Oct 18 11:55:33 2002 Steve Huston <shuston@riverace.com> @@ -1265,56 +732,56 @@ Fri Oct 18 11:39:29 2002 Steve Huston <shuston@riverace.com> together. Fri Oct 18 03:55:51 UTC 2002 Don Hinton <dhinton@objectsciences.com> - Bill Fulton <Bill_A_Fulton@raytheon.com> - - * ace/SOCK_Dgram_Mcast.{h,i,cpp}: - - Enhanced support for join()'ing multiple multicast groups. Ctor - now offers finer control over a bind()'ing to an address or - interface. Appropriate default behavior has been specified, - but note that due to issues on Linux, portable code should not - join() more than one multicast group per instance. - - An open() method has been added/exposed. If not explicitely - called, it will be implicitely called by the first join(), and - will bind() the address if the OPT_BINDADDR_YES options was - specified in the ctor. - - Error handling has also been enhanced. For instance, if - OPT_BINDADDR_YES has been specified (the default on Linux), - additional join()'s will fail since the socket gets bound on - the first call to open() or join(). Previously, subsequent - calls to join() would silently fail, i.e., the call succeeded - but only datagrams sent to the first, bound address where - actually delivered. - - If ACE_SOCK_DGRAM_MCAST_DUMPABLE is defined, a list of all - subscribed groups is maintained and can be dump()'ed, although - access to this list is not public. - - Added new join()/leave() methods that remove unused, deprecated - protocol_family and protocol arguments. These values can be - determined on the fly. The old subscribe()/unsubscribe() - methods have been deprecated and are now implemented in terms - of join()/leave() respectively. - - The unsubscribe(void) method has also been deprecated. It was - designed to allow the caller to unsubscribe/leave() all - groups at once, but since a list was never kept (and still - isn't unless ACE_SOCK_DGRAM_MCAST_DUMPABLE is defined) only - the last group join()'ed was ever left. A better way would - be to either keep track of you own groups and call leave() - for each, or let the dtor close() the socket which automatically - unsubscribes from all groups. - - Some IPv6 support has been added either directly or by removing - the need for the caller to handle it (see join()/leave() above), - although the internal calls to setsockopt() are still hard wired - for IPv4. + Bill Fulton <Bill_A_Fulton@raytheon.com> + + * ace/SOCK_Dgram_Mcast.{h,i,cpp}: + + Enhanced support for join()'ing multiple multicast groups. Ctor + now offers finer control over a bind()'ing to an address or + interface. Appropriate default behavior has been specified, + but note that due to issues on Linux, portable code should not + join() more than one multicast group per instance. + + An open() method has been added/exposed. If not explicitely + called, it will be implicitely called by the first join(), and + will bind() the address if the OPT_BINDADDR_YES options was + specified in the ctor. + + Error handling has also been enhanced. For instance, if + OPT_BINDADDR_YES has been specified (the default on Linux), + additional join()'s will fail since the socket gets bound on + the first call to open() or join(). Previously, subsequent + calls to join() would silently fail, i.e., the call succeeded + but only datagrams sent to the first, bound address where + actually delivered. + + If ACE_SOCK_DGRAM_MCAST_DUMPABLE is defined, a list of all + subscribed groups is maintained and can be dump()'ed, although + access to this list is not public. + + Added new join()/leave() methods that remove unused, deprecated + protocol_family and protocol arguments. These values can be + determined on the fly. The old subscribe()/unsubscribe() + methods have been deprecated and are now implemented in terms + of join()/leave() respectively. + + The unsubscribe(void) method has also been deprecated. It was + designed to allow the caller to unsubscribe/leave() all + groups at once, but since a list was never kept (and still + isn't unless ACE_SOCK_DGRAM_MCAST_DUMPABLE is defined) only + the last group join()'ed was ever left. A better way would + be to either keep track of you own groups and call leave() + for each, or let the dtor close() the socket which automatically + unsubscribes from all groups. + + Some IPv6 support has been added either directly or by removing + the need for the caller to handle it (see join()/leave() above), + although the internal calls to setsockopt() are still hard wired + for IPv4. Fri Oct 18 06:51:07 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - * ace/String_Base.{i,cpp}: Fixed the formatting in these files... + * ace/String_Base.{i,cpp}: Fixed the formatting in these files... Thu Oct 17 20:02:39 2002 Steve Huston <shuston@riverace.com> @@ -1336,24 +803,24 @@ Thu Oct 17 17:32:39 2002 Krishnakumar B <kitty@cse.wustl.edu> Thu Oct 17 19:18:02 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> - * ace/config-macosx.h: - - Remove define of __MACOSX__, and use constant __APPLE__ - instead defined by Apple's gcc. - - Removed definitions: - ACE_HAS_MACOSX_DYLIB, ACE_LACKS_SEMBUF_T - - Added definitions: - ACE_HAS_SEMUN, ACE_HAS_SIGINFO_T, ACE_LACKS_SIGINFO_H, - ACE_HAS_UCONTEXT_T, ACE_HAS_GETIFADDRS, + * ace/config-macosx.h: + - Remove define of __MACOSX__, and use constant __APPLE__ + instead defined by Apple's gcc. + - Removed definitions: + ACE_HAS_MACOSX_DYLIB, ACE_LACKS_SEMBUF_T + - Added definitions: + ACE_HAS_SEMUN, ACE_HAS_SIGINFO_T, ACE_LACKS_SIGINFO_H, + ACE_HAS_UCONTEXT_T, ACE_HAS_GETIFADDRS, ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES - - Defined ACE_HAS_POSITION_INDEPENDENT_POINTERS to 0 for temporary - Apple gcc bug workaround. + - Defined ACE_HAS_POSITION_INDEPENDENT_POINTERS to 0 for temporary + Apple gcc bug workaround. - * ace/Log_Msg.cpp (ACE_Log_Msg::log): Add check for __APPLE__ to catch - right prototype for sys_errlist. + * ace/Log_Msg.cpp (ACE_Log_Msg::log): Add check for __APPLE__ to catch + right prototype for sys_errlist. - * ace/OS.h: Remove unnecessary __MACOSX__ check. + * ace/OS.h: Remove unnecessary __MACOSX__ check. - * include/makeinclude/platform_macosx.GNU: Minor cleanups. + * include/makeinclude/platform_macosx.GNU: Minor cleanups. Thu Oct 17 13:47:39 2002 Steve Huston <shuston@riverace.com> @@ -1362,19 +829,19 @@ Thu Oct 17 13:47:39 2002 Steve Huston <shuston@riverace.com> Thu Oct 17 16:28:05 UTC 2002 Don Hinton <dhinton@ieee.org> - * THANKS: Added Jon Franklin <jfranklin@dctd.saic.com> - to the hall of fame. + * THANKS: Added Jon Franklin <jfranklin@dctd.saic.com> + to the hall of fame. Thu Oct 17 10:26:59 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * examples/C++NPv2/display_logfile.cpp (ACE_MT_SYNCH>): Fixed a - uninitialized member usage warning. + * examples/C++NPv2/display_logfile.cpp (ACE_MT_SYNCH>): Fixed a + uninitialized member usage warning. Thu Oct 17 00:26:13 2002 Nanbor Wang <nanbor@cs.wustl.edu> - * ace/Malloc_T.i (release): Instead of releasing the memory_pool_ - explicitly, changed to use remove () to make sure all resources - are removed properly. + * ace/Malloc_T.i (release): Instead of releasing the memory_pool_ + explicitly, changed to use remove () to make sure all resources + are removed properly. Wed Oct 16 20:23:09 2002 Krishnakumar B <kitty@cse.wustl.edu> @@ -1387,16 +854,16 @@ Wed Oct 16 20:23:09 2002 Krishnakumar B <kitty@cse.wustl.edu> Wed Oct 16 18:47:44 2002 Stephen Torri <storri@cse.wustl.edu> - * examples/C++NPv1/Makefile: + * examples/C++NPv1/Makefile: - Replaced Makefile with non-for-loop version provided by - Craig Rodrigues. + Replaced Makefile with non-for-loop version provided by + Craig Rodrigues. Wed Oct 16 16:52:52 2002 Nanbor Wang <nanbor@cs.wustl.edu> - * ace/MEM_SAP.cpp (close_shm_malloc): Fixed a memory leak that I - added last time when I fixed a race condition in removing mmap - file. + * ace/MEM_SAP.cpp (close_shm_malloc): Fixed a memory leak that I + added last time when I fixed a race condition in removing mmap + file. Wed Oct 16 15:35:22 2002 Steve Huston <shuston@riverace.com> @@ -1404,45 +871,45 @@ Wed Oct 16 15:35:22 2002 Steve Huston <shuston@riverace.com> Wed Oct 16 14:02:27 2002 Yuanfang Zhang <yfzhang@cse.wustl.edu> - * ace/RB_Tree.cpp: - * ace/RB_Tree.h: + * ace/RB_Tree.cpp: + * ace/RB_Tree.h: - forward and reverse partial tree traversal. - Changed the find_i method by adding a parameter "find_Exact". + forward and reverse partial tree traversal. + Changed the find_i method by adding a parameter "find_Exact". Wed Oct 16 12:18:03 2002 Stephen Torri <storri@cse.wustl.edu> - * examples/C++v1/Makefile: - * examples/C++NPv1/Makefile.Iterative_Logging_Server: - * examples/C++NPv1/Makefile.Logging_Client: - * examples/C++NPv1/Makefile.Reactive_Logging_Server: - * examples/C++NPv1/Makefile.Reactive_Logging_Server_Ex: - * examples/C++NPv1/Makefile.RT_Thread_Per_Connection_Logging_Server: - * examples/C++NPv1/Makefile.Thread_Per_Connection_Logging_Server: - * examples/C++NPv1/Makefile.wProcess_Per_Connection_Logging_Server: + * examples/C++v1/Makefile: + * examples/C++NPv1/Makefile.Iterative_Logging_Server: + * examples/C++NPv1/Makefile.Logging_Client: + * examples/C++NPv1/Makefile.Reactive_Logging_Server: + * examples/C++NPv1/Makefile.Reactive_Logging_Server_Ex: + * examples/C++NPv1/Makefile.RT_Thread_Per_Connection_Logging_Server: + * examples/C++NPv1/Makefile.Thread_Per_Connection_Logging_Server: + * examples/C++NPv1/Makefile.wProcess_Per_Connection_Logging_Server: Renamed from *.mak to Makefile.* to avoid looking like an exported MSVC project NMAKE file. (Following Steve Huston's - change to examples/C++v2). + change to examples/C++v2). - Fixed Make error that make realclean was not in Makefile. + Fixed Make error that make realclean was not in Makefile. - * tests/Recursive_Condition_Test.cpp: + * tests/Recursive_Condition_Test.cpp: - Changed function call of signal() to broadcast() to awaken - multiple threads waiting on a shared condition variable. + Changed function call of signal() to broadcast() to awaken + multiple threads waiting on a shared condition variable. Oct 16 11:44:27 2002 Nanbor Wang <nanbor@cs.wustl.edu> - * ace/Thread_Manager.cpp (check_state): Changed to return 0 if - the thread id is not managed by the Thread_Manager. + * ace/Thread_Manager.cpp (check_state): Changed to return 0 if + the thread id is not managed by the Thread_Manager. - * ace/Thread_Manager.h: Updated documentation for testcancel(), - testsuspend(), and testresume (). They all return false now if - the you try to test the status of a tid that is not managed by - the Thread_Manager. + * ace/Thread_Manager.h: Updated documentation for testcancel(), + testsuspend(), and testresume (). They all return false now if + the you try to test the status of a tid that is not managed by + the Thread_Manager. - Thanks to Giovanni Zito <g.zito@acsys.it> for reporting it. + Thanks to Giovanni Zito <g.zito@acsys.it> for reporting it. Wed Oct 16 12:41:29 2002 Steve Huston <shuston@riverace.com> @@ -1478,33 +945,33 @@ Wed Oct 16 12:08:21 2002 Steve Huston <shuston@riverace.com> Wed Oct 16 11:02:41 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - * ace/High_Res_Timer.cpp (get_cpuinfo): Removed the recalibration of - the scale factor every time the application is launched. Thanks - to Bo Balder <bba@post.utfors.se> for reporting this. + * ace/High_Res_Timer.cpp (get_cpuinfo): Removed the recalibration of + the scale factor every time the application is launched. Thanks + to Bo Balder <bba@post.utfors.se> for reporting this. Wed Oct 16 10:55:11 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * ace/config-linux-common.h: Added support for ACE_CC_NAME, - ACE_CC_MAJOR_VERSION and ACE_CC_MINOR_VERSION for linux. Thanks - to Jaroslaw Nozderko <jaroslaw.nozderko@polkomtel.com.pl> for - suggesting this. + * ace/config-linux-common.h: Added support for ACE_CC_NAME, + ACE_CC_MAJOR_VERSION and ACE_CC_MINOR_VERSION for linux. Thanks + to Jaroslaw Nozderko <jaroslaw.nozderko@polkomtel.com.pl> for + suggesting this. Wed Oct 16 10:55:44 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * ace/config-win32-msvc.h (ACE_HAS_ALLOCA): Enabled alloca support - for MSVC. Thanks to Pat McNertney <pat@mcnerthney.com> for - providing the patch. + * ace/config-win32-msvc.h (ACE_HAS_ALLOCA): Enabled alloca support + for MSVC. Thanks to Pat McNertney <pat@mcnerthney.com> for + providing the patch. Tue Oct 15 18:49:25 2002 Stephen Torri <storri@cse.wustl.edu> - * tests/Recursive_Condition_Test.cpp: + * tests/Recursive_Condition_Test.cpp: - Added two tests. - Test 2: repeat of test 1 but with a 2 second delay - after main thread signals the waiting thread. (Works) - Test 3: repeat of test 1 but with 4 threads waiting - on the condition variable. (Broken - no threads - awaken). + Added two tests. + Test 2: repeat of test 1 but with a 2 second delay + after main thread signals the waiting thread. (Works) + Test 3: repeat of test 1 but with 4 threads waiting + on the condition variable. (Broken - no threads + awaken). Tue Oct 15 17:27:34 2002 Krishnakumar B <kitty@cse.wustl.edu> @@ -1564,90 +1031,90 @@ Tue Oct 15 17:15:41 2002 Steve Huston <shuston@riverace.com> Tue Oct 15 11:43:27 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * ace/SPIPE_Connector.cpp (connect): Convert the first argument in - the ::WaitNamedPipe () call to char * always using the macro - defined. This shold fix compilation errors in WCHAR builds. + * ace/SPIPE_Connector.cpp (connect): Convert the first argument in + the ::WaitNamedPipe () call to char * always using the macro + defined. This shold fix compilation errors in WCHAR builds. Tue Oct 15 16:19:33 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> - [Bug 1090] - * ace/config-freebsd-pthread.h: Add ACE_HAS_GETIFADDRS. This fixes - Bugzilla bug 1090. + [Bug 1090] + * ace/config-freebsd-pthread.h: Add ACE_HAS_GETIFADDRS. This fixes + Bugzilla bug 1090. Tue Oct 15 10:47:20 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * ace/SPIPE_Connector.cpp: Fixed a unused variable warning. + * ace/SPIPE_Connector.cpp: Fixed a unused variable warning. Tue Oct 15 06:56:18 2002 Patrick J. McNerthney <ace@mcnerthney.com> - * tests/SPIPE_Test.cpp: Added support for testing the new Windows - bytestream mode. + * tests/SPIPE_Test.cpp: Added support for testing the new Windows + bytestream mode. Mon Oct 14 20:47:21 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - * ace/SPIPE_Acceptor.cpp (open): Changed "mode" to "pipe_mode", - which is the name of the parameter. Thanks to Don Hinton for - reporting this. + * ace/SPIPE_Acceptor.cpp (open): Changed "mode" to "pipe_mode", + which is the name of the parameter. Thanks to Don Hinton for + reporting this. Mon Oct 14 19:20:35 2002 Frank Hunleth <frank@hunleth.com> - * ACE-INSTALL.html: Added installation notes for the OpenBSD port. + * ACE-INSTALL.html: Added installation notes for the OpenBSD port. - * ace/config-openbsd.h: - * ace/config-openbsd-pthread.h: - * include/makeinclude/platform_openbsd.GNU: - * include/makeinclude/platform_openbsd_pthread.GNU: Configuration - files for OpenBSD. + * ace/config-openbsd.h: + * ace/config-openbsd-pthread.h: + * include/makeinclude/platform_openbsd.GNU: + * include/makeinclude/platform_openbsd_pthread.GNU: Configuration + files for OpenBSD. - * ace/ACE.cpp: Added OpenBSD-specific error code to ACE::out_of_handles + * ace/ACE.cpp: Added OpenBSD-specific error code to ACE::out_of_handles - * ace/OS.h: Added #define for OpenBSD-specific path to siginfo.h and - ACE_LACKS_CLEARERR guards around clearerr() for OpenBSD. + * ace/OS.h: Added #define for OpenBSD-specific path to siginfo.h and + ACE_LACKS_CLEARERR guards around clearerr() for OpenBSD. - * ace/OS.i: Added support for getifaddrs() with ACE_HAS_GETIFADDRS + * ace/OS.i: Added support for getifaddrs() with ACE_HAS_GETIFADDRS and fix for segfault when calling dlsym with a null handle. Added - guards on clearerr using ACE_LACKS_CLEARERR. (All only affect - OpenBSD.) + guards on clearerr using ACE_LACKS_CLEARERR. (All only affect + OpenBSD.) - * ace/POSIX_Proactor.cpp: - * ace/POSIX_Proactor.h: Added SystemType family for OpenBSD. + * ace/POSIX_Proactor.cpp: + * ace/POSIX_Proactor.h: Added SystemType family for OpenBSD. - * ace/README: Added new ACE #defines to support OpenBSD. These include: - ACE_HAS_GETIFADDRS - for support of the getifaddrs() system call - ACE_HAS_DLSYM_SEGFAULT_ON_INVALID_HANDLE - add check to dlsym call - to protect against NULL. OpenBSD 3.1 needs this. - ACE_LACKS_CLEARERR - #define to remove clearerr definition due - to bogus syntax error on OpenBSD. + * ace/README: Added new ACE #defines to support OpenBSD. These include: + ACE_HAS_GETIFADDRS - for support of the getifaddrs() system call + ACE_HAS_DLSYM_SEGFAULT_ON_INVALID_HANDLE - add check to dlsym call + to protect against NULL. OpenBSD 3.1 needs this. + ACE_LACKS_CLEARERR - #define to remove clearerr definition due + to bogus syntax error on OpenBSD. - * ace/Sock_Connect.cpp: Added code to get_ip_interfaces to use + * ace/Sock_Connect.cpp: Added code to get_ip_interfaces to use getifaddrs() if it is supported. OpenBSD is the only platform to - use this currently. Under OpenBSD, the code to parse the return - values from the corresponding ioctl calls gets confused when IPv6 - interfaces are present. + use this currently. Under OpenBSD, the code to parse the return + values from the corresponding ioctl calls gets confused when IPv6 + interfaces are present. - * tests/Malloc_Test.cpp: Added OpenBSD to the list of platforms that - can't handle the remap of fault part of the test. + * tests/Malloc_Test.cpp: Added OpenBSD to the list of platforms that + can't handle the remap of fault part of the test. - * tests/Reactor_Dispatch_Order_Test.cpp: Added code for OpenBSD to - clear the write mask after handle_output is called, since OpenBSD - calls handle_output more than once before the data is received - over the pipe. + * tests/Reactor_Dispatch_Order_Test.cpp: Added code for OpenBSD to + clear the write mask after handle_output is called, since OpenBSD + calls handle_output more than once before the data is received + over the pipe. Mon Oct 14 18:21:40 2002 Patrick J. McNerthney <ace@mcnerthney.com> * ace/OS.h: Added FILE_FLAG_WRITE_THROUGH defines for - non-supporting operating systems and added various PIPE_* - defines for non-supporting operating systems. + non-supporting operating systems and added various PIPE_* + defines for non-supporting operating systems. * ace/SPIPE_Connector.{h,cpp}: Added support to enable the - selection of whether bytestream or message mode is used on - Windows. Also added support for both blocking and timeout - connections on Windows, only non-blocking connections where - support before. + selection of whether bytestream or message mode is used on + Windows. Also added support for both blocking and timeout + connections on Windows, only non-blocking connections where + support before. * ace/SPIPE_Acceptor.{h.cpp}: Added support to enable the - selection of whether bytestream or message mode is used on - Windows. + selection of whether bytestream or message mode is used on + Windows. Mon Oct 14 20:19:51 2002 Steve Huston <shuston@riverace.com> @@ -1664,11 +1131,11 @@ Mon Oct 14 20:19:51 2002 Steve Huston <shuston@riverace.com> Mon Oct 14 17:23:43 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * ace/CDR_Base.cpp (consolidate): Reverted the optimization - performed in "Tue Mar 12 17:43:32 2002 Balachandran Natarajan - <bala@cs.wustl.edu>". This optimizations created problems for - CORBA::Any implementation which assumes that the data is totally - contained within the Any. Using the optimization created problems + * ace/CDR_Base.cpp (consolidate): Reverted the optimization + performed in "Tue Mar 12 17:43:32 2002 Balachandran Natarajan + <bala@cs.wustl.edu>". This optimizations created problems for + CORBA::Any implementation which assumes that the data is totally + contained within the Any. Using the optimization created problems for Any's that are copied between different threads. Thanks to Jian Chen <jchen@huawei.com> for reporting this problem. @@ -1719,27 +1186,27 @@ Sun Oct 13 19:38:35 2002 Krishnakumar B <kitty@cse.wustl.edu> Sun Oct 13 18:50:53 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - * ace/SPIPE_Stream.h: Enhanced the documentation of ACE_SPIPE_Stream. - Thanks to Pat McNerthney <ace@mcnerthney.com> for motivating - this. + * ace/SPIPE_Stream.h: Enhanced the documentation of ACE_SPIPE_Stream. + Thanks to Pat McNerthney <ace@mcnerthney.com> for motivating + this. Sun Oct 13 15:57:04 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * ace/Asynch_IO.cpp: - * ace/Asynch_IO.h: Protected ACE_Asynch_Read_File::readv () and - ACE_Asynch_Write_File::writev () from being called when - ACE_HAS_WINNT4 == 0. - * ace/WIN32_Asynch_IO.cpp: - * ace/WIN32_Asynch_IO.h: Protected - ACE_WIN32_Asynch_Read_File::readv () and - ACE_WIN32_Asynch_Write_File::writev () from being called when - ACE_HAS_WINNT4 == 0. + * ace/Asynch_IO.cpp: + * ace/Asynch_IO.h: Protected ACE_Asynch_Read_File::readv () and + ACE_Asynch_Write_File::writev () from being called when + ACE_HAS_WINNT4 == 0. + * ace/WIN32_Asynch_IO.cpp: + * ace/WIN32_Asynch_IO.h: Protected + ACE_WIN32_Asynch_Read_File::readv () and + ACE_WIN32_Asynch_Write_File::writev () from being called when + ACE_HAS_WINNT4 == 0. - Thanks to Eric Frias <efrias@syncad.com> for reporting the - problem and Alex Libman for suggesting the fix. + Thanks to Eric Frias <efrias@syncad.com> for reporting the + problem and Alex Libman for suggesting the fix. - * THANKS: Added Eric Frias <efrias@syncad.com> to the hall of - fame. + * THANKS: Added Eric Frias <efrias@syncad.com> to the hall of + fame. Sun Oct 13 15:54:59 2002 Krishnakumar B <kitty@cse.wustl.edu> @@ -1853,11 +1320,11 @@ Sat Oct 12 22:50:02 2002 Krishnakumar B <kitty@cse.wustl.edu> Fri Oct 11 12:44:58 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> - * RTJava/*: Removed. Angelo Corsaro <corsaro@ece.uci.edu> - keeps RTJperf related files in another CVS repository. + * RTJava/*: Removed. Angelo Corsaro <corsaro@ece.uci.edu> + keeps RTJperf related files in another CVS repository. - * ace/config-freebsd-pthread.h: Improved check of - _POSIX_REALTIME_SIGNALS preprocessor constant. + * ace/config-freebsd-pthread.h: Improved check of + _POSIX_REALTIME_SIGNALS preprocessor constant. Thu Oct 10 16:02:20 2002 Ossama Othman <othman@cs.wustl.edu> @@ -1865,19 +1332,19 @@ Thu Oct 10 16:02:20 2002 Ossama Othman <othman@cs.wustl.edu> Thu Oct 10 13:56:35 2002 Ossama Othman <ossama@uci.edu> - * bin/make_release (check_workspace): + * bin/make_release (check_workspace): - Ignore platform_macros.GNU and config.h files. They are - needed when cutting the beta/release. This isn't a problem - since the ACE/TAO kits are created from a "cvs export"ed - workspace that doesn't include those files. + Ignore platform_macros.GNU and config.h files. They are + needed when cutting the beta/release. This isn't a problem + since the ACE/TAO kits are created from a "cvs export"ed + workspace that doesn't include those files. Thu Oct 10 15:11:07 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * bin/make_release: A pattern matching issue. The cvs server now - gives a message starting with "cvs server:.." instead of "cvs - checkout:..". This created problems for Ossama when he was - trying to cut the beta. + * bin/make_release: A pattern matching issue. The cvs server now + gives a message starting with "cvs server:.." instead of "cvs + checkout:..". This created problems for Ossama when he was + trying to cut the beta. Wed Oct 9 23:43:51 2002 Steve Huston <shuston@riverace.com> @@ -1897,12 +1364,12 @@ Wed Oct 9 23:08:19 2002 Steve Huston <shuston@riverace.com> Wed Oct 09 12:19:40 2002 Nanbor Wang <nanbor@cs.wustl.edu> - * bin/PerlACE/Process_Win32.pm: Added hack to purify a process. - This will allow us to purify all the examples, tests much - easier. It is, however, tightly coupled to Purify 6.0. The - script automaticaly switch to purifying the process if the - ACE_RUN_PURIFY_CMD environment variable is defined. See the - comments in this file for more details. + * bin/PerlACE/Process_Win32.pm: Added hack to purify a process. + This will allow us to purify all the examples, tests much + easier. It is, however, tightly coupled to Purify 6.0. The + script automaticaly switch to purifying the process if the + ACE_RUN_PURIFY_CMD environment variable is defined. See the + comments in this file for more details. Tue Oct 8 21:06:23 2002 Steve Huston <shuston@riverace.com> @@ -1923,47 +1390,47 @@ Tue Oct 8 09:22:41 2002 Steve Huston <shuston@riverace.com> Mon Oct 7 17:29:14 2002 Ossama Othman <ossama@uci.edu> - * tests/Proactor_Scatter_Gather_Test.cpp (initiate_read_file): + * tests/Proactor_Scatter_Gather_Test.cpp (initiate_read_file): - Cast one of the operands in a subtraction operation to a size_t - to address a problem exhibited by Borland C++ where the ACE_MIN - template expects two parameters of the same type, but was - getting two parameter of different types. This problem occurred - on platforms where "unsigned int" and "unsigned long" are - different types. + Cast one of the operands in a subtraction operation to a size_t + to address a problem exhibited by Borland C++ where the ACE_MIN + template expects two parameters of the same type, but was + getting two parameter of different types. This problem occurred + on platforms where "unsigned int" and "unsigned long" are + different types. Mon Oct 07 15:21:44 2002 Nanbor Wang <nanbor@cs.wustl.edu> - * ACEXML/apps/svcconf/XML_Svc_Conf_Parser.dsp: - * ACEXML/common/XML_Common.dsp: - * ACEXML/parser/debug_validator/Debug_Validator.dsp: - * ACEXML/parser/parser/Parser.dsp: - * ACEXML/tests/HttpCharStream_Test.dsp: - * ACEXML/tests/NamespaceSupport_Test.dsp: - * ACEXML/tests/Transcoder_Test.dsp: - * apps/JAWS2/server.dsp: - * examples/Export/test.dsp: - * examples/IPC_SAP/FILE_SAP/client.dsp: - * examples/Logger/client/client.dsp: - * examples/Logger/simple-server/server_loggerd.dsp: - * examples/QOS/Simple/receiver.dsp: - * examples/QOS/Simple/sender.dsp: - * examples/Reactor/Multicast/client.dsp: - * examples/Reactor/Multicast/server.dsp: - * examples/Reactor/Proactor/test_udp_proactor.dsp: - * examples/Synch/proc_sema.dsp: - * tests/DLL_Test_Impl.dsp: - * tests/Framework_Component_DLL.dsp: Disabled the generation - of precompiled headers. They were taking up too much disk space - on the nightly build machines. Thanks to Ossama for noticing - this. + * ACEXML/apps/svcconf/XML_Svc_Conf_Parser.dsp: + * ACEXML/common/XML_Common.dsp: + * ACEXML/parser/debug_validator/Debug_Validator.dsp: + * ACEXML/parser/parser/Parser.dsp: + * ACEXML/tests/HttpCharStream_Test.dsp: + * ACEXML/tests/NamespaceSupport_Test.dsp: + * ACEXML/tests/Transcoder_Test.dsp: + * apps/JAWS2/server.dsp: + * examples/Export/test.dsp: + * examples/IPC_SAP/FILE_SAP/client.dsp: + * examples/Logger/client/client.dsp: + * examples/Logger/simple-server/server_loggerd.dsp: + * examples/QOS/Simple/receiver.dsp: + * examples/QOS/Simple/sender.dsp: + * examples/Reactor/Multicast/client.dsp: + * examples/Reactor/Multicast/server.dsp: + * examples/Reactor/Proactor/test_udp_proactor.dsp: + * examples/Synch/proc_sema.dsp: + * tests/DLL_Test_Impl.dsp: + * tests/Framework_Component_DLL.dsp: Disabled the generation + of precompiled headers. They were taking up too much disk space + on the nightly build machines. Thanks to Ossama for noticing + this. Sun Oct 6 09:03:28 2002 Ossama Othman <ossama@uci.edu> - * ace/UPIPE_Stream.cpp (send): + * ace/UPIPE_Stream.cpp (send): - Silenced a signed/unsigned conversion warning using a - static_cast<> until a better solution presents itself. + Silenced a signed/unsigned conversion warning using a + static_cast<> until a better solution presents itself. Sat Oct 5 17:04:38 2002 Steve Huston <shuston@riverace.com> @@ -2091,7 +1558,7 @@ Fri Oct 4 20:22:41 2002 Steve Huston <shuston@riverace.com> * ace/Memory_Pool.cpp: Adjust usage of size_t/off_t, usually with casts where needed. - (map): For Win64, allow full 64-bit range of file mapping size. + (map): For Win64, allow full 64-bit range of file mapping size. * ace/Message_Queue.{h i cpp} (ACE_Message_Queue_NT): Changed max_threads arg (ctor and open()) and max_cthrs_/cur_thrs_ from @@ -2279,10 +1746,10 @@ Fri Oct 4 18:39:19 2002 Steve Huston <shuston@riverace.com> Thu Oct 3 17:29:36 2002 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - * ace/OS_Dirent.cpp (readdir_emulation): Don't do a FindNextFile() - right after FindFirstFile() to avoid overwriting the existing - data! Thanks to Dmitry Botcharnikov <dimab@garant.ru> for - reporting this. + * ace/OS_Dirent.cpp (readdir_emulation): Don't do a FindNextFile() + right after FindFirstFile() to avoid overwriting the existing + data! Thanks to Dmitry Botcharnikov <dimab@garant.ru> for + reporting this. Wed Oct 2 20:44:19 2002 Steve Huston <shuston@riverace.com> @@ -2294,35 +1761,35 @@ Wed Oct 2 20:44:19 2002 Steve Huston <shuston@riverace.com> Wed Oct 2 10:50:49 2002 Ossama Othman <ossama@uci.edu> - * ace/Basic_Types.h: - * ace/Basic_Types.cpp: + * ace/Basic_Types.h: + * ace/Basic_Types.cpp: - Do not rely on the u_int and u_long typedefs. They are not - always defined in system headers. Addresses a compile-time - issue when _XOPEN_SOURCE is explicitly set to 600 on Glibc - platforms, such as Linux. + Do not rely on the u_int and u_long typedefs. They are not + always defined in system headers. Addresses a compile-time + issue when _XOPEN_SOURCE is explicitly set to 600 on Glibc + platforms, such as Linux. - * ace/OS.h: + * ace/OS.h: - Explicitly define the u_{char,short,int,long} typedefs on Glibc - platforms when _BSD_SOURCE is not defined. Addresses a - compile-time issue when _BSD_SOURCE is not defined. + Explicitly define the u_{char,short,int,long} typedefs on Glibc + platforms when _BSD_SOURCE is not defined. Addresses a + compile-time issue when _BSD_SOURCE is not defined. - * ace/config-linux.h: + * ace/config-linux.h: - If ACE_HAS_PTHREADS_UNIX98_EXT is not defined, do not define - ACE_LACKS_RWLOCK_T. Addresses a compile-time issue when - _XOPEN_SOURCE is not set to a value >= 600. + If ACE_HAS_PTHREADS_UNIX98_EXT is not defined, do not define + ACE_LACKS_RWLOCK_T. Addresses a compile-time issue when + _XOPEN_SOURCE is not set to a value >= 600. - * ace/config-linux-common.h: + * ace/config-linux-common.h: - Reverted change that explicitly defined _XOPEN_SOURCE to 600. - Explicitly defining _XOPEN_SOURCE to 600 causes many - compile-time errors and warnings to occur. + Reverted change that explicitly defined _XOPEN_SOURCE to 600. + Explicitly defining _XOPEN_SOURCE to 600 causes many + compile-time errors and warnings to occur. - Moved the check for (_XOPEN_SOURCE >= 600) after the - <features.h> include. That header may define _XOPEN_SOURCE when - other macros, such as _GNU_SOURCE, are defined. + Moved the check for (_XOPEN_SOURCE >= 600) after the + <features.h> include. That header may define _XOPEN_SOURCE when + other macros, such as _GNU_SOURCE, are defined. Wed Oct 2 01:08:51 2002 Krishnakumar B <kitty@cs.wustl.edu> @@ -2361,17 +1828,17 @@ Tue Oct 1 19:49:36 2002 Krishnakumar B <kitty@cs.wustl.edu> Tue Oct 1 05:06:18 2002 Balachandran Natarajan <bala@cs.wustl.edu> - * ace/WIN32_Asynch_IO.cpp: Minor cosmetic changes. + * ace/WIN32_Asynch_IO.cpp: Minor cosmetic changes. Mon Sep 30 12:21:32 2002 Ossama Othman <ossama@uci.edu> - From Christophe Juniet <cjuniet@entreview.com> - * ace/Sock_Connect.cpp (get_bcast_addr, get_ip_interfaces) - (count_interfaces): + From Christophe Juniet <cjuniet@entreview.com> + * ace/Sock_Connect.cpp (get_bcast_addr, get_ip_interfaces) + (count_interfaces): - The ifr_addr.sa_len field was not taken into account when - incrementing the ifreq pointer on FreeBSD. Addresses network - interface enumeration problems in FreeBSD builds. + The ifr_addr.sa_len field was not taken into account when + incrementing the ifreq pointer on FreeBSD. Addresses network + interface enumeration problems in FreeBSD builds. Mon Sep 30 09:33:42 2002 Christopher Kohlhoff <chris@kohlhoff.com> @@ -2412,13 +1879,13 @@ Mon Sep 30 10:19:33 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> Sun Sep 29 08:19:09 2002 Nanbor Wang <nanbor@cs.wustl.edu> - * ACEXML/examples/SAXPrint/Makefile: Removed inclusion of - rules.lib.GNU to allow mingw compilation to proceed. Thanks to - Vince Mounts <vince@mounts.cc> for reporting this. + * ACEXML/examples/SAXPrint/Makefile: Removed inclusion of + rules.lib.GNU to allow mingw compilation to proceed. Thanks to + Vince Mounts <vince@mounts.cc> for reporting this. - * ace/SString.h: Moved the ACE_INLINE before ACE_Export in - declaration of operator+ to resolved a mingw warning. Thanks to - Vince Mounts <vince@mounts.cc> for reporting this. + * ace/SString.h: Moved the ACE_INLINE before ACE_Export in + declaration of operator+ to resolved a mingw warning. Thanks to + Vince Mounts <vince@mounts.cc> for reporting this. Fri Sep 27 12:49:33 2002 Johnny Willemsen <jwillemsen@remedy.nl> @@ -2427,27 +1894,27 @@ Fri Sep 27 12:49:33 2002 Johnny Willemsen <jwillemsen@remedy.nl> Thu Sep 26 21:52:05 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * THANKS: Added Erich Hochmuth" <erich_hochmuth@hotmail.com> to - the hall of fame. + * THANKS: Added Erich Hochmuth" <erich_hochmuth@hotmail.com> to + the hall of fame. Thu Sep 26 13:48:26 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> - * ace/TP_Reactor.cpp (remove_handler): Make a check for the return - value from the remove_handler_i () call before calling - handle_close (). Thanks to Eric Malenfant - <EMalenfant@interstarinc.com> for suggesting this. + * ace/TP_Reactor.cpp (remove_handler): Make a check for the return + value from the remove_handler_i () call before calling + handle_close (). Thanks to Eric Malenfant + <EMalenfant@interstarinc.com> for suggesting this. - Eric mentions that doesnt show up the BUG 1020 problem. But - local testing here doesnt tell so. I still see some core dumps - with a test, albeit slowly! The patch cannot do any harm and - hence this is checked in. + Eric mentions that doesnt show up the BUG 1020 problem. But + local testing here doesnt tell so. I still see some core dumps + with a test, albeit slowly! The patch cannot do any harm and + hence this is checked in. Thu Sep 26 07:16:56 2002 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> - * ace/Local_Name_Space.h (ACE_NS_String): Removed the comment - about ACE_NS_String not having a destructor since this seems to - have been overtaken by events. Thanks to Vladislav Zverev - <vladislav@gtss.spb.ru> for reporting this inconsistency. + * ace/Local_Name_Space.h (ACE_NS_String): Removed the comment + about ACE_NS_String not having a destructor since this seems to + have been overtaken by events. Thanks to Vladislav Zverev + <vladislav@gtss.spb.ru> for reporting this inconsistency. Thu Sep 26 09:18:55 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> @@ -2479,13 +1946,13 @@ Wed Sep 25 17:58:43 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> Wed Sep 25 08:44:13 2002 Ossama Othman <ossama@uci.edu> - * tests/Notify_Performance_Test.cpp: + * tests/Notify_Performance_Test.cpp: - Do not explicitly instantiate an ACE_Atomic_Op<ACE_Thread_Mutex, - long> template if ACE_HAS_BUILTIN_ATOMIC_OP is defined. - Defining it causes template specialization with the same - parameters to be declared. Fixes a compile-time problem in - explicit template instantiation builds. + Do not explicitly instantiate an ACE_Atomic_Op<ACE_Thread_Mutex, + long> template if ACE_HAS_BUILTIN_ATOMIC_OP is defined. + Defining it causes template specialization with the same + parameters to be declared. Fixes a compile-time problem in + explicit template instantiation builds. Wed Sep 25 14:49:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> @@ -2537,14 +2004,14 @@ Tue Sep 24 06:30:31 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Map_T.i (find, unbind): * ace/Timer_Hash_T.cpp: Made arguments in method definition and implementation the - same. + same. * ace/Future.h: Improved doxygen documentation. * ace/POSIX_CB_Proactor.i: Added same ifdef as in the header file around the code in this - file, so that doxygen doesn't parse it. + file, so that doxygen doesn't parse it. Mon Sep 23 13:43:11 2002 Chad Elliott <elliott_c@ociweb.com> @@ -2554,9 +2021,9 @@ Mon Sep 23 13:43:11 2002 Chad Elliott <elliott_c@ociweb.com> Mon Sep 23 13:00:13 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> - * ace/Log_Msg_NT_Event_Log.{h,cpp}: Made the #ifdefs consistent - in both the *.h and *.cpp files. Thanks to Johnny Willemsen for - reporting this. + * ace/Log_Msg_NT_Event_Log.{h,cpp}: Made the #ifdefs consistent + in both the *.h and *.cpp files. Thanks to Johnny Willemsen for + reporting this. Mon Sep 23 13:14:28 2002 Steve Huston <shuston@riverace.com> diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL.ll b/TAO/orbsvcs/orbsvcs/ETCL/ETCL.ll index 06f67230fdc..4318dd652d5 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL.ll +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL.ll @@ -1,7 +1,7 @@ %option noyywrap %{ -// ETCL.ll,v 1.3 2002/01/14 19:52:28 parsons Exp +// ETCL.ll,v 1.3.28.1 2002/11/19 07:44:42 kitty Exp // ======================================================================== // // = LIBRARY @@ -1061,7 +1061,7 @@ John Buckman <john@lyris.com> Guy Rosen <grosen@bigfoot.com> <amoderni@viasoft.com> Bennett R. Stabile <bstabile@home.com> -Paul Caffrey <denginere@hotmail.com> +Paul Caffrey <pcaffrey@iel.ie> Low Aik long <aiklong@softhome.net> Michael Rinne <Michael.Rinne@ZN-AG.de> Jaffar Shaikh <Jaffar_Shaikh@Mitel.com> @@ -1542,12 +1542,13 @@ Davide Pasetto <dipo@sis.it> Michael Hornok <Michael.Hornok@alcatel.com> W.M. van den Boogaard <wim.vd.boogaard@meco.nl> Carol Hunsicker <carol.hunsicker@lmco.com> -Joseph Sarbak <joseph.sarbak@csfb.com> +Joseph Sarbak <joseph_t_sarbak@hotmail.com> Ruslan Zasukhin <sunshine@public.kherson.ua> Colin Weaver <colin.weaver@invensys.com> Kew Whitney <Whitney.Kew@Invensys.com> Sean Ogle <sean.ogle@syslog.at> Tim Bradley <bradley_t@ociweb.com> +Denginere <denginere@hotmail.com> Kier Schmitt <SchmittKC@kpt.nuwc.navy.mil> George Varsamis <gv@prismtechnologies.com> Alan Tanga <stang1@lucent.com> @@ -1580,7 +1581,7 @@ Jeff W <jeffw_1234@yahoo.com> Geir Berset <geirber@ifi.uio.no> Ken Sedgwick <ken@xvros.org> Vince Mounts <vince@mounts.cc> -Vladislav Zverev <vladislav@gtss.spb.ru> +Vladislav Zverev <vladislav@gtss.spb.ru> Erich Hochmuth <erich_hochmuth@hotmail.com> Nick S. Petrov <nicksp@ci.nnov.ru> Dmitry Botcharnikov <dimab@garant.ru> @@ -1596,18 +1597,6 @@ Tommy Persson <tpe@ida.lie.se> Christian Barheine <cbarheine@sympatec.com Ole Husgaard <osh@sparre.dk> Victor Kirk <vkirk@technology.serco.com> -Sandeep Neema <neemask@corvette.vuse.vanderbilt.edu> -Mike Curtis <mcurtis@wt.net> -Artashes Ghazaryan <arty@unicad.am> -Ashok Sadasivan <ashok_sadasivan@hotmail.com> -Andreas Koehler <andreas.koehler@sysde.eads.net> -Thomas Devanneaux <tdevanne@akamai.com> -Paul Marquis <pmarquis@pobox.com> -Ed Skees <eskees@dctd.saic.com> -Marc Alter <marc.alter@fr.thalesgroup.com> -Martin Geliot <martin.geliot@baesystems.com> -Simon McQueen <sm@prismtechnologies.com> -Jason Pasion <J.Pasion@motorola.com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/ace/Acceptor.h b/ace/Acceptor.h index e04604ca697..2c6f3da238e 100644 --- a/ace/Acceptor.h +++ b/ace/Acceptor.h @@ -248,25 +248,6 @@ class ACE_Strategy_Acceptor { public: - // Useful STL-style traits. - typedef ACE_Creation_Strategy<SVC_HANDLER> - creation_strategy_type; - typedef ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> - accept_strategy_type; - typedef ACE_Concurrency_Strategy<SVC_HANDLER> - concurrency_strategy_type; - typedef ACE_Scheduling_Strategy<SVC_HANDLER> scheduling_strategy_type; - typedef ACE_Acceptor <SVC_HANDLER, ACE_PEER_ACCEPTOR_2> - base_type; - - // = Define some useful (old style) traits. - typedef ACE_Creation_Strategy<SVC_HANDLER> CREATION_STRATEGY; - typedef ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> ACCEPT_STRATEGY; - typedef ACE_Concurrency_Strategy<SVC_HANDLER> CONCURRENCY_STRATEGY; - typedef ACE_Scheduling_Strategy<SVC_HANDLER> SCHEDULING_STRATEGY; - - - /// Default constructor. ACE_Strategy_Acceptor (const ACE_TCHAR service_name[] = 0, const ACE_TCHAR service_description[] = 0, @@ -429,6 +410,12 @@ protected: // = These data members are "logically private" but are put in the // protected part in case subclasses want to access them. + // = Define some useful typedefs. + typedef ACE_Creation_Strategy<SVC_HANDLER> CREATION_STRATEGY; + typedef ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> ACCEPT_STRATEGY; + typedef ACE_Concurrency_Strategy<SVC_HANDLER> CONCURRENCY_STRATEGY; + typedef ACE_Scheduling_Strategy<SVC_HANDLER> SCHEDULING_STRATEGY; + // = Strategy objects. /// Creation strategy for an Acceptor. diff --git a/ace/Asynch_IO.cpp b/ace/Asynch_IO.cpp index 25c7610c60a..6149f8daf1e 100644 --- a/ace/Asynch_IO.cpp +++ b/ace/Asynch_IO.cpp @@ -1197,9 +1197,20 @@ ACE_Service_Handler::~ACE_Service_Handler (void) } void -ACE_Service_Handler::addresses (const ACE_INET_Addr & /* remote_address */, - const ACE_INET_Addr & /* local_address */ ) +ACE_Service_Handler::addresses (const ACE_INET_Addr &remote_address, + const ACE_INET_Addr &local_address) { + // Default behavior is to print out the addresses. + ACE_TCHAR local_address_buf[BUFSIZ], remote_address_buf[BUFSIZ]; + if (local_address.addr_to_string (local_address_buf, sizeof local_address_buf) == -1) + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("can't obtain local_address's address string"))); + + if (remote_address.addr_to_string (remote_address_buf, sizeof remote_address_buf) == -1) + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("can't obtain remote_address's address string"))); + + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("On fd %d\n"), this->handle ())); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("local address %s\n"), local_address_buf)); + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("remote address %s\n"), remote_address_buf)); } void diff --git a/ace/CDR_Stream.cpp b/ace/CDR_Stream.cpp index 3ac6985356a..0795493f8d0 100644 --- a/ace/CDR_Stream.cpp +++ b/ace/CDR_Stream.cpp @@ -119,7 +119,9 @@ ACE_OutputCDR::grow_and_adjust (size_t size, // Make sure that there is enough room for <minsize> bytes, but // also make it bigger than whatever our current size is. if (minsize < cursize) - minsize = cursize; + { + minsize = cursize; + } size_t newsize = ACE_CDR::next_size (minsize); @@ -200,7 +202,9 @@ ACE_OutputCDR::write_string (ACE_CDR::ULong len, if (len != 0) { if (this->write_ulong (len + 1)) - return this->write_char_array (x, len + 1); + { + return this->write_char_array (x, len + 1); + } } else { @@ -209,7 +213,9 @@ ACE_OutputCDR::write_string (ACE_CDR::ULong len, // notion of null v. empty strings; nulls aren't part of the OMG-IDL // string model.) if (this->write_ulong (1)) - return this->write_char (0); + { + return this->write_char (0); + } } return 0; @@ -244,11 +250,15 @@ ACE_OutputCDR::write_wstring (ACE_CDR::ULong len, //the wstring occupies rather than number of wchars //Taking sizeof might not be a good way! This is a temporary fix. if (this->write_ulong (sizeof(ACE_CDR::WChar)*len)) - return this->write_wchar_array (x, len); + { + return this->write_wchar_array (x, len); + } } else - //In GIOP 1.2 zero length wstrings are legal - return this->write_ulong (0); + { + //In GIOP 1.2 zero length wstrings are legal + return this->write_ulong (0); + } } else @@ -257,8 +267,11 @@ ACE_OutputCDR::write_wstring (ACE_CDR::ULong len, if (this->write_ulong (len + 1)) return this->write_wchar_array (x, len + 1); } - else if (this->write_ulong (1)) - return this->write_wchar (0); + else + { + if (this->write_ulong (1)) + return this->write_wchar (0); + } return 0; } @@ -281,7 +294,9 @@ ACE_OutputCDR::write_octet_array_mb (const ACE_Message_Block* mb) ACE_CDR::OCTET_SIZE, ACE_CDR::OCTET_ALIGN, ACE_static_cast (ACE_CDR::ULong, length))) - return 0; + { + return 0; + } continue; } @@ -292,7 +307,9 @@ ACE_OutputCDR::write_octet_array_mb (const ACE_Message_Block* mb) ACE_CDR::OCTET_SIZE, ACE_CDR::OCTET_ALIGN, ACE_static_cast (ACE_CDR::ULong, length))) - return 0; + { + return 0; + } continue; } @@ -517,12 +534,10 @@ ACE_OutputCDR::write_boolean_array (const ACE_CDR::Boolean* x, // a non-zero value (different from 1). // We resort to a simple loop. const ACE_CDR::Boolean* end = x + length; - - for (const ACE_CDR::Boolean* i = x; - i != end && this->good_bit (); - ++i) - this->write_boolean (*i); - + for (const ACE_CDR::Boolean* i = x; i != end && this->good_bit (); ++i) + { + this->write_boolean (*i); + } return this->good_bit (); } @@ -642,7 +657,9 @@ ACE_InputCDR::ACE_InputCDR (const ACE_InputCDR& rhs, this->start_.wr_ptr (newpos + size); } else - this->good_bit_ = 0; + { + this->good_bit_ = 0; + } } ACE_InputCDR::ACE_InputCDR (const ACE_InputCDR& rhs, @@ -677,7 +694,9 @@ ACE_InputCDR::ACE_InputCDR (const ACE_InputCDR& rhs, this->do_byte_swap_ = (byte_order != ACE_CDR_BYTE_ORDER); } else - this->good_bit_ = 0; + { + this->good_bit_ = 0; + } } ACE_InputCDR::ACE_InputCDR (const ACE_InputCDR& rhs) @@ -791,9 +810,14 @@ ACE_InputCDR::read_wchar (ACE_CDR::WChar& x) ACE_CDR::Octet len; if (this->read_1 (&len)) - return this->read_octet_array - (ACE_reinterpret_cast (ACE_CDR::Octet*, &x), - ACE_static_cast (ACE_CDR::ULong, len)); + { + return this->read_octet_array ( + ACE_reinterpret_cast (ACE_CDR::Octet*, + &x), + ACE_static_cast (ACE_CDR::ULong, + len) + ); + } } else if (this->wchar_translator_ == 0) { @@ -805,7 +829,8 @@ ACE_InputCDR::read_wchar (ACE_CDR::WChar& x) &x)); } - return this->wchar_translator_->read_wchar (*this, x); + return this->wchar_translator_->read_wchar (*this, + x); } ACE_CDR::Boolean @@ -815,7 +840,10 @@ ACE_InputCDR::read_string (ACE_CDR::Char *&x) // i.e. normally the translator will be 0, but OTOH the code is // smaller and should be better for the cache ;-) ;-) if (this->char_translator_ != 0) - return this->char_translator_->read_string (*this, x); + { + return this->char_translator_->read_string (*this, + x); + } ACE_CDR::ULong len; @@ -829,7 +857,9 @@ ACE_InputCDR::read_string (ACE_CDR::Char *&x) ACE_CDR::Char[len], 0); if (this->read_char_array (x, len)) - return 1; + { + return 1; + } delete [] x; } @@ -946,7 +976,9 @@ ACE_InputCDR::read_array (void* x, ACE_OS::memcpy (x, buf, size*length); #else if (!this->do_byte_swap_ || size == 1) - ACE_OS::memcpy (x, buf, size*length); + { + ACE_OS::memcpy (x, buf, size*length); + } else { char *target = ACE_reinterpret_cast (char*, x); @@ -991,8 +1023,9 @@ ACE_InputCDR::read_boolean_array (ACE_CDR::Boolean *x, // a non-zero value (different from 1). // We resort to a simple loop. for (ACE_CDR::ULong i = 0; i != length && this->good_bit_; ++i) - this->read_boolean (x[i]); - + { + this->read_boolean (x[i]); + } return this->good_bit_; } @@ -1018,9 +1051,13 @@ ACE_InputCDR::read_2 (ACE_CDR::UShort *x) { #if !defined (ACE_DISABLE_SWAP_ON_READ) if (!this->do_byte_swap_) - *x = *ACE_reinterpret_cast (ACE_CDR::UShort*, buf); + { + *x = *ACE_reinterpret_cast (ACE_CDR::UShort*, buf); + } else - ACE_CDR::swap_2 (buf, ACE_reinterpret_cast (char*, x)); + { + ACE_CDR::swap_2 (buf, ACE_reinterpret_cast (char*, x)); + } #else *x = *ACE_reinterpret_cast(ACE_CDR::UShort*,buf); #endif /* ACE_DISABLE_SWAP_ON_READ */ @@ -1037,9 +1074,13 @@ ACE_InputCDR::read_4 (ACE_CDR::ULong *x) { #if !defined (ACE_DISABLE_SWAP_ON_READ) if (!this->do_byte_swap_) - *x = *ACE_reinterpret_cast (ACE_CDR::ULong*, buf); + { + *x = *ACE_reinterpret_cast (ACE_CDR::ULong*, buf); + } else - ACE_CDR::swap_4 (buf, ACE_reinterpret_cast (char*, x)); + { + ACE_CDR::swap_4 (buf, ACE_reinterpret_cast (char*, x)); + } #else *x = *ACE_reinterpret_cast(ACE_CDR::ULong*,buf); #endif /* ACE_DISABLE_SWAP_ON_READ */ @@ -1085,9 +1126,13 @@ ACE_InputCDR::read_8 (ACE_CDR::ULongLong *x) } # else if (!this->do_byte_swap_) - *x = *ACE_reinterpret_cast (ACE_CDR::ULongLong *, buf); + { + *x = *ACE_reinterpret_cast (ACE_CDR::ULongLong *, buf); + } else - ACE_CDR::swap_8 (buf, ACE_reinterpret_cast (char *, x)); + { + ACE_CDR::swap_8 (buf, ACE_reinterpret_cast (char *, x)); + } # endif /* !__arm__ */ #else *x = *ACE_reinterpret_cast (ACE_CDR::ULongLong *, buf); @@ -1108,9 +1153,13 @@ ACE_InputCDR::read_16 (ACE_CDR::LongDouble *x) { #if !defined (ACE_DISABLE_SWAP_ON_READ) if (!this->do_byte_swap_) - *x = *ACE_reinterpret_cast (ACE_CDR::LongDouble *, buf); + { + *x = *ACE_reinterpret_cast (ACE_CDR::LongDouble *, buf); + } else - ACE_CDR::swap_16 (buf, ACE_reinterpret_cast (char*, x)); + { + ACE_CDR::swap_16 (buf, ACE_reinterpret_cast (char*, x)); + } #else *x = *ACE_reinterpret_cast(ACE_CDR::LongDouble*,buf); #endif /* ACE_DISABLE_SWAP_ON_READ */ @@ -1266,6 +1315,7 @@ ACE_InputCDR::exchange_data_blocks (ACE_InputCDR &cdr) this->minor_version_ = dminor; } + ACE_Data_Block * ACE_InputCDR::clone_from (ACE_InputCDR &cdr) { @@ -1388,6 +1438,7 @@ operator<< (ACE_OutputCDR &os, const ACE_CString &x) return os.good_bit (); } + ACE_CDR::Boolean operator>> (ACE_InputCDR &is, ACE_CString &x) { diff --git a/ace/CDR_Stream.i b/ace/CDR_Stream.i index 73dfb5e69f7..90b73d012bb 100644 --- a/ace/CDR_Stream.i +++ b/ace/CDR_Stream.i @@ -3,6 +3,7 @@ // **************************************************************** + // implementing the special types ACE_INLINE ACE_OutputCDR::from_boolean::from_boolean (ACE_CDR::Boolean b) @@ -154,7 +155,6 @@ ACE_OutputCDR::reset (void) // It is tempting not to remove the memory, but we need to do so to // release any potential user buffers chained in the continuation // field. - ACE_Message_Block *cont = this->start_.cont (); if (cont != 0) { @@ -175,7 +175,7 @@ ACE_OutputCDR::write_octet (ACE_CDR::Octet x) ACE_INLINE ACE_CDR::Boolean ACE_OutputCDR::write_boolean (ACE_CDR::Boolean x) { - return (ACE_CDR::Boolean) this->write_octet (x ? (ACE_CDR::Octet) 1 : (ACE_CDR::Octet) 0); + return (ACE_CDR::Boolean) this->write_octet (x ? 1 : 0); } ACE_INLINE ACE_CDR::Boolean @@ -536,7 +536,7 @@ ACE_InputCDR::read_boolean (ACE_CDR::Boolean& x) { ACE_CDR::Octet tmp; this->read_octet (tmp); - x = tmp ? (ACE_CDR::Boolean) 1 : (ACE_CDR::Boolean) 0; + x = tmp ? 1 : 0; return (ACE_CDR::Boolean) this->good_bit_; } @@ -820,7 +820,7 @@ ACE_InputCDR::skip_boolean (void) { ACE_CDR::Octet tmp; this->read_octet (tmp); - return (ACE_CDR::Boolean) this->good_bit_; + return this->good_bit_; } ACE_INLINE ACE_CDR::Boolean @@ -954,84 +954,84 @@ ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::Char x) { os.write_char (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::Short x) { os.write_short (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::UShort x) { os.write_ushort (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::Long x) { os.write_long (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::ULong x) { os.write_ulong (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::LongLong x) { os.write_longlong (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::ULongLong x) { os.write_ulonglong (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::LongDouble x) { os.write_longdouble (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::Float x) { os.write_float (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_CDR::Double x) { os.write_double (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, const ACE_CDR::Char *x) { os.write_string (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, const ACE_CDR::WChar *x) { os.write_wstring (x); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } // The following use the helper classes @@ -1039,28 +1039,28 @@ ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_boolean x) { os.write_boolean (x.val_); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_char x) { os.write_char (x.val_); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_wchar x) { os.write_wchar (x.val_); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_octet x) { os.write_octet (x.val_); - return (ACE_CDR::Boolean) os.good_bit (); + return os.good_bit (); } ACE_INLINE ACE_CDR::Boolean @@ -1225,91 +1225,91 @@ ACE_INLINE ACE_CDR::Boolean ACE_OutputCDR::append_boolean (ACE_InputCDR &stream) { ACE_CDR::Boolean x; - return stream.read_boolean (x) ? this->write_boolean (x) : (ACE_CDR::Boolean) 0; + return (stream.read_boolean (x) ? this->write_boolean (x) : 0); } ACE_INLINE ACE_CDR::Boolean ACE_OutputCDR::append_char (ACE_InputCDR &stream) { ACE_CDR::Char x; - return stream.read_char (x) ? this->write_char (x) : (ACE_CDR::Boolean) 0; + return (stream.read_char (x) ? this->write_char (x) : 0); } ACE_INLINE ACE_CDR::Boolean ACE_OutputCDR::append_wchar (ACE_InputCDR &stream) { ACE_CDR::WChar x; - return stream.read_wchar (x) ? this->write_wchar (x) : (ACE_CDR::Boolean) 0; + return (stream.read_wchar (x) ? this->write_wchar (x) : 0); } ACE_INLINE ACE_CDR::Boolean ACE_OutputCDR::append_octet (ACE_InputCDR &stream) { ACE_CDR::Octet x; - return stream.read_octet (x) ? this->write_octet (x) : (ACE_CDR::Boolean) 0; + return (stream.read_octet (x) ? this->write_octet (x) : 0); } ACE_INLINE ACE_CDR::Boolean ACE_OutputCDR::append_short (ACE_InputCDR &stream) { ACE_CDR::Short x; - return stream.read_short (x) ? this->write_short (x) : (ACE_CDR::Boolean) 0; + return (stream.read_short (x) ? this->write_short (x) : 0); } ACE_INLINE ACE_CDR::Boolean ACE_OutputCDR::append_ushort (ACE_InputCDR &stream) { ACE_CDR::UShort x; - return stream.read_ushort (x) ? this->write_ushort (x) : (ACE_CDR::Boolean) 0; + return (stream.read_ushort (x) ? this->write_ushort (x) : 0); } ACE_INLINE ACE_CDR::Boolean ACE_OutputCDR::append_long (ACE_InputCDR &stream) { ACE_CDR::Long x; - return stream.read_long (x) ? this->write_long (x) : (ACE_CDR::Boolean) 0; + return (stream.read_long (x) ? this->write_long (x) : 0); } ACE_INLINE ACE_CDR::Boolean ACE_OutputCDR::append_ulong (ACE_InputCDR &stream) { ACE_CDR::ULong x; - return stream.read_ulong (x) ? this->write_ulong (x) : (ACE_CDR::Boolean) 0; + return (stream.read_ulong (x) ? this->write_ulong (x) : 0); } ACE_INLINE ACE_CDR::Boolean ACE_OutputCDR::append_longlong (ACE_InputCDR &stream) { ACE_CDR::LongLong x; - return stream.read_longlong (x) ? this->write_longlong (x) : (ACE_CDR::Boolean) 0; + return (stream.read_longlong (x) ? this->write_longlong (x) : 0); } ACE_INLINE ACE_CDR::Boolean ACE_OutputCDR::append_ulonglong (ACE_InputCDR &stream) { ACE_CDR::ULongLong x; - return stream.read_ulonglong (x) ? this->write_ulonglong (x) : (ACE_CDR::Boolean) 0; + return (stream.read_ulonglong (x) ? this->write_ulonglong (x) : 0); } ACE_INLINE ACE_CDR::Boolean ACE_OutputCDR::append_float (ACE_InputCDR &stream) { ACE_CDR::Float x; - return stream.read_float (x) ? this->write_float (x) : (ACE_CDR::Boolean) 0; + return (stream.read_float (x) ? this->write_float (x) : 0); } ACE_INLINE ACE_CDR::Boolean ACE_OutputCDR::append_double (ACE_InputCDR &stream) { ACE_CDR::Double x; - return stream.read_double (x) ? this->write_double (x) : (ACE_CDR::Boolean) 0; + return (stream.read_double (x) ? this->write_double (x) : 0); } ACE_INLINE ACE_CDR::Boolean ACE_OutputCDR::append_longdouble (ACE_InputCDR &stream) { ACE_CDR::LongDouble x; - return stream.read_longdouble (x) ? this->write_longdouble (x) : (ACE_CDR::Boolean) 0; + return (stream.read_longdouble (x) ? this->write_longdouble (x) : 0); } ACE_INLINE ACE_CDR::Boolean @@ -1317,7 +1317,7 @@ ACE_OutputCDR::append_string (ACE_InputCDR &stream) { ACE_CDR::Char *x; ACE_CDR::Boolean flag = - (stream.read_string (x) ? this->write_string (x) : (ACE_CDR::Boolean) 0); + (stream.read_string (x) ? this->write_string (x) : 0); delete [] x; return flag; } @@ -1327,7 +1327,7 @@ ACE_OutputCDR::append_wstring (ACE_InputCDR &stream) { ACE_CDR::WChar *x; ACE_CDR::Boolean flag = - (stream.read_wstring (x) ? this->write_wstring (x) : (ACE_CDR::Boolean) 0); + (stream.read_wstring (x) ? this->write_wstring (x) : 0); delete [] x; return flag; } diff --git a/ace/Connector.h b/ace/Connector.h index 47f5e6cd9bc..2d41b629946 100644 --- a/ace/Connector.h +++ b/ace/Connector.h @@ -38,7 +38,6 @@ template <class SVC_HANDLER> class ACE_Svc_Tuple { public: - // = Initialization methods. ACE_Svc_Tuple (SVC_HANDLER *, ACE_HANDLE, @@ -390,27 +389,6 @@ class ACE_Strategy_Connector : public ACE_Connector <SVC_HANDLER, ACE_PEER_CONNECTOR_2> { public: - - // Useful STL-style traits. - typedef ACE_Creation_Strategy<SVC_HANDLER> - creation_strategy_type; - typedef ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> - connect_strategy_type; - typedef ACE_Concurrency_Strategy<SVC_HANDLER> - concurrency_strategy_type; - typedef ACE_Connector <SVC_HANDLER, ACE_PEER_CONNECTOR_2> - base_type; - - // = Define some useful (old style) traits. - typedef ACE_Creation_Strategy<SVC_HANDLER> - CREATION_STRATEGY; - typedef ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> - CONNECT_STRATEGY; - typedef ACE_Concurrency_Strategy<SVC_HANDLER> - CONCURRENCY_STRATEGY; - typedef ACE_Connector <SVC_HANDLER, ACE_PEER_CONNECTOR_2> - SUPER; - /** * Initialize a connector. <flags> indicates how <SVC_HANDLER>'s * should be initialized prior to being activated. Right now, the @@ -451,6 +429,16 @@ public: /// Close down the Connector virtual int close (void); + // = Define some useful typedefs traits. + typedef ACE_Creation_Strategy<SVC_HANDLER> + CREATION_STRATEGY; + typedef ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> + CONNECT_STRATEGY; + typedef ACE_Concurrency_Strategy<SVC_HANDLER> + CONCURRENCY_STRATEGY; + typedef ACE_Connector <SVC_HANDLER, ACE_PEER_CONNECTOR_2> + SUPER; + // = Strategies accessors virtual ACE_Creation_Strategy<SVC_HANDLER> *creation_strategy (void) const; virtual ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> *connect_strategy (void) const; diff --git a/ace/Containers_T.cpp b/ace/Containers_T.cpp index f497f0cc9c3..bda51e5f363 100644 --- a/ace/Containers_T.cpp +++ b/ace/Containers_T.cpp @@ -828,9 +828,7 @@ ACE_Double_Linked_List<T>::delete_nodes (void) { T * temp = ACE_static_cast (T*, this->head_->next_); this->remove_element (temp); - ACE_DES_FREE (temp, - this->allocator_->free, - T); + delete temp; } } diff --git a/ace/Date_Time.h b/ace/Date_Time.h index 52df165365a..c3b7a6c95c8 100644 --- a/ace/Date_Time.h +++ b/ace/Date_Time.h @@ -48,9 +48,6 @@ public: /// Update to the current time/date. void update (void); - /// Update to the given ACE_Time_Value - void update (const ACE_Time_Value& timevalue); - /// Get day. long day (void) const; diff --git a/ace/Date_Time.i b/ace/Date_Time.i index 9678fbc0081..0edd4d5ba02 100644 --- a/ace/Date_Time.i +++ b/ace/Date_Time.i @@ -8,13 +8,8 @@ ACE_Date_Time::update (void) { ACE_TRACE ("ACE_Date_Time::update"); - update(ACE_OS::gettimeofday ()); -} - -ASYS_INLINE void -ACE_Date_Time::update (const ACE_Time_Value& timevalue) -{ - time_t time = timevalue.sec (); + ACE_Time_Value now = ACE_OS::gettimeofday (); + time_t time = now.sec (); struct tm tm_time; ACE_OS::localtime_r (&time, &tm_time); this->day_ = tm_time.tm_mday; @@ -23,7 +18,7 @@ ACE_Date_Time::update (const ACE_Time_Value& timevalue) this->hour_ = tm_time.tm_hour; this->minute_ = tm_time.tm_min; this->second_ = tm_time.tm_sec; - this->microsec_ = timevalue.usec (); + this->microsec_ = now.usec (); this->wday_ = tm_time.tm_wday; } diff --git a/ace/Dev_Poll_Reactor.cpp b/ace/Dev_Poll_Reactor.cpp index 6fb01fe5daa..620a38c1e8c 100644 --- a/ace/Dev_Poll_Reactor.cpp +++ b/ace/Dev_Poll_Reactor.cpp @@ -2119,7 +2119,7 @@ ACE_Dev_Poll_Reactor::handler (int signum, if (handler == 0) return -1; - else if (eh != 0) + else if (eh != 0 && *eh != 0) *eh = handler; return 0; diff --git a/ace/Event_Handler.h b/ace/Event_Handler.h index e5f0df47427..470751fb860 100644 --- a/ace/Event_Handler.h +++ b/ace/Event_Handler.h @@ -132,12 +132,7 @@ public: enum { - /// The handler is not resumed at all. Could lead to deadlock.. - ACE_EVENT_HANDLER_NOT_RESUMED = -1, - /// The reactor takes responsibility of resuming the handler and - /// is the default ACE_REACTOR_RESUMES_HANDLER = 0, - /// The application takes responsibility of resuming the handler ACE_APPLICATION_RESUMES_HANDLER }; /* Called to figure out whether the handler needs to resumed by the diff --git a/ace/FIFO_Send_Msg.cpp b/ace/FIFO_Send_Msg.cpp index 8d380c07d5e..8d947252002 100644 --- a/ace/FIFO_Send_Msg.cpp +++ b/ace/FIFO_Send_Msg.cpp @@ -1,3 +1,4 @@ +// FIFO_Send_Msg.cpp // $Id$ #include "ace/FIFO_Send_Msg.h" @@ -37,12 +38,9 @@ ACE_FIFO_Send_Msg::send (const ACE_Str_Buf &send_msg) iov[0].iov_len = sizeof send_msg.len; iov[1].iov_base = (char *) send_msg.buf; - iov[1].iov_len = ACE_static_cast (size_t, send_msg.len); + iov[1].iov_len = int (send_msg.len); - ssize_t sent = ACE_OS::writev (this->get_handle (), iov, 2); - if (sent > 0) - sent -= iov[0].iov_len; // Don't count the length we added. - return sent; + return ACE_OS::writev (this->get_handle (), iov, 2); #endif /* ACE_HAS_STREAM_PIPES */ } diff --git a/ace/Hash_Map_Manager_T.h b/ace/Hash_Map_Manager_T.h index 896f85412de..a19404229d0 100644 --- a/ace/Hash_Map_Manager_T.h +++ b/ace/Hash_Map_Manager_T.h @@ -700,9 +700,7 @@ public: * <ACE_Hash_Map_Manager_Ex>'s internal lock, which is * accessible via its <mutex> method. * Note that this iterator cannot be created by calling a method - * on the map, since this would require adding explicit template - * instantiations for bucket iterators on platforms with broken - * templates. + * on the map, since this would require */ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> class ACE_Hash_Map_Bucket_Iterator diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp index 0039f71327e..6663408a5d1 100644 --- a/ace/INET_Addr.cpp +++ b/ace/INET_Addr.cpp @@ -96,7 +96,9 @@ ACE_INET_Addr::ACE_INET_Addr (void) : ACE_Addr (this->determine_type(), sizeof (inet_addr_)) { // ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr"); - this->reset(); + (void) ACE_OS::memset ((void *) &this->inet_addr_, + 0, + sizeof this->inet_addr_); } int @@ -168,7 +170,7 @@ ACE_INET_Addr::ACE_INET_Addr (const char address[]) : ACE_Addr (this->determine_type(), sizeof (inet_addr_)) { ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr"); - this->reset(); + ACE_OS::memset (&this->inet_addr_, 0, sizeof (this->inet_addr_)); this->set (address); } @@ -177,7 +179,7 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t address[]) : ACE_Addr (this->determine_type(), sizeof (inet_addr_)) { ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr"); - this->reset(); + ACE_OS::memset (&this->inet_addr_, 0, sizeof (this->inet_addr_)); this->set (address); } @@ -189,7 +191,6 @@ ACE_INET_Addr::ACE_INET_Addr (const ACE_INET_Addr &sa) : ACE_Addr (sa.get_type (), sa.get_size()) { ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr"); - this->reset(); this->set (sa); } @@ -453,14 +454,15 @@ ACE_INET_Addr::set (const sockaddr_in *addr, int len) // Set a pointer to the address. void -ACE_INET_Addr::set_addr (void *addr, int /* len */) +ACE_INET_Addr::set_addr (void *addr, int len) { ACE_TRACE ("ACE_INET_Addr::set_addr"); + ACE_UNUSED_ARG (len); + struct sockaddr_in *getfamily = ACE_static_cast (struct sockaddr_in *, addr); if (getfamily->sin_family == AF_INET) { - this->set_port_number (getfamily->sin_port, 0); this->set_address (ACE_reinterpret_cast (const char*, &getfamily->sin_addr), sizeof (getfamily->sin_addr), 0); @@ -469,7 +471,6 @@ ACE_INET_Addr::set_addr (void *addr, int /* len */) else if (getfamily->sin_family == AF_INET6) { struct sockaddr_in6 *in6 = ACE_static_cast (struct sockaddr_in6*, addr); - this->set_port_number (in6->sin6_port, 0); this->set_address (ACE_reinterpret_cast (const char*, &in6->sin6_addr), sizeof (in6->sin6_addr), 0); @@ -484,7 +485,6 @@ ACE_INET_Addr::ACE_INET_Addr (const sockaddr_in *addr, int len) : ACE_Addr (this->determine_type(), sizeof (inet_addr_)) { ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr"); - this->reset(); this->set (addr, len); } @@ -496,7 +496,7 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number, : ACE_Addr (this->determine_type(), sizeof (inet_addr_)) { ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr"); - this->reset(); + ACE_OS::memset (&this->inet_addr_, 0, sizeof (this->inet_addr_)); if (this->set (port_number, inet_address) == -1) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), @@ -512,7 +512,7 @@ ACE_INET_Addr::ACE_INET_Addr (const char port_name[], : ACE_Addr (this->determine_type(), sizeof (inet_addr_)) { ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr"); - this->reset(); + ACE_OS::memset (&this->inet_addr_, 0, sizeof (this->inet_addr_)); if (this->set (port_name, host_name, protocol) == -1) @@ -527,7 +527,7 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[], : ACE_Addr (this->determine_type(), sizeof (inet_addr_)) { ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr"); - this->reset(); + ACE_OS::memset (&this->inet_addr_, 0, sizeof (this->inet_addr_)); if (this->set (port_name, host_name, protocol) == -1) @@ -545,7 +545,7 @@ ACE_INET_Addr::ACE_INET_Addr (const char port_name[], : ACE_Addr (this->determine_type(), sizeof (inet_addr_)) { ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr"); - this->reset(); + ACE_OS::memset (&this->inet_addr_, 0, sizeof (this->inet_addr_)); if (this->set (port_name, inet_address, protocol) == -1) @@ -560,7 +560,7 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[], : ACE_Addr (this->determine_type(), sizeof (inet_addr_)) { ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr"); - this->reset(); + ACE_OS::memset (&this->inet_addr_, 0, sizeof (this->inet_addr_)); if (this->set (port_name, inet_address, protocol) == -1) diff --git a/ace/INET_Addr.h b/ace/INET_Addr.h index 9f2d7c9496b..46ad3316424 100644 --- a/ace/INET_Addr.h +++ b/ace/INET_Addr.h @@ -305,9 +305,6 @@ private: int ip_addr_size (void) const; int determine_type (void) const; - /// Initialize underlying inet_addr_ to default values - void reset (void); - /// Underlying representation. /// This union uses the knowledge that the two structures share the /// first member, sa_family (as all sockaddr structures do). diff --git a/ace/INET_Addr.i b/ace/INET_Addr.i index f6961b0c6e9..0808b595e20 100644 --- a/ace/INET_Addr.i +++ b/ace/INET_Addr.i @@ -9,20 +9,6 @@ ACE_INET_Addr::~ACE_INET_Addr (void) { } -ACE_INLINE void -ACE_INET_Addr::reset (void) -{ - ACE_OS::memset(&this->inet_addr_, 0, sizeof(this->inet_addr_)); - if (this->get_type() == AF_INET) { - this->inet_addr_.in4_.sin_family = AF_INET; - } -#if defined (ACE_HAS_IPV6) - else if (this->get_type() == AF_INET6) { - this->inet_addr_.in6_.sin6_family = AF_INET6; - } -#endif /* ACE_HAS_IPV6 */ -} - ACE_INLINE int ACE_INET_Addr::determine_type (void) const { diff --git a/ace/Lib_Find.cpp b/ace/Lib_Find.cpp index c681f75463a..11aa00b6129 100644 --- a/ace/Lib_Find.cpp +++ b/ace/Lib_Find.cpp @@ -378,7 +378,7 @@ ACE_Lib_Find::ldname (const ACE_TCHAR *entry_point) { ACE_TRACE ("ACE_Lib_Find::ldname"); -#if defined (__BORLANDC__) || defined(__APPLE__) +#if defined (__BORLANDC__) size_t size = 1 // leading '_' + ACE_OS::strlen (entry_point) @@ -393,7 +393,7 @@ ACE_Lib_Find::ldname (const ACE_TCHAR *entry_point) ACE_OS::strcat (new_name, entry_point); return new_name; -#else /* __BORLANDC__ || __APPLE__ */ +#else /* __BORLANDC__ */ size_t size = ACE_OS::strlen (entry_point) + 1; @@ -406,7 +406,7 @@ ACE_Lib_Find::ldname (const ACE_TCHAR *entry_point) ACE_OS::strcpy (new_name, entry_point); return new_name; -#endif /* __BORLANDC__ || __APPLE__ */ +#endif /* __BORLANDC__ */ } int diff --git a/ace/Makefile.ace b/ace/Makefile.ace index a69423e04db..6a5a75f2f93 100644 --- a/ace/Makefile.ace +++ b/ace/Makefile.ace @@ -1061,8 +1061,7 @@ endif # GHS ace_wchar.h \ ace_wchar.inl -.obj/ACE.o .obj/ACE.so .shobj/ACE.o .shobj/ACE.so: ACE.cpp \ - ACE.h \ +.obj/ACE.o .obj/ACE.so .shobj/ACE.o .shobj/ACE.so: ACE.cpp ACE.h \ pre.h \ OS.h \ config-all.h \ @@ -2877,9 +2876,6 @@ endif # GHS Local_Tokens.i \ Token_Manager.i \ Thread_Manager.h \ - Thread_Exit.h \ - Thread_Control.h \ - Thread_Control.inl \ Containers.h \ Containers.i \ Containers_T.h \ @@ -3409,9 +3405,6 @@ endif # GHS Base_Thread_Adapter.inl \ Thread_Adapter.inl \ Thread.i \ - Thread_Exit.h \ - Thread_Control.h \ - Thread_Control.inl \ Synch.h \ Synch.i \ Synch_T.h \ @@ -4591,9 +4584,6 @@ endif # GHS Log_Msg.h \ Log_Priority.h \ Thread_Manager.h \ - Thread_Exit.h \ - Thread_Control.h \ - Thread_Control.inl \ Unbounded_Queue.h \ Node.h \ Node.cpp \ @@ -4644,7 +4634,10 @@ endif # GHS Dynamic.i \ Auto_Ptr.h \ Auto_Ptr.i \ - Auto_Ptr.cpp + Auto_Ptr.cpp \ + Thread_Exit.h \ + Thread_Control.h \ + Thread_Control.inl .obj/Thread_Adapter.o .obj/Thread_Adapter.so .shobj/Thread_Adapter.o .shobj/Thread_Adapter.so: Thread_Adapter.cpp \ Thread_Adapter.h \ @@ -4688,9 +4681,6 @@ endif # GHS Thread_Manager.h \ Thread.h \ Thread.i \ - Thread_Exit.h \ - Thread_Control.h \ - Thread_Control.inl \ Synch.h \ Synch.i \ Synch_T.h \ @@ -4744,6 +4734,9 @@ endif # GHS Framework_Component_T.inl \ Framework_Component_T.cpp \ Thread_Manager.i \ + Thread_Exit.h \ + Thread_Control.h \ + Thread_Control.inl \ Thread_Hook.h .obj/Thread_Exit.o .obj/Thread_Exit.so .shobj/Thread_Exit.o .shobj/Thread_Exit.so: Thread_Exit.cpp \ @@ -4801,49 +4794,7 @@ endif # GHS Object_Manager.h \ Object_Manager.i \ Managed_Object.i \ - Managed_Object.cpp \ - Thread_Manager.h \ - Unbounded_Queue.h \ - Node.h \ - Node.cpp \ - Unbounded_Queue.inl \ - Unbounded_Queue.cpp \ - Malloc_Base.h \ - Containers.h \ - Containers.i \ - Containers_T.h \ - Array_Base.h \ - Array_Base.inl \ - Array_Base.cpp \ - Unbounded_Set.h \ - Unbounded_Set.inl \ - Unbounded_Set.cpp \ - Containers_T.i \ - Containers_T.cpp \ - Free_List.h \ - Free_List.i \ - Free_List.cpp \ - Singleton.h \ - Singleton.i \ - Singleton.cpp \ - Framework_Component.h \ - Framework_Component.inl \ - ACE.h \ - Flag_Manip.h \ - Flag_Manip.i \ - Handle_Ops.h \ - Handle_Ops.i \ - Lib_Find.h \ - Lib_Find.i \ - Init_ACE.h \ - Init_ACE.i \ - Sock_Connect.h \ - Sock_Connect.i \ - ACE.i \ - Framework_Component_T.h \ - Framework_Component_T.inl \ - Framework_Component_T.cpp \ - Thread_Manager.i + Managed_Object.cpp .obj/Thread_Control.o .obj/Thread_Control.so .shobj/Thread_Control.o .shobj/Thread_Control.so: Thread_Control.cpp \ config-all.h \ @@ -4889,7 +4840,6 @@ endif # GHS Base_Thread_Adapter.inl \ Thread_Adapter.inl \ Thread.i \ - Thread_Exit.h \ Synch.h \ Synch.i \ Synch_T.h \ @@ -5068,9 +5018,6 @@ endif # GHS Reactor.i \ Reactor_Impl.h \ Thread_Manager.h \ - Thread_Exit.h \ - Thread_Control.h \ - Thread_Control.inl \ Unbounded_Queue.h \ Node.h \ Node.cpp \ @@ -5289,9 +5236,6 @@ endif # GHS Select_Reactor_T.i \ Task.h \ Thread_Manager.h \ - Thread_Exit.h \ - Thread_Control.h \ - Thread_Control.inl \ Containers.h \ Containers.i \ Containers_T.h \ @@ -5348,195 +5292,7 @@ endif # GHS config-g++-common.h \ post.h \ ace_wchar.h \ - ace_wchar.inl \ - POSIX_Proactor.h \ - Proactor_Impl.h \ - OS.h \ - OS_Dirent.h \ - OS_Export.h \ - OS_Errno.h \ - OS_Errno.inl \ - OS_Dirent.inl \ - OS_String.h \ - Basic_Types.h \ - ACE_export.h \ - Basic_Types.i \ - OS_String.inl \ - OS_Memory.h \ - OS_Memory.inl \ - OS_TLI.h \ - OS_TLI.inl \ - Time_Value.h \ - Time_Value.inl \ - Default_Constants.h \ - Global_Macros.h \ - Min_Max.h \ - streams.h \ - Trace.h \ - OS.i \ - Asynch_IO.h \ - Reactor.h \ - Handle_Set.h \ - Handle_Set.i \ - Timer_Queue.h \ - Synch.h \ - Synch.i \ - Synch_T.h \ - Synch_T.i \ - Thread.h \ - Thread_Adapter.h \ - Base_Thread_Adapter.h \ - OS_Log_Msg_Attributes.h \ - OS_Log_Msg_Attributes.inl \ - Base_Thread_Adapter.inl \ - Thread_Adapter.inl \ - Thread.i \ - Synch_T.cpp \ - Log_Msg.h \ - Log_Priority.h \ - Timer_Queue_T.h \ - Free_List.h \ - Free_List.i \ - Free_List.cpp \ - Test_and_Set.h \ - Event_Handler.h \ - Event_Handler.i \ - Test_and_Set.i \ - Test_and_Set.cpp \ - Timer_Queue_T.i \ - Timer_Queue_T.cpp \ - Signal.h \ - Signal.i \ - Reactor.i \ - Reactor_Impl.h \ - Pipe.h \ - Pipe.i \ - POSIX_Asynch_IO.h \ - Asynch_IO_Impl.h \ - Asynch_IO_Impl.i \ - Unbounded_Queue.h \ - Node.h \ - Node.cpp \ - Unbounded_Queue.inl \ - Unbounded_Queue.cpp \ - Malloc_Base.h \ - Map_Manager.h \ - Map_Manager.i \ - Map_Manager.cpp \ - Malloc.h \ - Malloc.i \ - Malloc_T.h \ - Malloc_Allocator.h \ - Malloc_Allocator.i \ - Malloc_T.i \ - Malloc_T.cpp \ - ACE.h \ - Flag_Manip.h \ - Flag_Manip.i \ - Handle_Ops.h \ - Handle_Ops.i \ - Lib_Find.h \ - Lib_Find.i \ - Init_ACE.h \ - Init_ACE.i \ - Sock_Connect.h \ - Sock_Connect.i \ - ACE.i \ - Memory_Pool.h \ - Mem_Map.h \ - Mem_Map.i \ - SV_Semaphore_Complex.h \ - SV_Semaphore_Simple.h \ - SV_Semaphore_Simple.i \ - SV_Semaphore_Complex.i \ - Unbounded_Set.h \ - Unbounded_Set.inl \ - Unbounded_Set.cpp \ - Memory_Pool.i \ - Service_Config.h \ - Service_Types.h \ - Service_Object.h \ - Shared_Object.h \ - Shared_Object.i \ - Svc_Conf_Tokens.h \ - DLL.h \ - Service_Object.i \ - Service_Types.i \ - SString.h \ - String_Base.h \ - String_Base_Const.h \ - String_Base.i \ - String_Base.cpp \ - Auto_Ptr.h \ - Auto_Ptr.i \ - Auto_Ptr.cpp \ - SString.i \ - XML_Svc_Conf.h \ - Service_Config.i \ - POSIX_Asynch_IO.i \ - Asynch_Pseudo_Task.h \ - Select_Reactor.h \ - Select_Reactor_T.h \ - Select_Reactor_Base.h \ - Token.h \ - Token.i \ - Select_Reactor_Base.i \ - Select_Reactor_T.cpp \ - Timer_Heap.h \ - Timer_Heap_T.h \ - Timer_Heap_T.cpp \ - Select_Reactor_T.i \ - Task.h \ - Thread_Manager.h \ - Thread_Exit.h \ - Thread_Control.h \ - Thread_Control.inl \ - Containers.h \ - Containers.i \ - Containers_T.h \ - Array_Base.h \ - Array_Base.inl \ - Array_Base.cpp \ - Containers_T.i \ - Containers_T.cpp \ - Singleton.h \ - Singleton.i \ - Singleton.cpp \ - Object_Manager.h \ - Object_Manager.i \ - Managed_Object.h \ - Managed_Object.i \ - Managed_Object.cpp \ - Framework_Component.h \ - Framework_Component.inl \ - Framework_Component_T.h \ - Framework_Component_T.inl \ - Framework_Component_T.cpp \ - Thread_Manager.i \ - Task.i \ - Task_T.h \ - Message_Queue.h \ - Message_Block.h \ - Message_Block.i \ - Message_Block_T.h \ - Message_Block_T.i \ - Message_Block_T.cpp \ - IO_Cntl_Msg.h \ - Message_Queue_T.h \ - Message_Queue_T.i \ - Message_Queue_T.cpp \ - Notification_Strategy.h \ - Notification_Strategy.inl \ - Message_Queue.i \ - Task_T.i \ - Task_T.cpp \ - Module.h \ - Module.i \ - Module.cpp \ - Stream_Modules.h \ - Stream_Modules.cpp \ - POSIX_Proactor.i \ - POSIX_CB_Proactor.i + ace_wchar.inl .obj/WIN32_Proactor.o .obj/WIN32_Proactor.so .shobj/WIN32_Proactor.o .shobj/WIN32_Proactor.so: WIN32_Proactor.cpp \ WIN32_Proactor.h \ @@ -5714,9 +5470,6 @@ endif # GHS Base_Thread_Adapter.inl \ Thread_Adapter.inl \ Thread.i \ - Thread_Exit.h \ - Thread_Control.h \ - Thread_Control.inl \ Synch.h \ Synch.i \ Synch_T.h \ @@ -6308,7 +6061,35 @@ endif # GHS Timer_Queue_T.i \ Timer_Queue_T.cpp \ Signal.h \ - Signal.i + Signal.i \ + Pipe.h \ + Pipe.i \ + Dev_Poll_Reactor.inl \ + Handle_Set.h \ + Handle_Set.i \ + Reactor.h \ + Reactor.i \ + Timer_Heap.h \ + Timer_Heap_T.h \ + Unbounded_Set.h \ + Node.h \ + Node.cpp \ + Unbounded_Set.inl \ + Unbounded_Set.cpp \ + Malloc_Base.h \ + Timer_Heap_T.cpp \ + ACE.h \ + Flag_Manip.h \ + Flag_Manip.i \ + Handle_Ops.h \ + Handle_Ops.i \ + Lib_Find.h \ + Lib_Find.i \ + Init_ACE.h \ + Init_ACE.i \ + Sock_Connect.h \ + Sock_Connect.i \ + ACE.i .obj/TP_Reactor.o .obj/TP_Reactor.so .shobj/TP_Reactor.o .shobj/TP_Reactor.so: TP_Reactor.cpp \ TP_Reactor.h \ @@ -6505,9 +6286,6 @@ endif # GHS Base_Thread_Adapter.inl \ Thread_Adapter.inl \ Thread.i \ - Thread_Exit.h \ - Thread_Control.h \ - Thread_Control.inl \ Synch.h \ Synch.i \ Synch_T.h \ @@ -6736,9 +6514,6 @@ endif # GHS DLL.h \ Service_Object.i \ Thread_Manager.h \ - Thread_Exit.h \ - Thread_Control.h \ - Thread_Control.inl \ Unbounded_Queue.h \ Unbounded_Queue.inl \ Unbounded_Queue.cpp \ @@ -6920,9 +6695,6 @@ endif # GHS POSIX_Asynch_IO.i \ Proactor.h \ Thread_Manager.h \ - Thread_Exit.h \ - Thread_Control.h \ - Thread_Control.inl \ Containers.h \ Containers.i \ Containers_T.h \ @@ -8053,10 +7825,14 @@ endif # GHS INET_Addr.i \ SOCK_Dgram.i \ SOCK_Dgram_Mcast.i \ - Log_Msg.h \ - Log_Priority.h \ - OS_Log_Msg_Attributes.h \ - OS_Log_Msg_Attributes.inl + ACE.h \ + Handle_Ops.h \ + Handle_Ops.i \ + Lib_Find.h \ + Lib_Find.i \ + Init_ACE.h \ + Init_ACE.i \ + ACE.i .obj/SOCK_IO.o .obj/SOCK_IO.so .shobj/SOCK_IO.o .shobj/SOCK_IO.so: SOCK_IO.cpp \ SOCK_IO.h \ @@ -8256,8 +8032,7 @@ endif # GHS ace_wchar.h \ ace_wchar.inl -.obj/DEV.o .obj/DEV.so .shobj/DEV.o .shobj/DEV.so: DEV.cpp \ - DEV.h \ +.obj/DEV.o .obj/DEV.so .shobj/DEV.o .shobj/DEV.so: DEV.cpp DEV.h \ pre.h \ IO_SAP.h \ Flag_Manip.h \ @@ -10358,8 +10133,7 @@ endif # GHS OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl -.obj/TLI.o .obj/TLI.so .shobj/TLI.o .shobj/TLI.so: TLI.cpp \ - TLI.h \ +.obj/TLI.o .obj/TLI.so .shobj/TLI.o .shobj/TLI.so: TLI.cpp TLI.h \ pre.h \ IPC_SAP.h \ Flag_Manip.h \ @@ -10816,9 +10590,6 @@ endif # GHS DLL.h \ Service_Object.i \ Thread_Manager.h \ - Thread_Exit.h \ - Thread_Control.h \ - Thread_Control.inl \ Unbounded_Queue.h \ Node.h \ Node.cpp \ @@ -10991,9 +10762,6 @@ endif # GHS DLL.h \ Service_Object.i \ Thread_Manager.h \ - Thread_Exit.h \ - Thread_Control.h \ - Thread_Control.inl \ Unbounded_Queue.h \ Node.h \ Node.cpp \ @@ -11164,9 +10932,6 @@ endif # GHS DLL.h \ Service_Object.i \ Thread_Manager.h \ - Thread_Exit.h \ - Thread_Control.h \ - Thread_Control.inl \ Unbounded_Queue.h \ Node.h \ Node.cpp \ @@ -12689,8 +12454,7 @@ endif # GHS Signal.i \ Timer_Wheel_T.cpp -.obj/DLL.o .obj/DLL.so .shobj/DLL.o .shobj/DLL.so: DLL.cpp \ - DLL.h \ +.obj/DLL.o .obj/DLL.so .shobj/DLL.o .shobj/DLL.so: DLL.cpp DLL.h \ pre.h \ OS.h \ config-all.h \ @@ -13154,9 +12918,6 @@ endif # GHS Service_Repository.i \ Task.h \ Thread_Manager.h \ - Thread_Exit.h \ - Thread_Control.h \ - Thread_Control.inl \ Containers.h \ Containers.i \ Containers_T.h \ @@ -13365,9 +13126,6 @@ endif # GHS Service_Repository.h \ Service_Repository.i \ Thread_Manager.h \ - Thread_Exit.h \ - Thread_Control.h \ - Thread_Control.inl \ Singleton.h \ Singleton.i \ Singleton.cpp \ @@ -13758,9 +13516,6 @@ endif # GHS Stream_Modules.h \ Task.h \ Thread_Manager.h \ - Thread_Exit.h \ - Thread_Control.h \ - Thread_Control.inl \ Unbounded_Queue.h \ Node.h \ Node.cpp \ @@ -13954,9 +13709,6 @@ endif # GHS Parse_Node.h \ Parse_Node.i \ Thread_Manager.h \ - Thread_Exit.h \ - Thread_Control.h \ - Thread_Control.inl \ Containers.h \ Containers.i \ Containers_T.h \ @@ -14345,9 +14097,6 @@ endif # GHS Message_Queue.i \ Task.h \ Thread_Manager.h \ - Thread_Exit.h \ - Thread_Control.h \ - Thread_Control.inl \ Containers.h \ Containers.i \ Containers_T.h \ @@ -14862,9 +14611,6 @@ endif # GHS Base_Thread_Adapter.inl \ Thread_Adapter.inl \ Thread.i \ - Thread_Exit.h \ - Thread_Control.h \ - Thread_Control.inl \ Synch.h \ Synch.i \ Synch_T.h \ diff --git a/ace/Message_Block.cpp b/ace/Message_Block.cpp index d4b3bb11891..5a2f29d4af6 100644 --- a/ace/Message_Block.cpp +++ b/ace/Message_Block.cpp @@ -75,11 +75,9 @@ ACE_Message_Block::copy (const char *buf, size_t n) { ACE_TRACE ("ACE_Message_Block::copy"); - /*size_t len = ACE_static_cast(size_t, - this->end () - this->wr_ptr ());*/ - // Note that for this to work correct, end () *must* be >= mark (). - size_t len = this->space (); - + // Note that for this to work correct, end() *must* be >= wr_ptr(). + size_t len = ACE_static_cast(size_t, + this->end () - this->wr_ptr ()); if (len < n) return -1; else @@ -97,11 +95,9 @@ ACE_Message_Block::copy (const char *buf) { ACE_TRACE ("ACE_Message_Block::copy"); - /* size_t len = ACE_static_cast(size_t, - (this->end () - this->wr_ptr ())); */ // Note that for this to work correct, end() *must* be >= wr_ptr(). - size_t len = this->space (); - + size_t len = ACE_static_cast(size_t, + (this->end () - this->wr_ptr ())); size_t buflen = ACE_OS::strlen (buf) + 1; if (len < buflen) diff --git a/ace/Message_Queue_T.h b/ace/Message_Queue_T.h index 140f03d6064..f0e0d34a0f7 100644 --- a/ace/Message_Queue_T.h +++ b/ace/Message_Queue_T.h @@ -105,7 +105,7 @@ public: /** * This method holds the queue lock during this operation. * - * @return The number of messages flushed. + * @retval The number of messages flushed. */ virtual int flush (void); @@ -115,7 +115,7 @@ public: * The caller must be holding the queue lock before calling this * method. * - * @return The number of messages flushed. + * @retval The number of messages flushed. */ virtual int flush_i (void); @@ -129,7 +129,7 @@ public: // elapses, (in which case errno = EWOULDBLOCK). /** - * Retrieve a pointer to the first ACE_Message_Block in the queue + * Retrieve a poiner to the first ACE_Message_Block in the queue * without removing it. * * @param first_item Reference to an ACE_Message_Block * that will @@ -139,10 +139,10 @@ public: * @param timeout The absolute time the caller will wait until * for a block to be queued. * - * @retval >0 The number of ACE_Message_Blocks on the queue. - * @retval -1 On failure. errno holds the reason. If EWOULDBLOCK, - * the timeout elapsed. If ESHUTDOWN, the queue was - * deactivated or pulsed. + * @retval The number of ACE_Message_Blocks on the queue. + * @return -1 on failure. errno holds the reason. If EWOULDBLOCK, + * the timeout elapsed. If ESHUTDOWN, the queue was + * deactivated or pulsed. */ virtual int peek_dequeue_head (ACE_Message_Block *&first_item, ACE_Time_Value *timeout = 0); @@ -159,11 +159,11 @@ public: * @param timeout The absolute time the caller will wait until * for the block to be queued. * - * @retval >0 The number of ACE_Message_Blocks on the queue after adding - * the specified block. - * @retval -1 On failure. errno holds the reason. If EWOULDBLOCK, - * the timeout elapsed. If ESHUTDOWN, the queue was - * deactivated or pulsed. + * @retval The number of ACE_Message_Blocks on the queue after adding + * the specified block. + * @return -1 on failure. errno holds the reason. If EWOULDBLOCK, + * the timeout elapsed. If ESHUTDOWN, the queue was + * deactivated or pulsed. */ virtual int enqueue_prio (ACE_Message_Block *new_item, ACE_Time_Value *timeout = 0); @@ -348,7 +348,7 @@ public: * queue state to PULSED; future enqueue/dequeue operations proceed * as in ACTIVATED state. * - * @return The queue's state before this call. + * @retval The queue's state before this call. */ virtual int pulse (void); @@ -374,10 +374,8 @@ public: */ virtual int notify (void); - /// Get the notification strategy for the <Message_Queue> + // = Get/set the notification strategy for the <Message_Queue> virtual ACE_Notification_Strategy *notification_strategy (void); - - /// Set the notification strategy for the <Message_Queue> virtual void notification_strategy (ACE_Notification_Strategy *s); /// Returns a reference to the lock used by the <ACE_Message_Queue>. @@ -453,7 +451,7 @@ protected: * If not zero, only the waiting threads are notified and * the queue's state changes to PULSED. * - * @return The state of the queue before the call. + * @retval The state of the queue before the call. */ virtual int deactivate_i (int pulse = 0); @@ -702,7 +700,7 @@ public: virtual void dump (void) const; /** - * Just call priority enqueue method: tail enqueue semantics for dynamic + * just call priority enqueue method: tail enqueue semantics for dynamic * message queues are unstable: the message may or may not be where * it was placed after the queue is refreshed prior to the next * enqueue or dequeue operation. @@ -711,7 +709,7 @@ public: ACE_Time_Value *timeout = 0); /** - * Just call priority enqueue method: head enqueue semantics for dynamic + * just call priority enqueue method: head enqueue semantics for dynamic * message queues are unstable: the message may or may not be where * it was placed after the queue is refreshed prior to the next * enqueue or dequeue operation. @@ -734,7 +732,7 @@ protected: */ virtual int enqueue_i (ACE_Message_Block *new_item); - /// Enqueue a message in priority order within a given priority status sublist + /// enqueue a message in priority order within a given priority status sublist virtual int sublist_enqueue_i (ACE_Message_Block *new_item, const ACE_Time_Value ¤t_time, ACE_Message_Block *&sublist_head, @@ -792,7 +790,7 @@ private: // provide definitions for these (just call base class method), // but make them private so they're not accessible outside the class - /// Private method to hide public base class method: just calls base class method + /// private method to hide public base class method: just calls base class method virtual int peek_dequeue_head (ACE_Message_Block *&first_item, ACE_Time_Value *timeout = 0); @@ -816,13 +814,13 @@ template <ACE_SYNCH_DECL> class ACE_Message_Queue_Factory { public: - /// Factory method for a statically prioritized ACE_Message_Queue + /// factory method for a statically prioritized ACE_Message_Queue static ACE_Message_Queue<ACE_SYNCH_USE> * create_static_message_queue (size_t hwm = ACE_Message_Queue_Base::DEFAULT_HWM, size_t lwm = ACE_Message_Queue_Base::DEFAULT_LWM, ACE_Notification_Strategy * = 0); - /// Factory method for a dynamically prioritized (by time to deadline) ACE_Dynamic_Message_Queue + /// factory method for a dynamically prioritized (by time to deadline) ACE_Dynamic_Message_Queue static ACE_Dynamic_Message_Queue<ACE_SYNCH_USE> * create_deadline_message_queue (size_t hwm = ACE_Message_Queue_Base::DEFAULT_HWM, size_t lwm = ACE_Message_Queue_Base::DEFAULT_LWM, @@ -832,7 +830,7 @@ public: u_long dynamic_priority_max = 0x3FFFFFUL, // 2^(22)-1 u_long dynamic_priority_offset = 0x200000UL); // 2^(22-1) - /// Factory method for a dynamically prioritized (by laxity) ACE_Dynamic_Message_Queue + /// factory method for a dynamically prioritized (by laxity) ACE_Dynamic_Message_Queue static ACE_Dynamic_Message_Queue<ACE_SYNCH_USE> * create_laxity_message_queue (size_t hwm = ACE_Message_Queue_Base::DEFAULT_HWM, size_t lwm = ACE_Message_Queue_Base::DEFAULT_LWM, @@ -845,7 +843,7 @@ public: #if defined (VXWORKS) - /// Factory method for a wrapped VxWorks message queue + /// factory method for a wrapped VxWorks message queue static ACE_Message_Queue_Vx * create_Vx_message_queue (size_t max_messages, size_t max_message_length, ACE_Notification_Strategy *ns = 0); @@ -854,7 +852,7 @@ public: #if defined (ACE_WIN32) && (ACE_HAS_WINNT4 != 0) - /// Factory method for a NT message queue. + /// factory method for a NT message queue. static ACE_Message_Queue_NT * create_NT_message_queue (size_t max_threads); @@ -943,12 +941,12 @@ public: /// Close down the message queue and release all resources. virtual ~ACE_Message_Queue_Ex (void); - /// Release all resources from the message queue but do not mark it as deactivated. - /// This method holds the queue lock during this operation. Returns the number of + /// Release all resources from the message queue but do not mark it as deactivated. + /// This method holds the queue lock during this operation. Returns the number of /// messages flushed. virtual int flush (void); - /// Release all resources from the message queue but do not mark it as deactivated. + /// Release all resources from the message queue but do not mark it as deactivated. /// This method does not hold the queue lock during this operation, i.e., it assume /// the lock is held externally. Returns the number of messages flushed. virtual int flush_i (void); @@ -2154,12 +2154,13 @@ typedef ACE_thread_mutex_t ACE_recursive_thread_mutex_t; # if defined (ACE_WIN32) // Windows has recursive mutexes, but doesn't have condition variables, // so there's no built-in support for this. Thus, the condition-related -// unlock/relock is augmented in ACE. +// save/restore is handled in ACE. struct ACE_recursive_mutex_state { - // On Windows the augmented processing is simply unlocking/relocking - // the recursive locks - the condition handles a single lock ok. - LONG relock_count_; + // On windows the mutex is a CRITICAL_SECTION, and these members + // match those in the CRITICAL_SECTION struct. + LONG lock_count_; + LONG recursion_count_; }; # else // No need for special handling; just need a type for method signatures. @@ -2841,14 +2842,10 @@ PAGE_NOCACHE */ # define EDQUOT WSAEDQUOT # define ESTALE WSAESTALE # define EREMOTE WSAEREMOTE -// Grrr! ENAMETOOLONG and ENOTEMPTY are already defined by the horrible -// 'standard' library. +// Grrr! These two are already defined by the horrible 'standard' +// library. // #define ENAMETOOLONG WSAENAMETOOLONG - -# if defined (__BORLANDC__) && (__BORLANDC__ <= 0x540) -# define ENOTEMPTY WSAENOTEMPTY -# endif /* __BORLANDC__ && __BORLANDC__ <= 0x540*/ - +// #define ENOTEMPTY WSAENOTEMPTY # if !defined (ACE_HAS_WINCE) # include /**/ <time.h> @@ -4392,7 +4389,7 @@ inline long ace_timezone() && !defined (CHORUS) # if defined (ACE_WIN32) return _timezone; // For Win32. -# elif ( defined (__Lynx__) || defined (__FreeBSD__) || defined (ACE_HAS_SUNOS4_GETTIMEOFDAY) ) && ( !defined (__linux__) ) +# elif defined (__Lynx__) || defined (__FreeBSD__) || defined (ACE_HAS_SUNOS4_GETTIMEOFDAY) long result = 0; struct timeval time; struct timezone zone; @@ -4400,15 +4397,6 @@ inline long ace_timezone() ACE_OSCALL (::gettimeofday (&time, &zone), int, -1, result); return zone.tz_minuteswest * 60; # else /* __Lynx__ || __FreeBSD__ ... */ -# if defined (__linux__) - // Under Linux, gettimeofday() does not correctly set the timezone - // struct, so we should use the global variable <timezone>. - // However, it is initialized by tzset(). I assume other systems - // are the same (i.e., tzset() needs to be called to set - // <timezone>), but since no one is complaining, I will only make - // the change for Linux. - ::tzset(); -# endif return timezone; # endif /* __Lynx__ || __FreeBSD__ ... */ #else @@ -6945,7 +6933,7 @@ typedef ACE_TRANSMIT_FILE_BUFFERS* ACE_LPTRANSMIT_FILE_BUFFERS; # define ACE_NTOHS(x) x # endif /* ACE_LITTLE_ENDIAN */ -# if defined (ACE_HAS_POSIX_REALTIME_SIGNALS) +# if defined (ACE_HAS_AIO_CALLS) // = Giving unique ACE scoped names for some important // RTSignal-Related constants. Becuase sometimes, different // platforms use different names for these constants. @@ -6961,7 +6949,7 @@ typedef ACE_TRANSMIT_FILE_BUFFERS* ACE_LPTRANSMIT_FILE_BUFFERS; // some other name. If yes, use that instead of 8. # define ACE_RTSIG_MAX 8 # endif /* _POSIX_RTSIG_MAX */ -# endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ +# endif /* ACE_HAS_AIO_CALLS */ // Wrapping around wait status <wstat> macros for platforms that // lack them. @@ -7126,21 +7114,13 @@ typedef ACE_TRANSMIT_FILE_BUFFERS* ACE_LPTRANSMIT_FILE_BUFFERS; //@} // Defining POSIX4 real-time signal range. -#if defined(ACE_HAS_POSIX_REALTIME_SIGNALS) +#if defined ACE_HAS_AIO_CALLS #define ACE_SIGRTMIN SIGRTMIN #define ACE_SIGRTMAX SIGRTMAX - -#else /* !ACE_HAS_POSIX_REALTIME_SIGNALS */ - -#ifndef ACE_SIGRTMIN +#else /* !ACE_HAS_AIO_CALLS */ #define ACE_SIGRTMIN 0 -#endif /* ACE_SIGRTMIN */ - -#ifndef ACE_SIGRTMAX #define ACE_SIGRTMAX 0 -#endif /* ACE_SIGRTMAX */ - -#endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ +#endif /* ACE_HAS_AIO_CALLS */ # if defined (ACE_LACKS_SYS_NERR) extern ACE_OS_Export int sys_nerr; @@ -574,8 +574,7 @@ ACE_OS::fstat (ACE_HANDLE handle, ACE_stat *stp) stp->st_nlink = ACE_static_cast (short, fdata.nNumberOfLinks); stp->st_dev = stp->st_rdev = 0; // No equivalent conversion. stp->st_mode = S_IXOTH | S_IROTH | - (fdata.dwFileAttributes & FILE_ATTRIBUTE_READONLY ? 0 : S_IWOTH) | - (fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? S_IFDIR : S_IFREG); + (fdata.dwFileAttributes & FILE_ATTRIBUTE_READONLY ? 0 : S_IWOTH); } return 0; # else /* 1 */ @@ -2631,19 +2630,16 @@ ACE_OS::recursive_mutex_cond_unlock (ACE_recursive_thread_mutex_t *m, // does not integrate them into a condition variable. # if defined (ACE_WIN32) // For Windows, the OS takes care of the mutex and its recursion. We just - // need to release the lock one fewer times than this thread has acquired - // it. Remember how many times, and reacquire it that many more times when - // the condition is signaled. - state.relock_count_ = 0; - while (m->LockCount > 0) - { - // This may fail if the current thread doesn't own the mutex. If it - // does fail, it'll be on the first try, so don't worry about resetting - // the state. - if (ACE_OS::recursive_mutex_unlock (m) == -1) - return -1; - ++state.relock_count_; - } + // need to save the nesting count and reduce it so that we can release + // the mutex with the condition. When we reacquire it, reset the counts + // to match the conditions before the wait occurred so that this thread + // does all of its acquires and releases correctly. + state.lock_count_ = m->LockCount; + m->LockCount = 0; +# if !defined (_WIN32_WCE) || (_WIN32_WCE >= 400) /* Windows and CE.NET */ + state.recursion_count_ = m->RecursionCount; + m->RecursionCount = 1; +# endif /* _WIN32_WCE >= 400 */ # endif /* ACE_WIN32 */ return 0; # else /* ACE_HAS_RECURSIVE_MUTEXES */ @@ -2713,14 +2709,12 @@ ACE_OS::recursive_mutex_cond_relock (ACE_recursive_thread_mutex_t *m, // Windows need special handling since it has recursive mutexes, but // does not integrate them into a condition variable. // On entry, the OS has already reacquired the lock for us. Just - // reacquire it the proper number of times so the recursion is the same as - // before waiting on the condition. + // restore the counts to what they were before waiting on the condition. # if defined (ACE_WIN32) - while (state.relock_count_ > 0) - { - ACE_OS::recursive_mutex_lock (m); - --state.relock_count_; - } + m->LockCount = state.lock_count_; +# if !defined (_WIN32_WCE) || (_WIN32_WCE >= 400) /* Windows and CE.NET */ + m->RecursionCount = state.recursion_count_; +# endif /* _WIN32_WCE >= 400 */ return; # endif /* ACE_WIN32 */ # else diff --git a/ace/OS_String.cpp b/ace/OS_String.cpp index fabb6bc4308..b36ace33f1d 100644 --- a/ace/OS_String.cpp +++ b/ace/OS_String.cpp @@ -489,9 +489,7 @@ ACE_OS_String::itoa_emulation (int value, char *string, int radix) if (value < 0 && radix == 10) { string[0] = '-'; - ++b; - ++e; // Don't overwrite the negative sign. - value = -value; // Drop negative sign so character selection is correct. + b++; } // Convert to base <radix>, but in reverse order @@ -509,13 +507,13 @@ ACE_OS_String::itoa_emulation (int value, char *string, int radix) // Now reverse the string to get the correct result while (e > b) - { - char temp = *e; - *e = *b; - *b = temp; - ++b; - --e; - } + { + char temp = *e; + *e = *b; + *b = temp; + ++b; + --e; + } return string; } diff --git a/ace/Obstack.h b/ace/Obstack.h index afc944dcc6e..42abf2bd23d 100644 --- a/ace/Obstack.h +++ b/ace/Obstack.h @@ -5,7 +5,7 @@ * * $Id$ * - * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> + * @author Doug Schmidt */ //============================================================================= diff --git a/ace/Obstack_T.h b/ace/Obstack_T.h index 87a6f15bbc6..9f4dd1f06aa 100644 --- a/ace/Obstack_T.h +++ b/ace/Obstack_T.h @@ -19,6 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ + /** * @class ACE_Obstack * diff --git a/ace/POSIX_Asynch_IO.cpp b/ace/POSIX_Asynch_IO.cpp index 1cdc230d1f7..8ecb78bba14 100644 --- a/ace/POSIX_Asynch_IO.cpp +++ b/ace/POSIX_Asynch_IO.cpp @@ -181,9 +181,9 @@ ACE_POSIX_Asynch_Operation::open (ACE_Handler &handler, int ACE_POSIX_Asynch_Operation::cancel (void) { - if (!posix_proactor_) + if (!posix_aiocb_proactor_) return -1; - return posix_proactor_->cancel_aio (this->handle_); + return posix_aiocb_proactor_->cancel_aio (this->handle_); } ACE_Proactor * @@ -192,19 +192,26 @@ ACE_POSIX_Asynch_Operation::proactor (void) const return this->proactor_; } -ACE_POSIX_Proactor * +ACE_POSIX_AIOCB_Proactor * ACE_POSIX_Asynch_Operation::posix_proactor (void) const { - return this->posix_proactor_; + return this->posix_aiocb_proactor_; +} + +int +ACE_POSIX_Asynch_Operation::register_and_start_aio (ACE_POSIX_Asynch_Result *result, + int op) +{ + return this->posix_proactor ()->register_and_start_aio (result, op); } ACE_POSIX_Asynch_Operation::~ACE_POSIX_Asynch_Operation (void) { } -ACE_POSIX_Asynch_Operation::ACE_POSIX_Asynch_Operation (ACE_POSIX_Proactor *posix_proactor) +ACE_POSIX_Asynch_Operation::ACE_POSIX_Asynch_Operation (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor) : ACE_Asynch_Operation_Impl (), - posix_proactor_ (posix_proactor), + posix_aiocb_proactor_ (posix_aiocb_proactor), handler_ (0), handle_ (ACE_INVALID_HANDLE) { @@ -277,12 +284,81 @@ ACE_POSIX_Asynch_Read_Stream_Result::~ACE_POSIX_Asynch_Read_Stream_Result (void) { } +// = Base class operations. These operations are here to kill +// dominance warnings. These methods call the base class methods. + +size_t +ACE_POSIX_Asynch_Read_Stream_Result::bytes_transferred (void) const +{ + return ACE_POSIX_Asynch_Result::bytes_transferred (); +} + +const void * +ACE_POSIX_Asynch_Read_Stream_Result::act (void) const +{ + return ACE_POSIX_Asynch_Result::act (); +} + +int +ACE_POSIX_Asynch_Read_Stream_Result::success (void) const +{ + return ACE_POSIX_Asynch_Result::success (); +} + +const void * +ACE_POSIX_Asynch_Read_Stream_Result::completion_key (void) const +{ + return ACE_POSIX_Asynch_Result::completion_key (); +} + +u_long +ACE_POSIX_Asynch_Read_Stream_Result::error (void) const +{ + return ACE_POSIX_Asynch_Result::error (); +} + +ACE_HANDLE +ACE_POSIX_Asynch_Read_Stream_Result::event (void) const +{ + return ACE_POSIX_Asynch_Result::event (); +} + +u_long +ACE_POSIX_Asynch_Read_Stream_Result::offset (void) const +{ + return ACE_POSIX_Asynch_Result::offset (); +} + +u_long +ACE_POSIX_Asynch_Read_Stream_Result::offset_high (void) const +{ + return ACE_POSIX_Asynch_Result::offset_high (); +} + +int +ACE_POSIX_Asynch_Read_Stream_Result::priority (void) const +{ + return ACE_POSIX_Asynch_Result::priority (); +} + +int +ACE_POSIX_Asynch_Read_Stream_Result::signal_number (void) const +{ + return ACE_POSIX_Asynch_Result::signal_number (); +} + +int +ACE_POSIX_Asynch_Read_Stream_Result::post_completion (ACE_Proactor_Impl *proactor) +{ + return ACE_POSIX_Asynch_Result::post_completion (proactor); +} + // ************************************************************ -ACE_POSIX_Asynch_Read_Stream::ACE_POSIX_Asynch_Read_Stream (ACE_POSIX_Proactor *posix_proactor) +ACE_POSIX_Asynch_Read_Stream::ACE_POSIX_Asynch_Read_Stream (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor) : ACE_Asynch_Operation_Impl (), ACE_Asynch_Read_Stream_Impl (), - ACE_POSIX_Asynch_Operation (posix_proactor) + ACE_POSIX_Asynch_Operation (posix_aiocb_proactor) { } @@ -294,30 +370,31 @@ ACE_POSIX_Asynch_Read_Stream::read (ACE_Message_Block &message_block, int signal_number) { size_t space = message_block.space (); - if (bytes_to_read > space) + if ( bytes_to_read > space ) bytes_to_read=space; - if (bytes_to_read == 0) - { - errno = ENOSPC; - return -1; - } + if ( bytes_to_read == 0 ) + ACE_ERROR_RETURN + ((LM_ERROR, + ACE_LIB_TEXT ("ACE_POSIX_Asynch_Read_Stream::read:") + ACE_LIB_TEXT ("Attempt to read 0 bytes or no space in the message block\n")), + -1); // Create the Asynch_Result. ACE_POSIX_Asynch_Read_Stream_Result *result = 0; - ACE_POSIX_Proactor *proactor = this->posix_proactor (); ACE_NEW_RETURN (result, ACE_POSIX_Asynch_Read_Stream_Result (*this->handler_, this->handle_, message_block, bytes_to_read, act, - proactor->get_handle (), + this->posix_proactor ()->get_handle (), priority, signal_number), -1); - int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::READ); + ssize_t return_val = this->register_and_start_aio (result, 0); + if (return_val == -1) delete result; @@ -328,6 +405,34 @@ ACE_POSIX_Asynch_Read_Stream::~ACE_POSIX_Asynch_Read_Stream (void) { } +// Methods belong to ACE_POSIX_Asynch_Operation base class. These +// methods are defined here to avoid dominance warnings. They route +// the call to the ACE_POSIX_Asynch_Operation base class. + +int +ACE_POSIX_Asynch_Read_Stream::open (ACE_Handler &handler, + ACE_HANDLE handle, + const void *completion_key, + ACE_Proactor *proactor) +{ + return ACE_POSIX_Asynch_Operation::open (handler, + handle, + completion_key, + proactor); +} + +int +ACE_POSIX_Asynch_Read_Stream::cancel (void) +{ + return ACE_POSIX_Asynch_Operation::cancel (); +} + +ACE_Proactor * +ACE_POSIX_Asynch_Read_Stream::proactor (void) const +{ + return ACE_POSIX_Asynch_Operation::proactor (); +} + // ********************************************************************* size_t @@ -348,15 +453,14 @@ ACE_POSIX_Asynch_Write_Stream_Result::handle (void) const return this->aio_fildes; } -ACE_POSIX_Asynch_Write_Stream_Result::ACE_POSIX_Asynch_Write_Stream_Result - (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block &message_block, - size_t bytes_to_write, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number) +ACE_POSIX_Asynch_Write_Stream_Result::ACE_POSIX_Asynch_Write_Stream_Result (ACE_Handler &handler, + ACE_HANDLE handle, + ACE_Message_Block &message_block, + size_t bytes_to_write, + const void* act, + ACE_HANDLE event, + int priority, + int signal_number) : ACE_Asynch_Result_Impl (), ACE_Asynch_Write_Stream_Result_Impl (), ACE_POSIX_Asynch_Result (handler, act, event, 0, 0, priority, signal_number), @@ -397,12 +501,81 @@ ACE_POSIX_Asynch_Write_Stream_Result::~ACE_POSIX_Asynch_Write_Stream_Result (voi { } +// Base class operations. These operations are here to kill dominance +// warnings. These methods call the base class methods. + +size_t +ACE_POSIX_Asynch_Write_Stream_Result::bytes_transferred (void) const +{ + return ACE_POSIX_Asynch_Result::bytes_transferred (); +} + +const void * +ACE_POSIX_Asynch_Write_Stream_Result::act (void) const +{ + return ACE_POSIX_Asynch_Result::act (); +} + +int +ACE_POSIX_Asynch_Write_Stream_Result::success (void) const +{ + return ACE_POSIX_Asynch_Result::success (); +} + +const void * +ACE_POSIX_Asynch_Write_Stream_Result::completion_key (void) const +{ + return ACE_POSIX_Asynch_Result::completion_key (); +} + +u_long +ACE_POSIX_Asynch_Write_Stream_Result::error (void) const +{ + return ACE_POSIX_Asynch_Result::error (); +} + +ACE_HANDLE +ACE_POSIX_Asynch_Write_Stream_Result::event (void) const +{ + return ACE_POSIX_Asynch_Result::event (); +} + +u_long +ACE_POSIX_Asynch_Write_Stream_Result::offset (void) const +{ + return ACE_POSIX_Asynch_Result::offset (); +} + +u_long +ACE_POSIX_Asynch_Write_Stream_Result::offset_high (void) const +{ + return ACE_POSIX_Asynch_Result::offset_high (); +} + +int +ACE_POSIX_Asynch_Write_Stream_Result::priority (void) const +{ + return ACE_POSIX_Asynch_Result::priority (); +} + +int +ACE_POSIX_Asynch_Write_Stream_Result::signal_number (void) const +{ + return ACE_POSIX_Asynch_Result::signal_number (); +} + +int +ACE_POSIX_Asynch_Write_Stream_Result::post_completion (ACE_Proactor_Impl *proactor) +{ + return ACE_POSIX_Asynch_Result::post_completion (proactor); +} + // ********************************************************************* -ACE_POSIX_Asynch_Write_Stream::ACE_POSIX_Asynch_Write_Stream (ACE_POSIX_Proactor *posix_proactor) +ACE_POSIX_Asynch_Write_Stream::ACE_POSIX_Asynch_Write_Stream (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor) : ACE_Asynch_Operation_Impl (), ACE_Asynch_Write_Stream_Impl (), - ACE_POSIX_Asynch_Operation (posix_proactor) + ACE_POSIX_Asynch_Operation (posix_aiocb_proactor) { } @@ -413,7 +586,7 @@ ACE_POSIX_Asynch_Write_Stream::write (ACE_Message_Block &message_block, int priority, int signal_number) { - size_t len = message_block.length (); + size_t len = message_block.length(); if (bytes_to_write > len) bytes_to_write = len; @@ -425,19 +598,19 @@ ACE_POSIX_Asynch_Write_Stream::write (ACE_Message_Block &message_block, -1); ACE_POSIX_Asynch_Write_Stream_Result *result = 0; - ACE_POSIX_Proactor *proactor = this->posix_proactor (); ACE_NEW_RETURN (result, ACE_POSIX_Asynch_Write_Stream_Result (*this->handler_, this->handle_, message_block, bytes_to_write, act, - proactor->get_handle (), + this->posix_proactor ()->get_handle (), priority, signal_number), -1); - int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::WRITE); + ssize_t return_val = this->register_and_start_aio (result, 1); + if (return_val == -1) delete result; @@ -448,19 +621,47 @@ ACE_POSIX_Asynch_Write_Stream::~ACE_POSIX_Asynch_Write_Stream (void) { } + +// Methods belong to ACE_POSIX_Asynch_Operation base class. These +// methods are defined here to avoid dominance warnings. They route +// the call to the ACE_POSIX_Asynch_Operation base class. + +int +ACE_POSIX_Asynch_Write_Stream::open (ACE_Handler &handler, + ACE_HANDLE handle, + const void *completion_key, + ACE_Proactor *proactor) +{ + return ACE_POSIX_Asynch_Operation::open (handler, + handle, + completion_key, + proactor); +} + +int +ACE_POSIX_Asynch_Write_Stream::cancel (void) +{ + return ACE_POSIX_Asynch_Operation::cancel (); +} + +ACE_Proactor * +ACE_POSIX_Asynch_Write_Stream::proactor (void) const +{ + return ACE_POSIX_Asynch_Operation::proactor (); +} + // ********************************************************************* -ACE_POSIX_Asynch_Read_File_Result::ACE_POSIX_Asynch_Read_File_Result - (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block &message_block, - size_t bytes_to_read, - const void* act, - u_long offset, - u_long offset_high, - ACE_HANDLE event, - int priority, - int signal_number) +ACE_POSIX_Asynch_Read_File_Result::ACE_POSIX_Asynch_Read_File_Result (ACE_Handler &handler, + ACE_HANDLE handle, + ACE_Message_Block &message_block, + size_t bytes_to_read, + const void* act, + u_long offset, + u_long offset_high, + ACE_HANDLE event, + int priority, + int signal_number) : ACE_Asynch_Result_Impl (), ACE_Asynch_Read_Stream_Result_Impl (), ACE_Asynch_Read_File_Result_Impl (), @@ -509,13 +710,105 @@ ACE_POSIX_Asynch_Read_File_Result::~ACE_POSIX_Asynch_Read_File_Result (void) { } +// Base class operations. These operations are here to kill dominance +// warnings. These methods call the base class methods. + +size_t +ACE_POSIX_Asynch_Read_File_Result::bytes_transferred (void) const +{ + return ACE_POSIX_Asynch_Result::bytes_transferred (); +} + +const void * +ACE_POSIX_Asynch_Read_File_Result::act (void) const +{ + return ACE_POSIX_Asynch_Result::act (); +} + +int +ACE_POSIX_Asynch_Read_File_Result::success (void) const +{ + return ACE_POSIX_Asynch_Result::success (); +} + +const void * +ACE_POSIX_Asynch_Read_File_Result::completion_key (void) const +{ + return ACE_POSIX_Asynch_Result::completion_key (); +} + +u_long +ACE_POSIX_Asynch_Read_File_Result::error (void) const +{ + return ACE_POSIX_Asynch_Result::error (); +} + +ACE_HANDLE +ACE_POSIX_Asynch_Read_File_Result::event (void) const +{ + return ACE_POSIX_Asynch_Result::event (); +} + +u_long +ACE_POSIX_Asynch_Read_File_Result::offset (void) const +{ + return ACE_POSIX_Asynch_Result::offset (); +} + +u_long +ACE_POSIX_Asynch_Read_File_Result::offset_high (void) const +{ + return ACE_POSIX_Asynch_Result::offset_high (); +} + +int +ACE_POSIX_Asynch_Read_File_Result::priority (void) const +{ + return ACE_POSIX_Asynch_Result::priority (); +} + +int +ACE_POSIX_Asynch_Read_File_Result::signal_number (void) const +{ + return ACE_POSIX_Asynch_Result::signal_number (); +} + +// The following methods belong to +// ACE_POSIX_Asynch_Read_Stream_Result. They are here to avoid +// dominace warnings. These methods route their call to the +// ACE_POSIX_Asynch_Read_Stream_Result base class. + +size_t +ACE_POSIX_Asynch_Read_File_Result::bytes_to_read (void) const +{ + return ACE_POSIX_Asynch_Read_Stream_Result::bytes_to_read (); +} + +ACE_Message_Block & +ACE_POSIX_Asynch_Read_File_Result::message_block (void) const +{ + return ACE_POSIX_Asynch_Read_Stream_Result::message_block (); +} + +ACE_HANDLE +ACE_POSIX_Asynch_Read_File_Result::handle (void) const +{ + return ACE_POSIX_Asynch_Read_Stream_Result::handle (); +} + +int +ACE_POSIX_Asynch_Read_File_Result::post_completion (ACE_Proactor_Impl *proactor) +{ + return ACE_POSIX_Asynch_Result::post_completion (proactor); +} + // ********************************************************************* -ACE_POSIX_Asynch_Read_File::ACE_POSIX_Asynch_Read_File (ACE_POSIX_Proactor *posix_proactor) +ACE_POSIX_Asynch_Read_File::ACE_POSIX_Asynch_Read_File (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor) : ACE_Asynch_Operation_Impl (), ACE_Asynch_Read_Stream_Impl (), ACE_Asynch_Read_File_Impl (), - ACE_POSIX_Asynch_Read_Stream (posix_proactor) + ACE_POSIX_Asynch_Read_Stream (posix_aiocb_proactor) { } @@ -540,7 +833,6 @@ ACE_POSIX_Asynch_Read_File::read (ACE_Message_Block &message_block, -1); ACE_POSIX_Asynch_Read_File_Result *result = 0; - ACE_POSIX_Proactor *proactor = this->posix_proactor (); ACE_NEW_RETURN (result, ACE_POSIX_Asynch_Read_File_Result (*this->handler_, this->handle_, @@ -549,12 +841,13 @@ ACE_POSIX_Asynch_Read_File::read (ACE_Message_Block &message_block, act, offset, offset_high, - posix_proactor ()->get_handle (), + this->posix_proactor ()->get_handle (), priority, signal_number), -1); - int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::READ); + ssize_t return_val = this->register_and_start_aio (result, 0); + if (return_val == -1) delete result; @@ -579,19 +872,46 @@ ACE_POSIX_Asynch_Read_File::read (ACE_Message_Block &message_block, signal_number); } +// Methods belong to ACE_POSIX_Asynch_Operation base class. These +// methods are defined here to avoid dominance warnings. They route +// the call to the ACE_POSIX_Asynch_Operation base class. + +int +ACE_POSIX_Asynch_Read_File::open (ACE_Handler &handler, + ACE_HANDLE handle, + const void *completion_key, + ACE_Proactor *proactor) +{ + return ACE_POSIX_Asynch_Operation::open (handler, + handle, + completion_key, + proactor); +} + +int +ACE_POSIX_Asynch_Read_File::cancel (void) +{ + return ACE_POSIX_Asynch_Operation::cancel (); +} + +ACE_Proactor * +ACE_POSIX_Asynch_Read_File::proactor (void) const +{ + return ACE_POSIX_Asynch_Operation::proactor (); +} + // ************************************************************ -ACE_POSIX_Asynch_Write_File_Result::ACE_POSIX_Asynch_Write_File_Result - (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block &message_block, - size_t bytes_to_write, - const void* act, - u_long offset, - u_long offset_high, - ACE_HANDLE event, - int priority, - int signal_number) +ACE_POSIX_Asynch_Write_File_Result::ACE_POSIX_Asynch_Write_File_Result (ACE_Handler &handler, + ACE_HANDLE handle, + ACE_Message_Block &message_block, + size_t bytes_to_write, + const void* act, + u_long offset, + u_long offset_high, + ACE_HANDLE event, + int priority, + int signal_number) : ACE_Asynch_Result_Impl (), ACE_Asynch_Write_Stream_Result_Impl (), ACE_Asynch_Write_File_Result_Impl (), @@ -640,13 +960,105 @@ ACE_POSIX_Asynch_Write_File_Result::~ACE_POSIX_Asynch_Write_File_Result (void) { } +// Base class operations. These operations are here to kill dominance +// warnings. These methods call the base class methods. + +size_t +ACE_POSIX_Asynch_Write_File_Result::bytes_transferred (void) const +{ + return ACE_POSIX_Asynch_Result::bytes_transferred (); +} + +const void * +ACE_POSIX_Asynch_Write_File_Result::act (void) const +{ + return ACE_POSIX_Asynch_Result::act (); +} + +int +ACE_POSIX_Asynch_Write_File_Result::success (void) const +{ + return ACE_POSIX_Asynch_Result::success (); +} + +const void * +ACE_POSIX_Asynch_Write_File_Result::completion_key (void) const +{ + return ACE_POSIX_Asynch_Result::completion_key (); +} + +u_long +ACE_POSIX_Asynch_Write_File_Result::error (void) const +{ + return ACE_POSIX_Asynch_Result::error (); +} + +ACE_HANDLE +ACE_POSIX_Asynch_Write_File_Result::event (void) const +{ + return ACE_POSIX_Asynch_Result::event (); +} + +u_long +ACE_POSIX_Asynch_Write_File_Result::offset (void) const +{ + return ACE_POSIX_Asynch_Result::offset (); +} + +u_long +ACE_POSIX_Asynch_Write_File_Result::offset_high (void) const +{ + return ACE_POSIX_Asynch_Result::offset_high (); +} + +int +ACE_POSIX_Asynch_Write_File_Result::priority (void) const +{ + return ACE_POSIX_Asynch_Result::priority (); +} + +int +ACE_POSIX_Asynch_Write_File_Result::signal_number (void) const +{ + return ACE_POSIX_Asynch_Result::signal_number (); +} + +// The following methods belong to +// ACE_POSIX_Asynch_Write_Stream_Result. They are here to avoid +// dominance warnings. These methods route their call to the +// ACE_POSIX_Asynch_Write_Stream_Result base class. + +size_t +ACE_POSIX_Asynch_Write_File_Result::bytes_to_write (void) const +{ + return ACE_POSIX_Asynch_Write_Stream_Result::bytes_to_write (); +} + +ACE_Message_Block & +ACE_POSIX_Asynch_Write_File_Result::message_block (void) const +{ + return ACE_POSIX_Asynch_Write_Stream_Result::message_block (); +} + +ACE_HANDLE +ACE_POSIX_Asynch_Write_File_Result::handle (void) const +{ + return ACE_POSIX_Asynch_Write_Stream_Result::handle (); +} + +int +ACE_POSIX_Asynch_Write_File_Result::post_completion (ACE_Proactor_Impl *proactor) +{ + return ACE_POSIX_Asynch_Result::post_completion (proactor); +} + // ********************************************************************* -ACE_POSIX_Asynch_Write_File::ACE_POSIX_Asynch_Write_File (ACE_POSIX_Proactor *posix_proactor) +ACE_POSIX_Asynch_Write_File::ACE_POSIX_Asynch_Write_File (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor) : ACE_Asynch_Operation_Impl (), ACE_Asynch_Write_Stream_Impl (), ACE_Asynch_Write_File_Impl (), - ACE_POSIX_Asynch_Write_Stream (posix_proactor) + ACE_POSIX_Asynch_Write_Stream (posix_aiocb_proactor) { } @@ -659,7 +1071,7 @@ ACE_POSIX_Asynch_Write_File::write (ACE_Message_Block &message_block, int priority, int signal_number) { - size_t len = message_block.length (); + size_t len = message_block.length(); if (bytes_to_write > len) bytes_to_write = len; @@ -671,7 +1083,6 @@ ACE_POSIX_Asynch_Write_File::write (ACE_Message_Block &message_block, -1); ACE_POSIX_Asynch_Write_File_Result *result = 0; - ACE_POSIX_Proactor *proactor = this->posix_proactor (); ACE_NEW_RETURN (result, ACE_POSIX_Asynch_Write_File_Result (*this->handler_, this->handle_, @@ -680,12 +1091,13 @@ ACE_POSIX_Asynch_Write_File::write (ACE_Message_Block &message_block, act, offset, offset_high, - proactor->get_handle (), + this->posix_proactor ()->get_handle (), priority, signal_number), -1); - int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::WRITE); + ssize_t return_val = this->register_and_start_aio (result, 1); + if (return_val == -1) delete result; @@ -710,6 +1122,34 @@ ACE_POSIX_Asynch_Write_File::write (ACE_Message_Block &message_block, signal_number); } +// Methods belong to ACE_POSIX_Asynch_Operation base class. These +// methods are defined here to avoid dominance warnings. They route +// the call to the ACE_POSIX_Asynch_Operation base class. + +int +ACE_POSIX_Asynch_Write_File::open (ACE_Handler &handler, + ACE_HANDLE handle, + const void *completion_key, + ACE_Proactor *proactor) +{ + return ACE_POSIX_Asynch_Operation::open (handler, + handle, + completion_key, + proactor); +} + +int +ACE_POSIX_Asynch_Write_File::cancel (void) +{ + return ACE_POSIX_Asynch_Operation::cancel (); +} + +ACE_Proactor * +ACE_POSIX_Asynch_Write_File::proactor (void) const +{ + return ACE_POSIX_Asynch_Operation::proactor (); +} + // ********************************************************************* @@ -737,16 +1177,15 @@ ACE_POSIX_Asynch_Accept_Result::accept_handle (void) const return this->aio_fildes; } -ACE_POSIX_Asynch_Accept_Result::ACE_POSIX_Asynch_Accept_Result - (ACE_Handler &handler, - ACE_HANDLE listen_handle, - ACE_HANDLE accept_handle, - ACE_Message_Block &message_block, - size_t bytes_to_read, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number) +ACE_POSIX_Asynch_Accept_Result::ACE_POSIX_Asynch_Accept_Result (ACE_Handler &handler, + ACE_HANDLE listen_handle, + ACE_HANDLE accept_handle, + ACE_Message_Block &message_block, + size_t bytes_to_read, + const void* act, + ACE_HANDLE event, + int priority, + int signal_number) : ACE_Asynch_Result_Impl (), ACE_Asynch_Accept_Result_Impl (), @@ -784,9 +1223,78 @@ ACE_POSIX_Asynch_Accept_Result::~ACE_POSIX_Asynch_Accept_Result (void) { } +// Base class operations. These operations are here to kill dominance +// warnings. These methods call the base class methods. + +size_t +ACE_POSIX_Asynch_Accept_Result::bytes_transferred (void) const +{ + return ACE_POSIX_Asynch_Result::bytes_transferred (); +} + +const void * +ACE_POSIX_Asynch_Accept_Result::act (void) const +{ + return ACE_POSIX_Asynch_Result::act (); +} + +int +ACE_POSIX_Asynch_Accept_Result::success (void) const +{ + return ACE_POSIX_Asynch_Result::success (); +} + +const void * +ACE_POSIX_Asynch_Accept_Result::completion_key (void) const +{ + return ACE_POSIX_Asynch_Result::completion_key (); +} + +u_long +ACE_POSIX_Asynch_Accept_Result::error (void) const +{ + return ACE_POSIX_Asynch_Result::error (); +} + +ACE_HANDLE +ACE_POSIX_Asynch_Accept_Result::event (void) const +{ + return ACE_POSIX_Asynch_Result::event (); +} + +u_long +ACE_POSIX_Asynch_Accept_Result::offset (void) const +{ + return ACE_POSIX_Asynch_Result::offset (); +} + +u_long +ACE_POSIX_Asynch_Accept_Result::offset_high (void) const +{ + return ACE_POSIX_Asynch_Result::offset_high (); +} + +int +ACE_POSIX_Asynch_Accept_Result::priority (void) const +{ + return ACE_POSIX_Asynch_Result::priority (); +} + +int +ACE_POSIX_Asynch_Accept_Result::signal_number (void) const +{ + return ACE_POSIX_Asynch_Result::signal_number (); +} + +int +ACE_POSIX_Asynch_Accept_Result::post_completion (ACE_Proactor_Impl *proactor) +{ + return ACE_POSIX_Asynch_Result::post_completion (proactor); +} + // ********************************************************************* -ACE_POSIX_Asynch_Accept::ACE_POSIX_Asynch_Accept (ACE_POSIX_Proactor * posix_proactor) +ACE_POSIX_Asynch_Accept::ACE_POSIX_Asynch_Accept (ACE_POSIX_AIOCB_Proactor * posix_proactor) : ACE_Asynch_Operation_Impl (), ACE_Asynch_Accept_Impl (), ACE_POSIX_Asynch_Operation (posix_proactor), @@ -801,6 +1309,12 @@ ACE_POSIX_Asynch_Accept::~ACE_POSIX_Asynch_Accept (void) this->reactor(0); // to avoid purge_pending_notifications } +ACE_Proactor * +ACE_POSIX_Asynch_Accept::proactor (void) const +{ + return ACE_POSIX_Asynch_Operation::proactor (); +} + ACE_HANDLE ACE_POSIX_Asynch_Accept::get_handle (void) const { @@ -1229,13 +1743,12 @@ void ACE_POSIX_Asynch_Connect_Result::connect_handle (ACE_HANDLE handle) } -ACE_POSIX_Asynch_Connect_Result::ACE_POSIX_Asynch_Connect_Result - (ACE_Handler &handler, - ACE_HANDLE connect_handle, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number) +ACE_POSIX_Asynch_Connect_Result::ACE_POSIX_Asynch_Connect_Result (ACE_Handler &handler, + ACE_HANDLE connect_handle, + const void* act, + ACE_HANDLE event, + int priority, + int signal_number) : ACE_Asynch_Result_Impl (), ACE_Asynch_Connect_Result_Impl (), @@ -1268,9 +1781,78 @@ ACE_POSIX_Asynch_Connect_Result::~ACE_POSIX_Asynch_Connect_Result (void) { } +// Base class operations. These operations are here to kill dominance +// warnings. These methods call the base class methods. + +size_t +ACE_POSIX_Asynch_Connect_Result::bytes_transferred (void) const +{ + return ACE_POSIX_Asynch_Result::bytes_transferred (); +} + +const void * +ACE_POSIX_Asynch_Connect_Result::act (void) const +{ + return ACE_POSIX_Asynch_Result::act (); +} + +int +ACE_POSIX_Asynch_Connect_Result::success (void) const +{ + return ACE_POSIX_Asynch_Result::success (); +} + +const void * +ACE_POSIX_Asynch_Connect_Result::completion_key (void) const +{ + return ACE_POSIX_Asynch_Result::completion_key (); +} + +u_long +ACE_POSIX_Asynch_Connect_Result::error (void) const +{ + return ACE_POSIX_Asynch_Result::error (); +} + +ACE_HANDLE +ACE_POSIX_Asynch_Connect_Result::event (void) const +{ + return ACE_POSIX_Asynch_Result::event (); +} + +u_long +ACE_POSIX_Asynch_Connect_Result::offset (void) const +{ + return ACE_POSIX_Asynch_Result::offset (); +} + +u_long +ACE_POSIX_Asynch_Connect_Result::offset_high (void) const +{ + return ACE_POSIX_Asynch_Result::offset_high (); +} + +int +ACE_POSIX_Asynch_Connect_Result::priority (void) const +{ + return ACE_POSIX_Asynch_Result::priority (); +} + +int +ACE_POSIX_Asynch_Connect_Result::signal_number (void) const +{ + return ACE_POSIX_Asynch_Result::signal_number (); +} + +int +ACE_POSIX_Asynch_Connect_Result::post_completion (ACE_Proactor_Impl *proactor) +{ + return ACE_POSIX_Asynch_Result::post_completion (proactor); +} + // ********************************************************************* -ACE_POSIX_Asynch_Connect::ACE_POSIX_Asynch_Connect (ACE_POSIX_Proactor * posix_proactor) +ACE_POSIX_Asynch_Connect::ACE_POSIX_Asynch_Connect (ACE_POSIX_AIOCB_Proactor * posix_proactor) : ACE_Asynch_Operation_Impl (), ACE_Asynch_Connect_Impl (), ACE_POSIX_Asynch_Operation (posix_proactor), @@ -1285,6 +1867,12 @@ ACE_POSIX_Asynch_Connect::~ACE_POSIX_Asynch_Connect (void) this->reactor(0); // to avoid purge_pending_notifications } +ACE_Proactor * +ACE_POSIX_Asynch_Connect::proactor (void) const +{ + return ACE_POSIX_Asynch_Operation::proactor (); +} + ACE_HANDLE ACE_POSIX_Asynch_Connect::get_handle (void) const { @@ -1822,21 +2410,19 @@ ACE_POSIX_Asynch_Transmit_File_Result::flags (void) const return this->flags_; } -ACE_POSIX_Asynch_Transmit_File_Result::ACE_POSIX_Asynch_Transmit_File_Result - (ACE_Handler &handler, - ACE_HANDLE socket, - ACE_HANDLE file, - ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer, - size_t bytes_to_write, - u_long offset, - u_long offset_high, - size_t bytes_per_send, - u_long flags, - const void *act, - ACE_HANDLE event, - int priority, - int signal_number) - +ACE_POSIX_Asynch_Transmit_File_Result::ACE_POSIX_Asynch_Transmit_File_Result (ACE_Handler &handler, + ACE_HANDLE socket, + ACE_HANDLE file, + ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer, + size_t bytes_to_write, + u_long offset, + u_long offset_high, + size_t bytes_per_send, + u_long flags, + const void *act, + ACE_HANDLE event, + int priority, + int signal_number) : ACE_Asynch_Result_Impl (), ACE_Asynch_Transmit_File_Result_Impl (), ACE_POSIX_Asynch_Result (handler, act, event, offset, offset_high, priority, signal_number), @@ -1888,6 +2474,74 @@ ACE_POSIX_Asynch_Transmit_File_Result::~ACE_POSIX_Asynch_Transmit_File_Result (v { } +// Base class operations. These operations are here to kill dominance +// warnings. These methods call the base class methods. + +size_t +ACE_POSIX_Asynch_Transmit_File_Result::bytes_transferred (void) const +{ + return ACE_POSIX_Asynch_Result::bytes_transferred (); +} + +const void * +ACE_POSIX_Asynch_Transmit_File_Result::act (void) const +{ + return ACE_POSIX_Asynch_Result::act (); +} + +int +ACE_POSIX_Asynch_Transmit_File_Result::success (void) const +{ + return ACE_POSIX_Asynch_Result::success (); +} + +const void * +ACE_POSIX_Asynch_Transmit_File_Result::completion_key (void) const +{ + return ACE_POSIX_Asynch_Result::completion_key (); +} + +u_long +ACE_POSIX_Asynch_Transmit_File_Result::error (void) const +{ + return ACE_POSIX_Asynch_Result::error (); +} + +ACE_HANDLE +ACE_POSIX_Asynch_Transmit_File_Result::event (void) const +{ + return ACE_POSIX_Asynch_Result::event (); +} + +u_long +ACE_POSIX_Asynch_Transmit_File_Result::offset (void) const +{ + return ACE_POSIX_Asynch_Result::offset (); +} + +u_long +ACE_POSIX_Asynch_Transmit_File_Result::offset_high (void) const +{ + return ACE_POSIX_Asynch_Result::offset_high (); +} + +int +ACE_POSIX_Asynch_Transmit_File_Result::priority (void) const +{ + return ACE_POSIX_Asynch_Result::priority (); +} + +int +ACE_POSIX_Asynch_Transmit_File_Result::signal_number (void) const +{ + return ACE_POSIX_Asynch_Result::signal_number (); +} + +int +ACE_POSIX_Asynch_Transmit_File_Result::post_completion (ACE_Proactor_Impl *proactor) +{ + return ACE_POSIX_Asynch_Result::post_completion (proactor); +} // ********************************************************************* @@ -1906,7 +2560,7 @@ public: /// Constructor. Result pointer will have all the information to do /// the file transmission (socket, file, application handler, bytes /// to write). - ACE_POSIX_Asynch_Transmit_Handler (ACE_POSIX_Proactor *posix_proactor, + ACE_POSIX_Asynch_Transmit_Handler (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor, ACE_POSIX_Asynch_Transmit_File_Result *result); /// Destructor. @@ -1970,7 +2624,7 @@ protected: // Constructor. ACE_POSIX_Asynch_Transmit_Handler::ACE_POSIX_Asynch_Transmit_Handler - (ACE_POSIX_Proactor *posix_proactor, + (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor, ACE_POSIX_Asynch_Transmit_File_Result *result) : result_ (result), mb_ (0), @@ -1980,8 +2634,8 @@ ACE_POSIX_Asynch_Transmit_Handler::ACE_POSIX_Asynch_Transmit_Handler file_offset_ (result->offset ()), file_size_ (0), bytes_transferred_ (0), - rf_ (posix_proactor), - ws_ (posix_proactor) + rf_ (posix_aiocb_proactor), + ws_ (posix_aiocb_proactor) { // Allocate memory for the message block. ACE_NEW (this->mb_, @@ -2222,24 +2876,24 @@ ACE_POSIX_Asynch_Transmit_Handler::initiate_read_file (void) // ********************************************************************* -ACE_POSIX_Asynch_Transmit_File::ACE_POSIX_Asynch_Transmit_File (ACE_POSIX_Proactor *posix_proactor) +ACE_POSIX_Asynch_Transmit_File::ACE_POSIX_Asynch_Transmit_File (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor) : ACE_Asynch_Operation_Impl (), ACE_Asynch_Transmit_File_Impl (), - ACE_POSIX_Asynch_Operation (posix_proactor) + ACE_POSIX_Asynch_Operation (posix_aiocb_proactor) { } int ACE_POSIX_Asynch_Transmit_File::transmit_file (ACE_HANDLE file, - ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer, - size_t bytes_to_write, - u_long offset, - u_long offset_high, - size_t bytes_per_send, - u_long flags, - const void *act, - int priority, - int signal_number) + ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer, + size_t bytes_to_write, + u_long offset, + u_long offset_high, + size_t bytes_per_send, + u_long flags, + const void *act, + int priority, + int signal_number) { // Adjust these parameters if there are default values specified. ssize_t file_size = ACE_OS::filesize (file); @@ -2305,6 +2959,34 @@ ACE_POSIX_Asynch_Transmit_File::~ACE_POSIX_Asynch_Transmit_File (void) { } +// Methods belong to ACE_POSIX_Asynch_Operation base class. These +// methods are defined here to avoid dominance warnings. They route the +// call to the ACE_POSIX_Asynch_Operation base class. + +int +ACE_POSIX_Asynch_Transmit_File::open (ACE_Handler &handler, + ACE_HANDLE handle, + const void *completion_key, + ACE_Proactor *proactor) +{ + return ACE_POSIX_Asynch_Operation::open (handler, + handle, + completion_key, + proactor); +} + +int +ACE_POSIX_Asynch_Transmit_File::cancel (void) +{ + return ACE_POSIX_Asynch_Operation::cancel (); +} + +ACE_Proactor * +ACE_POSIX_Asynch_Transmit_File::proactor (void) const +{ + return ACE_POSIX_Asynch_Operation::proactor (); +} + // ********************************************************************* size_t ACE_POSIX_Asynch_Read_Dgram_Result::bytes_to_read (void) const @@ -2347,24 +3029,88 @@ ACE_POSIX_Asynch_Read_Dgram_Result::handle (void) const return this->handle_; } +size_t +ACE_POSIX_Asynch_Read_Dgram_Result::bytes_transferred (void) const +{ + return ACE_POSIX_Asynch_Result::bytes_transferred (); +} + +const void * +ACE_POSIX_Asynch_Read_Dgram_Result::act (void) const +{ + return ACE_POSIX_Asynch_Result::act (); +} + +int +ACE_POSIX_Asynch_Read_Dgram_Result::success (void) const +{ + return ACE_POSIX_Asynch_Result::success (); +} + +const void * +ACE_POSIX_Asynch_Read_Dgram_Result::completion_key (void) const +{ + return ACE_POSIX_Asynch_Result::completion_key (); +} + +u_long +ACE_POSIX_Asynch_Read_Dgram_Result::error (void) const +{ + return ACE_POSIX_Asynch_Result::error (); +} + +ACE_HANDLE +ACE_POSIX_Asynch_Read_Dgram_Result::event (void) const +{ + return ACE_POSIX_Asynch_Result::event (); +} + +u_long +ACE_POSIX_Asynch_Read_Dgram_Result::offset (void) const +{ + return ACE_POSIX_Asynch_Result::offset (); +} + +u_long +ACE_POSIX_Asynch_Read_Dgram_Result::offset_high (void) const +{ + return ACE_POSIX_Asynch_Result::offset_high (); +} + +int +ACE_POSIX_Asynch_Read_Dgram_Result::priority (void) const +{ + return ACE_POSIX_Asynch_Result::priority (); +} + +int +ACE_POSIX_Asynch_Read_Dgram_Result::signal_number (void) const +{ + return ACE_POSIX_Asynch_Result::signal_number (); +} + +int +ACE_POSIX_Asynch_Read_Dgram_Result::post_completion (ACE_Proactor_Impl *proactor) +{ + return ACE_POSIX_Asynch_Result::post_completion (proactor); +} + ACE_Message_Block* ACE_POSIX_Asynch_Read_Dgram_Result::message_block () const { - return this->message_block_; + return this->message_block_; } -ACE_POSIX_Asynch_Read_Dgram_Result::ACE_POSIX_Asynch_Read_Dgram_Result - (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block *message_block, - size_t bytes_to_read, - int flags, - int protocol_family, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number) - +ACE_POSIX_Asynch_Read_Dgram_Result::ACE_POSIX_Asynch_Read_Dgram_Result (ACE_Handler &handler, + ACE_HANDLE handle, + ACE_Message_Block *message_block, + size_t bytes_to_read, + int flags, + int protocol_family, + const void* act, + ACE_HANDLE event, + int priority, + int signal_number) : ACE_Asynch_Result_Impl (), ACE_Asynch_Read_Dgram_Result_Impl(), ACE_POSIX_Asynch_Result (handler, act, event, 0, 0, priority, signal_number), @@ -2429,24 +3175,88 @@ ACE_POSIX_Asynch_Write_Dgram_Result::handle (void) const return this->handle_; } +size_t +ACE_POSIX_Asynch_Write_Dgram_Result::bytes_transferred (void) const +{ + return ACE_POSIX_Asynch_Result::bytes_transferred (); +} + +const void * +ACE_POSIX_Asynch_Write_Dgram_Result::act (void) const +{ + return ACE_POSIX_Asynch_Result::act (); +} + +int +ACE_POSIX_Asynch_Write_Dgram_Result::success (void) const +{ + return ACE_POSIX_Asynch_Result::success (); +} + +const void * +ACE_POSIX_Asynch_Write_Dgram_Result::completion_key (void) const +{ + return ACE_POSIX_Asynch_Result::completion_key (); +} + +u_long +ACE_POSIX_Asynch_Write_Dgram_Result::error (void) const +{ + return ACE_POSIX_Asynch_Result::error (); +} + +ACE_HANDLE +ACE_POSIX_Asynch_Write_Dgram_Result::event (void) const +{ + return ACE_POSIX_Asynch_Result::event (); +} + +u_long +ACE_POSIX_Asynch_Write_Dgram_Result::offset (void) const +{ + return ACE_POSIX_Asynch_Result::offset (); +} + +u_long +ACE_POSIX_Asynch_Write_Dgram_Result::offset_high (void) const +{ + return ACE_POSIX_Asynch_Result::offset_high (); +} + +int +ACE_POSIX_Asynch_Write_Dgram_Result::priority (void) const +{ + return ACE_POSIX_Asynch_Result::priority (); +} + +int +ACE_POSIX_Asynch_Write_Dgram_Result::signal_number (void) const +{ + return ACE_POSIX_Asynch_Result::signal_number (); +} ACE_Message_Block* ACE_POSIX_Asynch_Write_Dgram_Result::message_block () const { - return this->message_block_; + return this->message_block_; } -ACE_POSIX_Asynch_Write_Dgram_Result::ACE_POSIX_Asynch_Write_Dgram_Result - (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block *message_block, - size_t bytes_to_write, - int flags, - const void* act, - ACE_HANDLE event, - int priority, - int signal_number) +int +ACE_POSIX_Asynch_Write_Dgram_Result::post_completion (ACE_Proactor_Impl *proactor) +{ + return ACE_POSIX_Asynch_Result::post_completion (proactor); +} + +ACE_POSIX_Asynch_Write_Dgram_Result::ACE_POSIX_Asynch_Write_Dgram_Result (ACE_Handler &handler, + ACE_HANDLE handle, + ACE_Message_Block *message_block, + size_t bytes_to_write, + int flags, + const void* act, + ACE_HANDLE event, + int priority, + int signal_number) : ACE_Asynch_Result_Impl (), ACE_Asynch_Write_Dgram_Result_Impl(), ACE_POSIX_Asynch_Result (handler, act, event, 0, 0, priority, signal_number), @@ -2456,8 +3266,9 @@ ACE_POSIX_Asynch_Write_Dgram_Result::ACE_POSIX_Asynch_Write_Dgram_Result handle_ (handle) { - this->aio_fildes = handle; - this->aio_nbytes = bytes_to_write; + this->aio_fildes = handle; + this->aio_nbytes = bytes_to_write; + } void @@ -2496,12 +3307,12 @@ ACE_POSIX_Asynch_Read_Dgram::~ACE_POSIX_Asynch_Read_Dgram (void) ssize_t ACE_POSIX_Asynch_Read_Dgram::recv (ACE_Message_Block *message_block, - size_t &number_of_bytes_recvd, - int flags, - int protocol_family, - const void *act, - int priority, - int signal_number) + size_t &number_of_bytes_recvd, + int flags, + int protocol_family, + const void *act, + int priority, + int signal_number) { ACE_UNUSED_ARG (message_block); ACE_UNUSED_ARG (number_of_bytes_recvd); @@ -2513,13 +3324,36 @@ ACE_POSIX_Asynch_Read_Dgram::recv (ACE_Message_Block *message_block, ACE_NOTSUP_RETURN (-1); } -ACE_POSIX_Asynch_Read_Dgram::ACE_POSIX_Asynch_Read_Dgram (ACE_POSIX_Proactor *posix_proactor) +int +ACE_POSIX_Asynch_Read_Dgram::open (ACE_Handler &handler, + ACE_HANDLE handle, + const void *completion_key, + ACE_Proactor *proactor) +{ + return ACE_POSIX_Asynch_Operation::open (handler, + handle, + completion_key, + proactor); +} + +int +ACE_POSIX_Asynch_Read_Dgram::cancel (void) +{ + return ACE_POSIX_Asynch_Operation::cancel (); +} + +ACE_Proactor * +ACE_POSIX_Asynch_Read_Dgram::proactor (void) const +{ + return ACE_POSIX_Asynch_Operation::proactor (); +} + +ACE_POSIX_Asynch_Read_Dgram::ACE_POSIX_Asynch_Read_Dgram (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor) : ACE_Asynch_Operation_Impl (), ACE_Asynch_Read_Dgram_Impl (), - ACE_POSIX_Asynch_Operation (posix_proactor) + ACE_POSIX_Asynch_Operation (posix_aiocb_proactor) { } - //*************************************************************************** ACE_POSIX_Asynch_Write_Dgram::~ACE_POSIX_Asynch_Write_Dgram (void) @@ -2528,12 +3362,12 @@ ACE_POSIX_Asynch_Write_Dgram::~ACE_POSIX_Asynch_Write_Dgram (void) ssize_t ACE_POSIX_Asynch_Write_Dgram::send (ACE_Message_Block *message_block, - size_t &number_of_bytes_sent, - int flags, - const ACE_Addr &addr, - const void *act, - int priority, - int signal_number) + size_t &number_of_bytes_sent, + int flags, + const ACE_Addr &addr, + const void *act, + int priority, + int signal_number) { ACE_UNUSED_ARG (message_block); ACE_UNUSED_ARG (number_of_bytes_sent); @@ -2545,11 +3379,34 @@ ACE_POSIX_Asynch_Write_Dgram::send (ACE_Message_Block *message_block, ACE_NOTSUP_RETURN (-1); } -ACE_POSIX_Asynch_Write_Dgram::ACE_POSIX_Asynch_Write_Dgram - (ACE_POSIX_Proactor *posix_proactor) +int +ACE_POSIX_Asynch_Write_Dgram::open (ACE_Handler &handler, + ACE_HANDLE handle, + const void *completion_key, + ACE_Proactor *proactor) +{ + return ACE_POSIX_Asynch_Operation::open (handler, + handle, + completion_key, + proactor); +} + +int +ACE_POSIX_Asynch_Write_Dgram::cancel (void) +{ + return ACE_POSIX_Asynch_Operation::cancel (); +} + +ACE_Proactor * +ACE_POSIX_Asynch_Write_Dgram::proactor (void) const +{ + return ACE_POSIX_Asynch_Operation::proactor (); +} + +ACE_POSIX_Asynch_Write_Dgram::ACE_POSIX_Asynch_Write_Dgram (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor) : ACE_Asynch_Operation_Impl (), ACE_Asynch_Write_Dgram_Impl (), - ACE_POSIX_Asynch_Operation (posix_proactor) + ACE_POSIX_Asynch_Operation (posix_aiocb_proactor) { } diff --git a/ace/POSIX_Asynch_IO.h b/ace/POSIX_Asynch_IO.h index 20e3ad6dd66..893d9f54459 100644 --- a/ace/POSIX_Asynch_IO.h +++ b/ace/POSIX_Asynch_IO.h @@ -35,7 +35,8 @@ #include "ace/Map_Manager.h" // Forward declarations -class ACE_POSIX_Proactor; +class ACE_POSIX_SIG_Proactor; +class ACE_POSIX_AIOCB_Proactor; class ACE_Proactor_Impl; class ACE_Handle_Set; @@ -174,15 +175,21 @@ public: ACE_Proactor* proactor (void) const; /// Return the underlying Proactor implementation. - ACE_POSIX_Proactor * posix_proactor (void) const; + ACE_POSIX_AIOCB_Proactor * posix_proactor (void) const; protected: /// Contructor. - ACE_POSIX_Asynch_Operation (ACE_POSIX_Proactor *posix_proactor); + ACE_POSIX_Asynch_Operation (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor); /// Destructor. virtual ~ACE_POSIX_Asynch_Operation (void); + /// This is the method which does the real work to start aio + /// and should be used instead of shared_read/shared_write + /// <op> means operation : 0 - read , 1 - write. + virtual int register_and_start_aio (ACE_POSIX_Asynch_Result *result, + int op); + // This call is for the POSIX implementation. This method is used by // <ACE_Asynch_Operation> to store some information with the // Proactor after an <aio_> call is issued, so that the Proactor can @@ -197,7 +204,7 @@ protected: * objects. We can use this to get to the implementation proactor * directly. */ - ACE_POSIX_Proactor *posix_proactor_; + ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor_; /// Proactor that this Asynch IO will be registered with. ACE_Proactor *proactor_; @@ -236,6 +243,57 @@ public: /// I/O handle used for reading. ACE_HANDLE handle (void) const; + // = Base class operations. These operations are here to kill + // dominance warnings. These methods call the base class methods. + + /// Number of bytes transferred by the operation. + size_t bytes_transferred (void) const; + + /// ACT associated with the operation. + const void *act (void) const; + + /// Did the operation succeed? + int success (void) const; + + /** + * This is the ACT associated with the handle on which the + * Asynch_Operation takes place. + * + * @@ This is not implemented for POSIX4 platforms. + * + */ + const void *completion_key (void) const; + + /// Error value if the operation fail. + u_long error (void) const; + + /// This returns ACE_INVALID_HANDLE. + ACE_HANDLE event (void) const; + + /** + * This really make sense only when doing file I/O. + * + * @@ On POSIX4-Unix, offset_high should be supported using + * aiocb64. + * + */ + u_long offset (void) const; + u_long offset_high (void) const; + + /// The priority of the asynchronous operation. + int priority (void) const; + + /** + * POSIX4 realtime signal number to be used for the + * operation. <signal_number> ranges from SIGRTMIN to SIGRTMAX. By + * default, SIGRTMIN is used to issue <aio_> calls. This is a no-op + * on non-POSIX4 systems and returns 0. + */ + int signal_number (void) const; + + /// Post <this> to the Proactor. + int post_completion (ACE_Proactor_Impl *proactor); + protected: ACE_POSIX_Asynch_Read_Stream_Result (ACE_Handler &handler, ACE_HANDLE handle, @@ -280,7 +338,7 @@ class ACE_Export ACE_POSIX_Asynch_Read_Stream : public virtual ACE_Asynch_Read_S { public: /// Constructor. - ACE_POSIX_Asynch_Read_Stream (ACE_POSIX_Proactor *posix_proactor); + ACE_POSIX_Asynch_Read_Stream (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor); /// This starts off an asynchronous read. Upto <bytes_to_read> will /// be read and stored in the <message_block>. @@ -292,6 +350,29 @@ public: /// Destructor. virtual ~ACE_POSIX_Asynch_Read_Stream (void); + + // = Methods belong to ACE_POSIX_Asynch_Operation base class. These + // methods are defined here to avoid dominace warnings. They route + // the call to the ACE_POSIX_Asynch_Operation base class. + + /** + * Initializes the factory with information which will be used with + * each asynchronous call. If (<handle> == ACE_INVALID_HANDLE), + * <ACE_Handler::handle> will be called on the <handler> to get the + * correct handle. + */ + int open (ACE_Handler &handler, + ACE_HANDLE handle, + const void *completion_key, + ACE_Proactor *proactor = 0); + + /// + /// @@ Not implemented. Returns 0. + int cancel (void); + + /// Return the underlying proactor. + ACE_Proactor* proactor (void) const; + }; @@ -326,6 +407,57 @@ public: /// I/O handle used for writing. ACE_HANDLE handle (void) const; + // = Base class operations. These operations are here to kill + // dominance warnings. These methods call the base class methods. + + /// Number of bytes transferred by the operation. + size_t bytes_transferred (void) const; + + /// ACT associated with the operation. + const void *act (void) const; + + /// Did the operation succeed? + int success (void) const; + + /** + * This is the ACT associated with the handle on which the + * Asynch_Operation takes place. + * + * @@ This is not implemented for POSIX4 platforms. + * + */ + const void *completion_key (void) const; + + /// Error value if the operation fail. + u_long error (void) const; + + /// This returns ACE_INVALID_HANDLE on POSIX4 platforms. + ACE_HANDLE event (void) const; + + /** + * This really make sense only when doing file I/O. + * + * @@ On POSIX4-Unix, offset_high should be supported using + * aiocb64. + * + */ + u_long offset (void) const; + u_long offset_high (void) const; + + /// The priority of the asynchronous operation. + int priority (void) const; + + /** + * POSIX4 realtime signal number to be used for the + * operation. <signal_number> ranges from SIGRTMIN to SIGRTMAX. By + * default, SIGRTMIN is used to issue <aio_> calls. This is a no-op + * on non-POSIX4 systems and returns 0. + */ + int signal_number (void) const; + + /// Post <this> to the Proactor. + int post_completion (ACE_Proactor_Impl *proactor); + protected: /// Constructor is protected since creation is limited to /// ACE_Asynch_Write_Stream factory. @@ -370,7 +502,7 @@ class ACE_Export ACE_POSIX_Asynch_Write_Stream : public virtual ACE_Asynch_Write { public: /// Constructor. - ACE_POSIX_Asynch_Write_Stream (ACE_POSIX_Proactor *posix_proactor); + ACE_POSIX_Asynch_Write_Stream (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor); /// This starts off an asynchronous write. Upto <bytes_to_write> /// will be written from the <message_block>. @@ -382,6 +514,29 @@ public: /// Destructor. virtual ~ACE_POSIX_Asynch_Write_Stream (void); + + // = Methods belong to ACE_POSIX_Asynch_Operation base class. These + // methods are defined here to avoid dominace warnings. They route + // the call to the ACE_POSIX_Asynch_Operation base class. + + /** + * Initializes the factory with information which will be used with + * each asynchronous call. If (<handle> == ACE_INVALID_HANDLE), + * <ACE_Handler::handle> will be called on the <handler> to get the + * correct handle. + */ + int open (ACE_Handler &handler, + ACE_HANDLE handle, + const void *completion_key, + ACE_Proactor *proactor = 0); + + /// + /// @@ Not implemented. Returns 0. + int cancel (void); + + /// Return the underlying proactor. + ACE_Proactor* proactor (void) const; + }; /** @@ -400,6 +555,72 @@ class ACE_Export ACE_POSIX_Asynch_Read_File_Result : public virtual ACE_Asynch_R friend class ACE_POSIX_Proactor; public: + // = These methods belong to ACE_POSIX_Asynch_Result class base + // class. These operations are here to kill dominance + // warnings. These methods call the base class methods. + + /// Number of bytes transferred by the operation. + size_t bytes_transferred (void) const; + + /// ACT associated with the operation. + const void *act (void) const; + + /// Did the operation succeed? + int success (void) const; + + /** + * This is the ACT associated with the handle on which the + * Asynch_Operation takes place. + * + * @@ This is not implemented for POSIX4 platforms. + * + */ + const void *completion_key (void) const; + + /// Error value if the operation fail. + u_long error (void) const; + + /// This returns ACE_INVALID_HANDLE on POSIX4 platforms. + ACE_HANDLE event (void) const; + + /** + * This really make sense only when doing file I/O. + * + * @@ On POSIX4-Unix, offset_high should be supported using + * aiocb64. + * + */ + u_long offset (void) const; + u_long offset_high (void) const; + + /// The priority of the asynchronous operation. + int priority (void) const; + + /** + * POSIX4 realtime signal number to be used for the + * operation. <signal_number> ranges from SIGRTMIN to SIGRTMAX. By + * default, SIGRTMIN is used to issue <aio_> calls. This is a no-op + * on non-POSIX4 systems and returns 0. + */ + int signal_number (void) const; + + // = The following methods belong to + // ACE_POSIX_Asynch_Read_Stream_Result. They are here to avoid + // dominance warnings. These methods route their call to the + // ACE_POSIX_Asynch_Read_Stream_Result base class. + + /// The number of bytes which were requested at the start of the + /// asynchronous read. + size_t bytes_to_read (void) const; + + /// Message block which contains the read data. + ACE_Message_Block &message_block (void) const; + + /// I/O handle used for reading. + ACE_HANDLE handle (void) const; + + /// Post <this> to the Proactor. + int post_completion (ACE_Proactor_Impl *proactor); protected: /// Constructor is protected since creation is limited to @@ -447,7 +668,7 @@ class ACE_Export ACE_POSIX_Asynch_Read_File : public virtual ACE_Asynch_Read_Fil public: /// Constructor. - ACE_POSIX_Asynch_Read_File (ACE_POSIX_Proactor *posix_proactor); + ACE_POSIX_Asynch_Read_File (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor); /** * This starts off an asynchronous read. Upto <bytes_to_read> will @@ -465,6 +686,29 @@ public: /// Destructor. virtual ~ACE_POSIX_Asynch_Read_File (void); + + // = Methods belong to ACE_POSIX_Asynch_Operation base class. These + // methods are defined here to avoid dominace warnings. They route + // the call to the ACE_POSIX_Asynch_Operation base class. + + /** + * Initializes the factory with information which will be used with + * each asynchronous call. If (<handle> == ACE_INVALID_HANDLE), + * <ACE_Handler::handle> will be called on the <handler> to get the + * correct handle. + */ + int open (ACE_Handler &handler, + ACE_HANDLE handle, + const void *completion_key, + ACE_Proactor *proactor = 0); + + /// + /// @@ Not implemented. Returns 0. + int cancel (void); + + /// Return the underlying proactor. + ACE_Proactor* proactor (void) const; + private: /** * This belongs to ACE_POSIX_Asynch_Read_Stream. We have @@ -505,6 +749,73 @@ class ACE_Export ACE_POSIX_Asynch_Write_File_Result : public virtual ACE_Asynch_ /// The Proactor constructs the Result class for faking results. friend class ACE_POSIX_Proactor; +public: + // = Base class operations. These operations are here to kill some + // warnings. These methods call the base class methods. + + /// Number of bytes transferred by the operation. + size_t bytes_transferred (void) const; + + /// ACT associated with the operation. + const void *act (void) const; + + /// Did the operation succeed? + int success (void) const; + + /** + * This is the ACT associated with the handle on which the + * Asynch_Operation takes place. + * + * @@ This is not implemented for POSIX4 platforms. + * + */ + const void *completion_key (void) const; + + /// Error value if the operation fail. + u_long error (void) const; + + /// This returns ACE_INVALID_HANDLE on POSIX4 platforms. + ACE_HANDLE event (void) const; + + /** + * This really make sense only when doing file I/O. + * + * @@ On POSIX4-Unix, offset_high should be supported using + * aiocb64. + * + */ + u_long offset (void) const; + u_long offset_high (void) const; + + /// The priority of the asynchronous operation. + int priority (void) const; + + /** + * POSIX4 realtime signal number to be used for the + * operation. <signal_number> ranges from SIGRTMIN to SIGRTMAX. By + * default, SIGRTMIN is used to issue <aio_> calls. This is a no-op + * on non-POSIX4 systems and returns 0. + */ + int signal_number (void) const; + + // = The following methods belong to + // ACE_POSIX_Asynch_Write_Stream_Result. They are here to avoid + // dominace warnings. These methods route their call to the + // ACE_POSIX_Asynch_Write_Stream_Result base class. + + /// The number of bytes which were requested at the start of the + /// asynchronous write. + size_t bytes_to_write (void) const; + + /// Message block that contains the data to be written. + ACE_Message_Block &message_block (void) const; + + /// I/O handle used for writing. + ACE_HANDLE handle (void) const; + + /// Post <this> to the Proactor. + int post_completion (ACE_Proactor_Impl *proactor); + protected: /// Constructor is protected since creation is limited to /// ACE_Asynch_Write_File factory. @@ -543,7 +854,7 @@ class ACE_Export ACE_POSIX_Asynch_Write_File : public virtual ACE_Asynch_Write_F { public: /// Constructor. - ACE_POSIX_Asynch_Write_File (ACE_POSIX_Proactor *posix_proactor); + ACE_POSIX_Asynch_Write_File (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor); /** * This starts off an asynchronous write. Upto <bytes_to_write> @@ -561,6 +872,28 @@ public: /// Destructor. virtual ~ACE_POSIX_Asynch_Write_File (void); + // = Methods belong to ACE_POSIX_Asynch_Operation base class. These + // methods are defined here to avoid dominace warnings. They route + // the call to the ACE_POSIX_Asynch_Operation base class. + + /** + * Initializes the factory with information which will be used with + * each asynchronous call. If (<handle> == ACE_INVALID_HANDLE), + * <ACE_Handler::handle> will be called on the <handler> to get the + * correct handle. + */ + int open (ACE_Handler &handler, + ACE_HANDLE handle, + const void *completion_key, + ACE_Proactor *proactor = 0); + + /// + /// @@ Not implemented. Returns 0. + int cancel (void); + + /// Return the underlying proactor. + ACE_Proactor* proactor (void) const; + private: /** * This <write> belongs to ACE_POSIX_Asynch_Write_Stream. We @@ -609,6 +942,57 @@ public: /// I/O handle for the new connection. ACE_HANDLE accept_handle (void) const; + // = Base class operations. These operations are here to kill + // dominance warnings. These methods call the base class methods. + + /// Number of bytes transferred by the operation. + size_t bytes_transferred (void) const; + + /// ACT associated with the operation. + const void *act (void) const; + + /// Did the operation succeed? + int success (void) const; + + /** + * This is the ACT associated with the handle on which the + * Asynch_Operation takes place. + * + * @@ This is not implemented for POSIX4 platforms. + * + */ + const void *completion_key (void) const; + + /// Error value if the operation fail. + u_long error (void) const; + + /// This returns ACE_INVALID_HANDLE on POSIX4 platforms. + ACE_HANDLE event (void) const; + + /** + * This really make sense only when doing file I/O. + * + * @@ On POSIX4-Unix, offset_high should be supported using + * aiocb64. + * + */ + u_long offset (void) const; + u_long offset_high (void) const; + + /// The priority of the asynchronous operation. + int priority (void) const; + + /** + * POSIX4 realtime signal number to be used for the + * operation. <signal_number> ranges from SIGRTMIN to SIGRTMAX. By + * default, SIGRTMIN is used to issue <aio_> calls. This is a no-op + * on non-POSIX4 systems and returns 0. + */ + int signal_number (void) const; + + /// Post <this> to the Proactor. + int post_completion (ACE_Proactor_Impl *proactor); + protected: /// Constructor is protected since creation is limited to /// ACE_Asynch_Accept factory. @@ -660,7 +1044,7 @@ class ACE_Export ACE_POSIX_Asynch_Accept : public: /// Constructor. - ACE_POSIX_Asynch_Accept (ACE_POSIX_Proactor * posix_proactor); + ACE_POSIX_Asynch_Accept (ACE_POSIX_AIOCB_Proactor * posix_aiocb_proactor); /// Destructor. virtual ~ACE_POSIX_Asynch_Accept (void); @@ -718,6 +1102,12 @@ public: /// virtual from ACE_Event_Handler int handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask); + // = Methods belong to ACE_POSIX_Asynch_Operation base class. These + // methods are defined here to avoid dominace warnings. They route + // the call to the ACE_POSIX_Asynch_Operation base class. + /// Return the underlying proactor. + ACE_Proactor* proactor (void) const; + private: /// flg_notify points whether or not we should send notification about /// canceled accepts @@ -775,6 +1165,56 @@ public: /// I/O handle for the connection. ACE_HANDLE connect_handle (void) const; + // = Base class operations. These operations are here to kill + // dominance warnings. These methods call the base class methods. + + /// Number of bytes transferred by the operation. + size_t bytes_transferred (void) const; + + /// ACT associated with the operation. + const void *act (void) const; + + /// Did the operation succeed? + int success (void) const; + + /** + * This is the ACT associated with the handle on which the + * Asynch_Operation takes place. + * + * @note This is not implemented for POSIX4 platforms. + */ + const void *completion_key (void) const; + + /// Error value if the operation fail. + u_long error (void) const; + + /// This returns ACE_INVALID_HANDLE on POSIX4 platforms. + ACE_HANDLE event (void) const; + + /** + * This really make sense only when doing file I/O. + * + * @note On POSIX4-Unix, @c offset_high should be supported using + * @c aiocb64. + */ + u_long offset (void) const; + u_long offset_high (void) const; + + /// The priority of the asynchronous operation. + int priority (void) const; + + /** + * POSIX4 realtime signal number to be used for the + * operation. The signal number ranges from @c SIGRTMIN to @c SIGRTMAX. + * By default, SIGRTMIN is used to issue AIO calls. + * + * @note This is a no-op on non-POSIX4 systems and returns 0. + */ + int signal_number (void) const; + + /// Post this object to the Proactor. + int post_completion (ACE_Proactor_Impl *proactor); + protected: /// Constructor is protected since creation is limited to /// ACE_Asynch_Connect factory. @@ -812,7 +1252,7 @@ class ACE_Export ACE_POSIX_Asynch_Connect : public: /// Constructor. - ACE_POSIX_Asynch_Connect (ACE_POSIX_Proactor * posix_proactor); + ACE_POSIX_Asynch_Connect (ACE_POSIX_AIOCB_Proactor * posix_aiocb_proactor); /// Destructor. virtual ~ACE_POSIX_Asynch_Connect (void); @@ -868,6 +1308,13 @@ public: /// virtual from ACE_Event_Handler int handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask) ; + // = Methods belong to ACE_POSIX_Asynch_Operation base class. These + // methods are defined here to avoid dominace warnings. They route + // the call to the ACE_POSIX_Asynch_Operation base class. + + /// Return the underlying proactor. + ACE_Proactor* proactor (void) const; + private: int connect_i (ACE_POSIX_Asynch_Connect_Result *result, const ACE_Addr & remote_sap, @@ -962,6 +1409,57 @@ public: /// Flags which were passed into transmit file. u_long flags (void) const; + // = Base class operations. These operations are here to kill + // dominance warnings. These methods call the base class methods. + + /// Number of bytes transferred by the operation. + size_t bytes_transferred (void) const; + + /// ACT associated with the operation. + const void *act (void) const; + + /// Did the operation succeed? + int success (void) const; + + /** + * This is the ACT associated with the handle on which the + * Asynch_Operation takes place. + * + * @@ This is not implemented for POSIX4 platforms. + * + */ + const void *completion_key (void) const; + + /// Error value if the operation fail. + u_long error (void) const; + + /// This returns ACE_INVALID_HANDLE. + ACE_HANDLE event (void) const; + + /** + * This really make sense only when doing file I/O. + * + * @@ On POSIX4-Unix, offset_high should be supported using + * aiocb64. + * + */ + u_long offset (void) const; + u_long offset_high (void) const; + + /// The priority of the asynchronous operation. + int priority (void) const; + + /** + * POSIX4 realtime signal number to be used for the + * operation. <signal_number> ranges from SIGRTMIN to SIGRTMAX. By + * default, SIGRTMIN is used to issue <aio_> calls. This is a no-op + * on non-POSIX4 systems and returns 0. + */ + int signal_number (void) const; + + /// Post <this> to the Proactor. + int post_completion (ACE_Proactor_Impl *proactor); + protected: ACE_POSIX_Asynch_Transmit_File_Result (ACE_Handler &handler, ACE_HANDLE socket, @@ -1020,7 +1518,7 @@ class ACE_Export ACE_POSIX_Asynch_Transmit_File : public virtual ACE_Asynch_Tran { public: /// Constructor. - ACE_POSIX_Asynch_Transmit_File (ACE_POSIX_Proactor *posix_proactor); + ACE_POSIX_Asynch_Transmit_File (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor); /** * This starts off an asynchronous transmit file. The <file> is a @@ -1046,6 +1544,28 @@ public: /// Destructor. virtual ~ACE_POSIX_Asynch_Transmit_File (void); + + // = Methods belong to ACE_POSIX_Asynch_Operation base class. These + // methods are defined here to avoid dominace warnings. They route + // the call to the ACE_POSIX_Asynch_Operation base class. + + /** + * Initializes the factory with information which will be used with + * each asynchronous call. If (<handle> == ACE_INVALID_HANDLE), + * <ACE_Handler::handle> will be called on the <handler> to get the + * correct handle. + */ + int open (ACE_Handler &handler, + ACE_HANDLE handle, + const void *completion_key, + ACE_Proactor *proactor = 0); + + /// + /// @@ Not implemented. Returns 0. + int cancel (void); + + /// Return the underlying proactor. + ACE_Proactor* proactor (void) const; }; @@ -1067,7 +1587,7 @@ class ACE_Export ACE_POSIX_Asynch_Read_Dgram : public virtual ACE_Asynch_Read_Dg { public: /// Constructor. - ACE_POSIX_Asynch_Read_Dgram (ACE_POSIX_Proactor *posix_proactor); + ACE_POSIX_Asynch_Read_Dgram (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor); virtual ~ACE_POSIX_Asynch_Read_Dgram (void); /** This starts off an asynchronous read. Upto @@ -1094,6 +1614,31 @@ public: int priority, int signal_number); + // Methods belong to ACE_POSIX_Asynch_Operation base class. These + // methods are defined here to avoid VC++ warnings. They route the + // call to the ACE_POSIX_Asynch_Operation base class. + + /** + * Initializes the factory with information which will be used with + * each asynchronous call. If (<handle> == ACE_INVALID_HANDLE), + * <ACE_Handler::handle> will be called on the <handler> to get the + * correct handle. + */ + int open (ACE_Handler &handler, + ACE_HANDLE handle, + const void *completion_key, + ACE_Proactor *proactor); + + /** + * This cancels all pending accepts operations that were issued by + * the calling thread. The function does not cancel asynchronous + * operations issued by other threads. + */ + int cancel (void); + + /// Return the underlying proactor. + ACE_Proactor* proactor (void) const; + protected: /// Do-nothing constructor. ACE_POSIX_Asynch_Read_Dgram (void); @@ -1128,6 +1673,47 @@ public: /// I/O handle used for writing. ACE_HANDLE handle (void) const; + // = Base class operations. These operations are here to kill some + // warnings. These methods call the base class methods. + + /// Number of bytes transferred by the operation. + size_t bytes_transferred (void) const; + + /// ACT associated with the operation. + const void *act (void) const; + + /// Did the operation succeed? + int success (void) const; + + /** + * This returns the ACT associated with the handle when it was + * registered with the I/O completion port. This ACT is not the + * same as the ACT associated with the asynchronous operation. + */ + const void *completion_key (void) const; + + /// Error value if the operation fail. + u_long error (void) const; + + /// Event associated with the OVERLAPPED structure. + ACE_HANDLE event (void) const; + + /// This really make sense only when doing file I/O. + u_long offset (void) const; + + /// Offset_high associated with the OVERLAPPED structure. + u_long offset_high (void) const; + + /// The priority of the asynchronous operation. Currently, this is + /// not supported on Win32. + int priority (void) const; + + /// No-op. Returns 0. + int signal_number (void) const; + + /// Post <this> to the Proactor's completion port. + int post_completion (ACE_Proactor_Impl *proactor); + protected: /// Constructor is protected since creation is limited to /// ACE_Asynch_Write_Stream factory. @@ -1171,6 +1757,7 @@ protected: * @brief This class is a factory for starting off asynchronous writes * on a UDP socket. * + * * Once <open> is called, multiple asynchronous <writes>s can * started using this class. A ACE_Asynch_Write_Stream::Result * will be passed back to the <handler> when the asynchronous @@ -1182,7 +1769,7 @@ class ACE_Export ACE_POSIX_Asynch_Write_Dgram : public virtual ACE_Asynch_Write_ { public: /// Constructor. - ACE_POSIX_Asynch_Write_Dgram (ACE_POSIX_Proactor *posix_proactor); + ACE_POSIX_Asynch_Write_Dgram (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor); /// Destructor virtual ~ACE_POSIX_Asynch_Write_Dgram (void); @@ -1211,6 +1798,32 @@ public: int priority, int signal_number); + // = Methods belonging to <ACE_POSIX_Asynch_Operation> base class. + + // These methods are defined here to avoid VC++ warnings. They route + // the call to the <ACE_POSIX_Asynch_Operation> base class. + + /** + * Initializes the factory with information which will be used with + * each asynchronous call. If (<handle> == ACE_INVALID_HANDLE), + * <ACE_Handler::handle> will be called on the <handler> to get the + * correct handle. + */ + int open (ACE_Handler &handler, + ACE_HANDLE handle, + const void *completion_key, + ACE_Proactor *proactor); + + /** + * This cancels all pending accepts operations that were issued by + * the calling thread. The function does not cancel asynchronous + * operations issued by other threads. + */ + int cancel (void); + + /// Return the underlying proactor. + ACE_Proactor* proactor (void) const; + protected: /// Do-nothing constructor. ACE_POSIX_Asynch_Write_Dgram (void); @@ -1254,6 +1867,47 @@ public: /// I/O handle used for reading. ACE_HANDLE handle (void) const; + // Base class operations. These operations are here to kill + // dominance warnings. These methods call the base class methods. + + /// Number of bytes transferred by the operation. + size_t bytes_transferred (void) const; + + /// ACT associated with the operation. + const void *act (void) const; + + /// Did the operation succeed? + int success (void) const; + + /** + * This returns the ACT associated with the handle when it was + * registered with the I/O completion port. This ACT is not the + * same as the ACT associated with the asynchronous operation. + */ + const void *completion_key (void) const; + + /// Error value if the operation fail. + u_long error (void) const; + + /// Event associated with the OVERLAPPED structure. + ACE_HANDLE event (void) const; + + /// This really make sense only when doing file I/O. + u_long offset (void) const; + + /// Offset_high associated with the OVERLAPPED structure. + u_long offset_high (void) const; + + /// The priority of the asynchronous operation. Currently, this is + /// not supported on Win32. + int priority (void) const; + + /// No-op. Returns 0. + int signal_number (void) const; + + /// Post <this> to the Proactor's completion port. + int post_completion (ACE_Proactor_Impl *proactor); + protected: /// Constructor is protected since creation is limited to /// ACE_Asynch_Read_Dgram factory. @@ -1297,6 +1951,7 @@ protected: }; + #if defined (__ACE_INLINE__) #include "ace/POSIX_Asynch_IO.i" #endif /* __ACE_INLINE__ */ diff --git a/ace/POSIX_CB_Proactor.cpp b/ace/POSIX_CB_Proactor.cpp index f8a5c400490..69f063cfb37 100644 --- a/ace/POSIX_CB_Proactor.cpp +++ b/ace/POSIX_CB_Proactor.cpp @@ -3,7 +3,7 @@ #include "ace/POSIX_CB_Proactor.h" -#if defined (ACE_HAS_AIO_CALLS) && !defined(__sun) && !defined(__Lynx__) +#if defined (ACE_HAS_AIO_CALLS) && defined (__sgi) #include "ace/Task_T.h" #include "ace/Log_Msg.h" @@ -93,7 +93,7 @@ ACE_POSIX_CB_Proactor::handle_events (unsigned long milli_seconds) { ACE_POSIX_Asynch_Result * asynch_result = find_completed_aio (error_status, - (size_t)return_status, + return_status, index, count); @@ -161,13 +161,8 @@ ACE_POSIX_CB_Proactor::allocate_aio_slot (ACE_POSIX_Asynch_Result *result) // setup OS notification methods for this aio // store index!!, not pointer in signal info - // need to figure out correct thing to do here when we are not on SGI -#if defined(__sgi) result->aio_sigevent.sigev_notify = SIGEV_CALLBACK; result->aio_sigevent.sigev_func = aio_completion_func ; -#else - result->aio_sigevent.sigev_notify = SIGEV_SIGNAL; -#endif /* __sgi */ #if defined (__FreeBSD__) result->aio_sigevent.sigev_value.sigval_ptr = this ; @@ -185,7 +180,7 @@ ACE_POSIX_CB_Proactor::get_result_status ( ACE_POSIX_Asynch_Result* asynch_resul { return ACE_POSIX_AIOCB_Proactor::get_result_status (asynch_result, error_status, - (size_t)return_status ); + return_status ); } int @@ -200,5 +195,4 @@ ACE_POSIX_CB_Proactor::cancel_aio (ACE_HANDLE handle) return ACE_POSIX_AIOCB_Proactor::cancel_aio (handle); } -#endif /* ACE_HAS_AIO_CALLS && !__sun && !__Lynx__ */ - +#endif /* ACE_HAS_AIO_CALLS && __sgi */ diff --git a/ace/POSIX_CB_Proactor.h b/ace/POSIX_CB_Proactor.h index cd0ccdd62ef..e8315e3c8d2 100644 --- a/ace/POSIX_CB_Proactor.h +++ b/ace/POSIX_CB_Proactor.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_HAS_AIO_CALLS) && !defined(__sun) && !defined(__Lynx__) +#if defined (ACE_HAS_AIO_CALLS) && defined (__sgi) #include "ace/POSIX_Proactor.h" @@ -101,5 +101,5 @@ protected: #include "ace/POSIX_CB_Proactor.i" #endif /* __ACE_INLINE__ */ -#endif /* ACE_HAS_AIO_CALLS && !__sun && !__Lynx__ */ +#endif /* ACE_HAS_AIO_CALLS && __sgi */ #endif /* ACE_POSIX_CB_PROACTOR_H*/ diff --git a/ace/POSIX_CB_Proactor.i b/ace/POSIX_CB_Proactor.i index 5e6be74df26..c27144ff75f 100644 --- a/ace/POSIX_CB_Proactor.i +++ b/ace/POSIX_CB_Proactor.i @@ -1,7 +1,7 @@ /* -*- C++ -*- */ // $Id$ -#if defined (ACE_HAS_AIO_CALLS) +#if defined (ACE_HAS_AIO_CALLS) && defined (__sgi) ACE_INLINE ACE_POSIX_Proactor::Proactor_Type ACE_POSIX_CB_Proactor::get_impl_type (void) @@ -9,4 +9,4 @@ ACE_POSIX_Proactor::Proactor_Type ACE_POSIX_CB_Proactor::get_impl_type (void) return PROACTOR_CB; } -#endif /* ACE_HAS_AIO_CALLS */ +#endif /* ACE_HAS_AIO_CALLS && __sgi */ diff --git a/ace/POSIX_Proactor.cpp b/ace/POSIX_Proactor.cpp index 97b450474a8..4fc723e56fa 100644 --- a/ace/POSIX_Proactor.cpp +++ b/ace/POSIX_Proactor.cpp @@ -138,16 +138,6 @@ ACE_POSIX_Proactor::get_handle (void) const return ACE_INVALID_HANDLE; } -ACE_Asynch_Read_Stream_Impl * -ACE_POSIX_Proactor::create_asynch_read_stream (void) -{ - ACE_Asynch_Read_Stream_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_POSIX_Asynch_Read_Stream (this), - 0); - return implementation; -} - ACE_Asynch_Read_Stream_Result_Impl * ACE_POSIX_Proactor::create_asynch_read_stream_result (ACE_Handler &handler, ACE_HANDLE handle, @@ -172,17 +162,6 @@ ACE_POSIX_Proactor::create_asynch_read_stream_result (ACE_Handler &handler, return implementation; } - -ACE_Asynch_Write_Stream_Impl * -ACE_POSIX_Proactor::create_asynch_write_stream (void) -{ - ACE_Asynch_Write_Stream_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_POSIX_Asynch_Write_Stream (this), - 0); - return implementation; -} - ACE_Asynch_Write_Stream_Result_Impl * ACE_POSIX_Proactor::create_asynch_write_stream_result (ACE_Handler &handler, ACE_HANDLE handle, @@ -207,17 +186,6 @@ ACE_POSIX_Proactor::create_asynch_write_stream_result (ACE_Handler &handler, return implementation; } - -ACE_Asynch_Read_File_Impl * -ACE_POSIX_Proactor::create_asynch_read_file (void) -{ - ACE_Asynch_Read_File_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_POSIX_Asynch_Read_File (this), - 0); - return implementation; -} - ACE_Asynch_Read_File_Result_Impl * ACE_POSIX_Proactor::create_asynch_read_file_result (ACE_Handler &handler, ACE_HANDLE handle, @@ -246,17 +214,6 @@ ACE_POSIX_Proactor::create_asynch_read_file_result (ACE_Handler &handler, return implementation; } - -ACE_Asynch_Write_File_Impl * -ACE_POSIX_Proactor::create_asynch_write_file (void) -{ - ACE_Asynch_Write_File_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_POSIX_Asynch_Write_File (this), - 0); - return implementation; -} - ACE_Asynch_Write_File_Result_Impl * ACE_POSIX_Proactor::create_asynch_write_file_result (ACE_Handler &handler, ACE_HANDLE handle, @@ -285,17 +242,6 @@ ACE_POSIX_Proactor::create_asynch_write_file_result (ACE_Handler &handler, return implementation; } - -ACE_Asynch_Read_Dgram_Impl * -ACE_POSIX_Proactor::create_asynch_read_dgram (void) -{ - ACE_Asynch_Read_Dgram_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_POSIX_Asynch_Read_Dgram (this), - 0); - return implementation; -} - ACE_Asynch_Read_Dgram_Result_Impl * ACE_POSIX_Proactor::create_asynch_read_dgram_result (ACE_Handler &handler, ACE_HANDLE handle, @@ -325,18 +271,6 @@ ACE_POSIX_Proactor::create_asynch_read_dgram_result (ACE_Handler &handler, return implementation; } - -ACE_Asynch_Write_Dgram_Impl * -ACE_POSIX_Proactor::create_asynch_write_dgram (void) -{ - ACE_Asynch_Write_Dgram_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_POSIX_Asynch_Write_Dgram (this), - 0); - - return implementation; -} - ACE_Asynch_Write_Dgram_Result_Impl * ACE_POSIX_Proactor::create_asynch_write_dgram_result (ACE_Handler &handler, ACE_HANDLE handle, @@ -364,18 +298,6 @@ ACE_POSIX_Proactor::create_asynch_write_dgram_result (ACE_Handler &handler, return implementation; } - -ACE_Asynch_Accept_Impl * -ACE_POSIX_Proactor::create_asynch_accept (void) -{ - ACE_Asynch_Accept_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_POSIX_Asynch_Accept (this), - 0); - - return implementation; -} - ACE_Asynch_Accept_Result_Impl * ACE_POSIX_Proactor::create_asynch_accept_result (ACE_Handler &handler, ACE_HANDLE listen_handle, @@ -402,18 +324,6 @@ ACE_POSIX_Proactor::create_asynch_accept_result (ACE_Handler &handler, return implementation; } - -ACE_Asynch_Connect_Impl * -ACE_POSIX_Proactor::create_asynch_connect (void) -{ - ACE_Asynch_Connect_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_POSIX_Asynch_Connect (this), - 0); - - return implementation; -} - ACE_Asynch_Connect_Result_Impl * ACE_POSIX_Proactor::create_asynch_connect_result (ACE_Handler &handler, ACE_HANDLE connect_handle, @@ -434,17 +344,6 @@ ACE_POSIX_Proactor::create_asynch_connect_result (ACE_Handler &handler, return implementation; } - -ACE_Asynch_Transmit_File_Impl * -ACE_POSIX_Proactor::create_asynch_transmit_file (void) -{ - ACE_Asynch_Transmit_File_Impl *implementation = 0; - ACE_NEW_RETURN (implementation, - ACE_POSIX_Asynch_Transmit_File (this), - 0); - return implementation; -} - ACE_Asynch_Transmit_File_Result_Impl * ACE_POSIX_Proactor::create_asynch_transmit_file_result (ACE_Handler &handler, ACE_HANDLE socket, @@ -858,10 +757,10 @@ int ACE_POSIX_AIOCB_Proactor::delete_result_aiocb_list (void) // Get the error and return status of the aio_ operation. int error_status = 0; - size_t transfer_count = 0; + int return_status = 0; int flg_completed = this->get_result_status (result_list_[ai], error_status, - transfer_count); + return_status); //don't delete uncompleted AIOCB's if (flg_completed == 0) // not completed !!! @@ -877,12 +776,12 @@ int ACE_POSIX_AIOCB_Proactor::delete_result_aiocb_list (void) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("slot=%d op=%s status=%d xfercnt=%d %s\n"), - ai, - op, - error_status, - transfer_count, - errtxt)); + ACE_LIB_TEXT("slot=%d op=%s status=%d return=%d %s\n"), + ai, + op, + error_status, + return_status, + errtxt )); #endif /* 0 */ } else // completed , OK @@ -893,16 +792,16 @@ int ACE_POSIX_AIOCB_Proactor::delete_result_aiocb_list (void) } } - // If it is not possible cancel some operation (num_pending > 0 ), - // we can do only one thing -report about this - // and complain about POSIX implementation. - // We know that we have memory leaks, but it is better than - // segmentation fault! - ACE_DEBUG - ((LM_DEBUG, - ACE_LIB_TEXT("ACE_POSIX_AIOCB_Proactor::delete_result_aiocb_list\n") - ACE_LIB_TEXT(" number pending AIO=%d\n"), - num_pending)); + //if it is not possible cancel some operation (num_pending > 0 ), + //we can we do only one thing -report about this + //and complain about POSIX implementation + //we know that we have memory leaks, + //but it is better than segmentation fault! + ACE_DEBUG ((LM_DEBUG, + ACE_LIB_TEXT("ACE_POSIX_AIOCB_Proactor::delete_result_aiocb_list\n") + ACE_LIB_TEXT(" number pending AIO=%d\n"), + num_pending + )); delete [] this->aiocb_list_; this->aiocb_list_ = 0; @@ -1026,13 +925,13 @@ ACE_POSIX_AIOCB_Proactor::handle_events (ACE_Time_Value &wait_time) { // Decrement <wait_time> with the amount of time spent in the method ACE_Countdown_Time countdown (&wait_time); - return this->handle_events_i (wait_time.msec ()); + return this->handle_events (wait_time.msec ()); } int ACE_POSIX_AIOCB_Proactor::handle_events (void) { - return this->handle_events_i (ACE_INFINITE); + return this->handle_events (ACE_INFINITE); } int @@ -1128,8 +1027,101 @@ int ACE_POSIX_AIOCB_Proactor::process_result_queue (void) return ret_val; } +ACE_Asynch_Read_Stream_Impl * +ACE_POSIX_AIOCB_Proactor::create_asynch_read_stream (void) +{ + ACE_Asynch_Read_Stream_Impl *implementation = 0; + ACE_NEW_RETURN (implementation, + ACE_POSIX_Asynch_Read_Stream (this), + 0); + return implementation; +} + +ACE_Asynch_Write_Stream_Impl * +ACE_POSIX_AIOCB_Proactor::create_asynch_write_stream (void) +{ + ACE_Asynch_Write_Stream_Impl *implementation = 0; + ACE_NEW_RETURN (implementation, + ACE_POSIX_Asynch_Write_Stream (this), + 0); + return implementation; +} + +ACE_Asynch_Read_Dgram_Impl * +ACE_POSIX_AIOCB_Proactor::create_asynch_read_dgram (void) +{ + ACE_Asynch_Read_Dgram_Impl *implementation = 0; + ACE_NEW_RETURN (implementation, + ACE_POSIX_Asynch_Read_Dgram (this), + 0); + return implementation; +} + +ACE_Asynch_Write_Dgram_Impl * +ACE_POSIX_AIOCB_Proactor::create_asynch_write_dgram (void) +{ + ACE_Asynch_Write_Dgram_Impl *implementation = 0; + ACE_NEW_RETURN (implementation, + ACE_POSIX_Asynch_Write_Dgram (this), + 0); + + return implementation; +} + +ACE_Asynch_Read_File_Impl * +ACE_POSIX_AIOCB_Proactor::create_asynch_read_file (void) +{ + ACE_Asynch_Read_File_Impl *implementation = 0; + ACE_NEW_RETURN (implementation, + ACE_POSIX_Asynch_Read_File (this), + 0); + return implementation; +} + +ACE_Asynch_Write_File_Impl * +ACE_POSIX_AIOCB_Proactor::create_asynch_write_file (void) +{ + ACE_Asynch_Write_File_Impl *implementation = 0; + ACE_NEW_RETURN (implementation, + ACE_POSIX_Asynch_Write_File (this), + 0); + return implementation; +} + +ACE_Asynch_Accept_Impl * +ACE_POSIX_AIOCB_Proactor::create_asynch_accept (void) +{ + ACE_Asynch_Accept_Impl *implementation = 0; + ACE_NEW_RETURN (implementation, + ACE_POSIX_Asynch_Accept (this), + 0); + + return implementation; +} + +ACE_Asynch_Connect_Impl * +ACE_POSIX_AIOCB_Proactor::create_asynch_connect (void) +{ + ACE_Asynch_Connect_Impl *implementation = 0; + ACE_NEW_RETURN (implementation, + ACE_POSIX_Asynch_Connect (this), + 0); + + return implementation; +} + +ACE_Asynch_Transmit_File_Impl * +ACE_POSIX_AIOCB_Proactor::create_asynch_transmit_file (void) +{ + ACE_Asynch_Transmit_File_Impl *implementation = 0; + ACE_NEW_RETURN (implementation, + ACE_POSIX_Asynch_Transmit_File (this), + 0); + return implementation; +} + int -ACE_POSIX_AIOCB_Proactor::handle_events_i (u_long milli_seconds) +ACE_POSIX_AIOCB_Proactor::handle_events (u_long milli_seconds) { int result_suspend = 0; int retval= 0; @@ -1168,13 +1160,13 @@ ACE_POSIX_AIOCB_Proactor::handle_events_i (u_long milli_seconds) size_t index = 0; size_t count = aiocb_list_max_size_; // max number to iterate int error_status = 0; - size_t transfer_count = 0; + int return_status = 0; for (;; retval++) { ACE_POSIX_Asynch_Result *asynch_result = find_completed_aio (error_status, - transfer_count, + return_status, index, count); @@ -1183,9 +1175,9 @@ ACE_POSIX_AIOCB_Proactor::handle_events_i (u_long milli_seconds) // Call the application code. this->application_specific_code (asynch_result, - transfer_count, - 0, // No completion key. - error_status); + return_status, // Bytes transferred. + 0, // No completion key. + error_status); // Error } } @@ -1196,27 +1188,49 @@ ACE_POSIX_AIOCB_Proactor::handle_events_i (u_long milli_seconds) } int -ACE_POSIX_AIOCB_Proactor::get_result_status (ACE_POSIX_Asynch_Result *asynch_result, +ACE_POSIX_AIOCB_Proactor::get_result_status (ACE_POSIX_Asynch_Result* asynch_result, int &error_status, - size_t &transfer_count) + int &return_status) { - transfer_count = 0; + return_status = 0; // Get the error status of the aio_ operation. error_status = aio_error (asynch_result); - if (error_status == EINPROGRESS) - return 0; // not completed - ssize_t op_return = aio_return (asynch_result); - if (op_return > 0) - transfer_count = ACE_static_cast (size_t, op_return); - // else transfer_count is already 0, error_status reports the error. - return 1; // completed +#if 0 + if (error_status == -1) // <aio_error> itself has failed. + ACE_ERROR ((LM_ERROR, + "%N:%l:(%P | %t)::%p\n", + "ACE_POSIX_AIOCB_Proactor::get_result_status:" + "<aio_error> has failed\n")); +#endif /* 0 */ + + if (error_status == EINPROGRESS) + { + return_status = 0; + return 0; // not completed + } + + return_status = aio_return (asynch_result); + + if (return_status < 0) + { + return_status = 0; // zero bytes transferred +#if 0 + if (error_status == 0) // nonsense + ACE_ERROR ((LM_ERROR, + "%N:%l:(%P | %t)::%p\n", + "ACE_POSIX_AIOCB_Proactor::get_result_status:" + "<aio_return> failed\n")); +#endif /* 0 */ + } + + return 1; // completed } ACE_POSIX_Asynch_Result * ACE_POSIX_AIOCB_Proactor::find_completed_aio (int &error_status, - size_t &transfer_count, + int &return_status, size_t &index, size_t &count) { @@ -1227,8 +1241,12 @@ ACE_POSIX_AIOCB_Proactor::find_completed_aio (int &error_status, ACE_POSIX_Asynch_Result *asynch_result = 0; + error_status = 0; + return_status= 0; + if (num_started_aio_ == 0) // save time - return 0; + return asynch_result; + for (; count > 0; index++ , count--) { @@ -1240,13 +1258,14 @@ ACE_POSIX_AIOCB_Proactor::find_completed_aio (int &error_status, if (0 != this->get_result_status (result_list_[index], error_status, - transfer_count)) // completed + return_status)) // completed break; } // end for if (count == 0) // all processed , nothing found - return 0; + return asynch_result; + asynch_result = result_list_[index]; aiocb_list_[index] = 0; @@ -1254,7 +1273,7 @@ ACE_POSIX_AIOCB_Proactor::find_completed_aio (int &error_status, aiocb_list_cur_size_--; num_started_aio_--; // decrement count active aios - index++; // for next iteration + index++; // for next iteration count--; // for next iteration this->start_deferred_aio (); @@ -1264,12 +1283,23 @@ ACE_POSIX_AIOCB_Proactor::find_completed_aio (int &error_status, return asynch_result; } +void +ACE_POSIX_AIOCB_Proactor::application_specific_code (ACE_POSIX_Asynch_Result *asynch_result, + size_t bytes_transferred, + const void *completion_key, + u_long error) +{ + ACE_POSIX_Proactor::application_specific_code (asynch_result, + bytes_transferred, + completion_key, + error); +} int -ACE_POSIX_AIOCB_Proactor::start_aio (ACE_POSIX_Asynch_Result *result, - ACE_POSIX_Proactor::Opcode op) +ACE_POSIX_AIOCB_Proactor::register_and_start_aio (ACE_POSIX_Asynch_Result *result, + int op) { - ACE_TRACE ("ACE_POSIX_AIOCB_Proactor::start_aio"); + ACE_TRACE ("ACE_POSIX_AIOCB_Proactor::register_and_start_aio"); ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->mutex_, -1)); @@ -1281,60 +1311,69 @@ ACE_POSIX_AIOCB_Proactor::start_aio (ACE_POSIX_Asynch_Result *result, // Save operation code in the aiocb switch (op) { - case ACE_POSIX_Proactor::READ : + case 0 : result->aio_lio_opcode = LIO_READ; break; - case ACE_POSIX_Proactor::WRITE : + case 1 : result->aio_lio_opcode = LIO_WRITE; break; default: ACE_ERROR_RETURN ((LM_ERROR, "%N:%l:(%P | %t)::\n" - "start_aio: Invalid operation code\n"), + "register_and_start_aio: Invalid operation code\n"), -1); } if (ret_val != 0) // No free slot { errno = EAGAIN; - return -1; + ACE_ERROR_RETURN ((LM_ERROR, + "%N:%l:(%P | %t)::\n" + "register_and_start_aio: " + "No space to store the <aio>info\n"), + -1); } // Find a free slot and store. - ssize_t slot = allocate_aio_slot (result); + ret_val = allocate_aio_slot (result); - if (slot < 0) + if (ret_val < 0) return -1; - size_t index = ACE_static_cast (size_t, slot); + size_t index = ACE_static_cast (size_t, ret_val); result_list_[index] = result; //Store result ptr anyway aiocb_list_cur_size_++; - ret_val = start_aio_i (result); + ret_val = start_aio (result); + switch (ret_val) { - case 0: // started OK + case 0 : // started OK aiocb_list_[index] = result; return 0; - case 1: // OS AIO queue overflow + case 1 : //OS AIO queue overflow num_deferred_aiocb_ ++; return 0; - default: // Invalid request, there is no point + default: //Invalid request, there is no point break; // to start it later } result_list_[index] = 0; aiocb_list_cur_size_--; + + ACE_ERROR ((LM_ERROR, + "%N:%l:(%P | %t)::%p\n", + "register_and_start_aio: Invalid request to start <aio>\n")); return -1; } -ssize_t +int ACE_POSIX_AIOCB_Proactor::allocate_aio_slot (ACE_POSIX_Asynch_Result *result) { size_t i = 0; @@ -1368,21 +1407,22 @@ ACE_POSIX_AIOCB_Proactor::allocate_aio_slot (ACE_POSIX_Asynch_Result *result) "internal Proactor error 1\n"), -1); + //setup OS notification methods for this aio result->aio_sigevent.sigev_notify = SIGEV_NONE; - return ACE_static_cast (ssize_t, i); + return ACE_static_cast (int, i); } -// start_aio_i has new return codes +// start_aio has new return codes // 0 AIO was started successfully // 1 AIO was not started, OS AIO queue overflow // -1 AIO was not started, other errors int -ACE_POSIX_AIOCB_Proactor::start_aio_i (ACE_POSIX_Asynch_Result *result) +ACE_POSIX_AIOCB_Proactor::start_aio (ACE_POSIX_Asynch_Result *result) { - ACE_TRACE ("ACE_POSIX_AIOCB_Proactor::start_aio_i"); + ACE_TRACE ("ACE_POSIX_AIOCB_Proactor::start_aio"); int ret_val; const ACE_TCHAR *ptype; @@ -1392,30 +1432,30 @@ ACE_POSIX_AIOCB_Proactor::start_aio_i (ACE_POSIX_Asynch_Result *result) switch (result->aio_lio_opcode ) { case LIO_READ : - ptype = ACE_LIB_TEXT ("read "); + ptype = "read "; ret_val = aio_read (result); break; case LIO_WRITE : - ptype = ACE_LIB_TEXT ("write"); + ptype = "write"; ret_val = aio_write (result); break; default: - ptype = ACE_LIB_TEXT ("?????"); + ptype = "?????"; ret_val = -1; break; } if (ret_val == 0) - this->num_started_aio_++; + num_started_aio_ ++; else // if (ret_val == -1) { - if (errno == EAGAIN || errno == ENOMEM) //Ok, it will be deferred AIO - ret_val = 1; + if (errno == EAGAIN) //Ok, it will be deferred AIO + ret_val = 1; else ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:(%P | %t)::start_aio_i: aio_%s %p\n"), - ptype, - ACE_LIB_TEXT ("queueing failed\n"))); + "%N:%l:(%P | %t)::start_aio: aio_%s %p\n", + ptype, + "queueing failed\n")); } return ret_val; @@ -1454,7 +1494,7 @@ ACE_POSIX_AIOCB_Proactor::start_deferred_aio () ACE_POSIX_Asynch_Result *result = result_list_[i]; - int ret_val = start_aio_i (result); + int ret_val = start_aio (result); switch (ret_val) { @@ -1510,38 +1550,38 @@ ACE_POSIX_AIOCB_Proactor::cancel_aio (ACE_HANDLE handle) size_t ai = 0; - for (ai = 0; ai < this->aiocb_list_max_size_; ai++) + for (ai = 0; ai < aiocb_list_max_size_; ai++) { - if (this->result_list_[ai] == 0) // Skip empty slot - continue; + if (result_list_[ai] == 0) //skip empty slot + continue; - if (this->result_list_[ai]->aio_fildes != handle) // Not ours - continue; + if (result_list_[ai]->aio_fildes != handle) //skip not our slot + continue; num_total++; - ACE_POSIX_Asynch_Result *asynch_result = this->result_list_[ai]; + ACE_POSIX_Asynch_Result *asynch_result = result_list_[ai]; - if (this->aiocb_list_[ai] == 0) // Canceling a deferred operation + if (aiocb_list_ [ai] == 0) //deferred aio { - num_cancelled++; - this->num_deferred_aiocb_--; + num_cancelled ++; + num_deferred_aiocb_ --; - this->aiocb_list_[ai] = 0; - this->result_list_[ai] = 0; - this->aiocb_list_cur_size_--; + aiocb_list_[ai] = 0; + result_list_[ai] = 0; + aiocb_list_cur_size_--; asynch_result->set_error (ECANCELED); asynch_result->set_bytes_transferred (0); this->putq_result (asynch_result); // we are with locked mutex_ here ! } - else // Cancel started aio + else //cancel started aio { int rc_cancel = this->cancel_aiocb (asynch_result); if (rc_cancel == 0) //notification in the future - num_cancelled++; //it is OS responsiblity + num_cancelled ++; //it is OS responsiblity } } @@ -1559,8 +1599,8 @@ ACE_POSIX_AIOCB_Proactor::cancel_aio (ACE_HANDLE handle) int ACE_POSIX_AIOCB_Proactor::cancel_aiocb (ACE_POSIX_Asynch_Result * result) { - // This method is called from cancel_aio - // to cancel a previously submitted AIO request + // This new method is called from cancel_aio + // to cancel concrete running AIO request int rc = ::aio_cancel (0, result); // Check the return value and return 0/1/2 appropriately. @@ -1568,15 +1608,20 @@ ACE_POSIX_AIOCB_Proactor::cancel_aiocb (ACE_POSIX_Asynch_Result * result) return 0; else if (rc == AIO_ALLDONE) return 1; - else // (rc == AIO_NOTCANCELED) + else if (rc == AIO_NOTCANCELED) return 2; + + ACE_ERROR_RETURN ((LM_ERROR, + "%N:%l:(%P | %t)::%p\n", + "cancel_aiocb:" + "Unexpected result from <aio_cancel>"), + -1); + } // ********************************************************************* -#if defined(ACE_HAS_POSIX_REALTIME_SIGNALS) - ACE_POSIX_SIG_Proactor::ACE_POSIX_SIG_Proactor (size_t max_aio_operations) : ACE_POSIX_AIOCB_Proactor (max_aio_operations, ACE_POSIX_Proactor::PROACTOR_SIG) @@ -1809,7 +1854,7 @@ ACE_POSIX_SIG_Proactor::mask_signals (const sigset_t *signals) const return 0; } -ssize_t +int ACE_POSIX_SIG_Proactor::allocate_aio_slot (ACE_POSIX_Asynch_Result *result) { size_t i = 0; @@ -1826,17 +1871,19 @@ ACE_POSIX_SIG_Proactor::allocate_aio_slot (ACE_POSIX_Asynch_Result *result) "internal Proactor error 1\n"), -1); + int retval = ACE_static_cast (int, i); + // setup OS notification methods for this aio // store index!!, not pointer in signal info result->aio_sigevent.sigev_notify = SIGEV_SIGNAL; result->aio_sigevent.sigev_signo = result->signal_number (); #if defined (__FreeBSD__) - result->aio_sigevent.sigev_value.sigval_int = ACE_static_cast (int, i); + result->aio_sigevent.sigev_value.sigval_int = retval; #else - result->aio_sigevent.sigev_value.sival_int = ACE_static_cast (int, i); + result->aio_sigevent.sigev_value.sival_int = retval; #endif /* __FreeBSD__ */ - return ACE_static_cast (ssize_t, i); + return retval; } int @@ -1869,7 +1916,7 @@ ACE_POSIX_SIG_Proactor::handle_events (u_long milli_seconds) size_t index = 0; // start index to scan aiocb list size_t count = aiocb_list_max_size_; // max number to iterate int error_status = 0; - size_t transfer_count = 0; + int return_status = 0; int flg_aio = 0; // 1 if AIO Completion possible int flg_que = 0; // 1 if SIGQUEUE possible @@ -1973,7 +2020,7 @@ ACE_POSIX_SIG_Proactor::handle_events (u_long milli_seconds) { ACE_POSIX_Asynch_Result *asynch_result = find_completed_aio (error_status, - transfer_count, + return_status, index, count); @@ -1982,7 +2029,7 @@ ACE_POSIX_SIG_Proactor::handle_events (u_long milli_seconds) // Call the application code. this->application_specific_code (asynch_result, - transfer_count, + return_status, // Bytes transferred. 0, // No completion key. error_status); // Error } @@ -2000,8 +2047,6 @@ ACE_POSIX_SIG_Proactor::handle_events (u_long milli_seconds) return ret_aio + ret_que > 0 ? 1 : 0; } -#endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ - // ********************************************************************* ACE_POSIX_Asynch_Timer::ACE_POSIX_Asynch_Timer (ACE_Handler &handler, @@ -2025,7 +2070,6 @@ ACE_POSIX_Asynch_Timer::complete (size_t /* bytes_transferred */, this->handler_.handle_time_out (this->time_, this->act ()); } - // ********************************************************************* ACE_POSIX_Wakeup_Completion::ACE_POSIX_Wakeup_Completion (ACE_Handler &handler, diff --git a/ace/POSIX_Proactor.h b/ace/POSIX_Proactor.h index 714993abbbf..168b6fcd8c2 100644 --- a/ace/POSIX_Proactor.h +++ b/ace/POSIX_Proactor.h @@ -91,11 +91,6 @@ public: OS_OPENBSD = 0x4000 // OpenBSD familty }; - enum Opcode { - READ = 1, - WRITE = 2 - }; - virtual Proactor_Type get_impl_type (void); /// Virtual destructor. @@ -104,22 +99,9 @@ public: /// Close down the Proactor. virtual int close (void); - /** - * Dispatch a single set of events. If <wait_time> elapses before - * any events occur, return 0. Return 1 on success i.e., when a - * completion is dispatched, non-zero (-1) on errors and errno is - * set accordingly. - */ - virtual int handle_events (ACE_Time_Value &wait_time) = 0; - - /** - * Block indefinitely until at least one event is dispatched. - * Dispatch a single set of events. If <wait_time> elapses before - * any events occur, return 0. Return 1 on success i.e., when a - * completion is dispatched, non-zero (-1) on errors and errno is - * set accordingly. - */ - virtual int handle_events (void) = 0; + /// This function is a no-op function for Unix systems. Returns 0. + virtual int register_handle (ACE_HANDLE handle, + const void *completion_key); /** * Post a result to the completion port of the Proactor. If errors @@ -131,17 +113,6 @@ public: */ virtual int post_completion (ACE_POSIX_Asynch_Result *result) = 0; - virtual int start_aio (ACE_POSIX_Asynch_Result *result, Opcode op) = 0; - - virtual int cancel_aio (ACE_HANDLE h) = 0; - - /// Task to process pseudo-asynchronous operations - ACE_Asynch_Pseudo_Task &get_asynch_pseudo_task (); - - /// This function is a no-op function for Unix systems. Returns 0. - virtual int register_handle (ACE_HANDLE handle, - const void *completion_key); - /// @@ This is a no-op on POSIX platforms. Returns 0. int wake_up_dispatch_threads (void); @@ -155,129 +126,109 @@ public: /// This is a no-op in POSIX. Returns ACE_INVALID_HANDLE. virtual ACE_HANDLE get_handle (void) const; - // Methods used to create Asynch IO factory and result objects. We - // create the right objects here in these methods. - - virtual ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (void); - virtual ACE_Asynch_Read_Stream_Result_Impl * - create_asynch_read_stream_result (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block &message_block, - size_t bytes_to_read, - const void *act, - ACE_HANDLE event = ACE_INVALID_HANDLE, - int priority = 0, - int signal_number = ACE_SIGRTMIN); - - virtual ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (void); - virtual ACE_Asynch_Write_Stream_Result_Impl * - create_asynch_write_stream_result (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block &message_block, - size_t bytes_to_write, - const void *act, - ACE_HANDLE event = ACE_INVALID_HANDLE, - int priority = 0, - int signal_number = ACE_SIGRTMIN); - - virtual ACE_Asynch_Read_File_Impl *create_asynch_read_file (void); - virtual ACE_Asynch_Read_File_Result_Impl * - create_asynch_read_file_result (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block &message_block, - size_t bytes_to_read, - const void *act, - u_long offset, - u_long offset_high, - ACE_HANDLE event = ACE_INVALID_HANDLE, - int priority = 0, - int signal_number = ACE_SIGRTMIN); - - virtual ACE_Asynch_Write_File_Impl *create_asynch_write_file (void); - virtual ACE_Asynch_Write_File_Result_Impl * - create_asynch_write_file_result (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block &message_block, - size_t bytes_to_write, - const void *act, - u_long offset, - u_long offset_high, - ACE_HANDLE event = ACE_INVALID_HANDLE, - int priority = 0, - int signal_number = ACE_SIGRTMIN); - - virtual ACE_Asynch_Read_Dgram_Impl *create_asynch_read_dgram (void); - virtual ACE_Asynch_Read_Dgram_Result_Impl * - create_asynch_read_dgram_result (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block *message_block, - size_t bytes_to_read, - int flags, - int protocol_family, - const void* act, - ACE_HANDLE event = ACE_INVALID_HANDLE, - int priority = 0, - int signal_number = ACE_SIGRTMIN); - - virtual ACE_Asynch_Write_Dgram_Impl *create_asynch_write_dgram (void); - virtual ACE_Asynch_Write_Dgram_Result_Impl * - create_asynch_write_dgram_result (ACE_Handler &handler, - ACE_HANDLE handle, - ACE_Message_Block *message_block, - size_t bytes_to_write, - int flags, - const void* act, - ACE_HANDLE event = ACE_INVALID_HANDLE, - int priority = 0, - int signal_number = ACE_SIGRTMIN); - - virtual ACE_Asynch_Accept_Impl *create_asynch_accept (void); - virtual ACE_Asynch_Accept_Result_Impl * - create_asynch_accept_result (ACE_Handler &handler, - ACE_HANDLE listen_handle, - ACE_HANDLE accept_handle, - ACE_Message_Block &message_block, - size_t bytes_to_read, - const void *act, - ACE_HANDLE event = ACE_INVALID_HANDLE, - int priority = 0, - int signal_number = ACE_SIGRTMIN); - - virtual ACE_Asynch_Connect_Impl *create_asynch_connect (void); - virtual ACE_Asynch_Connect_Result_Impl * - create_asynch_connect_result (ACE_Handler & handler, - ACE_HANDLE connect_handle, - const void *act, - ACE_HANDLE event = ACE_INVALID_HANDLE, - int priority = 0, - int signal_number = ACE_SIGRTMIN); - - virtual ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file (void); - virtual ACE_Asynch_Transmit_File_Result_Impl * - create_asynch_transmit_file_result (ACE_Handler &handler, - ACE_HANDLE socket, - ACE_HANDLE file, - ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer, - size_t bytes_to_write, - u_long offset, - u_long offset_high, - size_t bytes_per_send, - u_long flags, - const void *act, - ACE_HANDLE event = ACE_INVALID_HANDLE, - int priority = 0, - int signal_number = ACE_SIGRTMIN); + // Methods used to create Asynch_IO_Result objects. We create the right + // objects here in these methods. + + virtual ACE_Asynch_Read_Stream_Result_Impl *create_asynch_read_stream_result (ACE_Handler &handler, + ACE_HANDLE handle, + ACE_Message_Block &message_block, + size_t bytes_to_read, + const void *act, + ACE_HANDLE event = ACE_INVALID_HANDLE, + int priority = 0, + int signal_number = ACE_SIGRTMIN); + + virtual ACE_Asynch_Write_Stream_Result_Impl *create_asynch_write_stream_result (ACE_Handler &handler, + ACE_HANDLE handle, + ACE_Message_Block &message_block, + size_t bytes_to_write, + const void *act, + ACE_HANDLE event = ACE_INVALID_HANDLE, + int priority = 0, + int signal_number = ACE_SIGRTMIN); + + virtual ACE_Asynch_Read_File_Result_Impl *create_asynch_read_file_result (ACE_Handler &handler, + ACE_HANDLE handle, + ACE_Message_Block &message_block, + size_t bytes_to_read, + const void *act, + u_long offset, + u_long offset_high, + ACE_HANDLE event = ACE_INVALID_HANDLE, + int priority = 0, + int signal_number = ACE_SIGRTMIN); + + virtual ACE_Asynch_Write_File_Result_Impl *create_asynch_write_file_result (ACE_Handler &handler, + ACE_HANDLE handle, + ACE_Message_Block &message_block, + size_t bytes_to_write, + const void *act, + u_long offset, + u_long offset_high, + ACE_HANDLE event = ACE_INVALID_HANDLE, + int priority = 0, + int signal_number = ACE_SIGRTMIN); + + virtual ACE_Asynch_Read_Dgram_Result_Impl *create_asynch_read_dgram_result (ACE_Handler &handler, + ACE_HANDLE handle, + ACE_Message_Block *message_block, + size_t bytes_to_read, + int flags, + int protocol_family, + const void* act, + ACE_HANDLE event = ACE_INVALID_HANDLE, + int priority = 0, + int signal_number = ACE_SIGRTMIN); + + virtual ACE_Asynch_Write_Dgram_Result_Impl *create_asynch_write_dgram_result (ACE_Handler &handler, + ACE_HANDLE handle, + ACE_Message_Block *message_block, + size_t bytes_to_write, + int flags, + const void* act, + ACE_HANDLE event = ACE_INVALID_HANDLE, + int priority = 0, + int signal_number = ACE_SIGRTMIN); + + virtual ACE_Asynch_Accept_Result_Impl *create_asynch_accept_result (ACE_Handler &handler, + ACE_HANDLE listen_handle, + ACE_HANDLE accept_handle, + ACE_Message_Block &message_block, + size_t bytes_to_read, + const void *act, + ACE_HANDLE event = ACE_INVALID_HANDLE, + int priority = 0, + int signal_number = ACE_SIGRTMIN); + + virtual ACE_Asynch_Connect_Result_Impl *create_asynch_connect_result (ACE_Handler & handler, + ACE_HANDLE connect_handle, + const void *act, + ACE_HANDLE event = ACE_INVALID_HANDLE, + int priority = 0, + int signal_number = ACE_SIGRTMIN); + + virtual ACE_Asynch_Transmit_File_Result_Impl *create_asynch_transmit_file_result (ACE_Handler &handler, + ACE_HANDLE socket, + ACE_HANDLE file, + ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer, + size_t bytes_to_write, + u_long offset, + u_long offset_high, + size_t bytes_per_send, + u_long flags, + const void *act, + ACE_HANDLE event = ACE_INVALID_HANDLE, + int priority = 0, + int signal_number = ACE_SIGRTMIN); /// Create a timer result object which can be used with the Timer /// mechanism of the Proactor. - virtual ACE_Asynch_Result_Impl * - create_asynch_timer (ACE_Handler &handler, - const void *act, - const ACE_Time_Value &tv, - ACE_HANDLE event = ACE_INVALID_HANDLE, - int priority = 0, - int signal_number = ACE_SIGRTMIN); - + virtual ACE_Asynch_Result_Impl *create_asynch_timer (ACE_Handler &handler, + const void *act, + const ACE_Time_Value &tv, + ACE_HANDLE event = ACE_INVALID_HANDLE, + int priority = 0, + int signal_number = ACE_SIGRTMIN); protected: /// Constructor. ACE_POSIX_Proactor (void); @@ -305,12 +256,7 @@ protected: /// Handler to handle the wakeups. This works in conjunction with the /// <ACE_Proactor::run_event_loop>. ACE_Handler wakeup_handler_; - int os_id_; - -private: - /// Task to process pseudo-asynchronous accept/connect - ACE_Asynch_Pseudo_Task pseudo_task_; - + int os_id_ ; }; // Forward declarations. @@ -369,20 +315,38 @@ public: /// Post a result to the completion port of the Proactor. virtual int post_completion (ACE_POSIX_Asynch_Result *result); - virtual int start_aio (ACE_POSIX_Asynch_Result *result, - ACE_POSIX_Proactor::Opcode op); + // = Methods used to create Asynch_IO objects. We create the right + // objects here in these methods. + + virtual ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (void); + + virtual ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (void); + + virtual ACE_Asynch_Read_Dgram_Impl *create_asynch_read_dgram (void); + + virtual ACE_Asynch_Write_Dgram_Impl *create_asynch_write_dgram (void); + + virtual ACE_Asynch_Read_File_Impl *create_asynch_read_file (void); + + virtual ACE_Asynch_Write_File_Impl *create_asynch_write_file (void); + + virtual ACE_Asynch_Accept_Impl *create_asynch_accept (void); + + virtual ACE_Asynch_Connect_Impl *create_asynch_connect (void); + + virtual ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file (void); /** - * This method should be called from - * ACE_POSIX_Asynch_Operation::cancel() - * instead of usual ::aio_cancel. - * For all deferred AIO requests with handle "h" - * it removes its from the lists and notifies user. - * For all running AIO requests with handle "h" - * it calls ::aio_cancel. According to the POSIX standards - * we will receive ECANCELED for all ::aio_canceled AIO requests - * later on return from ::aio_suspend - */ + * This method should be called from + * ACE_POSIX_Asynch_Operation::cancel() + * instead of usual ::aio_cancel. + * For all deferred AIO requests with handle "h" + * it removes its from the lists and notifies user. + * For all running AIO requests with handle "h" + * it calls ::aio_cancel. According to the POSIX standards + * we will receive ECANCELED for all ::aio_canceled AIO requests + * later on return from ::aio_suspend + */ virtual int cancel_aio (ACE_HANDLE h); protected: @@ -394,9 +358,12 @@ protected: /// Check AIO for completion, error and result status /// Return: 1 - AIO completed , 0 - not completed yet - virtual int get_result_status (ACE_POSIX_Asynch_Result *asynch_result, - int &error_status, - size_t &transfer_count); + virtual int get_result_status ( ACE_POSIX_Asynch_Result* asynch_result, + int & error_status, + int & return_status ); + + /// Task to process pseudo-asynchronous operations + ACE_Asynch_Pseudo_Task & get_asynch_pseudo_task(); /// Create aiocb list int create_result_aiocb_list (void); @@ -405,6 +372,7 @@ protected: /// built. int delete_result_aiocb_list (void); + /// Call these methods from derived class when virtual table is /// built. void create_notify_manager (void); @@ -422,7 +390,20 @@ protected: * before any events occur, return 0. Return 1 if a completion * dispatched. Return -1 on errors. */ - int handle_events_i (u_long milli_seconds); + virtual int handle_events (u_long milli_seconds); + + /// We will call the base class's application_specific_code from + /// here. + void application_specific_code (ACE_POSIX_Asynch_Result *asynch_result, + size_t bytes_transferred, + const void *completion_key, + u_long error); + + virtual int register_and_start_aio (ACE_POSIX_Asynch_Result *result, + int op); + + /// Op code now is saved in ACE_POSIX_Asynch_Result + virtual int start_aio (ACE_POSIX_Asynch_Result *result); /// Start deferred AIO if necessary int start_deferred_aio (void); @@ -432,15 +413,13 @@ protected: /// Extract the results of aio. ACE_POSIX_Asynch_Result *find_completed_aio (int &error_status, - size_t &transfer_count, + int &return_status, size_t &index, size_t &count); /// Find free slot to store result and aiocb pointer - virtual ssize_t allocate_aio_slot (ACE_POSIX_Asynch_Result *result); + virtual int allocate_aio_slot (ACE_POSIX_Asynch_Result *result); - /// Initiate an aio operation. - virtual int start_aio_i (ACE_POSIX_Asynch_Result *result); /// Notify queue of "post_completed" ACE_POSIX_Asynch_Results /// called from post_completion method @@ -480,7 +459,7 @@ protected: /// The purpose of this member is only to identify asynchronous request /// from NotifyManager. We will reserve for it always slot 0 /// in the list of aiocb's to be sure that don't lose notifications. - ACE_HANDLE notify_pipe_read_handle_ ; + ACE_HANDLE notify_pipe_read_handle_ ; /// Number of ACE_POSIX_Asynch_Result's waiting for start /// i.e. deferred AIOs @@ -491,9 +470,11 @@ protected: /// Queue which keeps "post_completed" ACE_POSIX_Asynch_Result's ACE_Unbounded_Queue<ACE_POSIX_Asynch_Result *> result_queue_; + + /// Task to process pseudo-asynchronous accept + ACE_Asynch_Pseudo_Task pseudo_task_; }; -#if defined(ACE_HAS_POSIX_REALTIME_SIGNALS) /** * @class ACE_POSIX_SIG_Proactor * @@ -592,7 +573,7 @@ protected: */ /// Find free slot to store result and aiocb pointer - virtual ssize_t allocate_aio_slot (ACE_POSIX_Asynch_Result *result); + virtual int allocate_aio_slot (ACE_POSIX_Asynch_Result *result); /// Notify queue of "post_completed" ACE_POSIX_Asynch_Results @@ -602,9 +583,6 @@ protected: sigset_t RT_completion_signals_; }; - -#endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ - /** * @class ACE_POSIX_Asynch_Timer * @@ -619,9 +597,7 @@ class ACE_Export ACE_POSIX_Asynch_Timer : public ACE_POSIX_Asynch_Result /// The factory method for this class is with the POSIX_Proactor /// class. friend class ACE_POSIX_Proactor; -#if defined(ACE_HAS_POSIX_REALTIME_SIGNALS) friend class ACE_POSIX_SIG_Proactor; -#endif protected: /// Constructor. @@ -649,5 +625,5 @@ protected: #include "ace/POSIX_Proactor.i" #endif /* __ACE_INLINE__ */ -#endif /* ACE_HAS_AIO_CALLS && ACE_HAS_POSIX_REALTIME_SIGNALS */ +#endif /* ACE_HAS_AIO_CALLS */ #endif /* ACE_POSIX_PROACTOR_H */ diff --git a/ace/POSIX_Proactor.i b/ace/POSIX_Proactor.i index c5e80b49943..1fe7d9cfa42 100644 --- a/ace/POSIX_Proactor.i +++ b/ace/POSIX_Proactor.i @@ -13,18 +13,14 @@ ACE_POSIX_Proactor::Proactor_Type ACE_POSIX_AIOCB_Proactor::get_impl_type (void) return PROACTOR_AIOCB; } -#if defined(ACE_HAS_POSIX_REALTIME_SIGNALS) - ACE_INLINE ACE_POSIX_Proactor::Proactor_Type ACE_POSIX_SIG_Proactor::get_impl_type (void) { return PROACTOR_SIG; } -#endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ - ACE_INLINE -ACE_Asynch_Pseudo_Task& ACE_POSIX_Proactor::get_asynch_pseudo_task (void) +ACE_Asynch_Pseudo_Task& ACE_POSIX_AIOCB_Proactor::get_asynch_pseudo_task (void) { return this->pseudo_task_; } diff --git a/ace/Proactor.cpp b/ace/Proactor.cpp index 5965ca30c38..26107b77277 100644 --- a/ace/Proactor.cpp +++ b/ace/Proactor.cpp @@ -265,10 +265,8 @@ ACE_Proactor::ACE_Proactor (ACE_Proactor_Impl *implementation, ACE_NEW (implementation, ACE_POSIX_SIG_Proactor); #else /* Default is to use the SIG one */ - #if defined(ACE_HAS_POSIX_REALTIME_SIGNALS) ACE_NEW (implementation, ACE_POSIX_SIG_Proactor); - #endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ #endif #elif (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) // WIN_Proactor. diff --git a/ace/Process.cpp b/ace/Process.cpp index 99761069c48..9cc0958c024 100644 --- a/ace/Process.cpp +++ b/ace/Process.cpp @@ -363,12 +363,11 @@ ACE_Process::wait (const ACE_Time_Value &tv, tv.msec ())) { case WAIT_OBJECT_0: + if (status != 0) // The error status of <GetExitCodeProcess> is nonetheless not // tested because we don't know how to return the value. ::GetExitCodeProcess (process_info_.hProcess, - &this->exit_code_); - if (status != 0) - *status = this->exit_code_; + status); return this->getpid (); case WAIT_TIMEOUT: errno = ETIME; @@ -379,16 +378,10 @@ ACE_Process::wait (const ACE_Time_Value &tv, } #else /* ACE_WIN32 */ if (tv == ACE_Time_Value::zero) - { - pid_t retv = - ACE_OS::waitpid (this->child_id_, - &this->exit_code_, - WNOHANG); - if (status != 0) - *status = this->exit_code_; - - return retv; - } + ACE_OSCALL_RETURN (ACE_OS::waitpid (this->child_id_, + status, + WNOHANG), + int, ACE_INVALID_PID); if (tv == ACE_Time_Value::max_time) return this->wait (status); @@ -407,12 +400,7 @@ ACE_Process::wait (const ACE_Time_Value &tv, ACE_Time_Value tmo (tv); // Need one we can change for (ACE_Countdown_Time time_left (&tmo); ; time_left.update ()) { - pid = ACE_OS::waitpid (this->getpid (), - &this->exit_code_, - WNOHANG); - if (status != 0) - *status = this->exit_code_; - + pid = ACE_OS::waitpid (this->getpid (), status, WNOHANG); if (pid > 0 || pid == ACE_INVALID_PID) break; // Got a child or an error - all done diff --git a/ace/Process.h b/ace/Process.h index a28fca18b65..d0c017cd1ff 100644 --- a/ace/Process.h +++ b/ace/Process.h @@ -412,8 +412,6 @@ protected: ACE_TCHAR process_name_[MAXPATHLEN + 1]; }; -//class ACE_Process_Manager; - /** * @class ACE_Process * @@ -430,7 +428,6 @@ protected: class ACE_Export ACE_Process { public: - friend class ACE_Process_Manager; /// Default construction. Must use <ACE_Process::spawn> to start. ACE_Process (void); @@ -514,14 +511,12 @@ public: /// Return 1 if running; 0 otherwise. int running (void) const; - /// Return the Process' exit code. This method returns the raw - /// exit status returned from system APIs (such as <wait> or - /// <waitpid>). This value is system dependent. - ACE_exitcode exit_code (void) const; + /// Return the Process' exit code + int exit_code (void) const; - /// Return the Process' return value. This method returns the - /// actual return value that a child process returns or <exit>s. - int return_value (void) const; + /// Set the Process' exit code (completely unrelated to whether the + /// Process has actually exited)! + void exit_code (int code); /// Close all the handles in the set obtained from the /// @arg ACE_Process_Options::dup_handles object used to spawn @@ -538,18 +533,13 @@ public: #endif /* ACE_WIN32 */ protected: - /// Set this process' <exit_code_>. ACE_Process_Manager uses this - /// method to set the <exit_code_> after successfully waiting for - /// this proecess to exit. - void exit_code (ACE_exitcode code); - #if defined (ACE_WIN32) PROCESS_INFORMATION process_info_; #else /* ACE_WIN32 */ /// Process id of the child. pid_t child_id_; #endif /* ACE_WIN32 */ - ACE_exitcode exit_code_; + int exit_code_; /// Set of handles that were passed to the child process. ACE_Handle_Set handles_passed_; diff --git a/ace/Process.i b/ace/Process.i index df46318b7b1..7e67653df43 100644 --- a/ace/Process.i +++ b/ace/Process.i @@ -35,18 +35,13 @@ ACE_INLINE pid_t ACE_Process::wait (ACE_exitcode *status, int wait_options) { - pid_t retv = - ACE_OS::wait (this->getpid (), - &this->exit_code_, - wait_options + return ACE_OS::wait (this->getpid (), + status, + wait_options #if defined (ACE_WIN32) - , process_info_.hProcess + , process_info_.hProcess #endif /* ACE_WIN32 */ - ); - if (status != 0) - *status = this->exit_code_; - - return retv; + ); } ACE_INLINE int @@ -68,23 +63,13 @@ ACE_Process::terminate (void) } ACE_INLINE int -ACE_Process::return_value (void) const -{ -#if defined (ACE_WIN32) - return this->exit_code_; -#else - return WEXITSTATUS (this->exit_code_); -#endif /* ACE_WIN32 */ -} - -ACE_INLINE ACE_exitcode ACE_Process::exit_code (void) const { return this->exit_code_; } ACE_INLINE void -ACE_Process::exit_code (ACE_exitcode code) +ACE_Process::exit_code (int code) { this->exit_code_ = code; } diff --git a/ace/README b/ace/README index 9fb8ef80d11..eb577f2b485 100644 --- a/ace/README +++ b/ace/README @@ -84,8 +84,6 @@ ACE_WSOCK_VERSION A parameter list indicating "1, 1" is version 1.1). ACE_HAS_AIO_CALLS Platform supports POSIX aio* calls. - Corresponds to _POSIX_ASYNCHRONOUS_IO - constant in <unistd.h>. ACE_HAS_ALT_CUSERID Use ACE's alternate cuserid() implementation since a system cuserid() may not exist, or it @@ -431,19 +429,11 @@ ACE_HAS_POLL Platform contains <poll.h> ACE_HAS_POSITION_INDEPENDENT_POINTERS Platform supports "position-independent" features provided by ACE_Based_Pointer<>. -ACE_HAS_POSIX_MESSAGE_PASSING Platform supports POSIX message queues. - Corresponds to _POSIX_MESSAGE_PASSING - constant in <unistd.h>. ACE_HAS_POSIX_NONBLOCK Platform supports POSIX O_NONBLOCK semantics -ACE_HAS_POSIX_REALTIME_SIGNALS Platform supports POSIX RT signals. - Corresponds to _POSIX_REALTIME_SIGNALS - constant in <unistd.h>. ACE_HAS_POSIX_SEM Platform supports POSIX real-time semaphores (e.g., - VxWorks and Solaris). Corresponds - to _POSIX_SEMAPHORES constant - in <unistd.h> + VxWorks and Solaris) ACE_HAS_POSIX_TIME Platform supports the POSIX struct timespec type ACE_HAS_PROC_FS Platform supports the /proc diff --git a/ace/RMCast/Makefile b/ace/RMCast/Makefile index 7d354fabd57..3ace09b2bf7 100644 --- a/ace/RMCast/Makefile +++ b/ace/RMCast/Makefile @@ -60,8 +60,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/RMCast.o .obj/RMCast.so .shobj/RMCast.o .shobj/RMCast.so: RMCast.cpp RMCast.h \ - $(ACE_ROOT)/ace/pre.h \ +.obj/RMCast.o .obj/RMCast.so .shobj/RMCast.o .shobj/RMCast.so: RMCast.cpp RMCast.h $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -87,13 +86,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i .obj/RMCast_Ack_Worker.o .obj/RMCast_Ack_Worker.so .shobj/RMCast_Ack_Worker.o .shobj/RMCast_Ack_Worker.so: RMCast_Ack_Worker.cpp RMCast_Ack_Worker.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Retransmission.h RMCast_Module.h RMCast.h \ - $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/pre.h RMCast_Retransmission.h \ + RMCast_Module.h RMCast.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -118,9 +115,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module.i RMCast_Copy_On_Write.h \ - RMCast_Worker.h RMCast_Worker.i RMCast_Worker.cpp \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module.i RMCast_Copy_On_Write.h RMCast_Worker.h \ + RMCast_Worker.i RMCast_Worker.cpp \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -135,9 +132,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - RMCast_Copy_On_Write.i RMCast_Copy_On_Write.cpp \ - $(ACE_ROOT)/ace/RB_Tree.h \ + $(ACE_ROOT)/ace/Log_Priority.h RMCast_Copy_On_Write.i \ + RMCast_Copy_On_Write.cpp $(ACE_ROOT)/ace/RB_Tree.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -193,17 +189,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - RMCast_Retransmission.i RMCast_Ack_Worker.i \ - $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/SString.i RMCast_Retransmission.i \ + RMCast_Ack_Worker.i $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp .obj/RMCast_Fork.o .obj/RMCast_Fork.so .shobj/RMCast_Fork.o .shobj/RMCast_Fork.so: RMCast_Fork.cpp RMCast_Fork.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Module.h RMCast.h \ + $(ACE_ROOT)/ace/pre.h RMCast_Module.h RMCast.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -229,12 +223,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module.i RMCast_Fork.i + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module.i RMCast_Fork.i .obj/RMCast_Fragment.o .obj/RMCast_Fragment.so .shobj/RMCast_Fragment.o .shobj/RMCast_Fragment.so: RMCast_Fragment.cpp RMCast_Fragment.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Module.h RMCast.h \ + $(ACE_ROOT)/ace/pre.h RMCast_Module.h RMCast.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -260,9 +253,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module.i \ - $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module.i $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ @@ -276,8 +268,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - RMCast_Fragment.i \ + $(ACE_ROOT)/ace/Log_Priority.h RMCast_Fragment.i \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ @@ -285,8 +276,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Message_Block_T.cpp .obj/RMCast_IO_UDP.o .obj/RMCast_IO_UDP.so .shobj/RMCast_IO_UDP.o .shobj/RMCast_IO_UDP.so: RMCast_IO_UDP.cpp RMCast_IO_UDP.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Module.h RMCast.h \ + $(ACE_ROOT)/ace/pre.h RMCast_Module.h RMCast.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -312,9 +302,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module.i $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ $(ACE_ROOT)/ace/SOCK_Dgram.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/Addr.h \ @@ -424,9 +413,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - RMCast_IO_UDP.i RMCast_UDP_Proxy.h RMCast_Proxy.h RMCast_Proxy.i \ - RMCast_UDP_Proxy.i RMCast_Module_Factory.h RMCast_Module_Factory.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h RMCast_IO_UDP.i \ + RMCast_UDP_Proxy.h RMCast_Proxy.h RMCast_Proxy.i RMCast_UDP_Proxy.i \ + RMCast_Module_Factory.h RMCast_Module_Factory.i \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ @@ -434,8 +423,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Message_Block_T.cpp .obj/RMCast_Membership.o .obj/RMCast_Membership.so .shobj/RMCast_Membership.o .shobj/RMCast_Membership.so: RMCast_Membership.cpp RMCast_Membership.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Module.h RMCast.h \ + $(ACE_ROOT)/ace/pre.h RMCast_Module.h RMCast.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -461,9 +449,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module.i \ - $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module.i $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Node.h \ @@ -494,8 +481,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - RMCast_Membership.i RMCast_Proxy.h RMCast_Proxy.i + $(ACE_ROOT)/ace/Synch_T.cpp RMCast_Membership.i \ + RMCast_Proxy.h RMCast_Proxy.i .obj/RMCast_Module.o .obj/RMCast_Module.so .shobj/RMCast_Module.o .shobj/RMCast_Module.so: RMCast_Module.cpp RMCast_Module.h \ $(ACE_ROOT)/ace/pre.h RMCast.h \ @@ -524,12 +511,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module.i + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module.i .obj/RMCast_Module_Factory.o .obj/RMCast_Module_Factory.so .shobj/RMCast_Module_Factory.o .shobj/RMCast_Module_Factory.so: RMCast_Module_Factory.cpp \ - RMCast_Module_Factory.h \ - $(ACE_ROOT)/ace/pre.h RMCast.h \ + RMCast_Module_Factory.h $(ACE_ROOT)/ace/pre.h RMCast.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -555,13 +541,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module_Factory.i + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module_Factory.i .obj/RMCast_Partial_Message.o .obj/RMCast_Partial_Message.so .shobj/RMCast_Partial_Message.o .shobj/RMCast_Partial_Message.so: RMCast_Partial_Message.cpp \ - RMCast_Partial_Message.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Export.h \ + RMCast_Partial_Message.h $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -606,9 +590,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -687,8 +668,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU RMCast_Partial_Message.i .obj/RMCast_Proxy.o .obj/RMCast_Proxy.so .shobj/RMCast_Proxy.o .shobj/RMCast_Proxy.so: RMCast_Proxy.cpp RMCast_Proxy.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Module.h RMCast.h \ + $(ACE_ROOT)/ace/pre.h RMCast_Module.h RMCast.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -714,12 +694,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module.i RMCast_Proxy.i + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module.i RMCast_Proxy.i .obj/RMCast_Reassembly.o .obj/RMCast_Reassembly.so .shobj/RMCast_Reassembly.o .shobj/RMCast_Reassembly.so: RMCast_Reassembly.cpp RMCast_Reassembly.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Module.h RMCast.h \ + $(ACE_ROOT)/ace/pre.h RMCast_Module.h RMCast.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -745,9 +724,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module.i $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -845,13 +823,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - RMCast_Reassembly.i RMCast_Partial_Message.h \ - $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Reactor_Impl.h RMCast_Reassembly.i \ + RMCast_Partial_Message.h $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -899,10 +873,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU RMCast_Partial_Message.i .obj/RMCast_Receiver_Module.o .obj/RMCast_Receiver_Module.so .shobj/RMCast_Receiver_Module.o .shobj/RMCast_Receiver_Module.so: RMCast_Receiver_Module.cpp \ - RMCast_Receiver_Module.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Module.h RMCast.h \ - $(ACE_ROOT)/ace/OS.h \ + RMCast_Receiver_Module.h $(ACE_ROOT)/ace/pre.h \ + RMCast_Module.h RMCast.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -927,19 +899,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module.i RMCast_Receiver_Module.i \ - RMCast_Proxy.h RMCast_Proxy.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module.i RMCast_Receiver_Module.i RMCast_Proxy.h \ + RMCast_Proxy.i $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl .obj/RMCast_Reliable_Factory.o .obj/RMCast_Reliable_Factory.so .shobj/RMCast_Reliable_Factory.o .shobj/RMCast_Reliable_Factory.so: RMCast_Reliable_Factory.cpp \ - RMCast_Reliable_Factory.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Module_Factory.h RMCast.h \ - $(ACE_ROOT)/ace/OS.h \ + RMCast_Reliable_Factory.h $(ACE_ROOT)/ace/pre.h \ + RMCast_Module_Factory.h RMCast.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -964,10 +933,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module_Factory.i \ - RMCast_Reliable_Factory.i RMCast_Receiver_Module.h RMCast_Module.h \ - RMCast_Module.i RMCast_Receiver_Module.i RMCast_Reassembly.h \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module_Factory.i RMCast_Reliable_Factory.i \ + RMCast_Receiver_Module.h RMCast_Module.h RMCast_Module.i \ + RMCast_Receiver_Module.i RMCast_Reassembly.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -1066,16 +1035,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - RMCast_Reassembly.i RMCast_Reordering.h \ - $(ACE_ROOT)/ace/RB_Tree.h \ + $(ACE_ROOT)/ace/Reactor_Impl.h RMCast_Reassembly.i \ + RMCast_Reordering.h $(ACE_ROOT)/ace/RB_Tree.h \ $(ACE_ROOT)/ace/RB_Tree.i \ - $(ACE_ROOT)/ace/RB_Tree.cpp \ - RMCast_Reordering.i + $(ACE_ROOT)/ace/RB_Tree.cpp RMCast_Reordering.i .obj/RMCast_Reordering.o .obj/RMCast_Reordering.so .shobj/RMCast_Reordering.o .shobj/RMCast_Reordering.so: RMCast_Reordering.cpp RMCast_Reordering.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Module.h RMCast.h \ + $(ACE_ROOT)/ace/pre.h RMCast_Module.h RMCast.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -1101,9 +1067,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module.i \ - $(ACE_ROOT)/ace/RB_Tree.h \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module.i $(ACE_ROOT)/ace/RB_Tree.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -1174,8 +1139,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - RMCast_Reordering.i RMCast_Proxy.h RMCast_Proxy.i \ + $(ACE_ROOT)/ace/SString.i RMCast_Reordering.i \ + RMCast_Proxy.h RMCast_Proxy.i \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ @@ -1183,9 +1148,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Message_Block_T.cpp .obj/RMCast_Resend_Handler.o .obj/RMCast_Resend_Handler.so .shobj/RMCast_Resend_Handler.o .shobj/RMCast_Resend_Handler.so: RMCast_Resend_Handler.cpp \ - RMCast_Resend_Handler.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Export.h \ + RMCast_Resend_Handler.h $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1231,9 +1194,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - RMCast_Copy_On_Write.i RMCast_Copy_On_Write.cpp \ - $(ACE_ROOT)/ace/RB_Tree.h \ + $(ACE_ROOT)/ace/Log_Priority.h RMCast_Copy_On_Write.i \ + RMCast_Copy_On_Write.cpp $(ACE_ROOT)/ace/RB_Tree.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -1287,12 +1249,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - RMCast_Retransmission.i + $(ACE_ROOT)/ace/SString.i RMCast_Retransmission.i .obj/RMCast_Resend_Worker.o .obj/RMCast_Resend_Worker.so .shobj/RMCast_Resend_Worker.o .shobj/RMCast_Resend_Worker.so: RMCast_Resend_Worker.cpp \ - RMCast_Resend_Worker.h \ - $(ACE_ROOT)/ace/pre.h RMCast.h \ + RMCast_Resend_Worker.h $(ACE_ROOT)/ace/pre.h RMCast.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -1318,10 +1278,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Copy_On_Write.h RMCast_Worker.h \ - RMCast_Worker.i RMCast_Worker.cpp \ - $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Copy_On_Write.h RMCast_Worker.h RMCast_Worker.i \ + RMCast_Worker.cpp $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ @@ -1335,15 +1294,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - RMCast_Copy_On_Write.i RMCast_Copy_On_Write.cpp \ - RMCast_Resend_Worker.i RMCast_Module.h RMCast_Module.i + $(ACE_ROOT)/ace/Log_Priority.h RMCast_Copy_On_Write.i \ + RMCast_Copy_On_Write.cpp RMCast_Resend_Worker.i RMCast_Module.h \ + RMCast_Module.i .obj/RMCast_Retransmission.o .obj/RMCast_Retransmission.so .shobj/RMCast_Retransmission.o .shobj/RMCast_Retransmission.so: RMCast_Retransmission.cpp \ - RMCast_Retransmission.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Module.h RMCast.h \ - $(ACE_ROOT)/ace/OS.h \ + RMCast_Retransmission.h $(ACE_ROOT)/ace/pre.h \ + RMCast_Module.h RMCast.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1368,9 +1325,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module.i RMCast_Copy_On_Write.h \ - RMCast_Worker.h RMCast_Worker.i RMCast_Worker.cpp \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module.i RMCast_Copy_On_Write.h RMCast_Worker.h \ + RMCast_Worker.i RMCast_Worker.cpp \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -1385,9 +1342,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - RMCast_Copy_On_Write.i RMCast_Copy_On_Write.cpp \ - $(ACE_ROOT)/ace/RB_Tree.h \ + $(ACE_ROOT)/ace/Log_Priority.h RMCast_Copy_On_Write.i \ + RMCast_Copy_On_Write.cpp $(ACE_ROOT)/ace/RB_Tree.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -1443,10 +1399,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - RMCast_Retransmission.i RMCast_Proxy.h RMCast_Proxy.i \ - RMCast_Ack_Worker.h RMCast_Ack_Worker.i RMCast_Resend_Worker.h \ - RMCast_Resend_Worker.i \ + $(ACE_ROOT)/ace/SString.i RMCast_Retransmission.i \ + RMCast_Proxy.h RMCast_Proxy.i RMCast_Ack_Worker.h RMCast_Ack_Worker.i \ + RMCast_Resend_Worker.h RMCast_Resend_Worker.i \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ @@ -1454,8 +1409,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Message_Block_T.cpp .obj/RMCast_Sequencer.o .obj/RMCast_Sequencer.so .shobj/RMCast_Sequencer.o .shobj/RMCast_Sequencer.so: RMCast_Sequencer.cpp RMCast_Sequencer.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Module.h RMCast.h \ + $(ACE_ROOT)/ace/pre.h RMCast_Module.h RMCast.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -1481,9 +1435,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module.i \ - $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module.i $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ @@ -1497,14 +1450,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - RMCast_Sequencer.i + $(ACE_ROOT)/ace/Log_Priority.h RMCast_Sequencer.i .obj/RMCast_Singleton_Factory.o .obj/RMCast_Singleton_Factory.so .shobj/RMCast_Singleton_Factory.o .shobj/RMCast_Singleton_Factory.so: RMCast_Singleton_Factory.cpp \ - RMCast_Singleton_Factory.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Module_Factory.h RMCast.h \ - $(ACE_ROOT)/ace/OS.h \ + RMCast_Singleton_Factory.h $(ACE_ROOT)/ace/pre.h \ + RMCast_Module_Factory.h RMCast.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1529,14 +1479,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module_Factory.i \ - RMCast_Singleton_Factory.i + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module_Factory.i RMCast_Singleton_Factory.i .obj/RMCast_UDP_Event_Handler.o .obj/RMCast_UDP_Event_Handler.so .shobj/RMCast_UDP_Event_Handler.o .shobj/RMCast_UDP_Event_Handler.so: RMCast_UDP_Event_Handler.cpp \ - RMCast_UDP_Event_Handler.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Export.h \ + RMCast_UDP_Event_Handler.h $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1675,14 +1622,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - RMCast_IO_UDP.i RMCast_UDP_Proxy.h RMCast_Proxy.h RMCast_Proxy.i \ - RMCast_UDP_Proxy.i RMCast_Module_Factory.h RMCast_Module_Factory.i + $(ACE_ROOT)/ace/Reactor_Impl.h RMCast_IO_UDP.i \ + RMCast_UDP_Proxy.h RMCast_Proxy.h RMCast_Proxy.i RMCast_UDP_Proxy.i \ + RMCast_Module_Factory.h RMCast_Module_Factory.i .obj/RMCast_UDP_Proxy.o .obj/RMCast_UDP_Proxy.so .shobj/RMCast_UDP_Proxy.o .shobj/RMCast_UDP_Proxy.so: RMCast_UDP_Proxy.cpp RMCast_UDP_Proxy.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Proxy.h RMCast_Module.h RMCast.h \ - $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/pre.h RMCast_Proxy.h RMCast_Module.h \ + RMCast.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1707,16 +1653,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module.i RMCast_Proxy.i \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module.i RMCast_Proxy.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - RMCast_UDP_Proxy.i RMCast_IO_UDP.h \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/INET_Addr.i RMCast_UDP_Proxy.i \ + RMCast_IO_UDP.h $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ $(ACE_ROOT)/ace/SOCK_Dgram.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/IPC_SAP.h \ @@ -1820,8 +1765,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - RMCast_IO_UDP.i RMCast_Module_Factory.h RMCast_Module_Factory.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h RMCast_IO_UDP.i \ + RMCast_Module_Factory.h RMCast_Module_Factory.i \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ @@ -1829,8 +1774,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Message_Block_T.cpp .obj/RMCast_UDP_Reliable_Receiver.o .obj/RMCast_UDP_Reliable_Receiver.so .shobj/RMCast_UDP_Reliable_Receiver.o .shobj/RMCast_UDP_Reliable_Receiver.so: RMCast_UDP_Reliable_Receiver.cpp \ - RMCast_UDP_Reliable_Receiver.h \ - $(ACE_ROOT)/ace/pre.h \ + RMCast_UDP_Reliable_Receiver.h $(ACE_ROOT)/ace/pre.h \ RMCast_Singleton_Factory.h RMCast_Module_Factory.h RMCast.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ @@ -1857,11 +1801,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module_Factory.i \ - RMCast_Singleton_Factory.i RMCast_Reliable_Factory.h \ - RMCast_Reliable_Factory.i RMCast_IO_UDP.h RMCast_Module.h \ - RMCast_Module.i \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module_Factory.i RMCast_Singleton_Factory.i \ + RMCast_Reliable_Factory.h RMCast_Reliable_Factory.i RMCast_IO_UDP.h \ + RMCast_Module.h RMCast_Module.i \ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ $(ACE_ROOT)/ace/SOCK_Dgram.h \ $(ACE_ROOT)/ace/SOCK.h \ @@ -1972,14 +1915,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - RMCast_IO_UDP.i RMCast_UDP_Proxy.h RMCast_Proxy.h RMCast_Proxy.i \ - RMCast_UDP_Proxy.i RMCast_UDP_Reliable_Receiver.i \ - RMCast_UDP_Event_Handler.h RMCast_UDP_Event_Handler.i + $(ACE_ROOT)/ace/Reactor_Impl.h RMCast_IO_UDP.i \ + RMCast_UDP_Proxy.h RMCast_Proxy.h RMCast_Proxy.i RMCast_UDP_Proxy.i \ + RMCast_UDP_Reliable_Receiver.i RMCast_UDP_Event_Handler.h \ + RMCast_UDP_Event_Handler.i .obj/RMCast_UDP_Reliable_Sender.o .obj/RMCast_UDP_Reliable_Sender.so .shobj/RMCast_UDP_Reliable_Sender.o .shobj/RMCast_UDP_Reliable_Sender.so: RMCast_UDP_Reliable_Sender.cpp \ - RMCast_UDP_Reliable_Sender.h \ - $(ACE_ROOT)/ace/pre.h \ + RMCast_UDP_Reliable_Sender.h $(ACE_ROOT)/ace/pre.h \ RMCast_Singleton_Factory.h RMCast_Module_Factory.h RMCast.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ @@ -2006,10 +1948,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module_Factory.i \ - RMCast_Singleton_Factory.i RMCast_IO_UDP.h RMCast_Module.h \ - RMCast_Module.i \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module_Factory.i RMCast_Singleton_Factory.i RMCast_IO_UDP.h \ + RMCast_Module.h RMCast_Module.i \ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ $(ACE_ROOT)/ace/SOCK_Dgram.h \ $(ACE_ROOT)/ace/SOCK.h \ @@ -2120,26 +2061,24 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - RMCast_IO_UDP.i RMCast_UDP_Proxy.h RMCast_Proxy.h RMCast_Proxy.i \ - RMCast_UDP_Proxy.i RMCast_Sequencer.h RMCast_Sequencer.i \ - RMCast_Retransmission.h RMCast_Copy_On_Write.h RMCast_Worker.h \ - RMCast_Worker.i RMCast_Worker.cpp RMCast_Copy_On_Write.i \ - RMCast_Copy_On_Write.cpp \ + $(ACE_ROOT)/ace/Reactor_Impl.h RMCast_IO_UDP.i \ + RMCast_UDP_Proxy.h RMCast_Proxy.h RMCast_Proxy.i RMCast_UDP_Proxy.i \ + RMCast_Sequencer.h RMCast_Sequencer.i RMCast_Retransmission.h \ + RMCast_Copy_On_Write.h RMCast_Worker.h RMCast_Worker.i \ + RMCast_Worker.cpp RMCast_Copy_On_Write.i RMCast_Copy_On_Write.cpp \ $(ACE_ROOT)/ace/RB_Tree.h \ $(ACE_ROOT)/ace/RB_Tree.i \ - $(ACE_ROOT)/ace/RB_Tree.cpp \ - RMCast_Retransmission.i RMCast_Membership.h \ - $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/RB_Tree.cpp RMCast_Retransmission.i \ + RMCast_Membership.h $(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 \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - RMCast_Membership.i RMCast_Fragment.h RMCast_Fragment.i RMCast_Fork.h \ - RMCast_Fork.i RMCast_UDP_Reliable_Sender.i RMCast_UDP_Event_Handler.h \ + $(ACE_ROOT)/ace/Containers_T.cpp RMCast_Membership.i \ + RMCast_Fragment.h RMCast_Fragment.i RMCast_Fork.h RMCast_Fork.i \ + RMCast_UDP_Reliable_Sender.i RMCast_UDP_Event_Handler.h \ RMCast_UDP_Event_Handler.i RMCast_Resend_Handler.h \ RMCast_Resend_Handler.i diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp index d9814ed508b..9fe44b094a3 100644 --- a/ace/SOCK_Dgram.cpp +++ b/ace/SOCK_Dgram.cpp @@ -27,7 +27,7 @@ ACE_SOCK_Dgram::dump (void) const // returns the number of bytes read. ssize_t -ACE_SOCK_Dgram::recv (iovec *io_vec, +ACE_SOCK_Dgram::recv (iovec io_vec[], ACE_Addr &addr, int flags, const ACE_Time_Value *timeout) const diff --git a/ace/SOCK_Dgram_Mcast.cpp b/ace/SOCK_Dgram_Mcast.cpp index 528e0aa1e09..c2378a87aa6 100644 --- a/ace/SOCK_Dgram_Mcast.cpp +++ b/ace/SOCK_Dgram_Mcast.cpp @@ -29,9 +29,12 @@ public: size_t len, int clip_portnum) // clip port# info? { + // Text displayed in case of conversion error. + static const ACE_TCHAR *cvt_err_string = ACE_LIB_TEXT ("<?>"); + if (ip_addr.addr_to_string (ret_string, len, 1) == -1) { - ACE_OS_String::strcpy (ret_string, ACE_LIB_TEXT ("<?>")); + ACE_OS_String::strcpy (ret_string, cvt_err_string); } else { @@ -162,13 +165,19 @@ ACE_SOCK_Dgram_Mcast::open_i (const ACE_INET_Addr &mcast_addr, int reuse_addr) { ACE_TRACE ("ACE_SOCK_Dgram_Mcast::open_i"); - // ACE_SOCK::open calls this if reuse_addr is set, so we only need to - // process port reuse option. + // ACE_SOCK::open calls this if reuse_addr is set, so we only need to + // add the port + // Process addr/port reuse option. if (reuse_addr) { -#if defined (SO_REUSEPORT) int one = 1; if (this->ACE_SOCK::set_option (SOL_SOCKET, + SO_REUSEADDR, + &one, + sizeof one) == -1) + return -1; +#if defined (SO_REUSEPORT) + if (this->ACE_SOCK::set_option (SOL_SOCKET, SO_REUSEPORT, &one, sizeof one) == -1) diff --git a/ace/SOCK_Dgram_Mcast.h b/ace/SOCK_Dgram_Mcast.h index e9e3970a800..5057ac1beb9 100644 --- a/ace/SOCK_Dgram_Mcast.h +++ b/ace/SOCK_Dgram_Mcast.h @@ -117,26 +117,20 @@ public: // - The address (and port#) passed to <open> (or the first <subscribe>, if // <open> is not explicitly invoked) is the one that is bound. // - /// Disable address bind. (Bind only port.) - // Note that this might seem odd, but we need a way to distinquish between - // default behavior, which might or might not be to bind, and explicitely - // choosing to bind or not to bind--which "is the question." ;-) - OPT_BINDADDR_NO = 0, /// Enable address bind. (Bind port and address.) OPT_BINDADDR_YES = 1, /// Default value for BINDADDR option. (Environment-dependent.) -#if defined (ACE_LACKS_PERFECT_MULTICAST_FILTERING) \ - && (ACE_LACKS_PERFECT_MULTICAST_FILTERING == 1) - // Platforms that don't support perfect filtering. Note that perfect - // filtering only really applies to multicast traffic, not unicast - // or broadcast. +#ifdef linux + // (Bring forward ad-hoc legacy hack: enable if 'linux' macro is defined) DEFOPT_BINDADDR = OPT_BINDADDR_YES, -# else +#elif defined (ACE_WIN32) // At least some Win32 OS's can not bind mcast addr, so disable it. + DEFOPT_BINDADDR = 0, +#else // !linux && !WIN32 // General-purpose default behavior is 'disabled', since effect is // environment-specific and side-effects might be surprising. - DEFOPT_BINDADDR = OPT_BINDADDR_NO, -#endif /* ACE_LACKS_PERFECT_MULTICAST_FILTERING = 1) */ + DEFOPT_BINDADDR = 0, +#endif // /// Define the interpretation of 'NULL' as a recv interface specification. // If the interface part of a multicast address specification is NULL, it @@ -152,11 +146,6 @@ public: // - This applies only to receives, not sends (which always use only one // interface; NULL means use the "system default" interface). // Supported values: - /// If (net_if==NULL), use default interface. - // Note that this might seem odd, but we need a way to distinquish between - // default behavior, which might or might not be to bind, and explicitely - // choosing to bind or not to bind--which "is the question." ;-) - OPT_NULLIFACE_ONE = 0, /// If (net_if==NULL), use all mcast interfaces. OPT_NULLIFACE_ALL = 2, /// Default value for NULLIFACE option. (Environment-dependent.) @@ -167,10 +156,11 @@ public: DEFOPT_NULLIFACE = OPT_NULLIFACE_ALL, #else // General-purpose default behavior (as per legacy behavior). - DEFOPT_NULLIFACE = OPT_NULLIFACE_ONE, + DEFOPT_NULLIFACE = 0, #endif /* ACE_WIN32 */ /// All default options. DEFOPTS = DEFOPT_BINDADDR | DEFOPT_NULLIFACE + }; // = Initialization routines. @@ -328,9 +318,7 @@ public: * or <IP_MULTICAST_TTL>. This is just a more concise, nice interface to a * subset of possible <ACE_SOCK::set_option> calls, but only works for * IPPROTO_IP or IPPROTO_IPV6 level options. Use <ACE_SOCK::set_option> - * directly to set anything else. - * \deprecated { This method has been deprecated since it cannot be used - * easily with with IPv6 options.} + * directly to set anything else. * Returns 0 on success, -1 on failure. */ int set_option (int option, diff --git a/ace/SSL/Makefile b/ace/SSL/Makefile index 2d8b6ffb780..571b2a475e8 100644 --- a/ace/SSL/Makefile +++ b/ace/SSL/Makefile @@ -207,9 +207,8 @@ endif # ssl $(ACE_ROOT)/ace/pre.h SSL_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - SSL_SOCK_Stream.h SSL_SOCK.h \ - $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/ace_wchar.inl SSL_SOCK_Stream.h \ + SSL_SOCK.h $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ @@ -239,8 +238,7 @@ endif # ssl $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i SSL_SOCK.i \ - SSL_Context.h \ + $(ACE_ROOT)/ace/SOCK.i SSL_SOCK.i SSL_Context.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -316,18 +314,15 @@ endif # ssl $(ACE_ROOT)/ace/Framework_Component_T.h \ $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - SSL_Context.inl \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ + SSL_Context.inl $(ACE_ROOT)/ace/SOCK_Stream.h \ $(ACE_ROOT)/ace/SOCK_IO.h \ $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - SSL_SOCK_Stream.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i SSL_SOCK_Stream.i \ $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/OS_QoS.h \ - SSL_SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/OS_QoS.h SSL_SOCK_Acceptor.i \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/Handle_Set.i @@ -335,9 +330,8 @@ endif # ssl $(ACE_ROOT)/ace/pre.h SSL_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - SSL_SOCK_Stream.h SSL_SOCK.h \ - $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/ace_wchar.inl SSL_SOCK_Stream.h \ + SSL_SOCK.h $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ @@ -367,8 +361,7 @@ endif # ssl $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i SSL_SOCK.i \ - SSL_Context.h \ + $(ACE_ROOT)/ace/SOCK.i SSL_SOCK.i SSL_Context.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -444,18 +437,15 @@ endif # ssl $(ACE_ROOT)/ace/Framework_Component_T.h \ $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - SSL_Context.inl \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ + SSL_Context.inl $(ACE_ROOT)/ace/SOCK_Stream.h \ $(ACE_ROOT)/ace/SOCK_IO.h \ $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - SSL_SOCK_Stream.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i SSL_SOCK_Stream.i \ $(ACE_ROOT)/ace/SOCK_Connector.h \ $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/OS_QoS.h \ - SSL_SOCK_Connector.i \ + $(ACE_ROOT)/ace/OS_QoS.h SSL_SOCK_Connector.i \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/Handle_Set.i @@ -501,8 +491,7 @@ endif # ssl $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i SSL_SOCK.i \ - SSL_Context.h \ + $(ACE_ROOT)/ace/SOCK.i SSL_SOCK.i SSL_Context.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -574,18 +563,15 @@ endif # ssl $(ACE_ROOT)/ace/Framework_Component_T.h \ $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - SSL_Context.inl \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ + SSL_Context.inl $(ACE_ROOT)/ace/SOCK_Stream.h \ $(ACE_ROOT)/ace/SOCK_IO.h \ $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - SSL_SOCK_Stream.i + $(ACE_ROOT)/ace/SOCK_Stream.i SSL_SOCK_Stream.i .obj/SSL_Asynch_Stream.o .obj/SSL_Asynch_Stream.so .shobj/SSL_Asynch_Stream.o .shobj/SSL_Asynch_Stream.so: SSL_Asynch_Stream.cpp SSL_Asynch_Stream.h \ - $(ACE_ROOT)/ace/pre.h \ - SSL_Context.h SSL_Export.h \ + $(ACE_ROOT)/ace/pre.h SSL_Context.h SSL_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -689,16 +675,14 @@ endif # ssl $(ACE_ROOT)/ace/Framework_Component_T.h \ $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - SSL_Context.inl \ - $(ACE_ROOT)/ace/Asynch_IO_Impl.h \ + SSL_Context.inl $(ACE_ROOT)/ace/Asynch_IO_Impl.h \ $(ACE_ROOT)/ace/Asynch_IO.h \ $(ACE_ROOT)/ace/Asynch_IO_Impl.i \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - SSL_Asynch_BIO.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp SSL_Asynch_BIO.h \ $(ACE_ROOT)/ace/POSIX_Proactor.h \ $(ACE_ROOT)/ace/Proactor_Impl.h \ $(ACE_ROOT)/ace/Reactor.h \ @@ -748,9 +732,6 @@ endif # ssl $(ACE_ROOT)/ace/Select_Reactor_T.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -785,15 +766,16 @@ endif # ssl $(ACE_ROOT)/ace/Timer_Wheel.h \ $(ACE_ROOT)/ace/Timer_Wheel_T.h \ $(ACE_ROOT)/ace/Timer_Wheel_T.cpp \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i \ $(ACE_ROOT)/ace/Proactor.i .obj/SSL_Asynch_BIO.o .obj/SSL_Asynch_BIO.so .shobj/SSL_Asynch_BIO.o .shobj/SSL_Asynch_BIO.so: SSL_Asynch_BIO.cpp SSL_Asynch_BIO.h \ $(ACE_ROOT)/ace/pre.h SSL_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - SSL_Asynch_Stream.h SSL_Context.h \ - $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/ace_wchar.inl SSL_Asynch_Stream.h \ + SSL_Context.h $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ @@ -893,8 +875,7 @@ endif # ssl $(ACE_ROOT)/ace/Framework_Component_T.h \ $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - SSL_Context.inl \ - $(ACE_ROOT)/ace/Asynch_IO_Impl.h \ + SSL_Context.inl $(ACE_ROOT)/ace/Asynch_IO_Impl.h \ $(ACE_ROOT)/ace/Asynch_IO.h \ $(ACE_ROOT)/ace/Asynch_IO_Impl.i \ $(ACE_ROOT)/ace/Message_Block.h \ diff --git a/ace/SUN_Proactor.cpp b/ace/SUN_Proactor.cpp index b3d374d1f12..ffeee0fcc9c 100644 --- a/ace/SUN_Proactor.cpp +++ b/ace/SUN_Proactor.cpp @@ -38,13 +38,13 @@ ACE_SUN_Proactor::handle_events (ACE_Time_Value &wait_time) { // Decrement <wait_time> with the amount of time spent in the method ACE_Countdown_Time countdown (&wait_time); - return this->handle_events_i (&wait_time); + return this->handle_events (wait_time.msec ()); } int ACE_SUN_Proactor::handle_events (void) { - return this->handle_events_i (0); + return this->handle_events (ACE_INFINITE); } int ACE_SUN_Proactor::wait_for_start (ACE_Time_Value * abstime) @@ -53,10 +53,10 @@ int ACE_SUN_Proactor::wait_for_start (ACE_Time_Value * abstime) ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, mutex_, -1)); - if (this->num_started_aio_ != 0) // double check + if (num_started_aio_ != 0) // double check return 0; - return this->condition_.wait (abstime); + return condition_.wait (abstime) ; #else @@ -66,31 +66,33 @@ int ACE_SUN_Proactor::wait_for_start (ACE_Time_Value * abstime) } int -ACE_SUN_Proactor::handle_events_i (ACE_Time_Value *delta) +ACE_SUN_Proactor::handle_events (u_long milli_seconds) { int retval = 0; aio_result_t *result = 0; - if (0 == delta) + if (milli_seconds == ACE_INFINITE) { - if (this->num_started_aio_ == 0) - this->wait_for_start (0); + if (num_started_aio_ == 0) + wait_for_start (0); result = aiowait (0); } else { - if (this->num_started_aio_ == 0) + struct timeval timeout; + timeout.tv_sec = milli_seconds / 1000; + timeout.tv_usec = (milli_seconds - (timeout.tv_sec * 1000)) * 1000; + + if (num_started_aio_ == 0) { - // Decrement delta with the amount of time spent waiting - ACE_Countdown_Time countdown (delta); - ACE_Time_Value tv (*delta); + ACE_Time_Value tv (timeout); + tv += ACE_OS::gettimeofday (); - if (this->wait_for_start (&tv) == -1) - return -1; + + wait_for_start (&tv); } - struct timeval delta_tv = *delta; - result = aiowait (&delta_tv); + result = aiowait (&timeout); } if (result == 0) @@ -118,21 +120,22 @@ ACE_SUN_Proactor::handle_events_i (ACE_Time_Value *delta) else { int error_status = 0; - size_t transfer_count = 0; + int return_status = 0; ACE_POSIX_Asynch_Result *asynch_result = find_completed_aio (result, error_status, - transfer_count); + return_status); if (asynch_result != 0) { // Call the application code. this->application_specific_code (asynch_result, - transfer_count, - 0, // No completion key. - error_status); // Error - retval++; + return_status, // Bytes transferred. + 0, // No completion key. + error_status); // Error + retval ++ ; + } } @@ -146,12 +149,12 @@ ACE_SUN_Proactor::handle_events_i (ACE_Time_Value *delta) int ACE_SUN_Proactor::get_result_status (ACE_POSIX_Asynch_Result* asynch_result, int &error_status, - size_t &transfer_count) + int &return_status) { // Get the error status of the aio_ operation. error_status = asynch_result->aio_resultp.aio_errno; - ssize_t op_return = asynch_result->aio_resultp.aio_return; + return_status = asynch_result->aio_resultp.aio_return; // ****** from Sun man pages ********************* // Upon completion of the operation both aio_return and aio_errno @@ -160,13 +163,27 @@ ACE_SUN_Proactor::get_result_status (ACE_POSIX_Asynch_Result* asynch_result, // so the client may detect a change in state // by initializing aio_return to this value. - if (error_status == EINPROGRESS || op_return == AIO_INPROGRESS) - return 0; // not completed + if (return_status == AIO_INPROGRESS || error_status == EINPROGRESS) + { + return_status = 0; + return 0; // not completed + } + + if (error_status == -1) // should never be + ACE_ERROR ((LM_ERROR, + "%N:%l:(%P | %t)::%p\n", + "ACE_SUN_Proactor::get_result_status:" + "<aio_errno> has failed\n")); - if (op_return < 0) - transfer_count = 0; // zero bytes transferred - else - transfer_count = ACE_static_cast (size_t, op_return); + if (return_status < 0) + { + return_status = 0; // zero bytes transferred + if (error_status == 0) // nonsense + ACE_ERROR ((LM_ERROR, + "%N:%l:(%P | %t)::%p\n", + "ACE_SUN_Proactor::get_result_status:" + "<aio_return> failed\n")); + } return 1; // completed } @@ -174,18 +191,18 @@ ACE_SUN_Proactor::get_result_status (ACE_POSIX_Asynch_Result* asynch_result, ACE_POSIX_Asynch_Result * ACE_SUN_Proactor::find_completed_aio (aio_result_t *result, int &error_status, - size_t &transfer_count) + int &return_status) { ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, mutex_, 0)); size_t ai; error_status = -1; - transfer_count = 0; + return_status = 0; // we call find_completed_aio always with result != 0 for (ai = 0; ai < aiocb_list_max_size_; ai++) - if (aiocb_list_[ai] != 0 && //check for non zero + if (aiocb_list_[ai] !=0 && //check for non zero result == &aiocb_list_[ai]->aio_resultp) break; @@ -196,7 +213,7 @@ ACE_SUN_Proactor::find_completed_aio (aio_result_t *result, if (this->get_result_status (asynch_result, error_status, - transfer_count) == 0) + return_status) == 0) { // should never be ACE_ERROR ((LM_ERROR, "%N:%l:(%P | %t)::%p\n", @@ -205,6 +222,9 @@ ACE_SUN_Proactor::find_completed_aio (aio_result_t *result, return 0; } + if (return_status < 0) + return_status = 0; // zero bytes transferred + aiocb_list_[ai] = 0; result_list_[ai] = 0; aiocb_list_cur_size_--; @@ -218,15 +238,15 @@ ACE_SUN_Proactor::find_completed_aio (aio_result_t *result, return asynch_result; } -// start_aio_i has new return codes +// start_aio has new return codes // 0 successful start // 1 try later, OS queue overflow // -1 invalid request and other errors int -ACE_SUN_Proactor::start_aio_i (ACE_POSIX_Asynch_Result *result) +ACE_SUN_Proactor::start_aio (ACE_POSIX_Asynch_Result *result) { - ACE_TRACE ("ACE_SUN_Proactor::start_aio_i"); + ACE_TRACE ("ACE_SUN_Proactor::start_aio"); int ret_val; const ACE_TCHAR *ptype; @@ -271,19 +291,19 @@ ACE_SUN_Proactor::start_aio_i (ACE_POSIX_Asynch_Result *result) if (ret_val == 0) { - this->num_started_aio_++; - if (this->num_started_aio_ == 1) // wake up condition - this->condition_.broadcast (); + num_started_aio_++; + if (num_started_aio_ == 1) // wake up condition + condition_.broadcast (); } else // if (ret_val == -1) { - if (errno == EAGAIN || errno == ENOMEM) // Defer - retry this later. - ret_val = 1; + if (errno == EAGAIN) //try later, it will be deferred AIO + ret_val = 1; else - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:(%P | %t)::start_aio: aio%s %p\n"), - ptype, - ACE_LIB_TEXT ("queueing failed\n"))); + ACE_ERROR ((LM_ERROR, + ACE_LIB_TEXT ("%N:%l:(%P | %t)::start_aio: aio%s %p\n"), + ptype, + ACE_LIB_TEXT ("queueing failed\n"))); } return ret_val; @@ -293,21 +313,75 @@ int ACE_SUN_Proactor::cancel_aiocb (ACE_POSIX_Asynch_Result *result) { ACE_TRACE ("ACE_SUN_Proactor::cancel_aiocb"); - int rc = ::aiocancel (&result->aio_resultp); + int rc = ::aiocancel (& result->aio_resultp); + if (rc == 0) // AIO_CANCELED - { - // after aiocancel Sun does not notify us - // so we should send notification - // to save POSIX behavoir. - // Also we should do this for deffered aio's - - result->set_error (ECANCELED); - result->set_bytes_transferred (0); - this->putq_result (result); - return 0; - } + return 0; return 2; } +int +ACE_SUN_Proactor::cancel_aio (ACE_HANDLE handle) +{ + ACE_TRACE ("ACE_SUN_Proactor::cancel_aio"); + + int num_total = 0; + int num_cancelled = 0; + + { + ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->mutex_, -1)); + + size_t ai = 0; + + for (ai = 0; ai < aiocb_list_max_size_; ai++) + { + if (result_list_[ai] == 0) //skip empty slot + continue ; + + if (result_list_[ai]->aio_fildes != handle) //skip not our slot + continue ; + + num_total++ ; + + ACE_POSIX_Asynch_Result *asynch_result = result_list_[ai]; + + int rc_cancel = 0 ; // let assume canceled + + if (aiocb_list_ [ai] == 0) //deferred aio + num_deferred_aiocb_--; + else //cancel started aio + rc_cancel = this->cancel_aiocb (asynch_result); + + if (rc_cancel == 0) + { + num_cancelled ++ ; + + aiocb_list_[ai] = 0; + result_list_[ai] = 0; + aiocb_list_cur_size_--; + + // after aiocancel Sun does not notify us + // so we should send notification + // to save POSIX behavoir. + // Also we should do this for deffered aio's + + asynch_result->set_error (ECANCELED); + asynch_result->set_bytes_transferred (0); + this->putq_result (asynch_result); + } + } + + } // release mutex_ + + + if (num_total == 0) + return 1; // ALLDONE + + if (num_cancelled == num_total) + return 0; // CANCELLED + + return 2; // NOT CANCELLED +} + #endif /* ACE_HAS_AIO_CALLS && sun */ diff --git a/ace/SUN_Proactor.h b/ace/SUN_Proactor.h index 3f9ad335df4..c1ddbaf0cbc 100644 --- a/ace/SUN_Proactor.h +++ b/ace/SUN_Proactor.h @@ -82,33 +82,39 @@ protected: virtual int handle_events (ACE_Time_Value &wait_time); /** + * Dispatch a single set of events. If <milli_seconds> elapses + * before any events occur, return 0. Return 1 if a completion is + * dispatched. Return -1 on errors. + */ + virtual int handle_events (u_long milli_seconds); + + /** * Block indefinitely until at least one event is dispatched. - * Dispatch a single set of events. Return 1 on success i.e., when a + * Dispatch a single set of events. If <wait_time> elapses before + * any events occur, return 0. Return 1 on success i.e., when a * completion is dispatched, non-zero (-1) on errors and errno is * set accordingly. */ virtual int handle_events (void); - /// Internal completion detection and dispatching. - int handle_events_i (ACE_Time_Value *delta); - - /// Initiate an aio operation. - virtual int start_aio_i (ACE_POSIX_Asynch_Result *result); + /// From ACE_POSIX_AIOCB_Proactor. + virtual int start_aio (ACE_POSIX_Asynch_Result *result); /// Check AIO for completion, error and result status /// Return: 1 - AIO completed , 0 - not completed yet virtual int get_result_status (ACE_POSIX_Asynch_Result* asynch_result, int &error_status, - size_t &transfer_count); + int &return_status); /// Extract the results of aio. ACE_POSIX_Asynch_Result *find_completed_aio (aio_result_t *result, int &error_status, - size_t &transfer_count); + int &return_status); /// From ACE_POSIX_AIOCB_Proactor. /// Attempt to cancel running request virtual int cancel_aiocb (ACE_POSIX_Asynch_Result *result); + virtual int cancel_aio (ACE_HANDLE handle); /// Specific Sun aiowait int wait_for_start (ACE_Time_Value * abstime); diff --git a/ace/Select_Reactor_Base.cpp b/ace/Select_Reactor_Base.cpp index af15adf293d..62dc95d3dcd 100644 --- a/ace/Select_Reactor_Base.cpp +++ b/ace/Select_Reactor_Base.cpp @@ -250,35 +250,22 @@ ACE_Select_Reactor_Handler_Repository::bind (ACE_HANDLE handle, this->max_handlep1_ = handle + 1; #endif /* ACE_WIN32 */ - if (this->select_reactor_.is_suspended_i (handle)) - { - this->select_reactor_.bit_ops (handle, - mask, - this->select_reactor_.suspend_set_, - ACE_Reactor::ADD_MASK); - } - else - { - this->select_reactor_.bit_ops (handle, - mask, - this->select_reactor_.wait_set_, - ACE_Reactor::ADD_MASK); - - // Note the fact that we've changed the state of the <wait_set_>, - // which is used by the dispatching loop to determine whether it can - // keep going or if it needs to reconsult select(). - this->select_reactor_.state_changed_ = 1; - } + // Add the <mask> for this <handle> in the Select_Reactor's wait_set. + this->select_reactor_.bit_ops (handle, + mask, + this->select_reactor_.wait_set_, + ACE_Reactor::ADD_MASK); - /* - // @@NOTE: We used to do this in earlier versions of ACE+TAO. But - // this is totally wrong.. // Clear any suspend masks for it too. this->select_reactor_.bit_ops (handle, mask, this->select_reactor_.suspend_set_, ACE_Reactor::CLR_MASK); - */ + + // Note the fact that we've changed the state of the <wait_set_>, + // which is used by the dispatching loop to determine whether it can + // keep going or if it needs to reconsult select(). + this->select_reactor_.state_changed_ = 1; return 0; } diff --git a/ace/Select_Reactor_Base.h b/ace/Select_Reactor_Base.h index 9d6c6cfe311..6f4c4923d54 100644 --- a/ace/Select_Reactor_Base.h +++ b/ace/Select_Reactor_Base.h @@ -460,10 +460,6 @@ protected: /// appropriate point specified by <requeue_position_>. virtual void renew (void) = 0; - /// Check to see if the <Event_Handler> associated with <handle> is - /// suspended. Returns 0 if not, 1 if so. - virtual int is_suspended_i (ACE_HANDLE handle) = 0; - /// Table that maps <ACE_HANDLEs> to <ACE_Event_Handler *>'s. ACE_Select_Reactor_Handler_Repository handler_rep_; diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp index ed1332ece07..9c42cd930b2 100644 --- a/ace/Select_Reactor_T.cpp +++ b/ace/Select_Reactor_T.cpp @@ -82,7 +82,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handler_i (int signum, if (handler == 0) return -1; - else if (eh != 0) + else if (eh != 0 && *eh != 0) *eh = handler; return 0; } diff --git a/ace/Strategies_T.h b/ace/Strategies_T.h index 6891d1d4b88..eade82c392e 100644 --- a/ace/Strategies_T.h +++ b/ace/Strategies_T.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -12,7 +12,6 @@ #ifndef ACE_STRATEGIES_T_H #define ACE_STRATEGIES_T_H - #include "ace/pre.h" #include "ace/Hash_Map_Manager.h" @@ -46,12 +45,6 @@ template<class SVC_HANDLER> class ACE_Recycling_Strategy { public: - - // Useful STL-style traits. - typedef ACE_TYPENAME SVC_HANDLER::addr_type addr_type; - typedef SVC_HANDLER handler_type; - typedef ACE_TYPENAME SVC_HANDLER::stream_type stream_type; - /// Virtual Destructor virtual ~ACE_Recycling_Strategy (void); @@ -81,12 +74,6 @@ template <class SVC_HANDLER> class ACE_Creation_Strategy { public: - - // Useful STL-style traits. - typedef ACE_TYPENAME SVC_HANDLER::addr_type addr_type; - typedef SVC_HANDLER handler_type; - typedef ACE_TYPENAME SVC_HANDLER::stream_type stream_type; - // = Initialization and termination methods. /// Default constructor. @@ -138,10 +125,6 @@ template <class SVC_HANDLER> class ACE_Singleton_Strategy : public ACE_Creation_Strategy<SVC_HANDLER> { public: - - // Useful STL-style traits. - typedef ACE_Creation_Strategy<SVC_HANDLER> base_type; - // = Initialization and termination methods. ACE_Singleton_Strategy (SVC_HANDLER * = 0, ACE_Thread_Manager * = 0); @@ -178,10 +161,6 @@ template <class SVC_HANDLER> class ACE_DLL_Strategy : public ACE_Creation_Strategy<SVC_HANDLER> { public: - - // Useful STL-style traits. - typedef ACE_Creation_Strategy<SVC_HANDLER> base_type; - // = Intialization and termination methods. /// "Do-nothing" constructor. @@ -248,12 +227,6 @@ template <class SVC_HANDLER> class ACE_Concurrency_Strategy { public: - - // Useful STL-style traits. - typedef ACE_TYPENAME SVC_HANDLER::addr_type addr_type; - typedef SVC_HANDLER handler_type; - typedef ACE_TYPENAME SVC_HANDLER::stream_type stream_type; - /// Constructor ACE_Concurrency_Strategy (int flags = 0); @@ -295,10 +268,6 @@ template <class SVC_HANDLER> class ACE_Reactive_Strategy : public ACE_Concurrency_Strategy <SVC_HANDLER> { public: - - // Useful STL-style traits. - typedef ACE_Concurrency_Strategy<SVC_HANDLER> base_type; - // = Intialization and termination methods. /// "Do-nothing constructor" ACE_Reactive_Strategy (int flags = 0); @@ -355,10 +324,6 @@ template <class SVC_HANDLER> class ACE_Thread_Strategy : public ACE_Concurrency_Strategy<SVC_HANDLER> { public: - - // Useful STL-style traits. - typedef ACE_Concurrency_Strategy<SVC_HANDLER> base_type; - // = Intialization and termination methods. /// "Do-nothing constructor" ACE_Thread_Strategy (int flags = 0); @@ -422,10 +387,6 @@ template <class SVC_HANDLER> class ACE_Process_Strategy : public ACE_Concurrency_Strategy<SVC_HANDLER> { public: - - // Useful STL-style traits. - typedef ACE_Concurrency_Strategy<SVC_HANDLER> base_type; - // = Intialization and termination methods. /// Initialize the strategy. If <avoid_zombies> is non-0 then set a @@ -494,13 +455,6 @@ template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> class ACE_Accept_Strategy { public: - - // Useful STL-style traits. - typedef ACE_PEER_ACCEPTOR_ADDR addr_type; - typedef ACE_PEER_ACCEPTOR acceptor_type; - typedef SVC_HANDLER handler_type; - typedef ACE_TYPENAME SVC_HANDLER::stream_type stream_type; - // = Initialization and termination methods. /// Default constructor. ACE_Accept_Strategy (ACE_Reactor *reactor = ACE_Reactor::instance ()); @@ -561,13 +515,6 @@ template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> class ACE_Connect_Strategy { public: - - // Useful STL-style traits. - typedef ACE_PEER_CONNECTOR_ADDR addr_type; - typedef ACE_PEER_CONNECTOR connector_type; - typedef SVC_HANDLER handler_type; - typedef ACE_TYPENAME SVC_HANDLER::stream_type stream_type; - // = Initialization and termination methods. /// Default constructor. ACE_Connect_Strategy (void); @@ -627,12 +574,6 @@ template <class SVC_HANDLER> class ACE_Scheduling_Strategy { public: - - // Useful STL-style traits. - typedef ACE_TYPENAME SVC_HANDLER::addr_type addr_type; - typedef SVC_HANDLER handler_type; - typedef ACE_TYPENAME SVC_HANDLER::stream_type stream_type; - // = Initialization and termination methods. /// Constructor @@ -663,14 +604,9 @@ public: * the Event_Handlers in a Reactor in one fell swoop. */ template <class SVC_HANDLER> -class ACE_Schedule_All_Reactive_Strategy - : public ACE_Scheduling_Strategy<SVC_HANDLER> +class ACE_Schedule_All_Reactive_Strategy : public ACE_Scheduling_Strategy<SVC_HANDLER> { public: - - // Useful STL-style traits. - typedef ACE_Scheduling_Strategy<SVC_HANDLER> base_type; - // = Initialization and termination methods. /// Constructor ACE_Schedule_All_Reactive_Strategy (SVC_HANDLER * = 0); @@ -702,14 +638,9 @@ protected: * the Event_Handlers controlled by a Thread_Manager in one fell swoop. */ template <class SVC_HANDLER> -class ACE_Schedule_All_Threaded_Strategy - : public ACE_Scheduling_Strategy<SVC_HANDLER> +class ACE_Schedule_All_Threaded_Strategy : public ACE_Scheduling_Strategy<SVC_HANDLER> { public: - - // Useful STL-style traits. - typedef ACE_Scheduling_Strategy<SVC_HANDLER> base_type; - // = Initialization and termination methods. /// Constructor ACE_Schedule_All_Threaded_Strategy (SVC_HANDLER * = 0); @@ -746,10 +677,6 @@ template <class SVC_HANDLER> class ACE_NOOP_Creation_Strategy : public ACE_Creation_Strategy<SVC_HANDLER> { public: - - // Useful STL-style traits. - typedef ACE_Creation_Strategy<SVC_HANDLER> base_type; - /// This is a no-op. virtual int make_svc_handler (SVC_HANDLER *&); }; @@ -766,14 +693,9 @@ public: * svc_handler more than once. */ template <class SVC_HANDLER> -class ACE_NOOP_Concurrency_Strategy - : public ACE_Concurrency_Strategy<SVC_HANDLER> +class ACE_NOOP_Concurrency_Strategy : public ACE_Concurrency_Strategy<SVC_HANDLER> { public: - - // Useful STL-style traits. - typedef ACE_Concurrency_Strategy<SVC_HANDLER> base_type; - // = Factory method. /// This is a no-op. virtual int activate_svc_handler (SVC_HANDLER *svc_handler, @@ -822,34 +744,10 @@ protected: * It's added value is re-use of established connections. */ template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> -class ACE_Cached_Connect_Strategy - : public ACE_Connection_Recycling_Strategy, - public ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> +class ACE_Cached_Connect_Strategy : public ACE_Connection_Recycling_Strategy, public ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> { public: - // Useful STL-style traits. - typedef ACE_Creation_Strategy<SVC_HANDLER> - creation_strategy_type; - typedef ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> - connect_strategy_type; - typedef ACE_Concurrency_Strategy<SVC_HANDLER> - concurrency_strategy_type; - typedef ACE_Recycling_Strategy<SVC_HANDLER> recycling_strategy_type; - - // = Define some useful (old style) traits. - typedef ACE_Creation_Strategy<SVC_HANDLER> - CREATION_STRATEGY; - typedef ACE_Concurrency_Strategy<SVC_HANDLER> - CONCURRENCY_STRATEGY; - typedef ACE_Recycling_Strategy<SVC_HANDLER> - RECYCLING_STRATEGY; - - // = Super class - typedef ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> - CONNECT_STRATEGY; - - typedef ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX> SELF; /// Constructor @@ -938,6 +836,18 @@ public: virtual int cleanup_hint (const void *recycling_act, void **act_holder = 0); + // = Define some useful typedefs. + typedef ACE_Creation_Strategy<SVC_HANDLER> + CREATION_STRATEGY; + typedef ACE_Concurrency_Strategy<SVC_HANDLER> + CONCURRENCY_STRATEGY; + typedef ACE_Recycling_Strategy<SVC_HANDLER> + RECYCLING_STRATEGY; + + // = Super class + typedef ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> + CONNECT_STRATEGY; + // = Typedefs for managing the map typedef ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR> REFCOUNTED_HASH_RECYCLABLE_ADDRESS; @@ -1066,6 +976,4 @@ protected: #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include "ace/post.h" - - #endif /* ACE_STRATEGIES_T_H */ diff --git a/ace/TP_Reactor.cpp b/ace/TP_Reactor.cpp index 8c58233a391..1f63c88e1f3 100644 --- a/ace/TP_Reactor.cpp +++ b/ace/TP_Reactor.cpp @@ -562,11 +562,7 @@ ACE_TP_Reactor::handle_socket_events (int &event_count, if (this->dispatch_socket_event (dispatch_info) == 0) ++result; // Dispatched an event - // This is to get around a problem/ which is well described in - // 1361. This is just a work around that would help applications - // from resuming handles at the most inopportune moment. - int flag = - ACE_Event_Handler::ACE_EVENT_HANDLER_NOT_RESUMED; + int flag = 0; // Acquire the token since we want to access the handler // repository. The call to find () does not hold a lock and hence diff --git a/ace/Thread_Exit.cpp b/ace/Thread_Exit.cpp index c3ebe0f577f..2128ac148f5 100644 --- a/ace/Thread_Exit.cpp +++ b/ace/Thread_Exit.cpp @@ -1,16 +1,24 @@ // $Id$ #include "ace/Thread_Exit.h" +#include "ace/OS.h" #include "ace/Synch.h" #include "ace/Managed_Object.h" -#include "ace/Thread_Manager.h" ACE_RCSID(ace, Thread_Exit, "$Id$") u_int ACE_Thread_Exit::is_constructed_ = 0; +#if defined (ACE_HAS_SIG_C_FUNC) +extern "C" void +ACE_Thread_Exit_cleanup (void *instance, void *arg) +{ + ACE_Thread_Exit::cleanup (instance, arg); +} +#endif + void -ACE_Thread_Exit::cleanup (void *instance) +ACE_Thread_Exit::cleanup (void *instance, void *) { ACE_OS_TRACE ("ACE_Thread_Exit::cleanup"); @@ -51,7 +59,16 @@ ACE_Thread_Exit::instance (void) ACE_Thread_Exit::is_constructed_ = 1; - ACE_Thread_Manager::set_thr_exit (instance_); + // Register for destruction with ACE_Object_Manager. +#if defined ACE_HAS_SIG_C_FUNC + ACE_Object_Manager::at_exit (instance_, + ACE_Thread_Exit_cleanup, + 0); +#else + ACE_Object_Manager::at_exit (instance_, + ACE_Thread_Exit::cleanup, + 0); +#endif /* ACE_HAS_SIG_C_FUNC */ } } diff --git a/ace/Thread_Exit.h b/ace/Thread_Exit.h index c47b4f7307d..5b87817ffaa 100644 --- a/ace/Thread_Exit.h +++ b/ace/Thread_Exit.h @@ -55,9 +55,12 @@ public: /// Cleanup method, used by the <ACE_Object_Manager> to destroy the /// singleton. - static void cleanup (void *instance); + static void cleanup (void *instance, void *); private: + /// Allow OS_Object_Manager to reset the status of <is_constructed_>. + friend class ACE_OS_Object_Manager; + /// Automatically add/remove the thread from the /// <ACE_Thread_Manager>. ACE_Thread_Control thread_control_; diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp index 1df82bd00e1..0c9878fb4b9 100644 --- a/ace/Thread_Manager.cpp +++ b/ace/Thread_Manager.cpp @@ -6,6 +6,7 @@ #include "ace/Object_Manager.h" #include "ace/Singleton.h" #include "ace/Auto_Ptr.h" +#include "ace/Thread_Exit.h" #if !defined (__ACE_INLINE__) #include "ace/Thread_Manager.i" @@ -25,18 +26,6 @@ ACE_Thread_Manager *ACE_Thread_Manager::thr_mgr_ = 0; int ACE_Thread_Manager::delete_thr_mgr_ = 0; #endif /* ! defined (ACE_THREAD_MANAGER_LACKS_STATICS) */ -ACE_TSS_TYPE (ACE_Thread_Exit) *ACE_Thread_Manager::thr_exit_ = 0; - -int -ACE_Thread_Manager::set_thr_exit (ACE_TSS_TYPE (ACE_Thread_Exit) *ptr) -{ - if (ACE_Thread_Manager::thr_exit_ == 0) - ACE_Thread_Manager::thr_exit_ = ptr; - else - return -1; - return 0; -} - void ACE_Thread_Manager::dump (void) { @@ -390,8 +379,6 @@ ACE_Thread_Manager::close_singleton (void) ACE_Thread_Manager::thr_mgr_ = 0; ACE_Thread_Manager::delete_thr_mgr_ = 0; } - - ACE_Thread_Exit::cleanup (ACE_Thread_Manager::thr_exit_); } #endif /* ! defined (ACE_THREAD_MANAGER_LACKS_STATICS) */ diff --git a/ace/Thread_Manager.h b/ace/Thread_Manager.h index 89b65fd85cc..3340897af32 100644 --- a/ace/Thread_Manager.h +++ b/ace/Thread_Manager.h @@ -16,7 +16,6 @@ #include "ace/Thread.h" #include "ace/Thread_Adapter.h" -#include "ace/Thread_Exit.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -388,9 +387,6 @@ class ACE_Export ACE_Thread_Manager { public: friend class ACE_Thread_Control; - - // Allow ACE_THread_Exit to register the global TSS instance object. - friend class ACE_Thread_Exit; #if !defined(ACE_USE_ONE_SHOT_AT_THREAD_EXIT) friend class ACE_Thread_Descriptor; #endif /* !ACE_USE_ONE_SHOT_AT_THREAD_EXIT */ @@ -1034,9 +1030,6 @@ protected: /// Register a thread as terminated and put it into the <terminated_thr_list_>. int register_as_terminated (ACE_Thread_Descriptor *td); - /// Setting the static ACE_TSS_TYPE (ACE_Thread_Exit) *thr_exit_ pointer. - static int set_thr_exit (ACE_TSS_TYPE (ACE_Thread_Exit) *ptr); - /** * Keeping a list of thread descriptors within the thread manager. * Double-linked list enables us to cache the entries in TSS @@ -1078,9 +1071,6 @@ private: /// Must delete the <thr_mgr_> if non-0. static int delete_thr_mgr_; - - /// Global ACE_TSS (ACE_Thread_Exit) object ptr. - static ACE_TSS_TYPE (ACE_Thread_Exit) *thr_exit_; #endif /* ! defined (ACE_THREAD_MANAGER_LACKS_STATICS) */ }; diff --git a/ace/Time_Request_Reply.cpp b/ace/Time_Request_Reply.cpp index 689099f92dc..79a17254de2 100644 --- a/ace/Time_Request_Reply.cpp +++ b/ace/Time_Request_Reply.cpp @@ -95,7 +95,7 @@ ACE_Time_Request::timeout (void) const } void -ACE_Time_Request::timeout (const ACE_Time_Value& timeout) +ACE_Time_Request::timeout (const ACE_Time_Value timeout) { ACE_TRACE ("ACE_Time_Request::timeout"); this->transfer_.sec_timeout_ = timeout.sec (); diff --git a/ace/Time_Request_Reply.h b/ace/Time_Request_Reply.h index 0314f43bb00..a88d1b1106a 100644 --- a/ace/Time_Request_Reply.h +++ b/ace/Time_Request_Reply.h @@ -48,21 +48,13 @@ public: /// Default constructor. ACE_Time_Request (void); - /** - * Create a ACE_Time_Request message. - * @param msg_type Type of request. - * @param time Time. - * @param timeout Max time waiting for request. - */ - ACE_Time_Request (ACE_INT32 msg_type, + /// Create a <ACE_Time_Request> message. + ACE_Time_Request (ACE_INT32 msg_type, // Type of request. const ACE_UINT32 time, - ACE_Time_Value *timeout = 0); + ACE_Time_Value *timeout = 0); // Max time waiting for request. - /** - * Initialize length_ in order to ensure correct byte ordering before a - * request is sent. - * @deprecated This method is a no-op. - */ + /// Initialize length_ in order to ensure correct byte ordering + /// before a request is sent. void init (void); // Get the fixed size of message @@ -90,7 +82,7 @@ public: ACE_Time_Value timeout (void) const; /// Set the timeout. - void timeout (const ACE_Time_Value& timeout); + void timeout (const ACE_Time_Value timeout); /// Encode the message before transmission. int encode (void *&); @@ -111,8 +103,8 @@ private: /// Type of the request (i.e., <TIME_UPDATE>) ACE_INT32 msg_type_; - /// Indicates if we should block forever. If 0, then sec_timeout_ - /// and usec_timeout_ indicates how long we should wait. + /// Indicates if we should block forever. If 0, then <secTimeout_> + /// and <usecTimeout_> indicates how long we should wait. ACE_UINT32 block_forever_; /// Max seconds willing to wait for name if not blocking forever. diff --git a/ace/Time_Value.h b/ace/Time_Value.h index 0110211576c..a954d83cd50 100644 --- a/ace/Time_Value.h +++ b/ace/Time_Value.h @@ -69,10 +69,8 @@ class ACE_Export ACE_U_LongLong; // Definition per POSIX. typedef struct timespec { - /// Seconds - time_t tv_sec; - /// Nanoseconds - long tv_nsec; + time_t tv_sec; // Seconds + long tv_nsec; // Nanoseconds } timespec_t; # elif defined (ACE_HAS_BROKEN_POSIX_TIME) // OSF/1 defines struct timespec in <sys/timers.h> - Tom Marrs @@ -107,7 +105,7 @@ public: * not intended for use with <select> or other calls that may have * *their own* implementation-specific maximum time representations. * Its primary use is in time computations such as those used by the - * dynamic subpriority strategies in the ACE_Dynamic_Message_Queue + * dynamic subpriority strategies in the <ACE_Dynamic_Message_Queue> * class. */ static const ACE_Time_Value max_time; @@ -121,49 +119,48 @@ public: ACE_Time_Value (long sec, long usec = 0); // = Methods for converting to/from various time formats. - - /// Construct the ACE_Time_Value from a timeval. + /// Construct the <ACE_Time_Value> from a <timeval>. ACE_Time_Value (const struct timeval &t); - /// Construct the ACE_Time_Value object from a timespec_t. + /// Initializes the <ACE_Time_Value> object from a <timespec_t>. ACE_Time_Value (const timespec_t &t); # if defined (ACE_WIN32) - /// Construct the ACE_Time_Value object from a Win32 FILETIME + /// Initializes the ACE_Time_Value object from a Win32 FILETIME ACE_Time_Value (const FILETIME &ft); # endif /* ACE_WIN32 */ - /// Initializes the ACE_Time_Value from two longs. + /// Construct a <Time_Value> from two <long>s. void set (long sec, long usec); - /// Initializes the ACE_Time_Value from a double, which is assumed to be + /// Construct a <Time_Value> from a <double>, which is assumed to be /// in second format, with any remainder treated as microseconds. void set (double d); - /// Initializes the ACE_Time_Value from a timeval. + /// Construct a <Time_Value> from a <timeval>. void set (const timeval &t); - /// Initializes the ACE_Time_Value object from a timespec_t. + /// Initializes the <Time_Value> object from a <timespec_t>. void set (const timespec_t &t); # if defined (ACE_WIN32) - /// Initializes the ACE_Time_Value object from a Win32 FILETIME. + /// Initializes the <Time_Value> object from a <timespec_t>. void set (const FILETIME &ft); # endif /* ACE_WIN32 */ - /// Converts from ACE_Time_Value format into milli-seconds format. + /// Converts from <Time_Value> format into milli-seconds format. long msec (void) const; - /// Converts from milli-seconds format into ACE_Time_Value format. + /// Converts from milli-seconds format into <Time_Value> format. void msec (long); - /// Returns the value of the object as a timespec_t. + /// Returns the value of the object as a <timespec_t>. operator timespec_t () const; - /// Returns the value of the object as a timeval. + /// Returns the value of the object as a <timeval>. operator timeval () const; - /// Returns a pointer to the object as a timeval. + /// Returns a pointer to the object as a <timeval>. operator const timeval *() const; # if defined (ACE_WIN32) @@ -185,44 +182,26 @@ public: /// Set microseconds. void usec (long usec); - // = The following arithmetic methods operate on ACE_Time_Value's. + // = The following arithmetic methods operate on <Time_Value>s. - /// Add @a tv to this. + /// Add <tv> to this. ACE_Time_Value &operator += (const ACE_Time_Value &tv); - /// Subtract @a tv to this. + /// Subtract <tv> to this. ACE_Time_Value &operator -= (const ACE_Time_Value &tv); - /// Multiply the time value by the @a d factor, which must be >= 0. + /// Multiply the time value by the <d> factor, which must be >= 0. ACE_Time_Value &operator *= (double d); - /** - * Increment microseconds as postfix. - * @note The only reason this is here is to allow the use of ACE_Atomic_Op - * with ACE_Time_Value. - */ - ACE_Time_Value operator++ (int); - - /** - * Increment microseconds as prefix. - * @note The only reason this is here is to allow the use of ACE_Atomic_Op - * with ACE_Time_Value. - */ - ACE_Time_Value &operator++ (void); + /// Increment microseconds (the only reason this is here is + /// to allow the use of ACE_Atomic_Op with ACE_Time_Value). + ACE_Time_Value operator++ (int); // Postfix advance + ACE_Time_Value &operator++ (void); // Prefix advance - /** - * Decrement microseconds as postfix. - * @note The only reason this is here is to allow the use of ACE_Atomic_Op - * with ACE_Time_Value. - */ - ACE_Time_Value operator-- (int); - - /** - * Decrement microseconds as prefix. - * @note The only reason this is here is to allow the use of ACE_Atomic_Op - * with ACE_Time_Value. - */ - ACE_Time_Value &operator-- (void); + /// Decrement microseconds (the only reason this is here is + /// to allow the use of ACE_Atomic_Op with ACE_Time_Value). + ACE_Time_Value operator-- (int); // Postfix dec + ACE_Time_Value &operator-- (void); // Prefix dec /// Adds two ACE_Time_Value objects together, returns the sum. friend ACE_OS_Export ACE_Time_Value operator + (const ACE_Time_Value &tv1, @@ -232,38 +211,36 @@ public: friend ACE_OS_Export ACE_Time_Value operator - (const ACE_Time_Value &tv1, const ACE_Time_Value &tv2); - /// True if @a tv1 < @a tv2. + /// True if tv1 < tv2. friend ACE_OS_Export int operator < (const ACE_Time_Value &tv1, const ACE_Time_Value &tv2); - /// True if @a tv1 > @a tv2. + /// True if tv1 > tv2. friend ACE_OS_Export int operator > (const ACE_Time_Value &tv1, const ACE_Time_Value &tv2); - /// True if @a tv1 <= @a tv2. + /// True if tv1 <= tv2. friend ACE_OS_Export int operator <= (const ACE_Time_Value &tv1, const ACE_Time_Value &tv2); - /// True if @a tv1 >= @a tv2. + /// True if tv1 >= tv2. friend ACE_OS_Export int operator >= (const ACE_Time_Value &tv1, const ACE_Time_Value &tv2); - /// True if @a tv1 == @a tv2. + /// True if tv1 == tv2. friend ACE_OS_Export int operator == (const ACE_Time_Value &tv1, const ACE_Time_Value &tv2); - /// True if @a tv1 != @a tv2. + /// True if tv1 != tv2. friend ACE_OS_Export int operator != (const ACE_Time_Value &tv1, const ACE_Time_Value &tv2); - //@{ - /// Multiplies the time value by @a d + /// Multiplies the time value by <d> friend ACE_OS_Export ACE_Time_Value operator * (double d, const ACE_Time_Value &tv); friend ACE_OS_Export ACE_Time_Value operator * (const ACE_Time_Value &tv, double d); - //@} /// Dump is a no-op. /** @@ -287,7 +264,7 @@ private: /// Put the timevalue into a canonical form. void normalize (void); - /// Store the values as a timeval. + /// Store the values as a <timeval>. timeval tv_; }; diff --git a/ace/Timeprobe.h b/ace/Timeprobe.h index 6ac8bd66448..91033b54ece 100644 --- a/ace/Timeprobe.h +++ b/ace/Timeprobe.h @@ -8,33 +8,26 @@ * * @author Irfan Pyarali * - * If users want to use time probes, the ACE_COMPILE_TIMEPROBES - * flag must be defined when compiling ACE. This can be achieved - * by doing one of the following: + * If users want to use time probes the ACE_COMPILE_TIMEPROBES flag + * must be defined when compiling ACE. This can be achieved by doing + * one of the following: . Use make probe = 1 if you are using the + * make utility. . Define ACE_COMPILE_TIMEPROBES in config.h . Define + * ACE_COMPILE_TIMEPROBES in the VC project file. . Other regular + * methods will also work. It is not necessary to define + * ACE_COMPILE_TIMEPROBES when using time probes you simply need + * ACE_ENABLE_TIMEPROBES. You can use the ACE_TIMEPROBE_* macros to + * program the time probes and use the ACE_ENABLE_TIMEPROBE to enable + * the time probes. If you define ACE_ENABLE_TIMEPROBE in your code + * but forget to compile ACE with ACE_COMPILE_TIMEPROBES you will end + * up with linker errors. Remember that ACE_COMPILE_TIMEPROBES means + * that the ACE library will contain code for time probes. This is + * only useful when compiling ACE. ACE_ENABLE_TIMEPROBES means that + * the ACE_TIMEPROBE_* macros should spring to life. * - * . Use make probe = 1, if you are using the make utility. - * - * . Define ACE_COMPILE_TIMEPROBES in config.h - * - * . Define ACE_COMPILE_TIMEPROBES in the VC project file. - * - * . Other regular methods will also work. - * - * It is not necessary to define ACE_COMPILE_TIMEPROBES when using - * time probes, you simply need ACE_ENABLE_TIMEPROBES. You can use - * the ACE_TIMEPROBE_* macros to program the time probes, and use - * the ACE_ENABLE_TIMEPROBE to enable the time probes. If you - * define ACE_ENABLE_TIMEPROBE in your code, but forget to compile - * ACE with ACE_COMPILE_TIMEPROBES, you will end up with linker - * errors. - * - * Remember that ACE_COMPILE_TIMEPROBES means that the ACE library - * will contain code for time probes. This is only useful when - * compiling ACE. ACE_ENABLE_TIMEPROBES means that the - * ACE_TIMEPROBE_* macros should spring to life. */ //============================================================================= + #ifndef ACE_TIMEPROBE_H #define ACE_TIMEPROBE_H #include "ace/pre.h" diff --git a/ace/Timer_Heap_T.h b/ace/Timer_Heap_T.h index 73ba57dd3e2..003d7d229d2 100644 --- a/ace/Timer_Heap_T.h +++ b/ace/Timer_Heap_T.h @@ -102,7 +102,7 @@ public: * time and is more predictable (though it requires more space). * Otherwise, timer nodes are allocated as needed. * @param freelist is the freelist of timer nodes. - * @param upcall_functor If 0 Timer Heap will create a default FUNCTOR. + * @param upcall_function If 0 Timer Heap will create a default FUNCTOR. */ ACE_Timer_Heap_T (size_t size, int preallocated = 0, diff --git a/ace/WFMO_Reactor.i b/ace/WFMO_Reactor.i index 98c6c5d81ba..8db81e4808b 100644 --- a/ace/WFMO_Reactor.i +++ b/ace/WFMO_Reactor.i @@ -1005,7 +1005,7 @@ ACE_WFMO_Reactor::handler (int signum, ACE_Event_Handler **eh) if (handler == 0) return -1; - else if (eh != 0) + else if (eh != 0 && *eh != 0) *eh = handler; return 0; } diff --git a/ace/WIN32_Asynch_IO.cpp b/ace/WIN32_Asynch_IO.cpp index c60519ef015..3a14601626c 100644 --- a/ace/WIN32_Asynch_IO.cpp +++ b/ace/WIN32_Asynch_IO.cpp @@ -374,10 +374,12 @@ ACE_WIN32_Asynch_Read_Stream::read (ACE_Message_Block &message_block, bytes_to_read = space; if (bytes_to_read == 0) - { - errno = ENOSPC; - return -1; - } + ACE_ERROR_RETURN + ((LM_ERROR, + ACE_LIB_TEXT ("ACE_WIN32_Asynch_Read_Stream::read:") + ACE_LIB_TEXT ("Attempt to read 0 bytes or no space in the message block\n")), + -1); + // Create the Asynch_Result. ACE_WIN32_Asynch_Read_Stream_Result *result = 0; diff --git a/ace/WIN32_Asynch_IO.h b/ace/WIN32_Asynch_IO.h index 6b48755b9ec..ed6ac6917ac 100644 --- a/ace/WIN32_Asynch_IO.h +++ b/ace/WIN32_Asynch_IO.h @@ -1316,11 +1316,6 @@ private: * connects. * According WIN32 standards we should receive * notifications on canceled AIO requests. - * - * @param set Receives the set of I/O handles on which asynchronous - * connect requests were canceled as a result of this - * method. The contents of @a set are completely - * replaced. */ int cancel_uncompleted (int flg_notify, ACE_Handle_Set & set); diff --git a/ace/ace_dll.dsp b/ace/ace_dll.dsp index 7c4e92d3a8f..3212fd6547f 100644 --- a/ace/ace_dll.dsp +++ b/ace/ace_dll.dsp @@ -342,6 +342,10 @@ SOURCE=.\Event_Handler.cpp # End Source File
# Begin Source File
+SOURCE=.\Event_Handler_T.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\FIFO.cpp
# End Source File
# Begin Source File
@@ -3231,13 +3235,20 @@ SOURCE=.\Dump_T.cpp # End Source File
# Begin Source File
-SOURCE=.\Event_Handler_T.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
SOURCE=.\Framework_Component_T.cpp
+
+!IF "$(CFG)" == "ACE DLL - Win32 MFC Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 MFC Debug"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Release"
+
+!ELSEIF "$(CFG)" == "ACE DLL - Win32 Debug"
+
# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# Begin Source File
diff --git a/ace/ace_lib.dsp b/ace/ace_lib.dsp index 756cc88dc6f..9c9b475c791 100644 --- a/ace/ace_lib.dsp +++ b/ace/ace_lib.dsp @@ -42,8 +42,8 @@ RSC=rc.exe # PROP Output_Dir ""
# PROP Intermediate_Dir ".\LIB\Release"
# PROP Target_Dir ""
-MTL=midl.exe
LINK32=link.exe -lib
+MTL=midl.exe
# ADD BASE CPP /nologo /MD /W3 /GX /O1 /I "../" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
# SUBTRACT BASE CPP /YX
# ADD CPP /nologo /MT /W3 /GX /O1 /I "../" /I "../PACE" /D ACE_OS_HAS_DLL=0 /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
@@ -69,8 +69,8 @@ LIB32=link.exe -lib # PROP Output_Dir ""
# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Target_Dir ""
-MTL=midl.exe
LINK32=link.exe -lib
+MTL=midl.exe
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /FD /c
# SUBTRACT BASE CPP /YX
# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /Gy /I "../" /I "../PACE" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
@@ -96,8 +96,8 @@ LIB32=link.exe -lib # PROP Output_Dir ""
# PROP Intermediate_Dir ".\LIB\Release"
# PROP Target_Dir ""
-MTL=midl.exe
LINK32=link.exe -lib
+MTL=midl.exe
# ADD BASE CPP /nologo /G5 /MT /W3 /GX /O1 /I "../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /Zi /O1 /I "../" /I "../PACE" /D "_WINDOWS" /D "NDEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c
# SUBTRACT CPP /YX
@@ -122,8 +122,8 @@ LIB32=link.exe -lib # PROP Output_Dir ""
# PROP Intermediate_Dir ".\LIB\Debug"
# PROP Target_Dir ""
-MTL=midl.exe
LINK32=link.exe -lib
+MTL=midl.exe
# ADD BASE CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /I "../PACE" /D "_WINDOWS" /D "_DEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c
# SUBTRACT CPP /YX
@@ -333,6 +333,10 @@ SOURCE=.\Event_Handler.cpp # End Source File
# Begin Source File
+SOURCE=.\Event_Handler_T.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\FIFO.cpp
# End Source File
# Begin Source File
@@ -3218,13 +3222,20 @@ SOURCE=.\Dump_T.cpp # End Source File
# Begin Source File
-SOURCE=.\Event_Handler_T.cpp
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
SOURCE=.\Framework_Component_T.cpp
+
+!IF "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Static Release"
+
+!ELSEIF "$(CFG)" == "ACE LIB - Win32 Static Debug"
+
# PROP Exclude_From_Build 1
+
+!ENDIF
+
# End Source File
# Begin Source File
diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h index 1fd1a72fd5b..045c2211a3a 100644 --- a/ace/config-aix-4.x.h +++ b/ace/config-aix-4.x.h @@ -151,12 +151,6 @@ #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT #define ACE_HAS_NONCONST_SELECT_TIMEVAL #define ACE_HAS_IP_MULTICAST - -// Lacks perfect filtering, must bind group address. -#if !defined ACE_LACKS_PERFECT_MULTICAST_FILTERING -# define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 -#endif /* ACE_LACKS_PERFECT_MULTICAST_FILTERING */ - #define ACE_HAS_MSG #if (ACE_AIX_VERS < 402) # define ACE_LACKS_MSG_ACCRIGHTS diff --git a/ace/config-all.h b/ace/config-all.h index 16734aa9798..7c5670da39a 100644 --- a/ace/config-all.h +++ b/ace/config-all.h @@ -23,17 +23,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ // ========================================================================= -// Perfect Multicast filting refers to RFC 3376, where a socket is only -// delivered dgrams for groups joined even if it didn't bind the group -// address. We turn this option off by default, although most OS's -// except for Windows and Solaris probably lack perfect filtering. -// ========================================================================= - -# if !defined (ACE_LACKS_PERFECT_MULTICAST_FILTERING) -# define ACE_LACKS_PERFECT_MULTICAST_FILTERING 0 -# endif /* ACE_LACKS_PERFECT_MULTICAST_FILTERING */ - -// ========================================================================= // Enable/Disable Features By Default // ========================================================================= diff --git a/ace/config-freebsd-pthread.h b/ace/config-freebsd-pthread.h new file mode 100644 index 00000000000..3bc05498ff4 --- /dev/null +++ b/ace/config-freebsd-pthread.h @@ -0,0 +1,228 @@ +/* -*- C++ -*- */ +// $Id$ + +// The following configuration file is designed to work for FreeBSD +// platforms with GNU C++ and the POSIX (pthread) threads package. + +// Notice that the threaded version of ACE is only supported for -current. + +#ifndef ACE_CONFIG_H +#define ACE_CONFIG_H +#include "ace/pre.h" + +#include <osreldate.h> +// Make sure we source in the OS version. + +#if ! defined (__ACE_INLINE__) +#define __ACE_INLINE__ +#endif /* ! __ACE_INLINE__ */ + +#if (__FreeBSD_version < 220000) +#error Threads are not supported. +#endif /* __FreeBSD_version < 220000 */ + +#define ACE_SIZEOF_LONG_DOUBLE 12 + +#if defined (__GNUG__) +# include "ace/config-g++-common.h" +#endif /* __GNUG__ */ + +#if defined (ACE_HAS_PENTIUM) +# undef ACE_HAS_PENTIUM +#endif /* ACE_HAS_PENTIUM */ + +// Platform specific directives +// gcc defines __FreeBSD__ automatically for us. +#if !defined (_THREAD_SAFE) +#define _THREAD_SAFE +#endif /* _THREAD_SAFE */ + +#define ACE_HAS_GPERF + +#if (__FreeBSD_version < 420000) +#define ACE_LACKS_GETPGID +#define ACE_LACKS_SETPGID +#define ACE_LACKS_SETREGID +#define ACE_LACKS_SETREUID +#endif /* __FreeBSD_version < 420000 */ + +#define ACE_HAS_ALT_CUSERID +#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS +#define ACE_LACKS_RWLOCK_T +#define ACE_LACKS_READDIR_R +#define ACE_HAS_SIG_MACROS +// Optimize ACE_Handle_Set for select(). +#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT +#define ACE_HAS_NONCONST_SELECT_TIMEVAL +#define ACE_HAS_CHARPTR_DL +//#define ACE_USES_ASM_SYMBOL_IN_DLSYM +#define ACE_LACKS_SIGSET +#define ACE_NEEDS_SCHED_H + +// Use of <malloc.h> is deprecated. +#define ACE_LACKS_MALLOC_H + +// sched.h still not fully support on FreeBSD ? +// this is taken from /usr/src/lib/libc_r/uthread/pthread-private.h +enum schedparam_policy { + SCHED_RR, + SCHED_IO, + SCHED_FIFO, + SCHED_OTHER +}; + +// This won't be necessary after it is fixed in the system include headers. +extern "C" { char * cuserid (char *s); } + +// Platform supports POSIX timers via struct timespec. +#define ACE_HAS_POSIX_TIME +#define ACE_HAS_UALARM + +// Platform defines struct timespec but not timespec_t +#define ACE_LACKS_TIMESPEC_T + +#define ACE_LACKS_SYSTIME_H + +#define ACE_LACKS_STRRECVFD + +#define ACE_HAS_SIN_LEN + +// Platform supports System V IPC (most versions of UNIX, but not Win32) +#define ACE_HAS_SYSV_IPC + +// Compiler/platform contains the <sys/syscall.h> file. +#define ACE_HAS_SYSCALL_H + +#if (__FreeBSD_version >= 300000) +#define ACE_HAS_SIGINFO_T +#endif /* __FreeBSD_version >= 300000 */ + +#if (__FreeBSD_version >= 320000) +#define ACE_HAS_REENTRANT_FUNCTIONS +#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS +#define ACE_LACKS_PWD_REENTRANT_FUNCTIONS +#define ACE_LACKS_RAND_REENTRANT_FUNCTIONS +#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R +#endif /* __FreeBSD_version >= 320000 */ + +#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES +#define ACE_LACKS_SIGINFO_H +#define ACE_LACKS_UCONTEXT_H +#define ACE_LACKS_SI_ADDR + +// Compiler/platform supports SVR4 signal typedef +#define ACE_HAS_SVR4_SIGNAL_T + +// Compiler/platform supports alloca(). +#define ACE_HAS_ALLOCA + +// Compiler/platform supports SVR4 dynamic linking semantics.. +#define ACE_HAS_SVR4_DYNAMIC_LINKING + +// Compiler/platform correctly calls init()/fini() for shared libraries. +#define ACE_HAS_AUTOMATIC_INIT_FINI + +// Explicit dynamic linking permits "lazy" symbol resolution +#define ACE_HAS_RTLD_LAZY_V + +// platform supports POSIX O_NONBLOCK semantics +#define ACE_HAS_POSIX_NONBLOCK + +// platform supports IP multicast +#define ACE_HAS_IP_MULTICAST + +// Compiler/platform has <alloca.h> +//#define ACE_HAS_ALLOCA_H + +// Compiler/platform has the getrusage() system call. +#define ACE_HAS_GETRUSAGE + +// Compiler/platform defines the sig_atomic_t typedef. +#define ACE_HAS_SIG_ATOMIC_T + +// Compiler/platform supports sys_siglist array. +// *** This refers to (_sys_siglist) instead of (sys_siglist) +// #define ACE_HAS_SYS_SIGLIST + +// Compiler/platform defines a union semun for SysV shared memory. +#define ACE_HAS_SEMUN + +// Compiler supports the ssize_t typedef. +#define ACE_HAS_SSIZE_T + +// Compiler/platform supports strerror (). +#define ACE_HAS_STRERROR + +// Compiler/platform provides the sockio.h file. +#define ACE_HAS_SOCKIO_H + +// Defines the page size of the system. +#define ACE_PAGE_SIZE 4096 + +// Platform provides <sys/filio.h> header. +#define ACE_HAS_SYS_FILIO_H + +// Compiler/platform supports SVR4 gettimeofday() prototype +#define ACE_HAS_SUNOS4_GETTIMEOFDAY +// #define ACE_HAS_TIMEZONE_GETTIMEOFDAY + +// Turns off the tracing feature. +#if !defined (ACE_NTRACE) +#define ACE_NTRACE 1 +#endif /* ACE_NTRACE */ + +#define ACE_HAS_MSG +#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG +#define ACE_HAS_NONCONST_MSGSND + +// Thread specific settings +// Yes, we do have threads. +#define ACE_HAS_THREADS +// And they're even POSIX pthreads +#if !defined (ACE_MT_SAFE) +# define ACE_MT_SAFE 1 +#endif /* ! ACE_MT_SAFE */ +#define ACE_HAS_PTHREADS +#define ACE_LACKS_SETSCHED +#define ACE_LACKS_PTHREAD_CANCEL +#define ACE_LACKS_THREAD_PROCESS_SCOPING +#define ACE_LACKS_PTHREAD_THR_SIGSETMASK +#define ACE_LACKS_CONDATTR_PSHARED +#define ACE_LACKS_MUTEXATTR_PSHARED +#define ACE_HAS_THREAD_SPECIFIC_STORAGE +#define ACE_HAS_DIRENT + +#define ACE_HAS_SIGWAIT + +#define ACE_HAS_TERM_IOCTLS +#define ACE_USES_NEW_TERMIOS_STRUCT +#define TCGETS TIOCGETA +#define TCSETS TIOCSETA + +#if (__FreeBSD_version > 400000) +#undef ACE_LACKS_SETSCHED +#undef ACE_LACKS_SIGSET +#undef ACE_LACKS_UCONTEXT_H +#define ACE_HAS_UCONTEXT_T +#define ACE_HAS_SOCKLEN_T +#define ACE_HAS_GETIFADDRS +#endif + +#include <unistd.h> +#include <signal.h> +/* POSIX Realtime signals are not fully implemented in FreeBSD. + When they are implemented, then _POSIX_REALTIME_SIGNALS will be + defined, as specified in the POSIX standard. + Refer to e-mail thread on freebsd-hackers mailing list, October 2002. */ +#if defined (_POSIX_REALTIME_SIGNALS) && (_POSIX_REALTIME_SIGNALS != -1) +# define ACE_HAS_AIO_CALLS +# ifndef SIGRTMIN +# define SIGRTMIN 32 +# endif /* SIGRTMIN */ +# ifndef SIGRTMAX +# define SIGRTMAX (_SIG_MAXSIG - 1) +# endif /* SIGRTMAX */ +#endif /* _POSIX_REALTIME_SIGNALS */ + +#include "ace/post.h" +#endif /* ACE_CONFIG_H */ diff --git a/ace/config-freebsd.h b/ace/config-freebsd.h index f68947ba310..68c71148c6b 100644 --- a/ace/config-freebsd.h +++ b/ace/config-freebsd.h @@ -1,14 +1,15 @@ /* -*- C++ -*- */ // $Id$ +// ***** This configuration file is still under testing. ***** + // The following configuration file is designed to work for FreeBSD +// platforms using GNU C++ but without the POSIX (pthread) threads package -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H +#ifndef ACE_CONFIG_FREEBSD_H +#define ACE_CONFIG_FREEBSD_H #include "ace/pre.h" -#include "ace/config-posix.h" - #include <osreldate.h> // Make sure we source in the OS version. @@ -16,7 +17,7 @@ #define __ACE_INLINE__ #endif /* ! __ACE_INLINE__ */ -#if (__FreeBSD_version < 220000) +#if (__FreeBSD_version < 220000) && defined (_THREAD_SAFE) #error Threads are not supported. #endif /* __FreeBSD_version < 220000 */ @@ -26,57 +27,69 @@ # include "ace/config-g++-common.h" #endif /* __GNUG__ */ -#if defined (ACE_HAS_PENTIUM) -# undef ACE_HAS_PENTIUM -#endif /* ACE_HAS_PENTIUM */ - -// Platform specific directives -// gcc defines __FreeBSD__ automatically for us. -#ifdef ACE_HAS_THREADS -#if !defined (_THREAD_SAFE) -#define _THREAD_SAFE -#endif /* _THREAD_SAFE */ -#endif - #define ACE_HAS_GPERF -#if (__FreeBSD_version < 420000) +// Platform specific directives #define ACE_LACKS_GETPGID #define ACE_LACKS_SETPGID #define ACE_LACKS_SETREGID #define ACE_LACKS_SETREUID -#endif /* __FreeBSD_version < 420000 */ - -#define ACE_HAS_ALT_CUSERID -#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS #define ACE_LACKS_RWLOCK_T #define ACE_LACKS_READDIR_R #define ACE_HAS_SIG_MACROS -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT -#define ACE_HAS_NONCONST_SELECT_TIMEVAL #define ACE_HAS_CHARPTR_DL - -#if (__FreeBSD_version < 400000) +#define ACE_HAS_DIRENT +#define ACE_USES_ASM_SYMBOL_IN_DLSYM #define ACE_LACKS_SIGSET -#endif +#define ACE_LACKS_SIGINFO_H +#define ACE_LACKS_UCONTEXT_H +#define ACE_LACKS_SI_ADDR -#define ACE_NEEDS_SCHED_H +#if (__FreeBSD__ > 2) +#define ACE_HAS_SIGINFO_T +#endif /* __FreeBSD__ > 2 */ // Use of <malloc.h> is deprecated. #define ACE_LACKS_MALLOC_H -// sched.h still not fully support on FreeBSD ? -// this is taken from /usr/src/lib/libc_r/uthread/pthread-private.h -enum schedparam_policy { - SCHED_RR, - SCHED_IO, - SCHED_FIFO, - SCHED_OTHER -}; +// This is for 2.1.x only. By default, gcc defines __FreeBSD__ automatically +#if (__FreeBSD_version < 220000) -// This won't be necessary after it is fixed in the system include headers. -extern "C" { char * cuserid (char *s); } +#define ACE_HAS_CPLUSPLUS_HEADERS + +// This is to fix the nested struct if_data definition on FreeBSD 2.1.x +#include <sys/types.h> +#include <sys/time.h> +struct if_data { +/* generic interface information */ + u_char ifi_type; /* ethernet, tokenring, etc */ + u_char ifi_physical; /* e.g., AUI, Thinnet, 10base-T, etc */ + u_char ifi_addrlen; /* media address length */ + u_char ifi_hdrlen; /* media header length */ + u_long ifi_mtu; /* maximum transmission unit */ + u_long ifi_metric; /* routing metric (external only) */ + u_long ifi_baudrate; /* linespeed */ +/* volatile statistics */ + u_long ifi_ipackets; /* packets received on interface */ + u_long ifi_ierrors; /* input errors on interface */ + u_long ifi_opackets; /* packets sent on interface */ + u_long ifi_oerrors; /* output errors on interface */ + u_long ifi_collisions; /* collisions on csma interfaces */ + u_long ifi_ibytes; /* total number of octets received */ + u_long ifi_obytes; /* total number of octets sent */ + u_long ifi_imcasts; /* packets received via multicast */ + u_long ifi_omcasts; /* packets sent via multicast */ + u_long ifi_iqdrops; /* dropped on input, this interface */ + u_long ifi_noproto; /* destined for unsupported protocol */ + struct timeval ifi_lastchange;/* time of last administrative ch +ange */ +} ; + +// this is a hack, but since this only occured in FreeBSD 2.1.x, +// I guess it is ok. +#define ACE_HAS_BROKEN_TIMESPEC_MEMBERS + +#endif /* __FreeBSD_version < 220000 */ // Platform supports POSIX timers via struct timespec. #define ACE_HAS_POSIX_TIME @@ -97,26 +110,9 @@ extern "C" { char * cuserid (char *s); } // Compiler/platform contains the <sys/syscall.h> file. #define ACE_HAS_SYSCALL_H -#if (__FreeBSD_version >= 300000) -#define ACE_HAS_SIGINFO_T -#endif /* __FreeBSD_version >= 300000 */ - -#if (__FreeBSD_version >= 320000) -#define ACE_HAS_REENTRANT_FUNCTIONS -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS -#define ACE_LACKS_PWD_REENTRANT_FUNCTIONS -#define ACE_LACKS_RAND_REENTRANT_FUNCTIONS -#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R -#endif /* __FreeBSD_version >= 320000 */ - +#if !defined(FreeBSD_2_1) #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES -#define ACE_LACKS_SIGINFO_H - -#if (__FreeBSD_version < 400000) -#define ACE_LACKS_UCONTEXT_H -#endif - -#define ACE_LACKS_SI_ADDR +#endif /* defined FreeBSD_2_1 */ // Compiler/platform supports SVR4 signal typedef #define ACE_HAS_SVR4_SIGNAL_T @@ -139,11 +135,6 @@ extern "C" { char * cuserid (char *s); } // platform supports IP multicast #define ACE_HAS_IP_MULTICAST -// Lacks perfect filtering, must bind group address. -#if !defined ACE_LACKS_PERFECT_MULTICAST_FILTERING -# define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 -#endif /* ACE_LACKS_PERFECT_MULTICAST_FILTERING */ - // Compiler/platform has <alloca.h> //#define ACE_HAS_ALLOCA_H @@ -188,58 +179,18 @@ extern "C" { char * cuserid (char *s); } #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG #define ACE_HAS_NONCONST_MSGSND -// Thread specific settings -// Yes, we do have threads. -#ifdef ACE_HAS_THREADS -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif /* ! ACE_MT_SAFE */ -#endif /* ACE_HAS_THREADS */ - -#if (__FreeBSD_version > 400000) -#define ACE_LACKS_SETSCHED -#endif - -#if (__FreeBSD_version < 420000) -#define ACE_LACKS_PTHREAD_CANCEL -#endif - -#define ACE_LACKS_THREAD_PROCESS_SCOPING -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK -#define ACE_LACKS_CONDATTR_PSHARED -#define ACE_LACKS_MUTEXATTR_PSHARED -#define ACE_HAS_THREAD_SPECIFIC_STORAGE -#define ACE_HAS_DIRENT - +#if (__FreeBSD_version >= 228000) #define ACE_HAS_SIGWAIT +#endif /* __FreeBSD_version >= 22800 */ + +// Optimize ACE_Handle_Set for select(). +#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT +#define ACE_HAS_NONCONST_SELECT_TIMEVAL #define ACE_HAS_TERM_IOCTLS #define ACE_USES_NEW_TERMIOS_STRUCT #define TCGETS TIOCGETA #define TCSETS TIOCSETA -#if (__FreeBSD_version > 400000) -#define ACE_HAS_UCONTEXT_T -#define ACE_HAS_SOCKLEN_T -#define ACE_HAS_GETIFADDRS -#endif - -// Note, on FreeBSD 5, POSIX aio is now an optional kernel module which -// must be loaded. -// Read the aio(4) man page for what to do, otherwise any aio_* call -// will coredump. - -// By default use Proactor which does not use POSIX Real-time Signals -#ifdef ACE_HAS_AIO_CALLS -#ifndef ACE_POSIX_AIOCB_PROACTOR -#define ACE_POSIX_AIOCB_PROACTOR -#endif /* ACE_POSIX_AIOCB_PROACTOR */ -#endif /* ACE_HAS_AIO_CALLS */ - -/* FreeBSD does not define sigval_t */ -#include <sys/signal.h> -typedef union sigval sigval_t; - #include "ace/post.h" - -#endif /* ACE_CONFIG_H */ +#endif /* ACE_CONFIG_FREEBSD_H */ diff --git a/ace/config-linux-common.h b/ace/config-linux-common.h index 466b0a476f9..63acbe7c29b 100644 --- a/ace/config-linux-common.h +++ b/ace/config-linux-common.h @@ -168,16 +168,6 @@ # endif /* ACE_POSIX_SIG_PROACTOR */ #if __GLIBC__ >= 2 -#ifndef ACE_HAS_POSIX_REALTIME_SIGNALS -#define ACE_HAS_POSIX_REALTIME_SIGNALS -#endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ - -#ifndef ACE_HAS_AIO_CALLS -#define ACE_HAS_AIO_CALLS -#endif /* ACE_HAS_AIO_CALLS */ -#endif - -#if __GLIBC__ >= 2 // glibc 2 and higher has wchar support # define ACE_HAS_XPG4_MULTIBYTE_CHAR #endif @@ -221,11 +211,6 @@ # define ACE_HAS_IP_MULTICAST #endif /* ! ACE_HAS_IP_MULTICAST */ -// At least for IPv4, Linux lacks perfect filtering. -#if !defined ACE_LACKS_PERFECT_MULTICAST_FILTERING -# define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 -#endif /* ACE_LACKS_PERFECT_MULTICAST_FILTERING */ - #define ACE_HAS_BIG_FD_SET // Linux defines struct msghdr in /usr/include/socket.h diff --git a/ace/config-macosx.h b/ace/config-macosx.h index 48f21466797..d47811133e9 100644 --- a/ace/config-macosx.h +++ b/ace/config-macosx.h @@ -167,26 +167,13 @@ #define ACE_LACKS_SIGINFO_H #define ACE_HAS_UCONTEXT_T #define ACE_HAS_GETIFADDRS - -// dlcompat package (not part of base Darwin) is needed for dlopen(). -// Fink installer puts libraries in /sw/lib and headers in /sw/include -// In order to install dlcompat do the following: -// - download fink from http://fink.sf.net -// - type: -// fink install dlcompat -#define ACE_HAS_SVR4_DYNAMIC_LINKING -#define ACE_LD_SEARCH_PATH ACE_LIB_TEXT ("DYLD_LIBRARY_PATH") -#define ACE_DLL_SUFFIX ACE_LIB_TEXT (".dylib") +#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES // gperf seems to need this #define ACE_HAS_NONSTATIC_OBJECT_MANAGER -// gcc 3.1 is broken, gcc 3.3 is a bit better -#if defined(__GNUC__) && (__GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 3)) -# define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES - // Remove the following when Apple fixes static template member problem - // in their compiler +// Remove the following when Apple fixes static template member problem in their +// compiler #define ACE_HAS_POSITION_INDEPENDENT_POINTERS 0 -#endif #endif /* ACE_CONFIG_MACOSX_H */ diff --git a/ace/config-netbsd.h b/ace/config-netbsd.h index ab5eadae6e7..386ef450277 100644 --- a/ace/config-netbsd.h +++ b/ace/config-netbsd.h @@ -127,11 +127,6 @@ ange */ // platform supports IP multicast #define ACE_HAS_IP_MULTICAST -// Lacks perfect filtering, must bind group address. -#if !defined ACE_LACKS_PERFECT_MULTICAST_FILTERING -# define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 -#endif /* ACE_LACKS_PERFECT_MULTICAST_FILTERING */ - // Compiler/platform has <alloca.h> //#define ACE_HAS_ALLOCA_H diff --git a/ace/config-openbsd-pthread.h b/ace/config-openbsd-pthread.h index 209b19201a8..f355ed0feba 100644 --- a/ace/config-openbsd-pthread.h +++ b/ace/config-openbsd-pthread.h @@ -202,11 +202,5 @@ // bogus compiler syntax error. #define ACE_LACKS_CLEARERR -#define ACE_HAS_MKSTEMP - -// OpenBSD supports IPv6 by default, but ACE IPv6 code -// has compile errors. -//#define ACE_HAS_IPV6 - #include "ace/post.h" #endif /* ACE_CONFIG_H */ diff --git a/ace/config-openbsd.h b/ace/config-openbsd.h index d2913998331..cdd4a04fb52 100644 --- a/ace/config-openbsd.h +++ b/ace/config-openbsd.h @@ -94,11 +94,6 @@ // platform supports IP multicast #define ACE_HAS_IP_MULTICAST -// Lacks perfect filtering, must bind group address. -#if !defined ACE_LACKS_PERFECT_MULTICAST_FILTERING -# define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1 -#endif /* ACE_LACKS_PERFECT_MULTICAST_FILTERING */ - // Compiler/platform has <alloca.h> //#define ACE_HAS_ALLOCA_H @@ -149,7 +144,6 @@ #define ACE_HAS_MSG #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG #define ACE_HAS_NONCONST_MSGSND -#define ACE_HAS_ALT_CUSERID #define ACE_HAS_SIGWAIT @@ -166,11 +160,5 @@ // bogus compiler syntax error. #define ACE_LACKS_CLEARERR -#define ACE_HAS_MKSTEMP - -// OpenBSD supports IPv6 by default, but ACE IPv6 code -// has compile errors. -//#define ACE_HAS_IPV6 - #include "ace/post.h" #endif /* ACE_CONFIG_H */ diff --git a/ace/config-posix.h b/ace/config-posix.h deleted file mode 100644 index be5734c451a..00000000000 --- a/ace/config-posix.h +++ /dev/null @@ -1,60 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#ifndef ACE_CONFIG_POSIX_H -#define ACE_CONFIG_POSIX_H - -#include <unistd.h> - -/* The following POSIX constants are defined after <unistd.h> is - * included. They are documented in: - * http://www.opengroup.org/onlinepubs/007904975/basedefs/unistd.h.html - */ -#if defined(_POSIX_REALTIME_SIGNALS) && (_POSIX_REALTIME_SIGNALS-0 != -1 ) -# if !defined(ACE_HAS_POSIX_REALTIME_SIGNALS) -# define ACE_HAS_POSIX_REALTIME_SIGNALS -# endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ -#endif /* _POSIX_REALTIME_SIGNALS */ - -#if defined(_POSIX_ASYNCHRONOUS_IO) && (_POSIX_ASYNCHRONOUS_IO-0 != -1 ) -# if !defined(ACE_HAS_AIO_CALLS) -# define ACE_HAS_AIO_CALLS -# endif /* ACE_HAS_AIO_CALLS */ -#endif /* _POSIX_ASYNCHRONOUS_IO */ - -#if defined(_POSIX_SEMAPHORES) && (_POSIX_SEMAPHORES-0 != -1 ) -# if !defined(ACE_HAS_POSIX_SEM) -# define ACE_HAS_POSIX_SEM -# endif /* ACE_HAS_POSIX_SEM */ -#endif /* ACE_HAS_POSIX_SEM */ - -#if defined(_POSIX_MESSAGE_PASSING) && (_POSIX_MESSAGE_PASSING-0 != -1 ) -# if !defined(ACE_HAS_POSIX_MESSAGE_PASSING) -# define ACE_HAS_POSIX_MESSAGE_PASSING -# endif /* ACE_HAS_POSIX_MESSAGE_PASSING */ -#endif /* _POSIX_MESSAGE_PASSING */ - -#if defined(_POSIX_SHARED_MEMORY_OBJECTS) && (_POSIX_SHARED_MEMORY_OBJECTS-0 != -1 ) -# if !defined(ACE_HAS_SHM_OPEN) -# define ACE_HAS_SHM_OPEN -# endif /* ACE_HAS_SHM_OPEN */ -#endif /* _POSIX_SHARED_MEMORY_OBJECTS */ - -#if defined(_POSIX_THREADS) && (_POSIX_THREADS-0 != -1 ) -# if !defined(ACE_HAS_THREADS) -# define ACE_HAS_THREADS -# endif /* ACE_HAS_THREADS */ - -# if !defined(ACE_HAS_PTHREADS) -# define ACE_HAS_PTHREADS -# endif /* ACE_HAS_PTHREADS */ -#endif /* _POSIX_THREADS */ - -#if defined(_POSIX_MESSAGE_PASSING) && (_POSIX_MESSAGE_PASSING-0 != -1 ) -# if !defined(ACE_HAS_POSIX_MESSAGE_PASSING) -# define ACE_HAS_POSIX_MESSAGE_PASSING -# endif /* ACE_HAS_POSIX_MESSAGE_PASSING */ -#endif /* _POSIX_MESSAGE_PASSING */ - -#endif /* ACE_CONFIG_POSIX_H */ - diff --git a/ace/config-sunos5.6.h b/ace/config-sunos5.6.h index 81127a1a809..7888bebcc9c 100644 --- a/ace/config-sunos5.6.h +++ b/ace/config-sunos5.6.h @@ -111,22 +111,10 @@ #define ACE_HAS_AIO_CALLS #endif /* ACE_HAS_AIO_CALLS */ -#if !defined (ACE_HAS_POSIX_REALTIME_SIGNALS) -#define ACE_HAS_POSIX_REALTIME_SIGNALS -#endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ - -#if !defined (ACE_HAS_POSIX_MESSAGE_PASSING) -#define ACE_HAS_POSIX_MESSAGE_PASSING -#endif /* ACE_HAS_POSIX_MESSAGE_PASSING */ - -#if !defined (ACE_HAS_POSIX_SEM) #define ACE_HAS_POSIX_SEM -#endif /* ACE_HAS_POSIX_SEM */ // Sunos 5.6's aio_* with RT signals is broken. -#if !defined (ACE_POSIX_AIOCB_PROACTOR) #define ACE_POSIX_AIOCB_PROACTOR -#endif /* ACE_POSIX_AIOCB_PROACTOR */ // SunOS 5.6 has a buggy select #define ACE_HAS_LIMITED_SELECT diff --git a/apps/gperf/src/Key_List.cpp b/apps/gperf/src/Key_List.cpp index 80d3d89e840..19f856148d8 100644 --- a/apps/gperf/src/Key_List.cpp +++ b/apps/gperf/src/Key_List.cpp @@ -759,7 +759,7 @@ Key_List::output_keylength_table (void) ACE_OS::printf ("\n%sstatic %sunsigned %s lengthtable[] =\n%s%s{\n ", indent, option[CONSTANT] ? "const " : "", - max_key_len <= ((int) UCHAR_MAX) ? "char" : (max_key_len <= ((int) USHRT_MAX) ? "short" : "long"), + max_key_len <= UCHAR_MAX ? "char" : (max_key_len <= USHRT_MAX ? "short" : "long"), indent, indent); @@ -1118,7 +1118,7 @@ Key_List::output_hash_function (void) // Generate the asso_values table. ACE_OS::printf (" static %sunsigned %s asso_values[] =\n {", option[CONSTANT] ? "const " : "", - max_hash_value <= ((int) UCHAR_MAX) ? "char" : (max_hash_value <= ((int) USHRT_MAX) ? "short" : "int")); + max_hash_value <= UCHAR_MAX ? "char" : (max_hash_value <= USHRT_MAX ? "short" : "int")); ACE_OS::printf ("\n#if defined (ACE_MVS)"); #if ACE_STANDARD_CHARACTER_SET_SIZE == ACE_EBCDIC_SIZE diff --git a/bin/MakeProjectCreator/README b/bin/MakeProjectCreator/README index 8b69baa3bdc..0186539ad14 100644 --- a/bin/MakeProjectCreator/README +++ b/bin/MakeProjectCreator/README @@ -93,16 +93,14 @@ dllout (Windows Only) Specifies where the dll will be placed libout (Windows Only) Specifies where the lib will be placed install Specifies where the executable (or library non-Windows) will go idlflags Specifies the idl flags to be used when processing idl files -idlgendir Specifies the output directory for idl generated files. - If a listed idl file has a directory as part of the name, - the generated files will go in that directory unless - idlgendir specifies otherwise. idlpreprocessor Simple assignment used in the gnu template only pch_header Specifies the precompiled header file name pch_source Specifies the precompiled source file name ssl Specifies that the project will use ssl tao Specifies that the project will use TAO version Specifies the version number for the library or executable +flag_overrides Used to determine flags that have been overriden on a per + file basis. libpaths Specifies 1 or more locations to find libraries includes Specifies 1 or more locations to find include files @@ -112,20 +110,6 @@ depends Specifies 1 or more project names upon which this project depend dllflags (Windows Only) Specifies preprocessor flags needed for dll's libflags (Windows Only) Specifies preprocessor flags needed for lib's -verbatim This allows arbitrary information to be place in a generated - project file. The syntax is as follows: - - verbatim(<project type>, <location>) { - .. - .. - } - - When MPC is generating a project of type <project type> and - comes upon a marker that matches the <location> name, it - will place the text found inside the construct directly into - the generated project. If you need to preserve whitespace, - the line or lines should be placed inside double quotes. - The Following are GNU only: requires Specifies which tao macros should be set to build the target avoids Specifies which tao macros should not be set to build the target @@ -143,8 +127,6 @@ guid This is used by the VC7 project and workspace creator. configurations When used within a foreach context, this info (each configuration) is gathered for use with the VC7 workspace creator. -flag_overrides Used to determine flags that have been overriden on a per - file basis. Defaulting Behavior diff --git a/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm b/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm index 860f8639f5b..6d3769ed4f7 100644 --- a/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm +++ b/bin/MakeProjectCreator/modules/BorlandProjectCreator.pm @@ -27,11 +27,11 @@ sub translate_value { my($key) = shift; my($val) = shift; - if ($key eq 'depends' && $val ne '') { + if ($key eq 'depends' && $val ne "") { my($arr) = $self->create_array($val); - $val = ''; + $val = ""; foreach my $entry (@$arr) { - $val .= '"' . $self->project_file_name($entry) . '" '; + $val .= "\"" . $self->project_file_name($entry) . "\" "; } $val =~ s/\s+$//; } @@ -44,16 +44,14 @@ sub fill_value { my($name) = shift; my($value) = undef; - if ($name eq 'cppdir') { - my(%dirnames) = (); - foreach my $file ($self->get_component_list('source_files')) { - my($dirname) = dirname($file); - if ($dirname eq '') { - $dirname = '.'; - } + if ($name eq "cppdir") { + my %dirnames; + foreach my $file ($self->get_component_list("source_files")) { + my $dirname = dirname($file); + $dirname = "." if $dirname eq ""; $dirnames{$dirname} = 1; } - $value = join(';', sort keys %dirnames); + $value = join(";", sort keys %dirnames); } return $value; @@ -68,25 +66,25 @@ sub project_file_name { $name = $self->project_name(); } - return 'Makefile' . ($name eq '' ? '' : ".$name") . '.bor'; + return "Makefile" . ($name eq "" ? "" : ".$name") . ".bor"; } sub get_dll_exe_template_input_file { - #my($self) = shift; - return 'borexe'; + my($self) = shift; + return "borexe"; } sub get_dll_template_input_file { - #my($self) = shift; - return 'bordll'; + my($self) = shift; + return "bordll"; } sub get_template { - #my($self) = shift; - return 'bor'; + my($self) = shift; + return "bor"; } diff --git a/bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm b/bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm index 8c9d580bfc7..5b22ff642de 100644 --- a/bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm +++ b/bin/MakeProjectCreator/modules/BorlandWorkspaceCreator.pm @@ -24,13 +24,13 @@ use vars qw(@ISA); # ************************************************************ sub workspace_file_name { - #my($self) = shift; - return 'Makefile.bor'; + my($self) = shift; + return "Makefile.bor"; } sub workspace_per_project { - #my($self) = shift; + my($self) = shift; return 1; } @@ -43,7 +43,7 @@ sub pre_workspace { print $fh "#----------------------------------------------------------------------------$crlf" . "# Borland Workspace$crlf" . "#----------------------------------------------------------------------------$crlf" . - $crlf; + "$crlf"; } @@ -57,8 +57,8 @@ sub write_comps { print $fh "!include <\$(ACE_ROOT)\\include\\makeinclude\\make_flags.bor>$crlf"; - foreach my $target ('all', 'clean', 'realclean', 'install') { - print $fh $crlf . + foreach my $target ("all", "clean", "realclean", "install") { + print $fh "$crlf" . "$target\:$crlf"; foreach my $project (@list) { my($dir) = dirname($project); @@ -67,11 +67,11 @@ sub write_comps { ## If the directory isn't "." then we need ## to figure out how to get back to our starting point - if ($dir ne '.') { + if ($dir ne ".") { $chdir = 1; my($length) = length($dir); for(my $i = 0; $i < $length; $i++) { - if (substr($dir, $i, 1) eq '/') { + if (substr($dir, $i, 1) eq "/") { $back++; } } @@ -79,15 +79,15 @@ sub write_comps { ## These commands will work. In practicality, only the ## default configuration can be built at the top level. - print $fh ($chdir ? "\t\@cd $dir$crlf" : '') . + print $fh ($chdir ? "\t\@cd $dir$crlf" : "") . "\t\$(MAKE) -\$(MAKEFLAGS) \$(MAKE_FLAGS) -f " . basename($project) . " $target$crlf" . - ($chdir ? "\t\@cd " . ('../' x $back) . $crlf : ''); + ($chdir ? "\t\@cd " . ("../" x $back) . $crlf : ""); } } # Generate a convenient rule for regenerating the workspace. - my($cmd) = "perl $0 " . join(" ", @ARGV); - print $fh $crlf . + my($cmd) = "perl " . $0 . " " . join(" ", @ARGV); + print $fh "$crlf" . "regenerate:$crlf" . "\t$cmd$crlf"; } diff --git a/bin/MakeProjectCreator/modules/Creator.pm b/bin/MakeProjectCreator/modules/Creator.pm index 13e796e69ed..bdfe8dd455e 100644 --- a/bin/MakeProjectCreator/modules/Creator.pm +++ b/bin/MakeProjectCreator/modules/Creator.pm @@ -11,6 +11,7 @@ package Creator; # ************************************************************ use strict; +use Cwd; use FileHandle; use File::Basename; @@ -44,7 +45,7 @@ sub new { $self->{'type_check'} = $type . '_defined'; $self->{'global_read'} = 0; $self->{'include_path'} = $inc; - $self->{'current_input'} = ''; + $self->{'current_input'} = ""; $self->{'progress'} = $progress; $self->{'addtemp'} = $addtemp; $self->{'addproj'} = $addproj; @@ -56,7 +57,7 @@ sub new { sub generate_default_input { my($self) = shift; $self->parse_line(undef, "$self->{'grammar_type'} {"); - $self->parse_line(undef, '}'); + $self->parse_line(undef, "}"); return 1; } @@ -107,7 +108,7 @@ sub generate { ## An empty input file name says that we ## should generate a default input file and use that - if ($input eq '') { + if ($input eq "") { $status = $self->generate_default_input(); } else { @@ -128,17 +129,17 @@ sub parse_assignment { if ($line =~ /^(\w+)\s*=\s*(.*)?/) { my($name) = lc($1); my($value) = $2; - push(@$values, 'assignment', $name, $value); + push(@$values, "assignment", $name, $value); } elsif ($line =~ /^(\w+)\s*\+=\s*(.*)?/) { my($name) = lc($1); my($value) = $2; - push(@$values, 'assign_add', $name, $value); + push(@$values, "assign_add", $name, $value); } elsif ($line =~ /^(\w+)\s*\-=\s*(.*)?/) { my($name) = lc($1); my($value) = $2; - push(@$values, 'assign_sub', $name, $value); + push(@$values, "assign_sub", $name, $value); } else { $status = 0; @@ -152,7 +153,7 @@ sub parse_known { my($self) = shift; my($line) = shift; my($status) = 1; - my($errorString) = ''; + my($errorString) = ""; my($type) = $self->{'grammar_type'}; my(@values) = (); my($typecheck) = $self->{'type_check'}; @@ -164,7 +165,7 @@ sub parse_known { ## allows for the most compact file as human readably ## possible. ## - if ($line eq '') { + if ($line eq "") { } elsif ($line =~ /^$type\s*(\([^\)]+\))?\s*(:.*)?\s*{$/) { my($name) = $1; @@ -179,14 +180,14 @@ sub parse_known { foreach my $parent (split(/[:,]/, $parents)) { $parent =~ s/^\s+//; $parent =~ s/\s+$//; - if ($parent ne '') { + if ($parent ne "") { push(@parents, $parent); } } if (!defined $parents[0]) { ## The : was used, but no parents followed. This ## is an error. - $errorString = 'ERROR: No parents listed'; + $errorString = "ERROR: No parents listed"; $status = 0; } $parents = \@parents; @@ -219,9 +220,9 @@ sub parse_known { $name =~ s/\s*\)$//; } else { - $name = 'default'; + $name = "default"; } - push(@values, 'component', $comp, $name); + push(@values, "component", $comp, $name); } else { $errorString = "ERROR: Unrecognized line: $line"; @@ -234,7 +235,7 @@ sub parse_known { sub base_directory { my($self) = shift; - return basename($self->getcwd()); + return basename(getcwd()); } @@ -245,7 +246,7 @@ sub generate_default_file_list { my(@files) = (); if (!defined $dir) { - $dir = '.'; + $dir = "."; } if (opendir($dh, $dir)) { @@ -256,7 +257,7 @@ sub generate_default_file_list { ## Prefix each file name with the directory ## only if it's not . - if ($dir ne '.') { + if ($dir ne ".") { for(my $i = 0; $i <= $#files; $i++) { $files[$i] = "$dir/$files[$i]"; } @@ -314,8 +315,8 @@ sub get_relative { sub windows_crlf { - #my($self) = shift; - if ($^O eq 'MSWin32' || $^O eq 'cygwin') { + my($self) = shift; + if ($^O eq 'MSWin32') { return "\n"; } else { @@ -362,18 +363,18 @@ sub get_addproj { # ************************************************************ sub crlf { - #my($self) = shift; + my($self) = shift; return "\n"; } sub reset_values { - #my($self) = shift; + my($self) = shift; } sub sort_files { - #my($self) = shift; + my($self) = shift; return 1; } @@ -387,8 +388,8 @@ sub file_sorter { sub read_global_configuration { - #my($self) = shift; - #my($input) = shift; + my($self) = shift; + my($input) = shift; return 1; } diff --git a/bin/MakeProjectCreator/modules/Driver.pm b/bin/MakeProjectCreator/modules/Driver.pm index 25336693df7..b1aa3d0aa2c 100644 --- a/bin/MakeProjectCreator/modules/Driver.pm +++ b/bin/MakeProjectCreator/modules/Driver.pm @@ -151,6 +151,7 @@ sub run { foreach my $creator (@$creators) { my($tag) = lc(substr($creator, 0, $signif)); $self->{'types'}->{$tag} = $creator; + require "$creator.pm"; } for(my $i = 0; $i <= $#args; $i++) { @@ -340,16 +341,9 @@ sub run { ## Set up un-buffered output for the progress callback $| = 1; - ## Set up a hash that we can use to keep track of what - ## has been 'required' - my(%loaded) = (); ## Generate the files foreach my $file (@input) { foreach my $name (@generators) { - if (!$loaded{$name}) { - require "$name.pm"; - $loaded{$name} = 1; - } my($generator) = $name->new($global, \@include, $template, \%ti, $dynamic, $static, \%relative, \%addtemp, \%addproj, diff --git a/bin/MakeProjectCreator/modules/EM3ProjectCreator.pm b/bin/MakeProjectCreator/modules/EM3ProjectCreator.pm index b15f24d9726..8a3806f49d0 100644 --- a/bin/MakeProjectCreator/modules/EM3ProjectCreator.pm +++ b/bin/MakeProjectCreator/modules/EM3ProjectCreator.pm @@ -26,8 +26,8 @@ sub fill_value { my($name) = shift; my($value) = undef; - if ($name eq 'make_file_name') { - $value = $self->base_project_name() . '.vcn'; + if ($name eq "make_file_name") { + $value = $self->base_project_name() . ".vcn"; } return $value; @@ -36,43 +36,43 @@ sub fill_value { sub project_file_name { my($self) = shift; - return $self->project_name() . '.vcp'; + return $self->project_name() . ".vcp"; } sub static_project_file_name { my($self) = shift; - return $self->project_name() . $self->get_static_append() . '.vcp'; + return $self->project_name() . $self->get_static_append() . ".vcp"; } sub get_dll_exe_template_input_file { - #my($self) = shift; - return 'em3vcpdllexe'; + my($self) = shift; + return "em3vcpdllexe"; } sub get_lib_exe_template_input_file { - #my($self) = shift; - return 'em3vcplibexe'; + my($self) = shift; + return "em3vcplibexe"; } sub get_lib_template_input_file { - #my($self) = shift; - return 'em3vcplib'; + my($self) = shift; + return "em3vcplib"; } sub get_dll_template_input_file { - #my($self) = shift; - return 'em3vcpdll'; + my($self) = shift; + return "em3vcpdll"; } sub get_template { - #my($self) = shift; - return 'em3vcp'; + my($self) = shift; + return "em3vcp"; } diff --git a/bin/MakeProjectCreator/modules/EM3WorkspaceCreator.pm b/bin/MakeProjectCreator/modules/EM3WorkspaceCreator.pm index a149e551cf5..56fdb137a35 100644 --- a/bin/MakeProjectCreator/modules/EM3WorkspaceCreator.pm +++ b/bin/MakeProjectCreator/modules/EM3WorkspaceCreator.pm @@ -25,7 +25,7 @@ use vars qw(@ISA); sub workspace_file_name { my($self) = shift; - return $self->get_workspace_name() . '.vcw'; + return $self->get_workspace_name() . ".vcw"; } @@ -36,7 +36,7 @@ sub pre_workspace { print $fh "Microsoft eMbedded Visual Tools Workspace File, Format Version 3.00$crlf" . "# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!$crlf" . - $crlf; + "$crlf"; } diff --git a/bin/MakeProjectCreator/modules/GHSProjectCreator.pm b/bin/MakeProjectCreator/modules/GHSProjectCreator.pm index 502d2e6e8bd..c370bfbda73 100644 --- a/bin/MakeProjectCreator/modules/GHSProjectCreator.pm +++ b/bin/MakeProjectCreator/modules/GHSProjectCreator.pm @@ -26,11 +26,11 @@ sub translate_value { my($key) = shift; my($val) = shift; - if ($key eq 'depends' && $val ne '') { + if ($key eq 'depends' && $val ne "") { my($arr) = $self->create_array($val); - $val = ''; + $val = ""; foreach my $entry (@$arr) { - $val .= '"' . $self->project_file_name($entry) . '" '; + $val .= "\"" . $self->project_file_name($entry) . "\" "; } $val =~ s/\s+$//; } @@ -59,20 +59,20 @@ sub project_file_name { sub get_dll_exe_template_input_file { - #my($self) = shift; - return 'ghsexe'; + my($self) = shift; + return "ghsexe"; } sub get_dll_template_input_file { - #my($self) = shift; - return 'ghsdll'; + my($self) = shift; + return "ghsdll"; } sub get_template { - #my($self) = shift; - return 'ghs'; + my($self) = shift; + return "ghs"; } diff --git a/bin/MakeProjectCreator/modules/GHSWorkspaceCreator.pm b/bin/MakeProjectCreator/modules/GHSWorkspaceCreator.pm index a3b0ebfbf71..d81f0aeccbd 100644 --- a/bin/MakeProjectCreator/modules/GHSWorkspaceCreator.pm +++ b/bin/MakeProjectCreator/modules/GHSWorkspaceCreator.pm @@ -24,8 +24,8 @@ use vars qw(@ISA); # ************************************************************ sub workspace_file_name { - #my($self) = shift; - return 'ghs/default.bld'; + my($self) = shift; + return "ghs/default.bld"; } @@ -59,7 +59,7 @@ sub write_comps { foreach my $project (@list) { ## Convert all /'s to \ - $project = $self->slash_to_backslash($project); + $project =~ s/\//\\/g; print $fh "..\\$project$crlf"; if ($gen->exe_target()) { diff --git a/bin/MakeProjectCreator/modules/GNUProjectCreator.pm b/bin/MakeProjectCreator/modules/GNUProjectCreator.pm index d360d535c85..8810247e8bf 100644 --- a/bin/MakeProjectCreator/modules/GNUProjectCreator.pm +++ b/bin/MakeProjectCreator/modules/GNUProjectCreator.pm @@ -22,9 +22,9 @@ use vars qw(@ISA); # Data Section # ************************************************************ -my(%compscript) = ('ACE_COMPONENTS' => ['--ace', '--set'], - 'TAO_COMPONENTS' => ['--tao', '--set'], - 'ORBSVCS_COMPONENTS' => ['--orbsvcs', '--append'], +my(%compscript) = ('ACE_COMPONENTS' => ["--ace", "--set"], + 'TAO_COMPONENTS' => ["--tao", "--set"], + 'ORBSVCS_COMPONENTS' => ["--orbsvcs", "--append"], ); # ************************************************************ @@ -32,7 +32,7 @@ my(%compscript) = ('ACE_COMPONENTS' => ['--ace', '--set'], # ************************************************************ sub sort_files { - #my($self) = shift; + my($self) = shift; return 0; } @@ -42,11 +42,11 @@ sub translate_value { my($key) = shift; my($val) = shift; - if ($key eq 'depends' && $val ne '') { + if ($key eq 'depends' && $val ne "") { my($arr) = $self->create_array($val); - $val = ''; + $val = ""; foreach my $entry (@$arr) { - $val .= '"' . $self->project_file_name($entry) . '" '; + $val .= "\"" . $self->project_file_name($entry) . "\" "; } $val =~ s/\s+$//; } @@ -55,7 +55,7 @@ sub translate_value { sub convert_slashes { - #my($self) = shift; + my($self) = shift; return 0; } @@ -68,9 +68,9 @@ sub fill_value { my($tag) = 'source_files'; my($names) = $self->{$tag}; - if ($name eq 'gnu_source_files') { + if ($name eq "gnu_source_files") { my(%vpath) = (); - $value = ''; + $value = ""; foreach my $name (keys %$names) { my($comps) = $$names{$name}; @@ -86,15 +86,15 @@ sub fill_value { my($dname) = dirname($item); $item =~ s/\.[^\.]+$//; - if ($dname ne '.' && $dname !~ /^\.\.\//) { + if ($dname ne "." && $dname !~ /^\.\.\//) { $vpath{$dname} = 1; } - $value .= "$crlf $item" . ($i != $#arr ? " \\" : ''); + $value .= "$crlf $item" . ($i != $#arr ? " \\" : ""); } } } foreach my $name (keys %$names) { - my($fname) = ''; + my($fname) = ""; my($comps) = $$names{$name}; foreach my $key (sort keys %$comps) { $fname = $key; @@ -102,15 +102,15 @@ sub fill_value { last; } - if ($name ne 'default') { - $fname = 'FILES'; + if ($name ne "default") { + $fname = "FILES"; $value .= "$crlf$crlf" . "ifndef $name$crlf" . " $name = \\$crlf"; my(@keys) = sort keys %$comps; for(my $i = 0; $i <= $#keys; $i++) { $keys[$i] =~ s/^\d+_//; my($key) = $keys[$i]; - $value .= " $key" . ($i != $#keys ? " \\" : '') . $crlf; + $value .= " $key" . ($i != $#keys ? " \\" : "") . $crlf; } $value .= "endif # $name"; @@ -123,27 +123,27 @@ sub fill_value { } my(@vkeys) = sort keys %vpath; if ($#vkeys >= 0) { - $value .= "$crlf$crlf" . 'VPATH = .'; + $value .= "$crlf$crlf" . "VPATH = ."; foreach my $key (@vkeys) { $value .= ":$key"; } } } - elsif ($name eq 'build') { + elsif ($name eq "build") { foreach my $name (keys %$names) { - if ($name ne 'default') { + if ($name ne "default") { if (!defined $value) { - $value = 'BUILD +='; + $value = "BUILD +="; } $value .= " $name"; } } } - elsif ($name eq 'comptarget') { + elsif ($name eq "comptarget") { foreach my $name (keys %$names) { - if ($name ne 'default') { + if ($name ne "default") { if (!defined $value) { - $value = ''; + $value = ""; } $value .= "$crlf.PHONY: $name$crlf" . "$name:$crlf" . @@ -153,15 +153,15 @@ sub fill_value { } } } - elsif ($name eq 'compclean') { + elsif ($name eq "compclean") { foreach my $name (keys %$names) { - if ($name ne 'default') { - $value = 'compclean'; + if ($name ne "default") { + $value = "compclean"; last; } } } - elsif ($name eq 'notdirfiles') { + elsif ($name eq "notdirfiles") { $value = "\$(notdir \$(FILES))"; foreach my $name (keys %$names) { my($comps) = $$names{$name}; @@ -189,25 +189,25 @@ sub project_file_name { $name = $self->project_name(); } - return 'Makefile' . ($name eq '' ? '' : ".$name"); + return "Makefile" . ($name eq "" ? "" : ".$name"); } sub get_dll_exe_template_input_file { - #my($self) = shift; - return 'gnuexe'; + my($self) = shift; + return "gnuexe"; } sub get_dll_template_input_file { - #my($self) = shift; - return 'gnudll'; + my($self) = shift; + return "gnudll"; } sub get_template { - #my($self) = shift; - return 'gnu'; + my($self) = shift; + return "gnu"; } 1; diff --git a/bin/MakeProjectCreator/modules/GNUWorkspaceCreator.pm b/bin/MakeProjectCreator/modules/GNUWorkspaceCreator.pm index cd56ee4b2bc..c86d8db73ba 100644 --- a/bin/MakeProjectCreator/modules/GNUWorkspaceCreator.pm +++ b/bin/MakeProjectCreator/modules/GNUWorkspaceCreator.pm @@ -24,13 +24,13 @@ use vars qw(@ISA); # ************************************************************ sub workspace_file_name { - #my($self) = shift; - return 'Makefile'; + my($self) = shift; + return "Makefile"; } sub workspace_per_project { - #my($self) = shift; + my($self) = shift; return 1; } @@ -43,7 +43,7 @@ sub pre_workspace { print $fh "#----------------------------------------------------------------------------$crlf" . "# GNU Workspace$crlf" . "#----------------------------------------------------------------------------$crlf" . - $crlf; + "$crlf"; } @@ -71,7 +71,7 @@ sub write_comps { } } - print $fh $crlf . + print $fh "$crlf" . "\$(TARGETS_NESTED):$crlf" . "ifneq (Windows,\$(findstring Windows,\$(OS)))$crlf"; @@ -83,12 +83,12 @@ sub write_comps { } else { ## Otherwise, just list the call to make without a for loop - print $fh "\t\@\$(MAKE) -f " . basename($list[0]) . ' -C ' . dirname($list[0]) . " \$(\@);$crlf"; + print $fh "\t\@\$(MAKE) -f " . basename($list[0]) . " -C " . dirname($list[0]) . " \$(\@);$crlf"; } print $fh "else$crlf"; foreach my $project (@list) { - print $fh "\t-\@cmd /c \"\$(MAKE) -f " . basename($project) . ' -C ' . dirname($project) . " \$(\@)\"$crlf"; + print $fh "\t-\@cmd /c \"\$(MAKE) -f " . basename($project) . " -C " . dirname($project) . " \$(\@)\"$crlf"; } print $fh "endif$crlf"; } diff --git a/bin/MakeProjectCreator/modules/GUID.pm b/bin/MakeProjectCreator/modules/GUID.pm index 015db9c2a47..944813a1543 100644 --- a/bin/MakeProjectCreator/modules/GUID.pm +++ b/bin/MakeProjectCreator/modules/GUID.pm @@ -11,6 +11,7 @@ package GUID; # ************************************************************ use strict; +use Cwd; # ************************************************************ # Subroutine Section @@ -28,8 +29,7 @@ sub generate { my($self) = shift; my($out) = shift; my($in) = shift; - my($cwd) = shift; - my($chash) = $self->hash($cwd); + my($chash) = $self->hash(getcwd()); my($nhash) = $self->hash($out); my($ihash) = $self->hash($in); my($val) = 0xfeca1bad; diff --git a/bin/MakeProjectCreator/modules/NMakeProjectCreator.pm b/bin/MakeProjectCreator/modules/NMakeProjectCreator.pm index 29469f48de6..131f435f393 100644 --- a/bin/MakeProjectCreator/modules/NMakeProjectCreator.pm +++ b/bin/MakeProjectCreator/modules/NMakeProjectCreator.pm @@ -22,7 +22,7 @@ use vars qw(@ISA); # ************************************************************ sub sort_files { - #my($self) = shift; + my($self) = shift; return 0; } @@ -32,11 +32,11 @@ sub translate_value { my($key) = shift; my($val) = shift; - if ($key eq 'depends' && $val ne '') { + if ($key eq 'depends' && $val ne "") { my($arr) = $self->create_array($val); - $val = ''; + $val = ""; foreach my $entry (@$arr) { - $val .= '"' . $self->project_file_name($entry) . '" '; + $val .= "\"" . $self->project_file_name($entry) . "\" "; } $val =~ s/\s+$//; } @@ -63,20 +63,20 @@ sub project_file_name { sub get_dll_exe_template_input_file { - #my($self) = shift; - return 'nmakeexe'; + my($self) = shift; + return "nmakeexe"; } sub get_dll_template_input_file { - #my($self) = shift; - return 'nmakedll'; + my($self) = shift; + return "nmakedll"; } sub get_template { - #my($self) = shift; - return 'nmake'; + my($self) = shift; + return "nmake"; } diff --git a/bin/MakeProjectCreator/modules/NMakeWorkspaceCreator.pm b/bin/MakeProjectCreator/modules/NMakeWorkspaceCreator.pm index fea75097de3..1fb9dce4805 100644 --- a/bin/MakeProjectCreator/modules/NMakeWorkspaceCreator.pm +++ b/bin/MakeProjectCreator/modules/NMakeWorkspaceCreator.pm @@ -31,13 +31,13 @@ sub crlf { sub workspace_file_name { - #my($self) = shift; - return 'Makefile'; + my($self) = shift; + return "Makefile"; } sub workspace_per_project { - #my($self) = shift; + my($self) = shift; return 1; } @@ -63,21 +63,21 @@ sub write_project_targets { my($chdir) = 0; my($back) = 1; - ## If the directory isn't '.' then we need + ## If the directory isn't "." then we need ## to figure out how to get back to our starting point - if ($dir ne '.') { + if ($dir ne ".") { $chdir = 1; my($length) = length($dir); for(my $i = 0; $i < $length; $i++) { - if (substr($dir, $i, 1) eq '/') { + if (substr($dir, $i, 1) eq "/") { $back++; } } } - print $fh ($chdir ? "\tcd $dir$crlf" : '') . + print $fh ($chdir ? "\tcd $dir$crlf" : "") . "\t\$(MAKE) /f " . basename($project) . " $target$crlf" . - ($chdir ? "\tcd " . ('../' x $back) . $crlf : ''); + ($chdir ? "\tcd " . ("../" x $back) . $crlf : ""); } } @@ -91,11 +91,11 @@ sub write_comps { my($crlf) = $self->crlf(); print $fh "ALL:$crlf"; - $self->write_project_targets($fh, 'CFG="$(CFG)"', \@list); + $self->write_project_targets($fh, "CFG=\"\$(CFG)\"", \@list); print $fh "$crlf" . "CLEAN\tREALCLEAN:$crlf"; - $self->write_project_targets($fh, 'CLEAN', \@list); + $self->write_project_targets($fh, "CLEAN", \@list); } diff --git a/bin/MakeProjectCreator/modules/Parser.pm b/bin/MakeProjectCreator/modules/Parser.pm index 7040b1f8652..674f2276afd 100644 --- a/bin/MakeProjectCreator/modules/Parser.pm +++ b/bin/MakeProjectCreator/modules/Parser.pm @@ -13,8 +13,6 @@ package Parser; use strict; use FileHandle; -my($cwd) = Cwd::getcwd(); - # ************************************************************ # Subroutine Section # ************************************************************ @@ -27,33 +25,11 @@ sub new { } -sub cd { - my($self) = shift; - my($dir) = shift; - my($status) = chdir($dir); - if ($status) { - if ($dir =~ /^\// || $dir =~ /^[A-Za-z]:/) { - $cwd = $dir; - } - else { - $cwd .= "/$dir"; - } - } - return $status; -} - - -sub getcwd { - #my($self) = shift; - return $cwd; -} - - sub strip_line { my($self) = shift; my($line) = shift; - ++$self->{'line_number'}; + $self->{'line_number'}++; $line =~ s/\/\/.*//; $line =~ s/^\s+//; $line =~ s/\s+$//; @@ -70,11 +46,11 @@ sub process_special { for(my $i = 0; $i < $length; $i++) { my($ch) = substr($line, $i, 1); if ($ch eq "\\" && $i + 1 < $length) { - substr($line, $i, 1) = ''; + substr($line, $i, 1) = ""; $length--; } elsif ($ch eq '"') { - substr($line, $i, 1) = ''; + substr($line, $i, 1) = ""; $length--; $i--; } @@ -88,7 +64,7 @@ sub read_file { my($input) = shift; my($ih) = new FileHandle(); my($status) = 1; - my($errorString) = ''; + my($errorString) = ""; $self->{'line_number'} = 0; if (open($ih, $input)) { @@ -104,7 +80,7 @@ sub read_file { close($ih); } else { - $errorString = 'ERROR: Unable to open for reading'; + $errorString = "ERROR: Unable to open for reading"; $status = 0; } @@ -134,7 +110,7 @@ sub create_array { for(my $i = 0; $i <= $length; $i++) { my($ch) = substr($line, $i, 1); - if (!$double && ($ch eq '' || $ch =~ /\s/)) { + if (!$double && ($ch eq "" || $ch =~ /\s/)) { my($val) = substr($line, $prev, $i - $prev); $val =~ s/^\s+//; $val =~ s/\s+$//; @@ -151,7 +127,7 @@ sub create_array { $prev = $i + 1; } elsif ($double && $ch eq "\\" && $i + 1 < $length) { - substr($line, $i, 1) = ''; + substr($line, $i, 1) = ""; $length--; } elsif ($ch eq '"') { @@ -162,22 +138,14 @@ sub create_array { } -sub slash_to_backslash { - my($self) = shift; - my($file) = shift; - $file =~ s/\//\\/g; - return $file; -} - - # ************************************************************ # Virtual Methods To Be Overridden # ************************************************************ sub parse_line { - #my($self) = shift; - #my($ih) = shift; - #my($line) = shift; + my($self) = shift; + my($ih) = shift; + my($line) = shift; } diff --git a/bin/MakeProjectCreator/modules/ProjectCreator.pm b/bin/MakeProjectCreator/modules/ProjectCreator.pm index 399e3d52b26..943bfc36209 100644 --- a/bin/MakeProjectCreator/modules/ProjectCreator.pm +++ b/bin/MakeProjectCreator/modules/ProjectCreator.pm @@ -60,7 +60,6 @@ my(%validNames) = ('exename' => 1, 'tagchecks' => 1, 'include_dir' => 1, 'core' => 1, - 'idlgendir' => 1, ); ## Deal with these components in a special way @@ -104,9 +103,6 @@ sub new { $self->{'want_static_projects'} = $static; $self->{'flag_overrides'} = {}; - ## Set up the verbatim constructs - $self->{'verbatim'} = {}; - ## Valid component names within a project along with the valid file extensions my(%vc) = ('source_files' => [ "\\.cpp", "\\.cxx", "\\.cc", "\\.c", "\\.C", ], 'template_files' => [ "_T\\.cpp", "_T\\.cxx", "_T\\.cc", "_T\\.c", "_T\\.C", ], @@ -123,12 +119,12 @@ sub new { ## Match up assignments with the valid components my(%ma) = ('source_files' => [ 'includes' ], - 'idl_files' => [ 'idlgendir', 'idlflags' ], + 'idl_files' => [ 'idlflags' ], ); $self->{'matching_assignments'} = \%ma; $self->{'valid_components'} = \%vc; $self->{'exclude_components'} = \%ec; - $self->{'skeleton_endings'} = [ 'C', 'S' ]; + $self->{'skeleton_endings'} = [ "C", "S" ]; ## Allow subclasses to override the default extensions $self->set_component_extensions(); @@ -171,7 +167,7 @@ sub parse_line { if ($values[0] eq $type) { my($name) = $values[1]; my($typecheck) = $self->{'type_check'}; - if (defined $name && $name eq '}') { + if (defined $name && $name eq "}") { ## Project Ending my($rp) = $self->{'reading_parent'}; if (!defined $$rp[0] && !$self->{'reading_global'}) { @@ -195,7 +191,7 @@ sub parse_line { } } else { - $errorString = 'ERROR: Invalid ' . + $errorString = "ERROR: Invalid " . "assignment modification name: $ap"; $status = 0; } @@ -208,8 +204,7 @@ sub parse_line { foreach my $key (keys %{$self->{'valid_components'}}) { delete $self->{$key}; } - $self->{'assign'} = {}; - $self->{'verbatim'} = {}; + $self->{'assign'} = {}; } } $self->{$typecheck} = 0; @@ -232,9 +227,10 @@ sub parse_line { } if (defined $file) { - push(@{$self->{'reading_parent'}}, 1); + my($rp) = $self->{'reading_parent'}; + push(@$rp, 1); $status = $self->parse_file($file); - pop(@{$self->{'reading_parent'}}); + pop(@$rp); if (!$status) { $errorString = "ERROR: Invalid parent: $parent"; @@ -265,7 +261,7 @@ sub parse_line { } } } - elsif ($values[0] eq 'assignment') { + elsif ($values[0] eq "assignment") { my($name) = $values[1]; my($value) = $values[2]; if (defined $validNames{$name}) { @@ -276,7 +272,7 @@ sub parse_line { $status = 0; } } - elsif ($values[0] eq 'assign_add') { + elsif ($values[0] eq "assign_add") { my($name) = $values[1]; my($value) = $values[2]; if (defined $validNames{$name}) { @@ -287,7 +283,7 @@ sub parse_line { $status = 0; } } - elsif ($values[0] eq 'assign_sub') { + elsif ($values[0] eq "assign_sub") { my($name) = $values[1]; my($value) = $values[2]; if (defined $validNames{$name}) { @@ -298,7 +294,7 @@ sub parse_line { $status = 0; } } - elsif ($values[0] eq 'component') { + elsif ($values[0] eq "component") { my($comp) = $values[1]; my($name) = $values[2]; if (defined $name) { @@ -317,17 +313,8 @@ sub parse_line { } } else { - if ($comp eq 'verbatim') { - my($type, $loc) = split(/\s*,\s*/, $name); - if (!$self->parse_verbatim($ih, $comp, $type, $loc)) { - $errorString = "ERROR: Unable to process $comp"; - $status = 0; - } - } - else { - $errorString = "ERROR: Invalid component name: $comp"; - $status = 0; - } + $errorString = "ERROR: Invalid component name: $comp"; + $status = 0; } } else { @@ -375,7 +362,7 @@ sub parse_components { while(<$fh>) { my($line) = $self->strip_line($_); - if ($line eq '') { + if ($line eq "") { } elsif ($line =~ /^(\w+)\s*{$/) { if (!defined $current || !$set) { @@ -450,41 +437,6 @@ sub parse_components { } -sub parse_verbatim { - my($self) = shift; - my($fh) = shift; - my($tag) = shift; - my($type) = shift; - my($loc) = shift; - - ## All types are lowercase - $type = lc($type); - - if (!defined $self->{'verbatim'}->{$type}) { - $self->{'verbatim'}->{$type} = {}; - } - $self->{'verbatim'}->{$type}->{$loc} = []; - my($array) = $self->{'verbatim'}->{$type}->{$loc}; - - while(<$fh>) { - my($line) = $self->strip_line($_); - - if ($line eq '') { - } - elsif ($line =~ /^}/) { - ## This is not an error, - ## this is the end of the components - last; - } - else { - push(@$array, $line); - } - } - - return 1; -} - - sub process_assignment { my($self) = shift; my($name) = shift; @@ -508,7 +460,7 @@ sub process_assignment { $value =~ s/\s+$//; if ($self->convert_slashes()) { - $value = $self->slash_to_backslash($value); + $value =~ s/\//\\/g; } } @@ -542,13 +494,14 @@ sub process_assignment_sub { if (defined $nval) { my($parts) = $self->create_array($nval); - $nval = ''; + $nval = ""; foreach my $part (@$parts) { - if ($part ne $value && $part ne '') { + if ($part ne $value && $part ne "") { $nval .= "$part "; } } $self->process_assignment($name, $nval, $assign); + $self->process_duplicate_modification($name, $assign); } } @@ -562,12 +515,12 @@ sub process_duplicate_modification { ## either addition or subtraction, we are going to ## perform a little fix on the value to avoid multiple ## libraries and to try to insure the correct linking order - if ($name eq 'libs' || $name eq 'libpaths' || $name eq 'includes') { + if ($name eq "libs" || $name eq "libpaths" || $name eq "includes") { my($nval) = $self->get_assignment($name, $assign); if (defined $nval) { my($parts) = $self->create_array($nval); my(%seen) = (); - my($value) = ''; + my($value) = ""; foreach my $part (reverse @$parts) { if (!defined $seen{$part}) { $value = "$part $value"; @@ -583,7 +536,7 @@ sub process_duplicate_modification { sub read_template_input { my($self) = shift; my($status) = 1; - my($errorString) = ''; + my($errorString) = ""; my($file) = undef; my($tag) = undef; my($ti) = $self->get_ti_override(); @@ -651,7 +604,7 @@ sub read_template_input { else { if ($override) { $status = 0; - $errorString = 'Unable to locate template input file.'; + $errorString = "Unable to locate template input file."; } } } @@ -1102,8 +1055,7 @@ sub add_source_corresponding_component_files { ## we must check to see if the file *would be* generated ## from idl. If so, we will add the file with the default ## (i.e. first) file extension. - foreach my $idlfile (@idl) { - my($idl) = $self->escape_regex_special($idlfile); + foreach my $idl (@idl) { if ($c =~ /^$idl/) { foreach my $ending (@{$self->{'skeleton_endings'}}) { if ($c =~ /^$idl$ending$/) { @@ -1218,7 +1170,7 @@ sub get_component_list { if ($self->convert_slashes()) { for(my $i = 0; $i <= $#list; $i++) { - $list[$i] = $self->slash_to_backslash($list[$i]); + $list[$i] =~ s/\//\\/g; } } @@ -1234,7 +1186,7 @@ sub write_output_file { my($self) = shift; my($name) = shift; my($status) = 0; - my($error) = ''; + my($error) = ""; my($dir) = dirname($name); my($fh) = new FileHandle(); my($tover) = $self->get_template_override(); @@ -1243,7 +1195,7 @@ sub write_output_file { my($tfile) = $self->search_include_path($template); if (defined $tfile) { - if ($dir ne '.') { + if ($dir ne ".") { mkpath($dir, 0, 0777); } @@ -1263,7 +1215,7 @@ sub write_output_file { if (open($fh, ">$name")) { my($lines) = $tp->get_lines(); foreach my $line (@$lines) { - print $fh $line; + print $fh "$line"; } close($fh); my($fw) = $self->{'files_written'}; @@ -1288,7 +1240,7 @@ sub write_output_file { sub write_project { my($self) = shift; my($status) = 1; - my($error) = ''; + my($error) = ""; my($name) = $self->transform_file_name($self->project_file_name()); my($prjname) = $self->get_assignment('project_name'); my($progress) = $self->get_progress_callback(); @@ -1400,7 +1352,7 @@ sub update_project_info { my($names) = shift; my($sep) = shift; my($pi) = $self->get_project_info(); - my($value) = ''; + my($value) = ""; my($arr) = ($append && defined $$pi[0] ? pop(@$pi) : []); ## Set up the hash table when we are starting a new project_info @@ -1414,7 +1366,7 @@ sub update_project_info { my($key) = $narr[$i]; $value .= $self->translate_value($key, $tparser->get_value_with_default($key)) . - (defined $sep && $i != $#narr ? $sep : ''); + (defined $sep && $i != $#narr ? $sep : ""); } ## If we haven't seen this value yet, put it on the array @@ -1431,53 +1383,27 @@ sub update_project_info { } -sub get_verbatim { - my($self) = shift; - my($marker) = shift; - my($type) = lc(substr("$self", 0, 3)); ## This number corresponds to - ## signif in Driver.pm - my($str) = undef; - my($thash) = $self->{'verbatim'}->{$type}; - - if (defined $thash) { - if (defined $thash->{$marker}) { - my($crlf) = $self->crlf(); - foreach my $line (@{$thash->{$marker}}) { - if (!defined $str) { - $str = ''; - } - $str .= $self->process_special($line) . $crlf; - } - if (defined $str) { - $str .= $crlf; - } - } - } - return $str; -} - - # ************************************************************ # Virtual Methods To Be Overridden # ************************************************************ sub specific_lookup { - #my($self) = shift; - #my($key) = shift; + my($self) = shift; + my($key) = shift; return undef; } sub save_project_value { - #my($self) = shift; - #my($name) = shift; - #my($value) = shift; + my($self) = shift; + my($name) = shift; + my($value) = shift; } sub get_type_append { - #my($self) = shift; - return ''; + my($self) = shift; + return ""; } @@ -1490,76 +1416,76 @@ sub translate_value { sub convert_slashes { - #my($self) = shift; + my($self) = shift; return 1; } sub fill_value { - #my($self) = shift; - #my($name) = shift; + my($self) = shift; + my($name) = shift; return undef; } sub separate_static_project { - #my($self) = shift; + my($self) = shift; return 0; } sub project_file_name { - #my($self) = shift; + my($self) = shift; return undef; } sub static_project_file_name { - #my($self) = shift; + my($self) = shift; return undef; } sub override_valid_component_extensions { - #my($self) = shift; - #my($comp) = shift; + my($self) = shift; + my($comp) = shift; return undef; } sub override_exclude_component_extensions { - #my($self) = shift; - #my($comp) = shift; + my($self) = shift; + my($comp) = shift; return undef; } sub get_dll_exe_template_input_file { - #my($self) = shift; + my($self) = shift; return undef; } sub get_lib_exe_template_input_file { - #my($self) = shift; + my($self) = shift; return undef; } sub get_lib_template_input_file { - #my($self) = shift; + my($self) = shift; return undef; } sub get_dll_template_input_file { - #my($self) = shift; + my($self) = shift; return undef; } sub get_template { - #my($self) = shift; + my($self) = shift; return undef; } diff --git a/bin/MakeProjectCreator/modules/TemplateInputReader.pm b/bin/MakeProjectCreator/modules/TemplateInputReader.pm index 3b9a5e2172c..09ee7621f93 100644 --- a/bin/MakeProjectCreator/modules/TemplateInputReader.pm +++ b/bin/MakeProjectCreator/modules/TemplateInputReader.pm @@ -38,10 +38,10 @@ sub parse_line { my($ih) = shift; my($line) = shift; my($status) = 1; - my($errorString) = ''; + my($errorString) = ""; my($current) = $self->{'current'}; - if ($line eq '') { + if ($line eq "") { } elsif ($line =~ /^([\w\s]+)\s*{$/) { ## Entering a new scope @@ -60,7 +60,7 @@ sub parse_line { } else { $status = 0; - $errorString = 'ERROR: Unmatched curly brace'; + $errorString = "ERROR: Unmatched curly brace"; } } elsif ($line =~ /^(\w+)\s*=\s*(.*)?/) { @@ -71,7 +71,7 @@ sub parse_line { $value = $self->create_array($value); } else { - $value = ''; + $value = ""; } if (!defined $$current[$self->{'cindex'}]->{$name}) { diff --git a/bin/MakeProjectCreator/modules/TemplateParser.pm b/bin/MakeProjectCreator/modules/TemplateParser.pm index 544264b3457..d34873a0b27 100644 --- a/bin/MakeProjectCreator/modules/TemplateParser.pm +++ b/bin/MakeProjectCreator/modules/TemplateParser.pm @@ -11,6 +11,7 @@ package TemplateParser; # ************************************************************ use strict; +use Cwd; use Parser; @@ -21,22 +22,11 @@ use vars qw(@ISA); # Data Section # ************************************************************ -my(%keywords) = ('if' => 1, - 'else' => 1, - 'endif' => 1, - 'noextension' => 1, - 'dirname' => 1, - 'basename' => 1, - 'basenoextension' => 1, - 'foreach' => 1, - 'forfirst' => 1, - 'fornotfirst' => 1, - 'fornotlast' => 1, - 'forlast' => 1, - 'endfor' => 1, - 'comment' => 1, - 'flag_overrides' => 1, - 'marker' => 1, +my(@keywords) = ('if', 'else', 'endif', + 'noextension', 'dirname', 'basename', 'basenoextension', + 'foreach', 'forfirst', 'fornotfirst', + 'fornotlast', 'forlast', 'endfor', + 'comment', 'flag_overrides', ); # ************************************************************ @@ -49,12 +39,10 @@ sub new { my($self) = Parser::new($class); $self->{'prjc'} = $prjc; - $self->{'ti'} = $prjc->get_template_input(); - $self->{'crlf'} = undef; $self->{'values'} = {}; $self->{'defaults'} = {}; $self->{'lines'} = []; - $self->{'built'} = ''; + $self->{'built'} = ""; $self->{'sstack'} = []; $self->{'lstack'} = []; $self->{'if_skip'} = 0; @@ -75,7 +63,7 @@ sub new { sub basename { my($self) = shift; my($file) = shift; - for(my $i = length($file) - 1; $i >= 0; --$i) { + for(my $i = length($file) - 1; $i >= 0; $i--) { my($ch) = substr($file, $i, 1); if ($ch eq '/' || $ch eq '\\') { ## The template file may use this value (<%basename_found%>) @@ -92,7 +80,7 @@ sub basename { sub dirname { my($self) = shift; my($file) = shift; - for(my $i = length($file) - 1; $i != 0; --$i) { + for(my $i = length($file) - 1; $i != 0; $i--) { my($ch) = substr($file, $i, 1); if ($ch eq '/' || $ch eq '\\') { ## The template file may use this value (<%dirname_found%>) @@ -102,7 +90,7 @@ sub dirname { } } delete $self->{'values'}->{'dirname_found'}; - return '.'; + return "."; } @@ -113,13 +101,26 @@ sub strip_line { ## Override strip_line() from Parser. ## We need to preserve leading space and ## there is no comment string in templates. - ++$self->{'line_number'}; + $self->{'line_number'}++; $line =~ s/\s+$//; return $line; } +sub is_keyword { + my($self) = shift; + my($name) = shift; + + foreach my $key (@keywords) { + if ($name eq $key) { + return 1; + } + } + return 0; +} + + ## Append the current value to the line that is being ## built. This line may be a foreach line or a general ## line without a foreach. @@ -166,9 +167,9 @@ sub adjust_value { $parts = $self->create_array($value); } - $value = ''; + $value = ""; foreach my $part (@$parts) { - if ($part ne $$val[1] && $part ne '') { + if ($part ne $$val[1] && $part ne "") { $value .= "$part "; } } @@ -192,18 +193,16 @@ sub set_current_values { ## If any value within a foreach matches the name ## of a hash table within the template input we will ## set the values of that hash table in the current scope - my($ti) = $self->{'ti'}; + my($ti) = $self->{'prjc'}->get_template_input(); if (defined $ti) { my($counter) = $self->{'foreach'}->{'count'}; - if ($counter >= 0) { - my($value) = $ti->get_value($name); - if (defined $value && UNIVERSAL::isa($value, 'HASH')) { - my(%copy) = (); - foreach my $key (keys %$value) { - $copy{$key} = $self->adjust_value($key, $$value{$key}); - } - $self->{'foreach'}->{'temp_scope'}->[$counter] = \%copy; + my($value) = $ti->get_value($name); + if (defined $value && $counter >= 0 && UNIVERSAL::isa($value, 'HASH')) { + my(%copy) = (); + foreach my $key (keys %$value) { + $copy{$key} = $self->adjust_value($key, $$value{$key}); } + $self->{'foreach'}->{'temp_scope'}->[$counter] = \%copy; } } } @@ -224,7 +223,7 @@ sub relative { $value = \@built; } else { - my($cwd) = $self->getcwd(); + my($cwd) = getcwd(); my($start) = 0; my($fixed) = 0; @@ -255,20 +254,20 @@ sub relative { if (index($cwd, $val) == 0) { my($count) = 0; - substr($cwd, 0, length($val)) = ''; + substr($cwd, 0, length($val)) = ""; while($cwd =~ /^\\/) { $cwd =~ s/^\///; } my($length) = length($cwd); - for(my $i = 0; $i < $length; ++$i) { + for(my $i = 0; $i < $length; $i++) { if (substr($cwd, $i, 1) eq '/') { - ++$count; + $count++; } } - $val = '../' x $count; + $val = "../" x $count; $val =~ s/\/$//; if ($self->{'prjc'}->convert_slashes()) { - $val = $self->slash_to_backslash($val); + $val =~ s/\//\\/g; } substr($value, $start) =~ s/\$\([^)]+\)/$val/; } @@ -291,15 +290,16 @@ sub get_value { ## First, check the temporary scope (set inside a foreach) if ($counter >= 0) { while(!defined $value && $counter >= 0) { - $value = $self->{'foreach'}->{'temp_scope'}->[$counter]->{$name}; - --$counter; + my($scope) = $self->{'foreach'}->{'temp_scope'}->[$counter]; + $value = $$scope{$name}; + $counter--; } $counter = $self->{'foreach'}->{'count'}; } if (!defined $value) { ## Next, check for a template value - my($ti) = $self->{'ti'}; + my($ti) = $self->{'prjc'}->get_template_input(); if (defined $ti) { $value = $ti->get_value($name); if (defined $value) { @@ -311,8 +311,9 @@ sub get_value { ## Next, check the inner to outer foreach ## scopes for overriding values while(!defined $value && $counter >= 0) { - $value = $self->{'foreach'}->{'scope'}->[$counter]->{$name}; - --$counter; + my($scope) = $self->{'foreach'}->{'scope'}->[$counter]; + $value = $$scope{$name}; + $counter--; } ## Then get the value from the project creator @@ -349,7 +350,7 @@ sub get_value_with_default { $value = $self->{'prjc'}->fill_value($name); if (!defined $value) { # print "DEBUG: WARNING: $name defaulting to empty string\n"; - $value = ''; + $value = ""; } } else { @@ -365,16 +366,17 @@ sub get_value_with_default { sub process_foreach { my($self) = shift; my($index) = $self->{'foreach'}->{'count'}; + my($name) = $self->{'foreach'}->{'names'}->[$index]; my($text) = $self->{'foreach'}->{'text'}->[$index]; my($status) = 1; - my($errorString) = ''; + my($errorString) = ""; my(@values) = (); - my($names) = $self->create_array($self->{'foreach'}->{'names'}->[$index]); - my($name) = undef; + my($names) = $self->create_array($name); + $name = undef; foreach my $n (@$names) { my($vals) = $self->get_value($n); - if (defined $vals && $vals ne '') { + if (defined $vals && $vals ne "") { if (!UNIVERSAL::isa($vals, 'ARRAY')) { $vals = $self->create_array($vals); } @@ -386,7 +388,7 @@ sub process_foreach { } ## Reset the text (it will be regenerated by calling parse_line - $self->{'foreach'}->{'text'}->[$index] = ''; + $self->{'foreach'}->{'text'}->[$index] = ""; if (defined $values[0]) { my($inner) = $name; @@ -398,7 +400,7 @@ sub process_foreach { $$scope{'forfirst'} = 1; $$scope{'fornotfirst'} = 0; - for(my $i = 0; $i <= $#values; ++$i) { + for(my $i = 0; $i <= $#values; $i++) { my($value) = $values[$i]; ## Set the corresponding values in the temporary scope @@ -427,9 +429,9 @@ sub process_foreach { ## Now parse the line of text, each time ## with different values - ++$self->{'foreach'}->{'processing'}; + $self->{'foreach'}->{'processing'}++; ($status, $errorString) = $self->parse_line(undef, $text); - --$self->{'foreach'}->{'processing'}; + $self->{'foreach'}->{'processing'}--; if (!$status) { last; } @@ -444,9 +446,11 @@ sub handle_end { my($self) = shift; my($name) = shift; my($status) = 1; - my($errorString) = ''; - my($end) = pop(@{$self->{'sstack'}}); - pop(@{$self->{'lstack'}}); + my($errorString) = ""; + my($sstack) = $self->{'sstack'}; + my($lstack) = $self->{'lstack'}; + my($end) = pop(@$sstack); + pop(@$lstack); if (!defined $end) { $status = 0; @@ -459,7 +463,7 @@ sub handle_end { my($index) = $self->{'foreach'}->{'count'}; ($status, $errorString) = $self->process_foreach(); if ($status) { - --$self->{'foreach'}->{'count'}; + $self->{'foreach'}->{'count'}--; $self->append_current($self->{'foreach'}->{'text'}->[$index]); } } @@ -471,7 +475,6 @@ sub handle_end { sub get_flag_overrides { my($self) = shift; my($name) = shift; - my($type) = shift; my($value) = undef; my($file) = $self->get_value($name); my($prjc) = $self->{'prjc'}; @@ -480,18 +483,12 @@ sub get_flag_overrides { foreach my $key (keys %$fo) { if ($key =~ /^$name/) { foreach my $of (keys %{$$fo{$key}}) { - my($cv) = $of; - if ($prjc->convert_slashes()) { - $cv = $prjc->slash_to_backslash($of); - } - if ($cv eq $file) { + if ($of eq $file) { foreach my $ma (keys %{$prjc->{'matching_assignments'}}) { if ($ma eq $key) { foreach my $aname (@{$prjc->{'matching_assignments'}->{$ma}}) { - if ($aname eq $type && - defined $$fo{$key}->{$of}->{$aname}) { + if (defined $$fo{$key}->{$of}->{$aname}) { $value = $$fo{$key}->{$of}->{$aname}; - last; } } last; @@ -510,20 +507,22 @@ sub get_flag_overrides { sub handle_if { my($self) = shift; my($val) = shift; + my($sstack) = $self->{'sstack'}; + my($lstack) = $self->{'lstack'}; my($name) = 'endif'; - push(@{$self->{'lstack'}}, $self->line_number() . " $val"); + push(@$lstack, $self->line_number() . " $val"); if (!$self->{'if_skip'}) { my($true) = 1; - push(@{$self->{'sstack'}}, $name); + push(@$sstack, $name); if ($val =~ /^!(.*)/) { $val = $1; $val =~ s/^\s+//; $true = 0; } - if ($val =~ /flag_overrides\(([^\)]+),\s*([^\)]+)\)/) { - $val = $self->get_flag_overrides($1, $2); + if ($val =~ /flag_overrides\(([^\)]+)\)/) { + $val = $self->get_flag_overrides($1); } else { $val = $self->get_value($val) @@ -537,19 +536,21 @@ sub handle_if { } } else { - push(@{$self->{'sstack'}}, "*$name"); + push(@$sstack, "*$name"); } } sub handle_else { - my($self) = shift; - my(@scopy) = @{$self->{'sstack'}}; + my($self) = shift; + my($sstack) = $self->{'sstack'}; + my(@scopy) = @$sstack; + my($name) = "endif"; ## This method does not take into account that ## multiple else clauses could be supplied to a single if. ## Someday, this may be fixed. - if (defined $scopy[$#scopy] && $scopy[$#scopy] eq 'endif') { + if (defined $scopy[$#scopy] && $scopy[$#scopy] eq $name) { $self->{'if_skip'} ^= 1; } } @@ -558,20 +559,22 @@ sub handle_else { sub handle_foreach { my($self) = shift; my($val) = shift; + my($sstack) = $self->{'sstack'}; + my($lstack) = $self->{'lstack'}; my($name) = 'endfor'; - push(@{$self->{'lstack'}}, $self->line_number()); + push(@$lstack, $self->line_number()); if (!$self->{'if_skip'}) { - push(@{$self->{'sstack'}}, $name); - ++$self->{'foreach'}->{'count'}; + push(@$sstack, $name); + $self->{'foreach'}->{'count'}++; my($index) = $self->{'foreach'}->{'count'}; $self->{'foreach'}->{'names'}->[$index] = $val; - $self->{'foreach'}->{'text'}->[$index] = ''; + $self->{'foreach'}->{'text'}->[$index] = ""; $self->{'foreach'}->{'scope'}->[$index] = {}; } else { - push(@{$self->{'sstack'}}, "*$name"); + push(@$sstack, "*$name"); } } @@ -639,25 +642,12 @@ sub handle_basenoextension { sub handle_flag_overrides { my($self) = shift; my($name) = shift; - my($type) = ''; - - ($name, $type) = split(/,\s*/, $name); - - if (!$self->{'if_skip'}) { - my($value) = $self->get_flag_overrides($name, $type); - if (defined $value) { - $self->append_current($value); - } - } -} - - -sub handle_marker { - my($self) = shift; - my($name) = shift; + my($file) = $self->get_value($name); + my($prjc) = $self->{'prjc'}; + my($fo) = $prjc->{'flag_overrides'}; if (!$self->{'if_skip'}) { - my($value) = $self->{'prjc'}->get_verbatim($name); + my($value) = $self->get_flag_overrides($name); if (defined $value) { $self->append_current($value); } @@ -675,14 +665,14 @@ sub split_name_value { my($name) = undef; my($val) = undef; - for(my $i = 0; $i < $length; ++$i) { + for(my $i = 0; $i < $length; $i++) { my($ch) = substr($line, $i, 1); if (!defined $name && $ch eq '(') { $name = substr($line, 0, $i); - $val = ''; + $val = ""; } elsif (!defined $name && $ch eq '%') { - if (substr($line, $i + 1, 1) eq '>') { + if (substr($line, $i + 1, 1) eq ">") { $name = substr($line, 0, $i); last; } @@ -691,7 +681,7 @@ sub split_name_value { $val .= $ch; } elsif (defined $val && $ch eq ')') { - if (substr($line, $i + 1, 2) eq '%>') { + if (substr($line, $i + 1, 2) eq "%>") { last; } else { @@ -699,7 +689,6 @@ sub split_name_value { } } } - return $name, $val; } @@ -709,11 +698,11 @@ sub process_name { my($line) = shift; my($length) = 0; my($status) = 1; - my($errorString) = ''; + my($errorString) = ""; - if ($line eq '') { + if ($line eq "") { } - elsif ($line =~ /^(\w+)(\(([^\)]+|\".*\"|flag_overrides\([^\)]+,\s*[^\)]+\))\))?%>/) { + elsif ($line =~ /^(\w+)(\(([^\)]+|\".*\"|flag_overrides\([^\)]+\))\))?%>/) { my($name, $val) = $self->split_name_value($line); $length += length($name); @@ -721,7 +710,7 @@ sub process_name { $length += length($val) + 2; } - if (defined $keywords{$name}) { + if ($self->is_keyword($name)) { if ($name eq 'endif' || $name eq 'endfor') { ($status, $errorString) = $self->handle_end($name); } @@ -744,9 +733,6 @@ sub process_name { elsif ($name eq 'flag_overrides') { $self->handle_flag_overrides($val); } - elsif ($name eq 'marker') { - $self->handle_marker($val); - } elsif ($name eq 'noextension') { $self->handle_noextension($val); } @@ -774,9 +760,9 @@ sub process_name { else { my($error) = $line; my($length) = length($line); - for(my $i = 0; $i < $length; ++$i) { + for(my $i = 0; $i < $length; $i++) { my($part) = substr($line, $i, 2); - if ($part eq '%>') { + if ($part eq "%>") { $error = substr($line, 0, $i + 2); last; } @@ -793,9 +779,6 @@ sub collect_data { my($self) = shift; my($prjc) = $self->{'prjc'}; - ## Save crlf so we don't have to keep going back to the prjc - $self->{'crlf'} = $prjc->crlf(); - ## Collect the components into {'values'} somehow foreach my $key (keys %{$prjc->{'valid_components'}}) { my(@list) = $prjc->get_component_list($key); @@ -822,18 +805,23 @@ sub collect_data { sub is_only_keyword { - my($self) = shift; - my($line) = shift; + my($self) = shift; + my($line) = shift; + my($status) = 0; ## Does the line contain only a keyword? if ($line =~ /^<%(.*)%>$/) { my($part) = $1; if ($part !~ /%>/) { - $part =~ s/\(.*//; - return (defined $keywords{$part} ? 1 : 0); + foreach my $keyword (@keywords) { + if ($part =~ /^$keyword/) { + $status = 1; + last; + } + } } } - return 0; + return $status; } @@ -842,12 +830,12 @@ sub parse_line { my($ih) = shift; my($line) = shift; my($status) = 1; - my($errorString) = ''; + my($errorString) = ""; my($length) = length($line); my($name) = 0; - my($crlf) = $self->{'crlf'}; + my($crlf) = $self->{'prjc'}->crlf(); my($clen) = length($crlf); - my($startempty) = ($line eq '' ? 1 : 0); + my($startempty) = ($line eq "" ? 1 : 0); my($append_name) = 0; ## If processing a foreach or the line only @@ -860,17 +848,17 @@ sub parse_line { } if ($self->{'foreach'}->{'count'} < 0) { - $self->{'built'} = ''; + $self->{'built'} = ""; } - for(my $i = 0; $i < $length; ++$i) { + for(my $i = 0; $i < $length; $i++) { my($part) = substr($line, $i, 2); - if ($part eq '<%') { - ++$i; + if ($part eq "<%") { + $i++; $name = 1; } - elsif ($part eq '%>') { - ++$i; + elsif ($part eq "%>") { + $i++; $name = 0; if ($append_name) { $append_name = 0; @@ -880,12 +868,12 @@ sub parse_line { } } elsif ($name) { - my($substr) = substr($line, $i); + my($substr) = substr($line, $i); my($efcheck) = ($substr =~ /^endfor\%\>/); my($focheck) = ($substr =~ /^foreach\(/); if ($focheck && $self->{'foreach'}->{'count'} >= 0) { - ++$self->{'foreach'}->{'nested'}; + $self->{'foreach'}->{'nested'}++; } if ($self->{'foreach'}->{'count'} < 0 || @@ -910,13 +898,13 @@ sub parse_line { else { $name = 0; if (!$self->{'if_skip'}) { - $self->append_current('<%' . substr($line, $i, 1)); + $self->append_current("<%" . substr($line, $i, 1)); $append_name = 1; } } if ($efcheck && $self->{'foreach'}->{'nested'} > 0) { - --$self->{'foreach'}->{'nested'}; + $self->{'foreach'}->{'nested'}--; } } else { @@ -930,8 +918,9 @@ sub parse_line { ## If the line started out empty and we're not ## skipping from the start or the built up line is not empty if ($startempty || - ($self->{'built'} ne $crlf && $self->{'built'} ne '')) { - push(@{$self->{'lines'}}, $self->{'built'}); + ($self->{'built'} ne $crlf && $self->{'built'} ne "")) { + my($lines) = $self->{'lines'}; + push(@$lines, $self->{'built'}); } } diff --git a/bin/MakeProjectCreator/modules/VA4ProjectCreator.pm b/bin/MakeProjectCreator/modules/VA4ProjectCreator.pm index 942be40a726..dd2a99640ca 100644 --- a/bin/MakeProjectCreator/modules/VA4ProjectCreator.pm +++ b/bin/MakeProjectCreator/modules/VA4ProjectCreator.pm @@ -21,7 +21,7 @@ use vars qw(@ISA); # Data Section # ************************************************************ -my($sname) = '_Static'; +my($sname) = "_Static"; # ************************************************************ # Subroutine Section @@ -32,13 +32,13 @@ sub translate_value { my($key) = shift; my($val) = shift; - if ($key eq 'depends' && $val ne '') { + if ($key eq 'depends' && $val ne "") { my($wt) = $self->get_writing_type(); my($arr) = $self->create_array($val); - $val = ''; + $val = ""; foreach my $entry (@$arr) { - $val .= '"' . ($wt == 1 ? $self->static_project_file_name($entry) : - $self->project_file_name($entry)) . '" '; + $val .= "\"" . ($wt == 1 ? $self->static_project_file_name($entry) : + $self->project_file_name($entry)) . "\" "; } $val =~ s/\s+$//; } @@ -47,7 +47,7 @@ sub translate_value { sub convert_slashes { - #my($self) = shift; + my($self) = shift; return 0; } @@ -67,7 +67,7 @@ sub crlf { sub separate_static_project { - #my($self) = shift; + my($self) = shift; return 1; } @@ -97,32 +97,32 @@ sub static_project_file_name { sub get_dll_exe_template_input_file { - #my($self) = shift; - return 'va4iccdllexe'; + my($self) = shift; + return "va4iccdllexe"; } sub get_lib_exe_template_input_file { - #my($self) = shift; - return 'va4icclibexe'; + my($self) = shift; + return "va4icclibexe"; } sub get_lib_template_input_file { - #my($self) = shift; - return 'va4icclib'; + my($self) = shift; + return "va4icclib"; } sub get_dll_template_input_file { - #my($self) = shift; - return 'va4iccdll'; + my($self) = shift; + return "va4iccdll"; } sub get_template { - #my($self) = shift; - return 'va4icc'; + my($self) = shift; + return "va4icc"; } diff --git a/bin/MakeProjectCreator/modules/VA4WorkspaceCreator.pm b/bin/MakeProjectCreator/modules/VA4WorkspaceCreator.pm index 53b649696be..f1eebf02842 100644 --- a/bin/MakeProjectCreator/modules/VA4WorkspaceCreator.pm +++ b/bin/MakeProjectCreator/modules/VA4WorkspaceCreator.pm @@ -31,7 +31,7 @@ sub crlf { sub workspace_file_name { my($self) = shift; - return $self->get_workspace_name() . '.icp'; + return $self->get_workspace_name() . ".icp"; } diff --git a/bin/MakeProjectCreator/modules/VC6ProjectCreator.pm b/bin/MakeProjectCreator/modules/VC6ProjectCreator.pm index f2d4fccdeab..17093fa3cab 100644 --- a/bin/MakeProjectCreator/modules/VC6ProjectCreator.pm +++ b/bin/MakeProjectCreator/modules/VC6ProjectCreator.pm @@ -21,11 +21,11 @@ use vars qw(@ISA); # Data Section # ************************************************************ -my($dynamiclib) = 'DLL'; -my($staticlib) = 'LIB'; -my($dynamicexe) = 'EXE'; -my($staticexe) = 'Static EXE'; -my($sname) = '_Static'; +my($dynamiclib) = "DLL"; +my($staticlib) = "LIB"; +my($dynamicexe) = "EXE"; +my($staticexe) = "Static EXE"; +my($sname) = "_Static"; # ************************************************************ # Subroutine Section @@ -50,19 +50,19 @@ sub base_project_name { my($self) = shift; return $self->transform_file_name( $self->remove_type_append($self->project_name()) . - ($self->get_writing_type() == 1 ? $sname : '')); + ($self->get_writing_type() == 1 ? $sname : "")); } sub get_static_append { - #my($self) = shift; + my($self) = shift; return $sname; } sub get_type_append { my($self) = shift; - my($type) = ''; + my($type) = ""; if ($self->lib_target()) { ## Set the type_append preserving whitespace if ($self->get_writing_type() == 1) { @@ -90,10 +90,10 @@ sub translate_value { my($key) = shift; my($val) = shift; - if ($key eq 'depends' && $val ne '') { + if ($key eq 'depends' && $val ne "") { my($arr) = $self->create_array($val); my($app) = $dynamiclib; - $val = ''; + $val = ""; ## Only write dependencies for non-static projects ## and static exe projects @@ -142,8 +142,8 @@ sub fill_value { my($name) = shift; my($value) = undef; - if ($name eq 'make_file_name') { - $value = $self->base_project_name() . '.mak'; + if ($name eq "make_file_name") { + $value = $self->base_project_name() . ".mak"; } return $value; @@ -151,14 +151,14 @@ sub fill_value { sub separate_static_project { - #my($self) = shift; + my($self) = shift; return 1; } sub project_file_name { my($self) = shift; - return $self->project_name() . '.dsp'; + return $self->project_name() . ".dsp"; } @@ -197,32 +197,32 @@ sub override_exclude_component_extensions { sub get_dll_exe_template_input_file { - #my($self) = shift; - return 'vc6dspdllexe'; + my($self) = shift; + return "vc6dspdllexe"; } sub get_lib_exe_template_input_file { - #my($self) = shift; - return 'vc6dsplibexe'; + my($self) = shift; + return "vc6dsplibexe"; } sub get_lib_template_input_file { - #my($self) = shift; - return 'vc6dsplib'; + my($self) = shift; + return "vc6dsplib"; } sub get_dll_template_input_file { - #my($self) = shift; - return 'vc6dspdll'; + my($self) = shift; + return "vc6dspdll"; } sub get_template { - #my($self) = shift; - return 'vc6dsp'; + my($self) = shift; + return "vc6dsp"; } diff --git a/bin/MakeProjectCreator/modules/VC6WorkspaceCreator.pm b/bin/MakeProjectCreator/modules/VC6WorkspaceCreator.pm index f7ca71cfeca..b69ee0280d2 100644 --- a/bin/MakeProjectCreator/modules/VC6WorkspaceCreator.pm +++ b/bin/MakeProjectCreator/modules/VC6WorkspaceCreator.pm @@ -31,7 +31,7 @@ sub crlf { sub workspace_file_name { my($self) = shift; - return $self->get_workspace_name() . '.dsw'; + return $self->get_workspace_name() . ".dsw"; } @@ -42,7 +42,7 @@ sub pre_workspace { print $fh "Microsoft Developer Studio Workspace File, Format Version 6.00$crlf" . "# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!$crlf" . - $crlf; + "$crlf"; } @@ -58,20 +58,20 @@ sub write_comps { my($name, $deps) = @$pi; ## Convert all /'s to \ - $project = $self->slash_to_backslash($project); + $project =~ s/\//\\/g; print $fh "###############################################################################$crlf" . - $crlf . + "$crlf" . "Project: \"$name\"=$project - Package Owner=<4>$crlf" . - $crlf . + "$crlf" . "Package=<5>$crlf" . "{{{$crlf" . "}}}$crlf" . - $crlf . + "$crlf" . "Package=<4>$crlf" . "{{{$crlf"; - if (defined $deps && $deps ne '') { + if (defined $deps && $deps ne "") { my($darr) = $self->create_array($deps); foreach my $dep (@$darr) { ## Avoid cirular dependencies @@ -83,7 +83,8 @@ sub write_comps { } } - print $fh "}}}$crlf$crlf"; + print $fh "}}}$crlf" . + "$crlf"; } } @@ -94,19 +95,19 @@ sub post_workspace { my($crlf) = $self->crlf(); print $fh "###############################################################################$crlf" . - $crlf . + "$crlf" . "Global:$crlf" . - $crlf . + "$crlf" . "Package=<5>$crlf" . "{{{$crlf" . "}}}$crlf" . - $crlf . + "$crlf" . "Package=<3>$crlf" . "{{{$crlf" . "}}}$crlf" . - $crlf . + "$crlf" . "###############################################################################$crlf" . - $crlf; + "$crlf"; } diff --git a/bin/MakeProjectCreator/modules/VC7ProjectCreator.pm b/bin/MakeProjectCreator/modules/VC7ProjectCreator.pm index ae85b933122..08bc44a6f51 100644 --- a/bin/MakeProjectCreator/modules/VC7ProjectCreator.pm +++ b/bin/MakeProjectCreator/modules/VC7ProjectCreator.pm @@ -27,11 +27,11 @@ sub translate_value { my($key) = shift; my($val) = shift; - if ($key eq 'depends' && $val ne '') { + if ($key eq 'depends' && $val ne "") { my($arr) = $self->create_array($val); - $val = ''; + $val = ""; foreach my $entry (@$arr) { - $val .= '"' . $self->project_file_name($entry) . '" '; + $val .= "\"" . $self->project_file_name($entry) . "\" "; } $val =~ s/\s+$//; } @@ -78,11 +78,10 @@ sub fill_value { my($name) = shift; my($value) = undef; - if ($name eq 'guid') { + if ($name eq "guid") { my($guid) = new GUID(); $value = $guid->generate($self->project_file_name(), - $self->get_current_input(), - $self->getcwd()); + $self->get_current_input()); } return $value; } @@ -101,20 +100,20 @@ sub project_file_name { sub get_dll_exe_template_input_file { - #my($self) = shift; - return 'vc7exe'; + my($self) = shift; + return "vc7exe"; } sub get_dll_template_input_file { - #my($self) = shift; - return 'vc7dll'; + my($self) = shift; + return "vc7dll"; } sub get_template { - #my($self) = shift; - return 'vc7'; + my($self) = shift; + return "vc7"; } diff --git a/bin/MakeProjectCreator/modules/VC7WorkspaceCreator.pm b/bin/MakeProjectCreator/modules/VC7WorkspaceCreator.pm index 0b9013d0e92..db5be6cacbe 100644 --- a/bin/MakeProjectCreator/modules/VC7WorkspaceCreator.pm +++ b/bin/MakeProjectCreator/modules/VC7WorkspaceCreator.pm @@ -31,7 +31,7 @@ sub crlf { sub workspace_file_name { my($self) = shift; - return $self->get_workspace_name() . '.sln'; + return $self->get_workspace_name() . ".sln"; } @@ -57,12 +57,13 @@ sub write_comps { ## $guid above is the VC7 Project GUID. It should not change. ## Project Information - foreach my $project (sort @list) { + foreach my $project (@list) { my($pi) = $$pjs{$project}; my($name, $deps, $pguid) = @$pi; ## Convert all /'s to \ - my($cpy) = $self->slash_to_backslash($project); + my($cpy) = $project; + $cpy =~ s/\//\\/g; print $fh "Project(\"{$guid}\") = \"$name\", \"$cpy\", \"{$pguid}\"$crlf" . "EndProject$crlf"; } @@ -92,7 +93,7 @@ sub write_comps { foreach my $project (@list) { my($pi) = $$pjs{$project}; my($name, $deps, $pguid) = @$pi; - if (defined $deps && $deps ne '') { + if (defined $deps && $deps ne "") { my($darr) = $self->create_array($deps); my($i) = 0; foreach my $dep (@$darr) { @@ -111,7 +112,7 @@ sub write_comps { "\tGlobalSection(ProjectConfiguration) = postSolution$crlf"; ## Project Configuration Names - foreach my $project (sort @list) { + foreach my $project (@list) { my($pi) = $$pjs{$project}; my($name, $deps, $pguid, @cfgs) = @$pi; foreach my $cfg (sort @cfgs) { diff --git a/bin/MakeProjectCreator/modules/WorkspaceCreator.pm b/bin/MakeProjectCreator/modules/WorkspaceCreator.pm index 895c2f81c50..d357481ea9a 100644 --- a/bin/MakeProjectCreator/modules/WorkspaceCreator.pm +++ b/bin/MakeProjectCreator/modules/WorkspaceCreator.pm @@ -11,6 +11,7 @@ package WorkspaceCreator; # ************************************************************ use strict; +use Cwd; use FileHandle; use File::Path; use File::Basename; @@ -72,7 +73,7 @@ sub parse_line { if ($values[0] eq $self->{'grammar_type'}) { my($name) = $values[1]; my($typecheck) = $self->{'type_check'}; - if (defined $name && $name eq '}') { + if (defined $name && $name eq "}") { my($rp) = $self->{'reading_parent'}; if (!defined $$rp[0]) { ## Fill in all the default values @@ -85,8 +86,8 @@ sub parse_line { $self->write_workspace($generator); } else { - $errorString = 'ERROR: Unable to ' . - 'generate all of the project files'; + $errorString = "ERROR: Unable to " . + "generate all of the project files"; $status = 0; } @@ -199,7 +200,7 @@ sub generate_default_components { ## string, so the Project Creator will generate ## the default project file. if (!defined $$pjf[0]) { - push(@$pjf, ''); + push(@$pjf, ""); } } } @@ -235,7 +236,7 @@ sub write_workspace { my($name) = $self->transform_file_name($self->workspace_file_name()); my($dir) = dirname($name); - if ($dir ne '.') { + if ($dir ne ".") { mkpath($dir, 0, 0777); } if (open($fh, ">$name")) { @@ -262,7 +263,7 @@ sub save_project_info { my($pi) = shift; my($c) = 0; foreach my $pj (@$gen) { - my($full) = ($dir ne '.' ? "$dir/" : '') . $pj; + my($full) = ($dir ne "." ? "$dir/" : "") . $pj; push(@$projects, $full); $$pi{$full} = $$gpi[$c]; $c++; @@ -276,34 +277,35 @@ sub generate_project_files { my(@projects) = (); my(%pi) = (); my($generator) = $self->project_creator(); - my($cwd) = $self->getcwd(); + my($cwd) = getcwd(); foreach my $file (@{$self->{'project_files'}}) { my($dir) = dirname($file); + my($gen) = []; ## We must change to the subdirectory for ## which this project file is intended - if ($self->cd($dir)) { + if (chdir($dir)) { $status = $generator->generate(basename($file)); ## If any one project file fails, then stop ## processing altogether. if (!$status) { - return $status, $generator; + return $status; } ## Get the individual project information and ## generated file name(s) - my($gen) = $generator->get_files_written(); - my($gpi) = $generator->get_project_info(); + $gen = $generator->get_files_written(); ## If we need to generate a workspace file per project ## then we generate a temporary project info and projects ## array and call write_project(). - if ($dir ne '.' && $self->workspace_per_project()) { + if ($dir ne "." && $self->workspace_per_project()) { my(%perpi) = (); my(@perprojects) = (); - $self->save_project_info($gen, $gpi, '.', \@perprojects, \%perpi); + my($gpi) = $generator->get_project_info(); + $self->save_project_info($gen, $gpi, ".", \@perprojects, \%perpi); ## Set our per project information $self->{'projects'} = \@perprojects; @@ -316,13 +318,10 @@ sub generate_project_files { $self->{'projects'} = []; $self->{'project_info'} = {}; } - $self->cd($cwd); - $self->save_project_info($gen, $gpi, $dir, \@projects, \%pi); - } - else { - ## Unable to change to the directory - return 0, $generator; + chdir($cwd); } + my($gpi) = $generator->get_project_info(); + $self->save_project_info($gen, $gpi, $dir, \@projects, \%pi); } $self->{'projects'} = \@projects; @@ -365,7 +364,7 @@ sub sort_dependencies { foreach my $project (@list) { my($dname) = dirname($project); - if ($dname ne '.') { + if ($dname ne ".") { $prepend{basename($project)} = dirname($project); } } @@ -377,13 +376,13 @@ sub sort_dependencies { my($pi) = $$pjs{$project}; my($name, $deps) = @$pi; - if ($deps ne '') { + if ($deps ne "") { my($darr) = $self->create_array($deps); my($moved) = 0; foreach my $dep (@$darr) { my($base) = basename($dep); my($full) = (defined $prepend{$base} ? - "$prepend{$base}/" : '') . $base; + "$prepend{$base}/" : "") . $base; if ($project ne $full) { ## See if the dependency is listed after this project for(my $j = $i; $j <= $#list; $j++) { @@ -430,44 +429,38 @@ sub project_creator { } -sub sort_files { - #my($self) = shift; - return 0; -} - - # ************************************************************ # Virtual Methods To Be Overridden # ************************************************************ sub workspace_file_name { - #my($self) = shift; - return ''; + my($self) = shift; + return ""; } sub workspace_per_project { - #my($self) = shift; + my($self) = shift; return 0; } sub pre_workspace { - #my($self) = shift; - #my($fh) = shift; + my($self) = shift; + my($fh) = shift; } sub write_comps { - #my($self) = shift; - #my($fh) = shift; - #my($gens) = shift; + my($self) = shift; + my($fh) = shift; + my($gens) = shift; } sub post_workspace { - #my($self) = shift; - #my($fh) = shift; + my($self) = shift; + my($fh) = shift; } diff --git a/bin/MakeProjectCreator/templates/bor.mpd b/bin/MakeProjectCreator/templates/bor.mpd index 3a29a655c0c..9f6a31f588d 100644 --- a/bin/MakeProjectCreator/templates/bor.mpd +++ b/bin/MakeProjectCreator/templates/bor.mpd @@ -123,23 +123,7 @@ BASE_BINDIR = <%dllout%> idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp) <%foreach(idl_files)%> -<%if(flag_overrides(idl_file, idlgendir))%> -<%flag_overrides(idl_file, idlgendir)%>\<%basenoextension(idl_file)%>S.cpp <%flag_overrides(idl_file, idlgendir)%>\<%basenoextension(idl_file)%>C.cpp: <%idl_file%> - $(TAO_IDL) -o <%flag_overrides(idl_file, idlgendir)%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> $** -<%else%> -<%if(idlgendir)%> -<%idlgendir%>\<%basenoextension(idl_file)%>S.cpp <%idlgendir%>\<%basenoextension(idl_file)%>C.cpp: <%idl_file%> - $(TAO_IDL) -o <%idlgendir%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> $** -<%else%> -# IDL File Directory: <%dirname(idl_file)%> -<%if(dirname_found)%> -<%dirname(idl_file)%>\<%basenoextension(idl_file)%>S.cpp <%dirname(idl_file)%>\<%basenoextension(idl_file)%>C.cpp: <%idl_file%> - $(TAO_IDL) -o <%dirname(idl_file)%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> $** -<%else%> -$(IDLDIR)\<%basenoextension(idl_file)%>S.cpp $(IDLDIR)\<%basenoextension(idl_file)%>C.cpp: $(IDLDIR)\<%idl_file%> - $(TAO_IDL) <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> $** -<%endif%> -<%endif%> -<%endif%> +$(IDLDIR)\<%basenoextension(idl_file)%>S.cpp $(IDLDIR)\<%basenoextension(idl_file)%>C.cpp: $(IDLDIR)\<%basenoextension(idl_file)%>.idl + $(TAO_IDL) <%if(flag_overrides(idl_file))%><%flag_overrides(idl_file)%><%else%><%idlflags("-Sc")%><%endif%> $** <%endfor%> <%endif%> diff --git a/bin/MakeProjectCreator/templates/em3vcp.mpd b/bin/MakeProjectCreator/templates/em3vcp.mpd index 70747790d03..099540b81a3 100644 --- a/bin/MakeProjectCreator/templates/em3vcp.mpd +++ b/bin/MakeProjectCreator/templates/em3vcp.mpd @@ -114,12 +114,6 @@ SOURCE=.\<%source_file%> # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hh" -<%if(pch_header)%> -# Begin Source File - -SOURCE=.\<%pch_header%> -# End Source File -<%endif%> <%foreach(header_files)%> # Begin Source File @@ -195,41 +189,60 @@ SOURCE=.\<%idl_file%> InputPath=.\<%idl_file%> InputName=<%basenoextension(idl_file)%> InputDir=<%dirname(idl_file)%> -<%if(flag_overrides(idl_file, idlgendir))%> -OutDir=<%flag_overrides(idl_file, idlgendir)%> -<%else%> -<%if(idlgendir)%> -OutDir=<%idlgendir%> -<%else%> + <%if(dirname_found)%> -OutDir=$(InputDir) -<%else%> -OutDir=. -<%endif%> -<%endif%> -<%endif%> +BuildCmds= \ + cd $(InputDir) \ + <%tao_idl_exe("$(ACE_ROOT)\\bin\\tao_idl")%> <%if(flag_overrides(idl_file))%><%flag_overrides(idl_file)%><%else%><%idlflags("-Sc")%><%endif%> <%basename(idl_file)%> + +"$(InputDir)\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) +"$(InputDir)\$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(InputDir)\$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(InputDir)\$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(InputDir)\$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(InputDir)\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) +<%else%> BuildCmds= \ - <%tao_idl_exe("$(ACE_ROOT)\\bin\\tao_idl")%> -o $(OutDir) <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> $(InputPath) + <%tao_idl_exe("$(ACE_ROOT)\\bin\\tao_idl")%> <%if(flag_overrides(idl_file))%><%flag_overrides(idl_file)%><%else%><%idlflags("-Sc")%><%endif%> $(InputPath) + +"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) -"$(OutDir)\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) -"$(OutDir)\$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) -"$(OutDir)\$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) -"$(OutDir)\$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) -"$(OutDir)\$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) -"$(OutDir)\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) +"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) +<%endif%> # End Custom Build <%endfor%> diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd index 2319bccfe0d..baf285e6c89 100644 --- a/bin/MakeProjectCreator/templates/gnu.mpd +++ b/bin/MakeProjectCreator/templates/gnu.mpd @@ -1,7 +1,7 @@ #---------------------------------------------------------------------------- # GNU Makefile #---------------------------------------------------------------------------- -<%marker(top)%> + MAKEFILE = <%project_file%> DEPENDENCY_FILE = .depend.<%project_file%> <%if(exename)%> @@ -73,7 +73,6 @@ endif #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- -<%marker(macros)%> include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU <%if(tao)%> include $(TAO_ROOT)/rules.tao.GNU @@ -177,34 +176,20 @@ TAO_IDLFLAGS += <%idlflags%> #---------------------------------------------------------------------------- # Local targets #---------------------------------------------------------------------------- -<%marker(local)%> <%comptarget%> <%if(idl_files)%> ADDITIONAL_IDL_TARGETS = <%foreach(idl_files)%> -<%if(flag_overrides(idl_file, idlgendir))%> -ADDITIONAL_IDL_TARGETS := $(ADDITIONAL_IDL_TARGETS) <%flag_overrides(idl_file, idlgendir)%>/<%basenoextension(idl_file)%>C.h -<%flag_overrides(idl_file, idlgendir)%>/<%basenoextension(idl_file)%>C.h: <%idl_file%> - $(TAO_IDL) -o <%flag_overrides(idl_file, idlgendir)%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%>$(TAO_IDLFLAGS)<%endif%> $^ -<%else%> -<%if(idlgendir)%> -ADDITIONAL_IDL_TARGETS := $(ADDITIONAL_IDL_TARGETS) <%idlgendir%>/<%basenoextension(idl_file)%>C.h -<%idlgendir%>/<%basenoextension(idl_file)%>C.h: <%idl_file%> - $(TAO_IDL) -o <%idlgendir%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%>$(TAO_IDLFLAGS)<%endif%> $^ -<%else%> - # IDL File Directory: <%dirname(idl_file)%> <%if(dirname_found)%> ADDITIONAL_IDL_TARGETS := $(ADDITIONAL_IDL_TARGETS) <%noextension(idl_file)%>C.h <%noextension(idl_file)%>C.h: <%idl_file%> - $(TAO_IDL) -o <%dirname(idl_file)%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%>$(TAO_IDLFLAGS)<%endif%> $^ + (cd <%dirname(idl_file)%> && $(TAO_IDL) <%if(flag_overrides(idl_file))%><%flag_overrides(idl_file)%><%else%>$(TAO_IDLFLAGS)<%endif%> <%basename(idl_file)%>) <%else%> -<%if(flag_overrides(idl_file, idlflags))%> +<%if(flag_overrides(idl_file))%> <%noextension(idl_file)%>C.h: <%idl_file%> - $(TAO_IDL) <%flag_overrides(idl_file, idlflags)%> $^ -<%endif%> -<%endif%> + $(TAO_IDL) <%flag_overrides(idl_file)%> <%basename(idl_file)%> <%endif%> <%endif%> <%endfor%> @@ -226,4 +211,10 @@ realclean: clean <%compclean%> -$(RM) $(foreach ext, $(IDL_EXT), $(foreach file, $(IDL_FILES), $(file)$(ext))) <%endif%> -<%marker(bottom)%>
\ No newline at end of file +#---------------------------------------------------------------------------- +# Dependencies +#---------------------------------------------------------------------------- +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/bin/MakeProjectCreator/templates/nmake.mpd b/bin/MakeProjectCreator/templates/nmake.mpd index 99d56f4735e..6165a952982 100644 --- a/bin/MakeProjectCreator/templates/nmake.mpd +++ b/bin/MakeProjectCreator/templates/nmake.mpd @@ -198,25 +198,21 @@ SOURCE=.\<%idl_file%> InputPath=.\<%idl_file%> InputName=<%basenoextension(idl_file)%> InputDir=<%dirname(idl_file)%> -<%if(flag_overrides(idl_file, idlgendir))%> -OutDir=<%flag_overrides(idl_file, idlgendir)%> -<%else%> -<%if(idlgendir)%> -OutDir=<%idlgendir%> -<%else%> -<%if(dirname_found)%> -OutDir=$(InputDir) -<%else%> -OutDir=. -<%endif%> -<%endif%> -<%endif%> -"$(OutDir)\$(InputName)C.h" "$(OutDir)\$(InputName)C.i" "$(OutDir)\$(InputName)C.cpp" "$(OutDir)\$(InputName)S.h" "$(OutDir)\$(InputName)S.i" "$(OutDir)\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +<%if(dirname_found)%> +".\$(InputDir)\$(InputName)C.h" ".\$(InputDir)\$(InputName)C.i" ".\$(InputDir)\$(InputName)C.cpp" ".\$(InputDir)\$(InputName)S.h" ".\$(InputDir)\$(InputName)S.i" ".\$(InputDir)\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" <<tempfile.bat @echo off - <%tao_idl_exe("$(ACE_ROOT)\\bin\\tao_idl")%> -o $(OutDir) <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%> + cd $(InputDir) + <%tao_idl_exe("$(ACE_ROOT)\\bin\\tao_idl")%> <%if(flag_overrides(idl_file))%><%flag_overrides(idl_file)%><%else%><%idlflags("-Sc")%><%endif%> <%basename(idl_file)%> << +<%else%> +".\$(InputName)C.h" ".\$(InputName)C.i" ".\$(InputName)C.cpp" ".\$(InputName)S.h" ".\$(InputName)S.i" ".\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + <<tempfile.bat + @echo off + <%tao_idl_exe("$(ACE_ROOT)\\bin\\tao_idl")%> <%if(flag_overrides(idl_file))%><%flag_overrides(idl_file)%><%else%><%idlflags("-Sc")%><%endif%> $(InputPath) +<< +<%endif%> <%endfor%> !ENDIF diff --git a/bin/MakeProjectCreator/templates/vc6dsp.mpd b/bin/MakeProjectCreator/templates/vc6dsp.mpd index 6c4a51d1199..00bf5e522a6 100644 --- a/bin/MakeProjectCreator/templates/vc6dsp.mpd +++ b/bin/MakeProjectCreator/templates/vc6dsp.mpd @@ -182,40 +182,51 @@ SOURCE=.\<%idl_file%> InputPath=.\<%idl_file%> InputName=<%basenoextension(idl_file)%> InputDir=<%dirname(idl_file)%> -<%if(flag_overrides(idl_file, idlgendir))%> -OutDir=<%flag_overrides(idl_file, idlgendir)%> -<%else%> -<%if(idlgendir)%> -OutDir=<%idlgendir%> -<%else%> + <%if(dirname_found)%> -OutDir=$(InputDir) -<%else%> -OutDir=. -<%endif%> -<%endif%> -<%endif%> +BuildCmds= \ + cd $(InputDir) \ + <%tao_idl_exe("$(ACE_ROOT)\\bin\\tao_idl")%> <%if(flag_overrides(idl_file))%><%flag_overrides(idl_file)%><%else%><%idlflags("-Sc")%><%endif%> <%basename(idl_file)%> +"$(InputDir)\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(InputDir)\$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(InputDir)\$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(InputDir)\$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(InputDir)\$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(InputDir)\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) +<%else%> BuildCmds= \ - <%tao_idl_exe("$(ACE_ROOT)\\bin\\tao_idl")%> -o $(OutDir) <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> $(InputPath) + <%tao_idl_exe("$(ACE_ROOT)\\bin\\tao_idl")%> <%if(flag_overrides(idl_file))%><%flag_overrides(idl_file)%><%else%><%idlflags("-Sc")%><%endif%> $(InputPath) -"$(OutDir)\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) -"$(OutDir)\$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) -"$(OutDir)\$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) -"$(OutDir)\$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) -"$(OutDir)\$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) -"$(OutDir)\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) +<%endif%> # End Custom Build diff --git a/bin/MakeProjectCreator/templates/vc7.mpd b/bin/MakeProjectCreator/templates/vc7.mpd index 2deed1991cd..f3371564342 100644 --- a/bin/MakeProjectCreator/templates/vc7.mpd +++ b/bin/MakeProjectCreator/templates/vc7.mpd @@ -150,24 +150,14 @@ Name="<%configuration%>|<%platform%>"> <Tool Name="VCCustomBuildTool" - Description="Invoking TAO_IDL Compiler on <%basename(idl_file)%> located in <%dirname(idl_file)%>" -<%if(flag_overrides(idl_file, idlgendir))%> - CommandLine="<%tao_idl_exe("$(ACE_ROOT)\\bin\\tao_idl")%> -o <%flag_overrides(idl_file, idlgendir)%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>" - Outputs="<%flag_overrides(idl_file, idlgendir)%>\<%basenoextension(idl_file)%>C.h;<%flag_overrides(idl_file, idlgendir)%>\<%basenoextension(idl_file)%>C.i;<%flag_overrides(idl_file, idlgendir)%>\<%basenoextension(idl_file)%>C.cpp;<%flag_overrides(idl_file, idlgendir)%>\<%basenoextension(idl_file)%>S.h;<%flag_overrides(idl_file, idlgendir)%>\<%basenoextension(idl_file)%>S.i;<%flag_overrides(idl_file, idlgendir)%>\<%basenoextension(idl_file)%>S.cpp"/> -<%else%> -<%if(idlgendir)%> - CommandLine="<%tao_idl_exe("$(ACE_ROOT)\\bin\\tao_idl")%> -o <%idlgendir%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>" - Outputs="<%idlgendir%>\<%basenoextension(idl_file)%>C.h;<%idlgendir%>\<%basenoextension(idl_file)%>C.i;<%idlgendir%>\<%basenoextension(idl_file)%>C.cpp;<%idlgendir%>\<%basenoextension(idl_file)%>S.h;<%idlgendir%>\<%basenoextension(idl_file)%>S.i;<%idlgendir%>\<%basenoextension(idl_file)%>S.cpp"/> -<%else%> + Description="Invoking TAO_IDL Compiler on <%idl_file%> in <%dirname(idl_file)%>" <%if(dirname_found)%> - CommandLine="<%tao_idl_exe("$(ACE_ROOT)\\bin\\tao_idl")%> -o <%dirname(idl_file)%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>" - Outputs="<%basenoextension(idl_file)%>C.h;<%basenoextension(idl_file)%>C.i;<%basenoextension(idl_file)%>C.cpp;<%basenoextension(idl_file)%>S.h;<%basenoextension(idl_file)%>S.i;<%basenoextension(idl_file)%>S.cpp"/> + CommandLine="cd <%dirname(idl_file)%> +<%tao_idl_exe("$(ACE_ROOT)\\bin\\tao_idl")%> <%if(flag_overrides(idl_file))%><%flag_overrides(idl_file)%><%else%><%idlflags("-Sc")%><%endif%> <%basename(idl_file)%>" <%else%> - CommandLine="<%tao_idl_exe("$(ACE_ROOT)\\bin\\tao_idl")%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>" - Outputs="<%noextension(idl_file)%>C.h;<%noextension(idl_file)%>C.i;<%noextension(idl_file)%>C.cpp;<%noextension(idl_file)%>S.h;<%noextension(idl_file)%>S.i;<%noextension(idl_file)%>S.cpp"/> -<%endif%> -<%endif%> + CommandLine="<%tao_idl_exe("$(ACE_ROOT)\\bin\\tao_idl")%> <%if(flag_overrides(idl_file))%><%flag_overrides(idl_file)%><%else%><%idlflags("-Sc")%><%endif%> <%idl_file%>" <%endif%> + Outputs="<%noextension(idl_file)%>C.h;<%noextension(idl_file)%>C.i;<%noextension(idl_file)%>C.cpp;<%noextension(idl_file)%>S.h;<%noextension(idl_file)%>S.i;<%noextension(idl_file)%>S.cpp"/> </FileConfiguration> <%endfor%> </File> diff --git a/bin/PerlACE/Process_Unix.pm b/bin/PerlACE/Process_Unix.pm index b6ae698d3f5..a7ca2127a76 100644 --- a/bin/PerlACE/Process_Unix.pm +++ b/bin/PerlACE/Process_Unix.pm @@ -18,7 +18,7 @@ $PerlACE::Process::chorus = 0; $PerlACE::Process::cwd = getcwd(); for(my $i = 0; $i <= $#ARGV; $i++) { - if ($ARGV[$i] eq '-chorus') { + if ($ARGV[$i] eq '-chorus') { if (defined $ARGV[$i + 1]) { $PerlACE::Process::chorus = 1; $PerlACE::Process::chorushostname = $ARGV[$1 + 1]; @@ -28,7 +28,7 @@ for(my $i = 0; $i <= $#ARGV; $i++) { "the hostname of the target\n"; exit(1); } - + splice(@ARGV, $i, 2); # Don't break from the loop just in case there # is an accidental duplication of the -chorus option @@ -59,18 +59,18 @@ else { ### Constructor and Destructor -sub new +sub new { my $proto = shift; my $class = ref ($proto) || $proto; my $self = {}; - + $self->{RUNNING} = 0; $self->{IGNOREEXESUBDIR} = 0; $self->{PROCESS} = undef; $self->{EXECUTABLE} = shift; $self->{ARGUMENTS} = shift; - + bless ($self, $class); return $self; } @@ -78,11 +78,11 @@ sub new sub DESTROY { my $self = shift; - + if ($self->{RUNNING} == 1) { - print STDERR "ERROR: <", $self->{EXECUTABLE}, + print STDERR "ERROR: <", $self->{EXECUTABLE}, "> still running upon object destruction\n"; - $self->Kill (); + $self->Kill (); } } @@ -99,7 +99,7 @@ sub Executable } my $executable = $self->{EXECUTABLE}; - + if ($self->{IGNOREEXESUBDIR}) { return $executable; } @@ -134,10 +134,10 @@ sub CommandLine () } if ($PerlACE::Process::chorus == 1) { - $commandline = "rsh " - . $PerlACE::Process::chorushostname + $commandline = "rsh " + . $PerlACE::Process::chorushostname . " arun " - . $PerlACE::Process::cwd + . $PerlACE::Process::cwd . "/" . $commandline; } @@ -177,13 +177,13 @@ sub Spawn () if ($self->{IGNOREEXESUBDIR} == 0) { if (!-f $self->Executable ()) { - print STDERR "ERROR: Cannot Spawn: <", $self->Executable (), + print STDERR "ERROR: Cannot Spawn: <", $self->Executable (), "> not found\n"; return -1; } if (!$PerlACE::Process::chorus && !-x $self->Executable ()) { - print STDERR "ERROR: Cannot Spawn: <", $self->Executable (), + print STDERR "ERROR: Cannot Spawn: <", $self->Executable (), "> not executable\n"; return -1; } @@ -211,7 +211,6 @@ sub Spawn () } } $self->{RUNNING} = 1; - return 0; } sub WaitKill ($) @@ -223,9 +222,9 @@ sub WaitKill ($) if ($status == -1) { print STDERR "ERROR: $self->{EXECUTABLE} timedout\n"; - $self->Kill (); + $self->Kill (); } - + $self->{RUNNING} = 0; return $status; @@ -250,11 +249,11 @@ sub TerminateWaitKill ($) { my $self = shift; my $timeout = shift; - + if ($self->{RUNNING}) { kill ('TERM', $self->{PROCESS}); } - + return $self->WaitKill ($timeout); } @@ -302,7 +301,7 @@ sub check_return_value ($) sub Kill () { my $self = shift; - + if ($self->{RUNNING}) { kill ('KILL', $self->{PROCESS}); waitpid ($self->{PROCESS}, 0); @@ -315,7 +314,7 @@ sub Kill () sub Wait () { my $self = shift; - + waitpid ($self->{PROCESS}, 0); } @@ -323,12 +322,12 @@ sub TimedWait ($) { my $self = shift; my $timeout = shift; - + while ($timeout-- != 0) { my $pid = waitpid ($self->{PROCESS}, &WNOHANG); if ($pid != 0 && $? != -1) { return $self->check_return_value ($?); - } + } sleep 1; } @@ -336,3 +335,4 @@ sub TimedWait ($) } 1; + diff --git a/bin/auto_run_tests.lst b/bin/auto_run_tests.lst index 5c27319c8a8..06377c0cec9 100644 --- a/bin/auto_run_tests.lst +++ b/bin/auto_run_tests.lst @@ -41,8 +41,7 @@ TAO/tests/BiDirectional_NestedUpcall/run_test.pl: !MINIMUM !STATIC TAO/tests/Leader_Followers/run_test.pl: !ST TAO/tests/Leader_Followers/run_test_mt.pl: !ST TAO/tests/Multiple_Inheritance/run_test.pl -TAO/tests/Bug_1269_Regression/run_test.pl: !SANDBOX !MINIMUM -TAO/tests/Bug_1270_Regression/run_test.pl: !SANDBOX !MINIMUM + TAO/tests/RTCORBA/Banded_Connections/run_test.pl: !MINIMUM !ST !Linux TAO/tests/RTCORBA/Client_Propagated/run_test.pl: !MINIMUM !ST !Linux TAO/tests/RTCORBA/Client_Protocol/run_test.pl: !MINIMUM !ST @@ -70,7 +69,7 @@ TAO/tests/MT_Client/run_test.pl: !ST TAO/tests/MT_BiDir/run_test.pl: !ST !MINIMUM TAO/tests/File_IO/run_test.pl: !ST !MINIMUM TAO/tests/MT_Server/run_test.pl: !ST -TAO/tests/No_Server_MT_Connect_Test/run_test.pl: !ST !MINIMUM +TAO/tests/No_Server_MT_Connect_Test/run_test.pl: !ST TAO/tests/Connect_Strategy_Test/run_test.pl # DISABLED TAO/tests/Client_Leaks/run_test.pl: !ST !Tru64 TAO/tests/Server_Leaks/run_test.pl @@ -93,8 +92,6 @@ TAO/tests/POA/POA_Destruction/run_test.pl TAO/tests/POA/Default_Servant/run_test.pl: !MINIMUM TAO/tests/POA/Single_Threaded_POA/run_test.pl: !MINIMUM !ST TAO/tests/POA/Non_Servant_Upcalls/run_test.pl: !SUNCC5_1 -TAO/tests/POA/MT_Servant_Locator/run_test.pl: !MINIMUM !ST -TAO/tests/POA/Current/run_test.pl TAO/tests/POA/wait_for_completion/run_test.pl TAO/tests/IORManipulation/run_test.pl TAO/tests/Policies/run_test.pl: !MINIMUM !ST @@ -103,7 +100,6 @@ TAO/tests/MT_Timeout/run_test.pl: !MINIMUM !ST TAO/tests/Timed_Buffered_Oneways/run_test.pl: !MINIMUM TAO/tests/Single_Read/run_test.pl: TAO/tests/Connection_Timeout/run_test.pl: !MINIMUM -TAO/tests/MProfile_Connection_Timeout/run_test.pl: !MINIMUM TAO/tests/Codec/run_test.pl TAO/tests/IDL_Test/run_test.pl TAO/tests/ORB_init/run_test.pl @@ -142,7 +138,6 @@ TAO/tests/Portable_Interceptors/ForwardRequest/run_test.pl: !MINIMUM !DISABLE_IN TAO/tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS TAO/tests/Portable_Interceptors/PICurrent/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS -TAO/tests/Portable_Interceptors/AMI/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS TAO/tests/ORT/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS TAO/tests/Object_Loader/run_test.pl: !STATIC @@ -190,17 +185,6 @@ TAO/orbsvcs/tests/ImplRepo/run_test.pl: SANDBOX TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl: SANDBOX TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl: !MINIMUM -TAO/orbsvcs/tests/Notify/Basic/run_test.pl -TAO/orbsvcs/tests/Notify/Blocking/run_test.pl -TAO/orbsvcs/tests/Notify/Discarding/run_test.pl -TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl -TAO/orbsvcs/tests/Notify/Ordering/run_test.pl -TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl -TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl -TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl -TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl -TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl -TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl # BREAKS !linux 'TAO/orbsvcs/tests/EC_Mcast/run_test.pl # FAILS 'TAO/orbsvcs/tests/EC_Multiple/run_test.pl @@ -216,7 +200,4 @@ TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test.pl: !ST SSL TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl: SSL TAO/orbsvcs/tests/Security/SecurityLevel1/run_test.pl: SSL TAO/orbsvcs/tests/Miop/McastHello/run_test.pl: !MINIMUM !STATIC !SUNCC5_1 - -TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS - TAO/tests/Two_Objects/run_test.pl: !ST diff --git a/docs/ACE-guidelines.html b/docs/ACE-guidelines.html index a25ca2ef9a8..cbc173acd7e 100644 --- a/docs/ACE-guidelines.html +++ b/docs/ACE-guidelines.html @@ -142,13 +142,16 @@ bgcolor="#ffffff"> </pre><p> <li>Be sure to follow the guidelines and restrictions for use of the - documentation tools for ACE - header files, which must follow the - <a href="http://www.doxygen.org/">Doxygen</a> + <a href="../bin/README.html">ACE documentation tools</a>, notably + for header files.<p> + + <li>One example of such guidelines is that comments, especially in + header files, must follow the + <a href="http://www.stack.nl/~dimitri/doxygen/">Doxygen</a> format requirements. The complete documentation for Doxygen is available in the - <a href="http://www.stack.nl/~dimitri/doxygen/download.html#latestman">Doxygen - manual</a>. + <a href="http://www.stack.nl/~dimitri/doxygen/">Doxygen + manual</a>.<br> For an example header file using Doxygen-style comments, please refer to <a href="../ace/ACE.h">ACE.h</a>.<p> </ul> diff --git a/docs/ACE-subsets.html b/docs/ACE-subsets.html index 2b8adbb8080..902419a7bd1 100644 --- a/docs/ACE-subsets.html +++ b/docs/ACE-subsets.html @@ -120,12 +120,6 @@ This library will depend on <CODE>libACE_OS</CODE> and <DT> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> -<CODE>libACE_Timer</CODE> -- This library contains the ACE C++ -wrappers for timer support. This library will depend on -<CODE>libACE_OS</CODE>. <P> - -<DT> <img alt="o" -src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> <CODE>libACE_Svcconf</CODE> -- This library contains the ACE C++ wrappers for the Service Configurator. This library will depend on <CODE>libACE_OS</CODE>, <CODE>libACE_Demux</CODE>, diff --git a/examples/ASX/CCM_App/Makefile b/examples/ASX/CCM_App/Makefile index 81dae25e288..a0aff8167e7 100644 --- a/examples/ASX/CCM_App/Makefile +++ b/examples/ASX/CCM_App/Makefile @@ -63,6 +63,8 @@ libCCM_App.$(SOEXT): CCM_App.cpp .obj/CCM_App.o .obj/CCM_App.so .shobj/CCM_App.o .shobj/CCM_App.so: CCM_App.cpp \ $(ACE_ROOT)/ace/Stream.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -129,9 +131,6 @@ libCCM_App.$(SOEXT): CCM_App.cpp $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ diff --git a/examples/ASX/Event_Server/Event_Server/Makefile b/examples/ASX/Event_Server/Event_Server/Makefile index ed899478b4f..15d57a7b7dc 100644 --- a/examples/ASX/Event_Server/Event_Server/Makefile +++ b/examples/ASX/Event_Server/Event_Server/Makefile @@ -51,6 +51,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -148,8 +150,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Get_Opt.i \ - Options.h \ + $(ACE_ROOT)/ace/Get_Opt.i Options.h \ $(ACE_ROOT)/ace/Profile_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.i \ @@ -161,6 +162,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -296,9 +299,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -381,6 +381,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/Event_Analyzer.o .obj/Event_Analyzer.so .shobj/Event_Analyzer.o .shobj/Event_Analyzer.so: Event_Analyzer.cpp Options.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -452,9 +454,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -518,6 +517,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SOCK_IO.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -608,9 +609,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -751,6 +749,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/Peer_Router.o .obj/Peer_Router.so .shobj/Peer_Router.o .shobj/Peer_Router.so: Peer_Router.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -875,8 +875,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Get_Opt.i \ - Options.h \ + $(ACE_ROOT)/ace/Get_Opt.i Options.h \ $(ACE_ROOT)/ace/Profile_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.i \ @@ -888,9 +887,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ diff --git a/examples/ASX/Event_Server/Transceiver/Makefile b/examples/ASX/Event_Server/Transceiver/Makefile index f5729c343eb..bf0a6fe792b 100644 --- a/examples/ASX/Event_Server/Transceiver/Makefile +++ b/examples/ASX/Event_Server/Transceiver/Makefile @@ -44,6 +44,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/transceiver.o .obj/transceiver.so .shobj/transceiver.o .shobj/transceiver.so: transceiver.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -182,9 +184,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ diff --git a/examples/ASX/Message_Queue/Makefile b/examples/ASX/Message_Queue/Makefile index c1631d1edd8..2a1cf34dcb3 100644 --- a/examples/ASX/Message_Queue/Makefile +++ b/examples/ASX/Message_Queue/Makefile @@ -42,6 +42,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -174,9 +176,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Message_Queue.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -214,6 +213,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -268,9 +269,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Notification_Strategy.inl \ $(ACE_ROOT)/ace/Message_Queue.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -323,6 +321,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -379,9 +379,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Read_Buffer.h \ $(ACE_ROOT)/ace/Read_Buffer.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ diff --git a/examples/ASX/UPIPE_Event_Server/Makefile b/examples/ASX/UPIPE_Event_Server/Makefile index fa145601849..2d108c3645e 100644 --- a/examples/ASX/UPIPE_Event_Server/Makefile +++ b/examples/ASX/UPIPE_Event_Server/Makefile @@ -51,6 +51,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -148,8 +150,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Get_Opt.i \ - Options.h \ + $(ACE_ROOT)/ace/Get_Opt.i Options.h \ $(ACE_ROOT)/ace/Profile_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.i \ @@ -159,6 +160,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/Supplier_Router.o .obj/Supplier_Router.so .shobj/Supplier_Router.o .shobj/Supplier_Router.so: Supplier_Router.cpp Options.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -284,9 +287,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ @@ -388,6 +388,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/Event_Analyzer.o .obj/Event_Analyzer.so .shobj/Event_Analyzer.o .shobj/Event_Analyzer.so: Event_Analyzer.cpp Event_Analyzer.h \ $(ACE_ROOT)/ace/Stream.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -454,9 +456,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -518,6 +517,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -550,9 +551,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -735,8 +733,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Map_Manager.cpp \ Peer_Router.cpp \ $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i \ - Options.h \ + $(ACE_ROOT)/ace/Get_Opt.i Options.h \ $(ACE_ROOT)/ace/Profile_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.i \ @@ -750,6 +747,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -878,9 +877,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ diff --git a/examples/C++NPv1/Makefile b/examples/C++NPv1/Makefile index 62b894894f0..ff16fb9e1f4 100644 --- a/examples/C++NPv1/Makefile +++ b/examples/C++NPv1/Makefile @@ -36,399 +36,3 @@ ifneq ($(MKLIST),) @$(MAKE) -f $(MAKEFILE) MKFILE_TARGET=$@ $(addsuffix .mkfile, $(MKLIST)) endif -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - -.obj/Thread_Per_Connection_Logging_Server.o .obj/Thread_Per_Connection_Logging_Server.so .shobj/Thread_Per_Connection_Logging_Server.o .shobj/Thread_Per_Connection_Logging_Server.so: \ - Thread_Per_Connection_Logging_Server.cpp \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/FILE_IO.h \ - $(ACE_ROOT)/ace/FILE.h \ - $(ACE_ROOT)/ace/IO_SAP.h \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/IO_SAP.i \ - $(ACE_ROOT)/ace/FILE_Addr.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/FILE_Addr.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/FILE.i \ - $(ACE_ROOT)/ace/FILE_IO.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(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 \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Framework_Component.h \ - $(ACE_ROOT)/ace/Framework_Component.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 \ - Thread_Per_Connection_Logging_Server.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - Logging_Server.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - Logging_Handler.h - -.obj/Logging_Handler.o .obj/Logging_Handler.so .shobj/Logging_Handler.o .shobj/Logging_Handler.so: Logging_Handler.cpp \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/CDR_Base.inl \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - Logging_Handler.h \ - $(ACE_ROOT)/ace/FILE_IO.h \ - $(ACE_ROOT)/ace/FILE.h \ - $(ACE_ROOT)/ace/IO_SAP.h \ - $(ACE_ROOT)/ace/IO_SAP.i \ - $(ACE_ROOT)/ace/FILE_Addr.h \ - $(ACE_ROOT)/ace/FILE_Addr.i \ - $(ACE_ROOT)/ace/FILE.i \ - $(ACE_ROOT)/ace/FILE_IO.i \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i - -.obj/Logging_Server.o .obj/Logging_Server.so .shobj/Logging_Server.o .shobj/Logging_Server.so: Logging_Server.cpp \ - $(ACE_ROOT)/ace/FILE_Addr.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/Flag_Manip.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_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/FILE_Addr.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/FILE_Connector.h \ - $(ACE_ROOT)/ace/FILE_IO.h \ - $(ACE_ROOT)/ace/FILE.h \ - $(ACE_ROOT)/ace/IO_SAP.h \ - $(ACE_ROOT)/ace/IO_SAP.i \ - $(ACE_ROOT)/ace/FILE.i \ - $(ACE_ROOT)/ace/FILE_IO.i \ - $(ACE_ROOT)/ace/FILE_Connector.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - Logging_Server.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/examples/C++NPv2/Makefile b/examples/C++NPv2/Makefile index ecca3fcac09..ea66da5ab97 100644 --- a/examples/C++NPv2/Makefile +++ b/examples/C++NPv2/Makefile @@ -52,9 +52,3 @@ ifneq ($(MKLIST),) @$(MAKE) -f $(MAKEFILE) MKFILE_TARGET=$@ $(addsuffix .mkfile, $(MKLIST)) endif -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - - - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/examples/Connection/misc/Makefile b/examples/Connection/misc/Makefile index d6bdaec63fe..65ec506c776 100644 --- a/examples/Connection/misc/Makefile +++ b/examples/Connection/misc/Makefile @@ -50,6 +50,8 @@ endif $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -170,9 +172,6 @@ endif $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -275,6 +274,8 @@ endif $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -395,9 +396,6 @@ endif $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ diff --git a/examples/Connection/non_blocking/Makefile b/examples/Connection/non_blocking/Makefile index a0c6ef6950d..9f0656506b8 100644 --- a/examples/Connection/non_blocking/Makefile +++ b/examples/Connection/non_blocking/Makefile @@ -68,6 +68,8 @@ endif .obj/CPP-connector.o .obj/CPP-connector.so .shobj/CPP-connector.o .shobj/CPP-connector.so: CPP-connector.cpp CPP-connector.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -192,9 +194,6 @@ endif $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -270,6 +269,8 @@ endif .obj/CPP-acceptor.o .obj/CPP-acceptor.so .shobj/CPP-acceptor.o .shobj/CPP-acceptor.so: CPP-acceptor.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -392,9 +393,6 @@ endif $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -474,6 +472,8 @@ endif $(ACE_ROOT)/ace/SOCK_IO.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -610,9 +610,6 @@ endif $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -691,6 +688,8 @@ endif $(ACE_ROOT)/ace/SOCK_IO.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -823,9 +822,6 @@ endif $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -901,6 +897,8 @@ endif .obj/test_lsock_connector.o .obj/test_lsock_connector.so .shobj/test_lsock_connector.o .shobj/test_lsock_connector.so: test_lsock_connector.cpp \ $(ACE_ROOT)/ace/LSOCK_Connector.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1048,9 +1046,6 @@ endif $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -1126,6 +1121,8 @@ endif .obj/test_lsock_acceptor.o .obj/test_lsock_acceptor.so .shobj/test_lsock_acceptor.o .shobj/test_lsock_acceptor.so: test_lsock_acceptor.cpp \ $(ACE_ROOT)/ace/LSOCK_Acceptor.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1269,9 +1266,6 @@ endif $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -1352,6 +1346,8 @@ endif $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1381,14 +1377,17 @@ endif $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/TLI.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/TLI_Stream.i \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/TLI_Connector.i \ CPP-connector.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Types.h \ @@ -1481,9 +1480,6 @@ endif $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -1563,6 +1559,8 @@ endif $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1592,11 +1590,13 @@ endif $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/TLI.i \ $(ACE_ROOT)/ace/TLI_Stream.h \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/TLI_Stream.i \ CPP-acceptor.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Service_Config.h \ @@ -1690,9 +1690,6 @@ endif $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -1773,6 +1770,8 @@ endif $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1905,9 +1904,6 @@ endif $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -1988,6 +1984,8 @@ endif $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -2116,9 +2114,6 @@ endif $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ diff --git a/examples/IOStream/client/Makefile b/examples/IOStream/client/Makefile index c188f09a4ec..24f2273264e 100644 --- a/examples/IOStream/client/Makefile +++ b/examples/IOStream/client/Makefile @@ -46,6 +46,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SOCK_IO.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/examples/IOStream/server/Makefile b/examples/IOStream/server/Makefile index 0d458be4acf..cb8d12447ff 100644 --- a/examples/IOStream/server/Makefile +++ b/examples/IOStream/server/Makefile @@ -43,6 +43,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -163,9 +165,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ diff --git a/examples/IPC_SAP/DEV_SAP/reader/Makefile b/examples/IPC_SAP/DEV_SAP/reader/Makefile index e90ce326892..a8ca6510960 100644 --- a/examples/IPC_SAP/DEV_SAP/reader/Makefile +++ b/examples/IPC_SAP/DEV_SAP/reader/Makefile @@ -47,6 +47,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/reader.o .obj/reader.so .shobj/reader.o .shobj/reader.so: reader.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/examples/IPC_SAP/DEV_SAP/writer/Makefile b/examples/IPC_SAP/DEV_SAP/writer/Makefile index fc2e0023770..88434c32eca 100644 --- a/examples/IPC_SAP/DEV_SAP/writer/Makefile +++ b/examples/IPC_SAP/DEV_SAP/writer/Makefile @@ -52,6 +52,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IO_SAP.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/examples/IPC_SAP/FIFO_SAP/Makefile b/examples/IPC_SAP/FIFO_SAP/Makefile index 77810880860..061a2cf3971 100644 --- a/examples/IPC_SAP/FIFO_SAP/Makefile +++ b/examples/IPC_SAP/FIFO_SAP/Makefile @@ -51,6 +51,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -100,6 +102,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -152,6 +156,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -203,6 +209,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -254,6 +262,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/examples/IPC_SAP/FILE_SAP/Makefile b/examples/IPC_SAP/FILE_SAP/Makefile index b7c83ae8681..9bc92ccdb40 100644 --- a/examples/IPC_SAP/FILE_SAP/Makefile +++ b/examples/IPC_SAP/FILE_SAP/Makefile @@ -41,6 +41,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/examples/IPC_SAP/FILE_SAP/client.cpp b/examples/IPC_SAP/FILE_SAP/client.cpp index ea04ffed654..8a708955724 100644 --- a/examples/IPC_SAP/FILE_SAP/client.cpp +++ b/examples/IPC_SAP/FILE_SAP/client.cpp @@ -26,8 +26,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_FILE_Addr (argv[1]), 0, ACE_Addr::sap_any, 0, - O_RDWR|O_APPEND|O_CREAT, - ACE_DEFAULT_FILE_PERMS) == -1) + O_RDWR|O_APPEND|O_CREAT, 0666) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n to %s", "connect", diff --git a/examples/IPC_SAP/SOCK_SAP/Makefile b/examples/IPC_SAP/SOCK_SAP/Makefile index a5789cec871..71facc227bf 100644 --- a/examples/IPC_SAP/SOCK_SAP/Makefile +++ b/examples/IPC_SAP/SOCK_SAP/Makefile @@ -66,6 +66,8 @@ endif $(ACE_ROOT)/ace/SOCK_IO.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -122,9 +124,6 @@ endif $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -203,6 +202,8 @@ endif .obj/CPP-unclient.o .obj/CPP-unclient.so .shobj/CPP-unclient.o .shobj/CPP-unclient.so: CPP-unclient.cpp \ $(ACE_ROOT)/ace/LSOCK_Connector.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -274,6 +275,8 @@ endif $(ACE_ROOT)/ace/SOCK_IO.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -330,9 +333,6 @@ endif $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -388,6 +388,8 @@ endif $(ACE_ROOT)/ace/SOCK_IO.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -456,9 +458,6 @@ endif $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -586,6 +585,8 @@ endif $(ACE_ROOT)/ace/SOCK_IO.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -646,6 +647,8 @@ endif $(ACE_ROOT)/ace/SOCK_IO.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -774,9 +777,6 @@ endif $(ACE_ROOT)/ace/MEM_Addr.i \ $(ACE_ROOT)/ace/MEM_Connector.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ @@ -811,6 +811,8 @@ endif $(ACE_ROOT)/ace/SOCK_IO.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -940,9 +942,6 @@ endif $(ACE_ROOT)/ace/OS_QoS.h \ $(ACE_ROOT)/ace/MEM_Acceptor.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ @@ -965,6 +964,8 @@ endif .obj/CPP-unserver.o .obj/CPP-unserver.so .shobj/CPP-unserver.o .shobj/CPP-unserver.so: CPP-unserver.cpp \ $(ACE_ROOT)/ace/LSOCK_Acceptor.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1034,9 +1035,6 @@ endif $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -1080,6 +1078,8 @@ endif .obj/FD-unclient.o .obj/FD-unclient.so .shobj/FD-unclient.o .shobj/FD-unclient.so: FD-unclient.cpp \ $(ACE_ROOT)/ace/LSOCK_Connector.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1147,6 +1147,8 @@ endif .obj/FD-unserver.o .obj/FD-unserver.so .shobj/FD-unserver.o .shobj/FD-unserver.so: FD-unserver.cpp \ $(ACE_ROOT)/ace/LSOCK_Acceptor.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1213,6 +1215,8 @@ endif .obj/C-inclient.o .obj/C-inclient.so .shobj/C-inclient.o .shobj/C-inclient.so: C-inclient.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1242,6 +1246,8 @@ endif .obj/C-inserver.o .obj/C-inserver.so .shobj/C-inserver.o .shobj/C-inserver.so: C-inserver.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/examples/IPC_SAP/SPIPE_SAP/Makefile b/examples/IPC_SAP/SPIPE_SAP/Makefile index 4ba160b3b15..86baba89d64 100644 --- a/examples/IPC_SAP/SPIPE_SAP/Makefile +++ b/examples/IPC_SAP/SPIPE_SAP/Makefile @@ -49,6 +49,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SPIPE_Addr.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -148,12 +150,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/SPIPE.i \ $(ACE_ROOT)/ace/SPIPE_Stream.i \ - $(ACE_ROOT)/ace/SPIPE_Connector.i + $(ACE_ROOT)/ace/SPIPE_Connector.i \ + shared.h .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \ $(ACE_ROOT)/ace/SPIPE_Addr.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -252,12 +257,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/SPIPE.i \ - $(ACE_ROOT)/ace/SPIPE_Stream.i + $(ACE_ROOT)/ace/SPIPE_Stream.i \ + shared.h .obj/consumer_msg.o .obj/consumer_msg.so .shobj/consumer_msg.o .shobj/consumer_msg.so: consumer_msg.cpp \ $(ACE_ROOT)/ace/SPIPE_Addr.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -356,12 +364,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/SPIPE.i \ - $(ACE_ROOT)/ace/SPIPE_Stream.i + $(ACE_ROOT)/ace/SPIPE_Stream.i \ + shared.h .obj/consumer_read.o .obj/consumer_read.so .shobj/consumer_read.o .shobj/consumer_read.so: consumer_read.cpp \ $(ACE_ROOT)/ace/SPIPE_Addr.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -460,12 +471,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/SPIPE.i \ - $(ACE_ROOT)/ace/SPIPE_Stream.i + $(ACE_ROOT)/ace/SPIPE_Stream.i \ + shared.h .obj/producer_msg.o .obj/producer_msg.so .shobj/producer_msg.o .shobj/producer_msg.so: producer_msg.cpp \ $(ACE_ROOT)/ace/SPIPE_Addr.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -565,12 +579,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/SPIPE.i \ $(ACE_ROOT)/ace/SPIPE_Stream.i \ - $(ACE_ROOT)/ace/SPIPE_Connector.i + $(ACE_ROOT)/ace/SPIPE_Connector.i \ + shared.h .obj/producer_read.o .obj/producer_read.so .shobj/producer_read.o .shobj/producer_read.so: producer_read.cpp \ $(ACE_ROOT)/ace/SPIPE_Addr.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -670,12 +687,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/SPIPE.i \ $(ACE_ROOT)/ace/SPIPE_Stream.i \ - $(ACE_ROOT)/ace/SPIPE_Connector.i + $(ACE_ROOT)/ace/SPIPE_Connector.i \ + shared.h .obj/NPClient.o .obj/NPClient.so .shobj/NPClient.o .shobj/NPClient.so: NPClient.cpp \ $(ACE_ROOT)/ace/SPIPE_Addr.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -781,6 +801,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SPIPE_Addr.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/examples/IPC_SAP/TLI_SAP/Makefile b/examples/IPC_SAP/TLI_SAP/Makefile index c4a6a7c8dcd..6268cb01666 100644 --- a/examples/IPC_SAP/TLI_SAP/Makefile +++ b/examples/IPC_SAP/TLI_SAP/Makefile @@ -56,6 +56,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -85,20 +87,25 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/TLI.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/TLI_Stream.i \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/TLI_Connector.i .obj/ftp-server.o .obj/ftp-server.so .shobj/ftp-server.o .shobj/ftp-server.so: ftp-server.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -131,9 +138,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -193,9 +197,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/TLI.i \ $(ACE_ROOT)/ace/TLI_Stream.h \ $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/TLI_Stream.i .obj/db-client.o .obj/db-client.so .shobj/db-client.o .shobj/db-client.so: db-client.cpp \ $(ACE_ROOT)/ace/TLI_Connector.h \ @@ -205,6 +211,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -234,14 +242,17 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/TLI.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/TLI_Stream.i \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/TLI_Connector.i .obj/db-server.o .obj/db-server.so .shobj/db-server.o .shobj/db-server.so: db-server.cpp \ $(ACE_ROOT)/ace/TLI_Acceptor.h \ @@ -250,6 +261,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -279,11 +292,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/TLI.i \ $(ACE_ROOT)/ace/TLI_Stream.h \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/TLI_Stream.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ @@ -293,9 +308,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -354,6 +366,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -383,14 +397,17 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/TLI.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/TLI_Stream.i \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/TLI_Connector.i .obj/CPP-server.o .obj/CPP-server.so .shobj/CPP-server.o .shobj/CPP-server.so: CPP-server.cpp \ $(ACE_ROOT)/ace/TLI_Acceptor.h \ @@ -399,6 +416,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -428,11 +447,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/TLI.i \ $(ACE_ROOT)/ace/TLI_Stream.h \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/TLI_Stream.i \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ @@ -446,6 +467,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -475,14 +498,17 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/TLI.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/TLI_Stream.i \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/TLI_Connector.i \ $(ACE_ROOT)/ace/ATM_QoS.h \ $(ACE_ROOT)/ace/ATM_Addr.h @@ -493,6 +519,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -522,11 +550,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/TLI.i \ $(ACE_ROOT)/ace/TLI_Stream.h \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/TLI_Stream.i \ $(ACE_ROOT)/ace/ATM_Addr.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ diff --git a/examples/IPC_SAP/UPIPE_SAP/Makefile b/examples/IPC_SAP/UPIPE_SAP/Makefile index 6718ae33155..4057fb0ccdf 100644 --- a/examples/IPC_SAP/UPIPE_SAP/Makefile +++ b/examples/IPC_SAP/UPIPE_SAP/Makefile @@ -43,6 +43,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/ex1.o .obj/ex1.so .shobj/ex1.o .shobj/ex1.so: ex1.cpp \ $(ACE_ROOT)/ace/Stream.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -109,9 +111,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -217,6 +216,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/UPIPE_Stream.h \ $(ACE_ROOT)/ace/Stream.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -283,9 +284,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -389,6 +387,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/UPIPE_Stream.h \ $(ACE_ROOT)/ace/Stream.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -455,9 +455,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ diff --git a/examples/Log_Msg/Makefile b/examples/Log_Msg/Makefile index 533a5f02675..f349ecaf7c1 100644 --- a/examples/Log_Msg/Makefile +++ b/examples/Log_Msg/Makefile @@ -44,6 +44,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/test_log_msg.o .obj/test_log_msg.so .shobj/test_log_msg.o .shobj/test_log_msg.so: test_log_msg.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -77,6 +79,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/test_ostream.o .obj/test_ostream.so .shobj/test_ostream.o .shobj/test_ostream.so: test_ostream.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -110,6 +114,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/test_callback.o .obj/test_callback.so .shobj/test_callback.o .shobj/test_callback.so: test_callback.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/examples/Logger/Acceptor-server/Makefile b/examples/Logger/Acceptor-server/Makefile index 56a7fe28434..b0fa56a024e 100644 --- a/examples/Logger/Acceptor-server/Makefile +++ b/examples/Logger/Acceptor-server/Makefile @@ -46,6 +46,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -173,9 +175,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ diff --git a/examples/Logger/client/Makefile b/examples/Logger/client/Makefile index a1953c823f1..2d5a9052bce 100644 --- a/examples/Logger/client/Makefile +++ b/examples/Logger/client/Makefile @@ -46,6 +46,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SOCK_IO.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/examples/Logger/simple-server/Makefile b/examples/Logger/simple-server/Makefile index 5653e111392..c4ef5e43e23 100644 --- a/examples/Logger/simple-server/Makefile +++ b/examples/Logger/simple-server/Makefile @@ -44,6 +44,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/Logging_Acceptor.o .obj/Logging_Acceptor.so .shobj/Logging_Acceptor.o .shobj/Logging_Acceptor.so: Logging_Acceptor.cpp \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -52,27 +54,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/Default_Constants.h \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ Logging_Acceptor.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.h \ @@ -83,6 +71,20 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Addr.i \ $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(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/Time_Value.h \ + $(ACE_ROOT)/ace/Time_Value.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/SOCK.i \ @@ -149,6 +151,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/Logging_Handler.o .obj/Logging_Handler.so .shobj/Logging_Handler.o .shobj/Logging_Handler.so: Logging_Handler.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -156,15 +160,20 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/Default_Constants.h \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + Logging_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS_String.inl \ $(ACE_ROOT)/ace/OS_Memory.h \ $(ACE_ROOT)/ace/OS_Memory.inl \ @@ -173,13 +182,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/Time_Value.inl \ $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - Logging_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Sock_Connect.h \ diff --git a/examples/Map_Manager/Makefile b/examples/Map_Manager/Makefile index 3c8232fda9f..57333d93679 100644 --- a/examples/Map_Manager/Makefile +++ b/examples/Map_Manager/Makefile @@ -40,6 +40,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/test_hash_map_manager.o .obj/test_hash_map_manager.so .shobj/test_hash_map_manager.o .shobj/test_hash_map_manager.so: test_hash_map_manager.cpp \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/examples/Mem_Map/IO-tests/Makefile b/examples/Mem_Map/IO-tests/Makefile index 39e7ac85fa1..f83452625fb 100644 --- a/examples/Mem_Map/IO-tests/Makefile +++ b/examples/Mem_Map/IO-tests/Makefile @@ -44,6 +44,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/IO_Test.o .obj/IO_Test.so .shobj/IO_Test.o .shobj/IO_Test.so: IO_Test.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/examples/Mem_Map/file-reverse/Makefile b/examples/Mem_Map/file-reverse/Makefile index f5610903f4c..ac19743dc00 100644 --- a/examples/Mem_Map/file-reverse/Makefile +++ b/examples/Mem_Map/file-reverse/Makefile @@ -47,6 +47,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/examples/Misc/Makefile b/examples/Misc/Makefile index eea321a9923..14264f65d8f 100644 --- a/examples/Misc/Makefile +++ b/examples/Misc/Makefile @@ -63,6 +63,8 @@ endif $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -104,8 +106,7 @@ endif $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Dump_T.h \ $(ACE_ROOT)/ace/Dump_T.cpp \ - test_dump.h \ - $(ACE_ROOT)/ace/Reactor.h \ + test_dump.h $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ @@ -132,6 +133,8 @@ endif $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -234,6 +237,8 @@ endif .obj/test_profile_timer.o .obj/test_profile_timer.so .shobj/test_profile_timer.o .shobj/test_profile_timer.so: test_profile_timer.cpp \ $(ACE_ROOT)/ace/Profile_Timer.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -271,6 +276,8 @@ endif .obj/test_read_buffer.o .obj/test_read_buffer.so .shobj/test_read_buffer.o .shobj/test_read_buffer.so: test_read_buffer.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -393,6 +400,8 @@ endif $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -445,6 +454,8 @@ endif $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -537,6 +548,8 @@ endif $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -587,9 +600,6 @@ endif $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ diff --git a/examples/Naming/Makefile b/examples/Naming/Makefile index ed14c97b65e..b0d00621005 100644 --- a/examples/Naming/Makefile +++ b/examples/Naming/Makefile @@ -51,6 +51,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Naming_Context.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -198,6 +200,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Naming_Context.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -345,6 +349,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Naming_Context.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -492,6 +498,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Naming_Context.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/examples/RMCast/Send_File/Makefile b/examples/RMCast/Send_File/Makefile index 34b77d44f95..616e91cd9f7 100644 --- a/examples/RMCast/Send_File/Makefile +++ b/examples/RMCast/Send_File/Makefile @@ -43,6 +43,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/RMCast/RMCast_Module_Factory.h \ $(ACE_ROOT)/ace/RMCast/RMCast.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -240,6 +242,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/RMCast/RMCast_Module_Factory.h \ $(ACE_ROOT)/ace/RMCast/RMCast.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/examples/Reactor/Dgram/Makefile b/examples/Reactor/Dgram/Makefile index 104dd0543a6..090854aa263 100644 --- a/examples/Reactor/Dgram/Makefile +++ b/examples/Reactor/Dgram/Makefile @@ -47,6 +47,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -166,6 +168,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/examples/Reactor/FIFO/Makefile b/examples/Reactor/FIFO/Makefile index 343271ef389..d5447930a68 100644 --- a/examples/Reactor/FIFO/Makefile +++ b/examples/Reactor/FIFO/Makefile @@ -48,6 +48,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -96,6 +98,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/examples/Reactor/Misc/Makefile b/examples/Reactor/Misc/Makefile index 4b2cb6847b1..d6d384ab899 100644 --- a/examples/Reactor/Misc/Makefile +++ b/examples/Reactor/Misc/Makefile @@ -51,6 +51,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -127,6 +129,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/notification.o .obj/notification.so .shobj/notification.o .shobj/notification.so: notification.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -243,9 +247,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -272,6 +273,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/test_demuxing.o .obj/test_demuxing.so .shobj/test_demuxing.o .shobj/test_demuxing.so: test_demuxing.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -389,9 +392,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -444,6 +444,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -482,6 +484,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -597,9 +601,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -645,14 +646,14 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Atomic_Op.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Atomic_Op.cpp .obj/test_signals_1.o .obj/test_signals_1.so .shobj/test_signals_1.o .shobj/test_signals_1.so: test_signals_1.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -774,6 +775,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -867,6 +870,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/test_time_value.o .obj/test_time_value.so .shobj/test_time_value.o .shobj/test_time_value.so: test_time_value.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -901,6 +906,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -941,6 +948,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/examples/Reactor/Multicast/Makefile b/examples/Reactor/Multicast/Makefile index fc86e673cf6..239f2613186 100644 --- a/examples/Reactor/Multicast/Makefile +++ b/examples/Reactor/Multicast/Makefile @@ -44,6 +44,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/Log_Wrapper.o .obj/Log_Wrapper.so .shobj/Log_Wrapper.o .shobj/Log_Wrapper.so: Log_Wrapper.cpp Log_Wrapper.h \ $(ACE_ROOT)/ace/Profile_Timer.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/examples/Reactor/Ntalker/Makefile b/examples/Reactor/Ntalker/Makefile index d05d8db9139..29191b718ea 100644 --- a/examples/Reactor/Ntalker/Makefile +++ b/examples/Reactor/Ntalker/Makefile @@ -45,6 +45,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -170,9 +172,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ diff --git a/examples/Reactor/Proactor/test_proactor2.cpp b/examples/Reactor/Proactor/test_proactor2.cpp index 35e31822c22..15fb6151ecd 100644 --- a/examples/Reactor/Proactor/test_proactor2.cpp +++ b/examples/Reactor/Proactor/test_proactor2.cpp @@ -433,7 +433,7 @@ ACE_HANDLE Sender::handle (void) const void Sender::handle (ACE_HANDLE handle) { - this->stream_.set_handle (handle); + return this->stream_.set_handle (handle); } int Sender::open (const ACE_TCHAR *host, u_short port) diff --git a/examples/Service_Configurator/IPC-tests/client/Makefile b/examples/Service_Configurator/IPC-tests/client/Makefile index 874b9b7918a..be8b0c8aaf8 100644 --- a/examples/Service_Configurator/IPC-tests/client/Makefile +++ b/examples/Service_Configurator/IPC-tests/client/Makefile @@ -54,6 +54,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/local_dgram_client_test.o .obj/local_dgram_client_test.so .shobj/local_dgram_client_test.o .shobj/local_dgram_client_test.so: local_dgram_client_test.cpp \ $(ACE_ROOT)/ace/LSOCK_CODgram.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -182,6 +184,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/local_stream_client_test.o .obj/local_stream_client_test.so .shobj/local_stream_client_test.o .shobj/local_stream_client_test.so: local_stream_client_test.cpp \ $(ACE_ROOT)/ace/LSOCK_Connector.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -310,6 +314,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/local_pipe_client_test.o .obj/local_pipe_client_test.so .shobj/local_pipe_client_test.o .shobj/local_pipe_client_test.so: local_pipe_client_test.cpp \ $(ACE_ROOT)/ace/LSOCK_Connector.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -439,6 +445,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -561,6 +569,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -596,14 +606,17 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/TLI.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/TLI_Stream.i \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/TLI_Connector.i \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/String_Base.h \ @@ -676,6 +689,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -792,6 +807,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -907,6 +924,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1024,6 +1043,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1145,6 +1166,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SOCK_IO.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/examples/Service_Configurator/IPC-tests/server/Makefile b/examples/Service_Configurator/IPC-tests/server/Makefile index 39a8e1d62ac..0bf8789cc84 100644 --- a/examples/Service_Configurator/IPC-tests/server/Makefile +++ b/examples/Service_Configurator/IPC-tests/server/Makefile @@ -61,6 +61,8 @@ endif .obj/Handle_L_Dgram.o .obj/Handle_L_Dgram.so .shobj/Handle_L_Dgram.o .shobj/Handle_L_Dgram.so: Handle_L_Dgram.cpp Handle_L_Dgram.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -208,6 +210,8 @@ endif .obj/Handle_L_CODgram.o .obj/Handle_L_CODgram.so .shobj/Handle_L_CODgram.o .shobj/Handle_L_CODgram.so: Handle_L_CODgram.cpp Handle_L_CODgram.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -357,6 +361,8 @@ endif .obj/Handle_L_FIFO.o .obj/Handle_L_FIFO.so .shobj/Handle_L_FIFO.o .shobj/Handle_L_FIFO.so: Handle_L_FIFO.cpp Handle_L_FIFO.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -496,6 +502,8 @@ endif .obj/Handle_L_Pipe.o .obj/Handle_L_Pipe.so .shobj/Handle_L_Pipe.o .shobj/Handle_L_Pipe.so: Handle_L_Pipe.cpp Handle_L_Pipe.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -648,6 +656,8 @@ endif .obj/Handle_L_Stream.o .obj/Handle_L_Stream.so .shobj/Handle_L_Stream.o .shobj/Handle_L_Stream.so: Handle_L_Stream.cpp Handle_L_Stream.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -800,6 +810,8 @@ endif .obj/Handle_R_Dgram.o .obj/Handle_R_Dgram.so .shobj/Handle_R_Dgram.o .shobj/Handle_R_Dgram.so: Handle_R_Dgram.cpp Handle_R_Dgram.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -941,6 +953,8 @@ endif .obj/Handle_R_Stream.o .obj/Handle_R_Stream.so .shobj/Handle_R_Stream.o .shobj/Handle_R_Stream.so: Handle_R_Stream.cpp Handle_R_Stream.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1087,6 +1101,8 @@ endif .obj/Handle_Timeout.o .obj/Handle_Timeout.so .shobj/Handle_Timeout.o .shobj/Handle_Timeout.so: Handle_Timeout.cpp Handle_Timeout.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1218,6 +1234,8 @@ endif .obj/Handle_Broadcast.o .obj/Handle_Broadcast.so .shobj/Handle_Broadcast.o .shobj/Handle_Broadcast.so: Handle_Broadcast.cpp Handle_Broadcast.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1359,6 +1377,8 @@ endif .obj/Handle_L_SPIPE.o .obj/Handle_L_SPIPE.so .shobj/Handle_L_SPIPE.o .shobj/Handle_L_SPIPE.so: Handle_L_SPIPE.cpp Handle_L_SPIPE.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1485,7 +1505,18 @@ endif $(ACE_ROOT)/ace/SPIPE_Addr.i \ $(ACE_ROOT)/ace/SPIPE.i \ $(ACE_ROOT)/ace/SPIPE_Stream.i \ - $(ACE_ROOT)/ace/svc_export.h + $(ACE_ROOT)/ace/svc_export.h \ + Handle_L_SPIPE.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(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 \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Get_Opt.i .obj/Handle_Thr_Stream.o .obj/Handle_Thr_Stream.so .shobj/Handle_Thr_Stream.o .shobj/Handle_Thr_Stream.so: Handle_Thr_Stream.cpp \ $(ACE_ROOT)/ace/Get_Opt.h \ @@ -1494,6 +1525,8 @@ endif $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1600,7 +1633,9 @@ endif $(ACE_ROOT)/ace/TLI.h \ $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/TLI.i \ $(ACE_ROOT)/ace/TLI_Stream.h \ + $(ACE_ROOT)/ace/TLI_Stream.i \ Handle_Thr_Stream.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Service_Config.h \ @@ -1631,9 +1666,6 @@ endif $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ @@ -1696,19 +1728,13 @@ endif $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Acceptor.cpp \ - Handle_Thr_Stream.i Handle_Thr_Stream.cpp \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i + Handle_Thr_Stream.i Handle_Thr_Stream.cpp .obj/server_test.o .obj/server_test.so .shobj/server_test.o .shobj/server_test.so: server_test.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/examples/Service_Configurator/Misc/Makefile b/examples/Service_Configurator/Misc/Makefile index 481b6d3c47a..e71fc0cd2d1 100644 --- a/examples/Service_Configurator/Misc/Makefile +++ b/examples/Service_Configurator/Misc/Makefile @@ -54,6 +54,8 @@ endif .obj/Timer_Service.o .obj/Timer_Service.so .shobj/Timer_Service.o .shobj/Timer_Service.so: Timer_Service.cpp Timer_Service.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -174,6 +176,8 @@ endif .obj/main.o .obj/main.so .shobj/main.o .shobj/main.so: main.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/examples/Shared_Malloc/Makefile b/examples/Shared_Malloc/Makefile index c58f2e1d519..24e12e9a16c 100644 --- a/examples/Shared_Malloc/Makefile +++ b/examples/Shared_Malloc/Makefile @@ -48,6 +48,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/Malloc.o .obj/Malloc.so .shobj/Malloc.o .shobj/Malloc.so: Malloc.cpp Options.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -138,6 +140,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -235,13 +239,14 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Get_Opt.i \ - Options.h + $(ACE_ROOT)/ace/Get_Opt.i Options.h .obj/test_malloc.o .obj/test_malloc.so .shobj/test_malloc.o .shobj/test_malloc.so: test_malloc.cpp \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -275,9 +280,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -356,6 +358,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -441,6 +445,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU test_position_independent_malloc.h \ $(ACE_ROOT)/ace/Based_Pointer_T.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -569,6 +575,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -657,6 +665,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/Malloc.o .obj/Malloc.so .shobj/Malloc.o .shobj/Malloc.so: Malloc.cpp Options.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -747,6 +757,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -844,7 +856,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Get_Opt.i \ - Options.h + $(ACE_ROOT)/ace/Get_Opt.i Options.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/examples/Shared_Memory/Makefile b/examples/Shared_Memory/Makefile index 6a6e77f063b..d9217113c7b 100644 --- a/examples/Shared_Memory/Makefile +++ b/examples/Shared_Memory/Makefile @@ -50,6 +50,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Shared_Memory.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -88,6 +90,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Shared_Memory.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/examples/Synch/Makefile b/examples/Synch/Makefile index 315ae5b93cc..71739f48166 100644 --- a/examples/Synch/Makefile +++ b/examples/Synch/Makefile @@ -47,6 +47,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -86,10 +88,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(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/Process_Semaphore.inl \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/SString.h \ @@ -127,6 +125,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(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/Unbounded_Set.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ diff --git a/examples/System_V_IPC/SV_Message_Queues/Makefile b/examples/System_V_IPC/SV_Message_Queues/Makefile index 20c178ca567..a62b1dce0dc 100644 --- a/examples/System_V_IPC/SV_Message_Queues/Makefile +++ b/examples/System_V_IPC/SV_Message_Queues/Makefile @@ -49,6 +49,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -100,6 +102,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/MQ_Client.o .obj/MQ_Client.so .shobj/MQ_Client.o .shobj/MQ_Client.so: MQ_Client.cpp \ $(ACE_ROOT)/ace/SV_Message_Queue.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -136,6 +140,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -194,6 +200,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Typed_SV_Message_Queue.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/SV_Message_Queue.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/examples/System_V_IPC/SV_Semaphores/Makefile b/examples/System_V_IPC/SV_Semaphores/Makefile index b3ba2259752..23b05d60bde 100644 --- a/examples/System_V_IPC/SV_Semaphores/Makefile +++ b/examples/System_V_IPC/SV_Semaphores/Makefile @@ -44,6 +44,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SV_Shared_Memory.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -130,6 +132,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Malloc.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/examples/System_V_IPC/SV_Shared_Memory/Makefile b/examples/System_V_IPC/SV_Shared_Memory/Makefile index ff9d680c5c3..93576b0e0e2 100644 --- a/examples/System_V_IPC/SV_Shared_Memory/Makefile +++ b/examples/System_V_IPC/SV_Shared_Memory/Makefile @@ -47,6 +47,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SV_Shared_Memory.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/examples/Threads/Makefile b/examples/Threads/Makefile index 153d929d148..1f6a0d326f9 100644 --- a/examples/Threads/Makefile +++ b/examples/Threads/Makefile @@ -69,6 +69,8 @@ endif .obj/auto_event.o .obj/auto_event.so .shobj/auto_event.o .shobj/auto_event.so: auto_event.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -198,9 +200,6 @@ endif $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -215,6 +214,8 @@ endif $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -255,9 +256,6 @@ endif $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -362,6 +360,8 @@ endif $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -402,9 +402,6 @@ endif $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -528,6 +525,8 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -582,9 +581,6 @@ endif $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -721,15 +717,15 @@ endif $(ACE_ROOT)/ace/Activation_Queue.h \ $(ACE_ROOT)/ace/Activation_Queue.i \ $(ACE_ROOT)/ace/Atomic_Op.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Atomic_Op.cpp .obj/future2.o .obj/future2.so .shobj/future2.o .shobj/future2.so: future2.cpp \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -784,9 +780,6 @@ endif $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -923,14 +916,14 @@ endif $(ACE_ROOT)/ace/Activation_Queue.h \ $(ACE_ROOT)/ace/Activation_Queue.i \ $(ACE_ROOT)/ace/Atomic_Op.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Atomic_Op.cpp .obj/manual_event.o .obj/manual_event.so .shobj/manual_event.o .shobj/manual_event.so: manual_event.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1047,9 +1040,6 @@ endif $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -1073,14 +1063,14 @@ endif $(ACE_ROOT)/ace/Framework_Component_T.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Atomic_Op.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Atomic_Op.cpp .obj/process_manager.o .obj/process_manager.so .shobj/process_manager.o .shobj/process_manager.so: process_manager.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1197,9 +1187,6 @@ endif $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -1233,6 +1220,8 @@ endif $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1287,6 +1276,8 @@ endif $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1331,16 +1322,14 @@ endif $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Process_Semaphore.h \ - $(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/Process_Semaphore.inl .obj/reader_writer.o .obj/reader_writer.so .shobj/reader_writer.o .shobj/reader_writer.so: reader_writer.cpp \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1381,9 +1370,6 @@ endif $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -1461,14 +1447,14 @@ endif $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/Atomic_Op.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Atomic_Op.cpp .obj/recursive_mutex.o .obj/recursive_mutex.so .shobj/recursive_mutex.o .shobj/recursive_mutex.so: recursive_mutex.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1585,9 +1571,6 @@ endif $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -1619,6 +1602,8 @@ endif $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1659,9 +1644,6 @@ endif $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -1787,6 +1769,8 @@ endif $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1827,9 +1811,6 @@ endif $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -1949,16 +1930,16 @@ endif $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Atomic_Op.cpp .obj/task_three.o .obj/task_three.so .shobj/task_three.o .shobj/task_three.so: task_three.cpp \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -2074,9 +2055,6 @@ endif $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -2128,6 +2106,8 @@ endif $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -2168,9 +2148,6 @@ endif $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -2295,6 +2272,8 @@ endif $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -2327,9 +2306,6 @@ endif $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -2418,6 +2394,8 @@ endif .obj/thread_manager.o .obj/thread_manager.so .shobj/thread_manager.o .shobj/thread_manager.so: thread_manager.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -2534,9 +2512,6 @@ endif $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -2566,6 +2541,8 @@ endif $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -2606,9 +2583,6 @@ endif $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -2731,6 +2705,8 @@ endif .obj/thread_specific.o .obj/thread_specific.so .shobj/thread_specific.o .shobj/thread_specific.so: thread_specific.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -2847,9 +2823,6 @@ endif $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -2877,6 +2850,8 @@ endif .obj/tss1.o .obj/tss1.so .shobj/tss1.o .shobj/tss1.so: tss1.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -2994,9 +2969,6 @@ endif $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -3047,6 +3019,8 @@ endif $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -3087,10 +3061,8 @@ endif $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Atomic_Op.cpp \ TSS_Data.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ @@ -3126,6 +3098,8 @@ endif $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -3176,9 +3150,6 @@ endif $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ diff --git a/examples/Timer_Queue/Makefile b/examples/Timer_Queue/Makefile index 2d26baf1878..49822f0143b 100644 --- a/examples/Timer_Queue/Makefile +++ b/examples/Timer_Queue/Makefile @@ -61,6 +61,8 @@ endif $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -130,9 +132,6 @@ endif $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ @@ -204,6 +203,8 @@ endif $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -236,9 +237,6 @@ endif $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -353,8 +351,7 @@ endif $(ACE_ROOT)/ace/Timer_Queue_Adapters.h \ $(ACE_ROOT)/ace/Timer_Queue_Adapters.i \ $(ACE_ROOT)/ace/Timer_Queue_Adapters.cpp \ - Driver.cpp \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ + Driver.cpp $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ Reactor_Timer_Queue_Test.h @@ -365,6 +362,8 @@ endif $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -405,9 +404,6 @@ endif $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -504,6 +500,8 @@ endif .obj/Driver.o .obj/Driver.so .shobj/Driver.o .shobj/Driver.so: Driver.cpp \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -512,8 +510,8 @@ endif $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - Driver.h $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp Driver.h \ + $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/OS.h \ @@ -550,9 +548,6 @@ endif $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -646,6 +641,8 @@ endif .obj/main_async.o .obj/main_async.so .shobj/main_async.o .shobj/main_async.so: main_async.cpp \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -654,8 +651,8 @@ endif $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - Driver.h $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp Driver.h \ + $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/OS.h \ @@ -692,9 +689,6 @@ endif $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -789,6 +783,8 @@ endif .obj/main_reactor.o .obj/main_reactor.so .shobj/main_reactor.o .shobj/main_reactor.so: main_reactor.cpp \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -836,9 +832,6 @@ endif $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -934,6 +927,8 @@ endif .obj/main_thread.o .obj/main_thread.so .shobj/main_thread.o .shobj/main_thread.so: main_thread.cpp \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -942,8 +937,8 @@ endif $(ACE_ROOT)/ace/Global_Macros.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - Driver.h $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp Driver.h \ + $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/OS.h \ @@ -980,9 +975,6 @@ endif $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ diff --git a/include/makeinclude/platform_freebsd.GNU b/include/makeinclude/platform_freebsd.GNU index 964efc6b186..a7eb55eeac4 100644 --- a/include/makeinclude/platform_freebsd.GNU +++ b/include/makeinclude/platform_freebsd.GNU @@ -11,10 +11,6 @@ ifndef exceptions exceptions = 1 endif -ifeq (,$(threads)) - threads = 1 -endif - ifeq (,$(debug)) debug = 1 endif @@ -49,9 +45,3 @@ RANLIB = ranlib SOFLAGS += $(CPPFLAGS) -shared SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< PRELIB = @echo - -ifeq ($(threads),1) -LDFLAGS += -pthread -CFLAGS += -D_THREAD_SAFE -endif # threads - diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU index bea9685f1bd..bffb29c4e46 100644 --- a/include/makeinclude/platform_linux.GNU +++ b/include/makeinclude/platform_linux.GNU @@ -77,8 +77,10 @@ LIBS += -ldl ifeq ($(threads),1) LIBS += -lpthread + ifeq (-DACE_HAS_AIO_CALLS,$(PLATFORM_AIO_SUPPORT)) + LIBS += -lrt + endif endif -LIBS += $(shell test -e /usr/lib/librt.so && echo -lrt) PLATFORM_QT_CPPFLAGS=-I$(QTDIR)/include PLATFORM_QT_LIBS=-lqt diff --git a/include/makeinclude/platform_macosx.GNU b/include/makeinclude/platform_macosx.GNU index 2f0b35db01d..2cfe502547b 100644 --- a/include/makeinclude/platform_macosx.GNU +++ b/include/makeinclude/platform_macosx.GNU @@ -1,4 +1,4 @@ -# $Id$ +# platform_macosx.GNU,v 4.6 2001/08/14 18:57:28 bala Exp # platform_macosx.GNU # support for Mac OS X 10.2 @@ -12,9 +12,9 @@ ifeq (,$(optimize)) optimize = 0 endif -CC = gcc -CXX = g++ -CFLAGS += -Wall -Wpointer-arith -pipe -I/sw/include +CC = cc +CXX = c++ +CFLAGS += -Wall -Wpointer-arith -pipe # Test for template instantiation. # @@ -25,16 +25,8 @@ CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) DCFLAGS += -g DLD = libtool LD = $(CXX) -LDFLAGS += -L/sw/lib +LDFLAGS += #-flat_namespace LIBS += -lcc_dynamic -lstdc++ -lSystem - -## dlcompat package (not part of base Darwin) is needed for dlopen(). -## Fink installer puts libraries in /sw/lib and headers in /sw/include -## In order to install dlcompat do the following: -## - download fink from http://fink.sf.net -## - type: -## fink install dlcompat -LIBS += -ldl OCFLAGS += -O3 RANLIB = ranlib SOEXT = dylib diff --git a/performance-tests/Misc/Makefile b/performance-tests/Misc/Makefile index 795bf3f3df8..e5f7f2eb6b3 100644 --- a/performance-tests/Misc/Makefile +++ b/performance-tests/Misc/Makefile @@ -83,6 +83,8 @@ endif # ! Other $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -124,6 +126,8 @@ endif # ! Other $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -231,6 +235,8 @@ endif # ! Other .obj/childbirth_time.o .obj/childbirth_time.o .obj/childbirth_time.o .obj/childbirth_time.o: childbirth_time.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -342,9 +348,6 @@ endif # ! Other $(ACE_ROOT)/ace/High_Res_Timer.i \ $(ACE_ROOT)/ace/Profile_Timer.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ @@ -366,6 +369,8 @@ endif # ! Other $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -406,9 +411,6 @@ endif # ! Other $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -527,6 +529,8 @@ endif # ! Other $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -567,9 +571,6 @@ endif # ! Other $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -679,6 +680,8 @@ endif # ! Other .obj/test_mutex.o .obj/test_mutex.o .obj/test_mutex.o .obj/test_mutex.o: test_mutex.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -686,15 +689,19 @@ endif # ! Other $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/Default_Constants.h \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Profile_Timer.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS_String.inl \ $(ACE_ROOT)/ace/OS_Memory.h \ $(ACE_ROOT)/ace/OS_Memory.inl \ @@ -703,12 +710,8 @@ endif # ! Other $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/Time_Value.inl \ $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Profile_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.i \ $(ACE_ROOT)/ace/Profile_Timer.i @@ -716,6 +719,8 @@ endif # ! Other .obj/test_singleton.o .obj/test_singleton.o .obj/test_singleton.o .obj/test_singleton.o: test_singleton.cpp \ $(ACE_ROOT)/ace/Profile_Timer.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -793,6 +798,8 @@ endif # ! Other $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/performance-tests/Server_Concurrency/Leader_Follower/Makefile b/performance-tests/Server_Concurrency/Leader_Follower/Makefile index bb7326ea59b..48cbb956ff2 100644 --- a/performance-tests/Server_Concurrency/Leader_Follower/Makefile +++ b/performance-tests/Server_Concurrency/Leader_Follower/Makefile @@ -41,6 +41,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -81,9 +83,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -202,6 +201,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -242,9 +243,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ diff --git a/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile b/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile index 53be72957c8..237a1a6082b 100644 --- a/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile +++ b/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile @@ -41,6 +41,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -81,9 +83,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -201,6 +200,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -262,9 +263,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ diff --git a/performance-tests/TCP/Makefile b/performance-tests/TCP/Makefile index 09de8f1b000..358427427d4 100644 --- a/performance-tests/TCP/Makefile +++ b/performance-tests/TCP/Makefile @@ -44,6 +44,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -190,9 +192,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/High_Res_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ diff --git a/performance-tests/UDP/Makefile b/performance-tests/UDP/Makefile index 354abd2d390..fb5fd1006f9 100644 --- a/performance-tests/UDP/Makefile +++ b/performance-tests/UDP/Makefile @@ -44,6 +44,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ diff --git a/protocols/ace/RMCast/Makefile b/protocols/ace/RMCast/Makefile index 7d354fabd57..3ace09b2bf7 100644 --- a/protocols/ace/RMCast/Makefile +++ b/protocols/ace/RMCast/Makefile @@ -60,8 +60,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/RMCast.o .obj/RMCast.so .shobj/RMCast.o .shobj/RMCast.so: RMCast.cpp RMCast.h \ - $(ACE_ROOT)/ace/pre.h \ +.obj/RMCast.o .obj/RMCast.so .shobj/RMCast.o .shobj/RMCast.so: RMCast.cpp RMCast.h $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -87,13 +86,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i .obj/RMCast_Ack_Worker.o .obj/RMCast_Ack_Worker.so .shobj/RMCast_Ack_Worker.o .shobj/RMCast_Ack_Worker.so: RMCast_Ack_Worker.cpp RMCast_Ack_Worker.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Retransmission.h RMCast_Module.h RMCast.h \ - $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/pre.h RMCast_Retransmission.h \ + RMCast_Module.h RMCast.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -118,9 +115,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module.i RMCast_Copy_On_Write.h \ - RMCast_Worker.h RMCast_Worker.i RMCast_Worker.cpp \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module.i RMCast_Copy_On_Write.h RMCast_Worker.h \ + RMCast_Worker.i RMCast_Worker.cpp \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -135,9 +132,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - RMCast_Copy_On_Write.i RMCast_Copy_On_Write.cpp \ - $(ACE_ROOT)/ace/RB_Tree.h \ + $(ACE_ROOT)/ace/Log_Priority.h RMCast_Copy_On_Write.i \ + RMCast_Copy_On_Write.cpp $(ACE_ROOT)/ace/RB_Tree.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -193,17 +189,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - RMCast_Retransmission.i RMCast_Ack_Worker.i \ - $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/SString.i RMCast_Retransmission.i \ + RMCast_Ack_Worker.i $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp .obj/RMCast_Fork.o .obj/RMCast_Fork.so .shobj/RMCast_Fork.o .shobj/RMCast_Fork.so: RMCast_Fork.cpp RMCast_Fork.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Module.h RMCast.h \ + $(ACE_ROOT)/ace/pre.h RMCast_Module.h RMCast.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -229,12 +223,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module.i RMCast_Fork.i + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module.i RMCast_Fork.i .obj/RMCast_Fragment.o .obj/RMCast_Fragment.so .shobj/RMCast_Fragment.o .shobj/RMCast_Fragment.so: RMCast_Fragment.cpp RMCast_Fragment.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Module.h RMCast.h \ + $(ACE_ROOT)/ace/pre.h RMCast_Module.h RMCast.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -260,9 +253,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module.i \ - $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module.i $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ @@ -276,8 +268,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - RMCast_Fragment.i \ + $(ACE_ROOT)/ace/Log_Priority.h RMCast_Fragment.i \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ @@ -285,8 +276,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Message_Block_T.cpp .obj/RMCast_IO_UDP.o .obj/RMCast_IO_UDP.so .shobj/RMCast_IO_UDP.o .shobj/RMCast_IO_UDP.so: RMCast_IO_UDP.cpp RMCast_IO_UDP.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Module.h RMCast.h \ + $(ACE_ROOT)/ace/pre.h RMCast_Module.h RMCast.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -312,9 +302,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module.i $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ $(ACE_ROOT)/ace/SOCK_Dgram.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/Addr.h \ @@ -424,9 +413,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - RMCast_IO_UDP.i RMCast_UDP_Proxy.h RMCast_Proxy.h RMCast_Proxy.i \ - RMCast_UDP_Proxy.i RMCast_Module_Factory.h RMCast_Module_Factory.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h RMCast_IO_UDP.i \ + RMCast_UDP_Proxy.h RMCast_Proxy.h RMCast_Proxy.i RMCast_UDP_Proxy.i \ + RMCast_Module_Factory.h RMCast_Module_Factory.i \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ @@ -434,8 +423,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Message_Block_T.cpp .obj/RMCast_Membership.o .obj/RMCast_Membership.so .shobj/RMCast_Membership.o .shobj/RMCast_Membership.so: RMCast_Membership.cpp RMCast_Membership.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Module.h RMCast.h \ + $(ACE_ROOT)/ace/pre.h RMCast_Module.h RMCast.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -461,9 +449,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module.i \ - $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module.i $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Node.h \ @@ -494,8 +481,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - RMCast_Membership.i RMCast_Proxy.h RMCast_Proxy.i + $(ACE_ROOT)/ace/Synch_T.cpp RMCast_Membership.i \ + RMCast_Proxy.h RMCast_Proxy.i .obj/RMCast_Module.o .obj/RMCast_Module.so .shobj/RMCast_Module.o .shobj/RMCast_Module.so: RMCast_Module.cpp RMCast_Module.h \ $(ACE_ROOT)/ace/pre.h RMCast.h \ @@ -524,12 +511,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module.i + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module.i .obj/RMCast_Module_Factory.o .obj/RMCast_Module_Factory.so .shobj/RMCast_Module_Factory.o .shobj/RMCast_Module_Factory.so: RMCast_Module_Factory.cpp \ - RMCast_Module_Factory.h \ - $(ACE_ROOT)/ace/pre.h RMCast.h \ + RMCast_Module_Factory.h $(ACE_ROOT)/ace/pre.h RMCast.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -555,13 +541,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module_Factory.i + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module_Factory.i .obj/RMCast_Partial_Message.o .obj/RMCast_Partial_Message.so .shobj/RMCast_Partial_Message.o .shobj/RMCast_Partial_Message.so: RMCast_Partial_Message.cpp \ - RMCast_Partial_Message.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Export.h \ + RMCast_Partial_Message.h $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -606,9 +590,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -687,8 +668,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU RMCast_Partial_Message.i .obj/RMCast_Proxy.o .obj/RMCast_Proxy.so .shobj/RMCast_Proxy.o .shobj/RMCast_Proxy.so: RMCast_Proxy.cpp RMCast_Proxy.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Module.h RMCast.h \ + $(ACE_ROOT)/ace/pre.h RMCast_Module.h RMCast.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -714,12 +694,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module.i RMCast_Proxy.i + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module.i RMCast_Proxy.i .obj/RMCast_Reassembly.o .obj/RMCast_Reassembly.so .shobj/RMCast_Reassembly.o .shobj/RMCast_Reassembly.so: RMCast_Reassembly.cpp RMCast_Reassembly.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Module.h RMCast.h \ + $(ACE_ROOT)/ace/pre.h RMCast_Module.h RMCast.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -745,9 +724,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module.i $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -845,13 +823,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - RMCast_Reassembly.i RMCast_Partial_Message.h \ - $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Reactor_Impl.h RMCast_Reassembly.i \ + RMCast_Partial_Message.h $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -899,10 +873,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU RMCast_Partial_Message.i .obj/RMCast_Receiver_Module.o .obj/RMCast_Receiver_Module.so .shobj/RMCast_Receiver_Module.o .shobj/RMCast_Receiver_Module.so: RMCast_Receiver_Module.cpp \ - RMCast_Receiver_Module.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Module.h RMCast.h \ - $(ACE_ROOT)/ace/OS.h \ + RMCast_Receiver_Module.h $(ACE_ROOT)/ace/pre.h \ + RMCast_Module.h RMCast.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -927,19 +899,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module.i RMCast_Receiver_Module.i \ - RMCast_Proxy.h RMCast_Proxy.i \ - $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module.i RMCast_Receiver_Module.i RMCast_Proxy.h \ + RMCast_Proxy.i $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl .obj/RMCast_Reliable_Factory.o .obj/RMCast_Reliable_Factory.so .shobj/RMCast_Reliable_Factory.o .shobj/RMCast_Reliable_Factory.so: RMCast_Reliable_Factory.cpp \ - RMCast_Reliable_Factory.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Module_Factory.h RMCast.h \ - $(ACE_ROOT)/ace/OS.h \ + RMCast_Reliable_Factory.h $(ACE_ROOT)/ace/pre.h \ + RMCast_Module_Factory.h RMCast.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -964,10 +933,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module_Factory.i \ - RMCast_Reliable_Factory.i RMCast_Receiver_Module.h RMCast_Module.h \ - RMCast_Module.i RMCast_Receiver_Module.i RMCast_Reassembly.h \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module_Factory.i RMCast_Reliable_Factory.i \ + RMCast_Receiver_Module.h RMCast_Module.h RMCast_Module.i \ + RMCast_Receiver_Module.i RMCast_Reassembly.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -1066,16 +1035,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - RMCast_Reassembly.i RMCast_Reordering.h \ - $(ACE_ROOT)/ace/RB_Tree.h \ + $(ACE_ROOT)/ace/Reactor_Impl.h RMCast_Reassembly.i \ + RMCast_Reordering.h $(ACE_ROOT)/ace/RB_Tree.h \ $(ACE_ROOT)/ace/RB_Tree.i \ - $(ACE_ROOT)/ace/RB_Tree.cpp \ - RMCast_Reordering.i + $(ACE_ROOT)/ace/RB_Tree.cpp RMCast_Reordering.i .obj/RMCast_Reordering.o .obj/RMCast_Reordering.so .shobj/RMCast_Reordering.o .shobj/RMCast_Reordering.so: RMCast_Reordering.cpp RMCast_Reordering.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Module.h RMCast.h \ + $(ACE_ROOT)/ace/pre.h RMCast_Module.h RMCast.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -1101,9 +1067,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module.i \ - $(ACE_ROOT)/ace/RB_Tree.h \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module.i $(ACE_ROOT)/ace/RB_Tree.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -1174,8 +1139,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - RMCast_Reordering.i RMCast_Proxy.h RMCast_Proxy.i \ + $(ACE_ROOT)/ace/SString.i RMCast_Reordering.i \ + RMCast_Proxy.h RMCast_Proxy.i \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ @@ -1183,9 +1148,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Message_Block_T.cpp .obj/RMCast_Resend_Handler.o .obj/RMCast_Resend_Handler.so .shobj/RMCast_Resend_Handler.o .shobj/RMCast_Resend_Handler.so: RMCast_Resend_Handler.cpp \ - RMCast_Resend_Handler.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Export.h \ + RMCast_Resend_Handler.h $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1231,9 +1194,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - RMCast_Copy_On_Write.i RMCast_Copy_On_Write.cpp \ - $(ACE_ROOT)/ace/RB_Tree.h \ + $(ACE_ROOT)/ace/Log_Priority.h RMCast_Copy_On_Write.i \ + RMCast_Copy_On_Write.cpp $(ACE_ROOT)/ace/RB_Tree.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -1287,12 +1249,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - RMCast_Retransmission.i + $(ACE_ROOT)/ace/SString.i RMCast_Retransmission.i .obj/RMCast_Resend_Worker.o .obj/RMCast_Resend_Worker.so .shobj/RMCast_Resend_Worker.o .shobj/RMCast_Resend_Worker.so: RMCast_Resend_Worker.cpp \ - RMCast_Resend_Worker.h \ - $(ACE_ROOT)/ace/pre.h RMCast.h \ + RMCast_Resend_Worker.h $(ACE_ROOT)/ace/pre.h RMCast.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -1318,10 +1278,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Copy_On_Write.h RMCast_Worker.h \ - RMCast_Worker.i RMCast_Worker.cpp \ - $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Copy_On_Write.h RMCast_Worker.h RMCast_Worker.i \ + RMCast_Worker.cpp $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ @@ -1335,15 +1294,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - RMCast_Copy_On_Write.i RMCast_Copy_On_Write.cpp \ - RMCast_Resend_Worker.i RMCast_Module.h RMCast_Module.i + $(ACE_ROOT)/ace/Log_Priority.h RMCast_Copy_On_Write.i \ + RMCast_Copy_On_Write.cpp RMCast_Resend_Worker.i RMCast_Module.h \ + RMCast_Module.i .obj/RMCast_Retransmission.o .obj/RMCast_Retransmission.so .shobj/RMCast_Retransmission.o .shobj/RMCast_Retransmission.so: RMCast_Retransmission.cpp \ - RMCast_Retransmission.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Module.h RMCast.h \ - $(ACE_ROOT)/ace/OS.h \ + RMCast_Retransmission.h $(ACE_ROOT)/ace/pre.h \ + RMCast_Module.h RMCast.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1368,9 +1325,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module.i RMCast_Copy_On_Write.h \ - RMCast_Worker.h RMCast_Worker.i RMCast_Worker.cpp \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module.i RMCast_Copy_On_Write.h RMCast_Worker.h \ + RMCast_Worker.i RMCast_Worker.cpp \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -1385,9 +1342,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - RMCast_Copy_On_Write.i RMCast_Copy_On_Write.cpp \ - $(ACE_ROOT)/ace/RB_Tree.h \ + $(ACE_ROOT)/ace/Log_Priority.h RMCast_Copy_On_Write.i \ + RMCast_Copy_On_Write.cpp $(ACE_ROOT)/ace/RB_Tree.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -1443,10 +1399,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - RMCast_Retransmission.i RMCast_Proxy.h RMCast_Proxy.i \ - RMCast_Ack_Worker.h RMCast_Ack_Worker.i RMCast_Resend_Worker.h \ - RMCast_Resend_Worker.i \ + $(ACE_ROOT)/ace/SString.i RMCast_Retransmission.i \ + RMCast_Proxy.h RMCast_Proxy.i RMCast_Ack_Worker.h RMCast_Ack_Worker.i \ + RMCast_Resend_Worker.h RMCast_Resend_Worker.i \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ @@ -1454,8 +1409,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Message_Block_T.cpp .obj/RMCast_Sequencer.o .obj/RMCast_Sequencer.so .shobj/RMCast_Sequencer.o .shobj/RMCast_Sequencer.so: RMCast_Sequencer.cpp RMCast_Sequencer.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Module.h RMCast.h \ + $(ACE_ROOT)/ace/pre.h RMCast_Module.h RMCast.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -1481,9 +1435,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module.i \ - $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module.i $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ @@ -1497,14 +1450,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - RMCast_Sequencer.i + $(ACE_ROOT)/ace/Log_Priority.h RMCast_Sequencer.i .obj/RMCast_Singleton_Factory.o .obj/RMCast_Singleton_Factory.so .shobj/RMCast_Singleton_Factory.o .shobj/RMCast_Singleton_Factory.so: RMCast_Singleton_Factory.cpp \ - RMCast_Singleton_Factory.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Module_Factory.h RMCast.h \ - $(ACE_ROOT)/ace/OS.h \ + RMCast_Singleton_Factory.h $(ACE_ROOT)/ace/pre.h \ + RMCast_Module_Factory.h RMCast.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1529,14 +1479,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module_Factory.i \ - RMCast_Singleton_Factory.i + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module_Factory.i RMCast_Singleton_Factory.i .obj/RMCast_UDP_Event_Handler.o .obj/RMCast_UDP_Event_Handler.so .shobj/RMCast_UDP_Event_Handler.o .shobj/RMCast_UDP_Event_Handler.so: RMCast_UDP_Event_Handler.cpp \ - RMCast_UDP_Event_Handler.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Export.h \ + RMCast_UDP_Event_Handler.h $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1675,14 +1622,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - RMCast_IO_UDP.i RMCast_UDP_Proxy.h RMCast_Proxy.h RMCast_Proxy.i \ - RMCast_UDP_Proxy.i RMCast_Module_Factory.h RMCast_Module_Factory.i + $(ACE_ROOT)/ace/Reactor_Impl.h RMCast_IO_UDP.i \ + RMCast_UDP_Proxy.h RMCast_Proxy.h RMCast_Proxy.i RMCast_UDP_Proxy.i \ + RMCast_Module_Factory.h RMCast_Module_Factory.i .obj/RMCast_UDP_Proxy.o .obj/RMCast_UDP_Proxy.so .shobj/RMCast_UDP_Proxy.o .shobj/RMCast_UDP_Proxy.so: RMCast_UDP_Proxy.cpp RMCast_UDP_Proxy.h \ - $(ACE_ROOT)/ace/pre.h \ - RMCast_Proxy.h RMCast_Module.h RMCast.h \ - $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/pre.h RMCast_Proxy.h RMCast_Module.h \ + RMCast.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1707,16 +1653,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module.i RMCast_Proxy.i \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module.i RMCast_Proxy.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i \ - RMCast_UDP_Proxy.i RMCast_IO_UDP.h \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/INET_Addr.i RMCast_UDP_Proxy.i \ + RMCast_IO_UDP.h $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ $(ACE_ROOT)/ace/SOCK_Dgram.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/IPC_SAP.h \ @@ -1820,8 +1765,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - RMCast_IO_UDP.i RMCast_Module_Factory.h RMCast_Module_Factory.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h RMCast_IO_UDP.i \ + RMCast_Module_Factory.h RMCast_Module_Factory.i \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ @@ -1829,8 +1774,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Message_Block_T.cpp .obj/RMCast_UDP_Reliable_Receiver.o .obj/RMCast_UDP_Reliable_Receiver.so .shobj/RMCast_UDP_Reliable_Receiver.o .shobj/RMCast_UDP_Reliable_Receiver.so: RMCast_UDP_Reliable_Receiver.cpp \ - RMCast_UDP_Reliable_Receiver.h \ - $(ACE_ROOT)/ace/pre.h \ + RMCast_UDP_Reliable_Receiver.h $(ACE_ROOT)/ace/pre.h \ RMCast_Singleton_Factory.h RMCast_Module_Factory.h RMCast.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ @@ -1857,11 +1801,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module_Factory.i \ - RMCast_Singleton_Factory.i RMCast_Reliable_Factory.h \ - RMCast_Reliable_Factory.i RMCast_IO_UDP.h RMCast_Module.h \ - RMCast_Module.i \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module_Factory.i RMCast_Singleton_Factory.i \ + RMCast_Reliable_Factory.h RMCast_Reliable_Factory.i RMCast_IO_UDP.h \ + RMCast_Module.h RMCast_Module.i \ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ $(ACE_ROOT)/ace/SOCK_Dgram.h \ $(ACE_ROOT)/ace/SOCK.h \ @@ -1972,14 +1915,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - RMCast_IO_UDP.i RMCast_UDP_Proxy.h RMCast_Proxy.h RMCast_Proxy.i \ - RMCast_UDP_Proxy.i RMCast_UDP_Reliable_Receiver.i \ - RMCast_UDP_Event_Handler.h RMCast_UDP_Event_Handler.i + $(ACE_ROOT)/ace/Reactor_Impl.h RMCast_IO_UDP.i \ + RMCast_UDP_Proxy.h RMCast_Proxy.h RMCast_Proxy.i RMCast_UDP_Proxy.i \ + RMCast_UDP_Reliable_Receiver.i RMCast_UDP_Event_Handler.h \ + RMCast_UDP_Event_Handler.i .obj/RMCast_UDP_Reliable_Sender.o .obj/RMCast_UDP_Reliable_Sender.so .shobj/RMCast_UDP_Reliable_Sender.o .shobj/RMCast_UDP_Reliable_Sender.so: RMCast_UDP_Reliable_Sender.cpp \ - RMCast_UDP_Reliable_Sender.h \ - $(ACE_ROOT)/ace/pre.h \ + RMCast_UDP_Reliable_Sender.h $(ACE_ROOT)/ace/pre.h \ RMCast_Singleton_Factory.h RMCast_Module_Factory.h RMCast.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ @@ -2006,10 +1948,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RMCast_Export.h RMCast.i RMCast_Module_Factory.i \ - RMCast_Singleton_Factory.i RMCast_IO_UDP.h RMCast_Module.h \ - RMCast_Module.i \ + $(ACE_ROOT)/ace/OS.i RMCast_Export.h RMCast.i \ + RMCast_Module_Factory.i RMCast_Singleton_Factory.i RMCast_IO_UDP.h \ + RMCast_Module.h RMCast_Module.i \ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ $(ACE_ROOT)/ace/SOCK_Dgram.h \ $(ACE_ROOT)/ace/SOCK.h \ @@ -2120,26 +2061,24 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - RMCast_IO_UDP.i RMCast_UDP_Proxy.h RMCast_Proxy.h RMCast_Proxy.i \ - RMCast_UDP_Proxy.i RMCast_Sequencer.h RMCast_Sequencer.i \ - RMCast_Retransmission.h RMCast_Copy_On_Write.h RMCast_Worker.h \ - RMCast_Worker.i RMCast_Worker.cpp RMCast_Copy_On_Write.i \ - RMCast_Copy_On_Write.cpp \ + $(ACE_ROOT)/ace/Reactor_Impl.h RMCast_IO_UDP.i \ + RMCast_UDP_Proxy.h RMCast_Proxy.h RMCast_Proxy.i RMCast_UDP_Proxy.i \ + RMCast_Sequencer.h RMCast_Sequencer.i RMCast_Retransmission.h \ + RMCast_Copy_On_Write.h RMCast_Worker.h RMCast_Worker.i \ + RMCast_Worker.cpp RMCast_Copy_On_Write.i RMCast_Copy_On_Write.cpp \ $(ACE_ROOT)/ace/RB_Tree.h \ $(ACE_ROOT)/ace/RB_Tree.i \ - $(ACE_ROOT)/ace/RB_Tree.cpp \ - RMCast_Retransmission.i RMCast_Membership.h \ - $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/RB_Tree.cpp RMCast_Retransmission.i \ + RMCast_Membership.h $(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 \ $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - RMCast_Membership.i RMCast_Fragment.h RMCast_Fragment.i RMCast_Fork.h \ - RMCast_Fork.i RMCast_UDP_Reliable_Sender.i RMCast_UDP_Event_Handler.h \ + $(ACE_ROOT)/ace/Containers_T.cpp RMCast_Membership.i \ + RMCast_Fragment.h RMCast_Fragment.i RMCast_Fork.h RMCast_Fork.i \ + RMCast_UDP_Reliable_Sender.i RMCast_UDP_Event_Handler.h \ RMCast_UDP_Event_Handler.i RMCast_Resend_Handler.h \ RMCast_Resend_Handler.i diff --git a/protocols/ace/RMCast/README b/protocols/ace/RMCast/README deleted file mode 100644 index 2dd0c5d9cfc..00000000000 --- a/protocols/ace/RMCast/README +++ /dev/null @@ -1,57 +0,0 @@ -# $Id$ - - This directory will contain a simple, small-scale reliable -multicast framework for ACE. The framework is based on the ASX -components of the ACE library: the protocol is implemented as a stack -of interchangeable "modules", each one in charge of a very small task. -For example, one module implements fragmentation and reassembly, other -modules implement retransmission, send ACK and NAK messages, and -maintain receiver membership. - - The modules are replaced to achieve different levels of -reliability. For example, the retransmission module can be either the -"Best_Effort", "Semi_Reliable" or "Reliable" implementation. In the -first case no retransmissions are performed, but lost messages are -detected and reported to the receiver. The "Semi_Reliable" case -messages are held for a pre-specified amount of time, and -re-transmited if requested, but it is possible to loose some messages -if multiple re-transmissions fail. As in the "Best_Effort" case the -lost messages are detected and flagged to the application. Finally -in the "Reliable" mode the senders are flowed controlled until enough -messages are successfully transmitted. - - In general the stack looks like this: - - -SENDER: - ----------------------------------------------------------------- -Buffering : Save lost messages -Retransmission : Retransmit ----------------------------------------------------------------- -Fragmentation : Fragment messages in smaller chunks -Reassembly : and ensure that the IOVMAX limit is not - : reached ----------------------------------------------------------------- -Tranport : Encapsulate the specific transport media - : such as TCP/IP, ATM, or shared memory - : Demuxes incoming data to the right chain - : Change control messages and data messages - : to the right dynamic types. ----------------------------------------------------------------- - -RECEIVER: - ----------------------------------------------------------------- -Lost detection : Detect lost messages and send control - : messages back ----------------------------------------------------------------- -Reassembly : Reassemble messages, fragment control -Fragmentation : data ----------------------------------------------------------------- -Transport : Group membership, ACT reception, - : handle keep-alive messages... ----------------------------------------------------------------- - - -@@ TODO: Piggybacking... diff --git a/protocols/ace/RMCast/RMCast_Export.h b/protocols/ace/RMCast/RMCast_Export.h deleted file mode 100644 index 51257c4d682..00000000000 --- a/protocols/ace/RMCast/RMCast_Export.h +++ /dev/null @@ -1,44 +0,0 @@ -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by -// generate_export_file.pl -// ------------------------------ -#if !defined (ACE_RMCAST_EXPORT_H) -#define ACE_RMCAST_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_RMCAST_HAS_DLL) -# define ACE_RMCAST_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ACE_RMCAST_HAS_DLL */ - -#if !defined (ACE_RMCAST_HAS_DLL) -#define ACE_RMCAST_HAS_DLL 1 -#endif /* ! ACE_RMCAST_HAS_DLL */ - -#if defined (ACE_RMCAST_HAS_DLL) -# if (ACE_RMCAST_HAS_DLL == 1) -# if defined (ACE_RMCAST_BUILD_DLL) -# define ACE_RMCast_Export ACE_Proper_Export_Flag -# define ACE_RMCAST_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else -# define ACE_RMCast_Export ACE_Proper_Import_Flag -# define ACE_RMCAST_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ACE_RMCAST_BUILD_DLL */ -# else -# define ACE_RMCast_Export -# define ACE_RMCAST_SINGLETON_DECLARATION(T) -# define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ! ACE_RMCAST_HAS_DLL == 1 */ -#else -# define ACE_RMCast_Export -# define ACE_RMCAST_SINGLETON_DECLARATION(T) -# define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ACE_RMCAST_HAS_DLL */ - -#endif /* ACE_RMCAST_EXPORT_H */ - -// End of auto generated file. diff --git a/tests/FIFO_Test.cpp b/tests/FIFO_Test.cpp deleted file mode 100644 index f23a9de4aa0..00000000000 --- a/tests/FIFO_Test.cpp +++ /dev/null @@ -1,286 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// tests -// -// = FILENAME -// FIFO_Test.cpp -// -// = DESCRIPTION -// This is a test of basic ACE_FIFO_* class functionality. -// The test forks two processes or spawns two threads (depending -// upon the platform) and then tests various data exchange -// scenarios. -// -// = AUTHOR -// Steve Huston <shuston@riverace.com> -// -// ============================================================================ - -#include "test_config.h" -#include "ace/OS.h" -#include "ace/ACE.h" -#include "ace/FIFO_Send_Msg.h" -#include "ace/FIFO_Recv_Msg.h" -#include "ace/Handle_Set.h" -#include "ace/Lib_Find.h" -#include "ace/Thread.h" -#include "ace/Thread_Manager.h" - -ACE_RCSID(tests, SOCK_Test, "$Id$") - -static const ACE_TCHAR ACE_ALPHABET[] = - ACE_TEXT ("abcdefghijklmnopqrstuvwxyz"); - -// This length is used for the "big buffer" send/receive. -static const size_t big_size = (BUFSIZ * 4); - - -static void * -client (void *arg) -{ - ACE_TCHAR *fifo_path = ACE_reinterpret_cast (ACE_TCHAR *, arg); - ACE_FIFO_Send_Msg fifo; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) client opening %s\n"), fifo_path)); - if (fifo.open (fifo_path) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), fifo_path), 0); - - // Try some transfers - the server part is expecting this data. - // First, try a nice, easy send. - ssize_t send_count; - ssize_t expect = ACE_static_cast (ssize_t, ACE_OS::strlen (ACE_ALPHABET)); - send_count = fifo.send (ACE_ALPHABET, ACE_OS::strlen (ACE_ALPHABET)); - if (send_count == expect) - { - // Ok, so far so good. Now try one that will overflow the reader - // side to be sure it properly tosses the overflow. Then send another - // to be sure it finds the start of the next message ok. - char big[big_size]; - for (size_t i = 0; i < big_size; ++i) - big[i] = (i % 2) ? 0x05 : 0x0A; // Make nice pattern in blown stack - expect = ACE_static_cast (ssize_t, big_size); - send_count = fifo.send (big, big_size); - if (send_count == expect) - { - expect = ACE_static_cast (ssize_t, ACE_OS::strlen (ACE_ALPHABET)); - send_count = fifo.send (ACE_ALPHABET, ACE_OS::strlen (ACE_ALPHABET)); - if (send_count != expect) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) Final send; sent %d, expected %d") - ACE_TEXT ("%p\n"), - send_count, expect, ACE_TEXT ("send"))); - else - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) All sends ok\n"))); - } - else - { - ACE_ERROR - ((LM_ERROR, - ACE_TEXT ("(%P|%t) Second send expected %d; sent %d. %p\n"), - expect, send_count, ACE_TEXT ("send"))); - } - } - else - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) First send expected %d; sent %d. %p\n"), - expect, send_count, ACE_TEXT ("send"))); - } - - if (fifo.close () != 0) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("fifo close"))); - - return 0; -} - -static void * -server (void *arg) -{ - ACE_FIFO_Recv_Msg *fifo = ACE_reinterpret_cast (ACE_FIFO_Recv_Msg *, arg); - - // Wait for the client to get going and open the FIFO. - ACE_Handle_Set h; - ACE_Time_Value delay (10); - h.set_bit (fifo->get_handle ()); - if (ACE::select (h.max_set () + 1, h, &delay) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) server %p\n"), - ACE_TEXT ("select")), - 0); - - // Read the things the client is sending; alphabet, huge overflow, then - // alphabet. - - char buf[BUFSIZ]; - ssize_t recv_count; - ssize_t expect = ACE_static_cast (ssize_t, ACE_OS::strlen (ACE_ALPHABET)); - recv_count = fifo->recv (buf, sizeof (buf)); - if (recv_count != expect) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) Recv 1 expected %d, got %d. %p\n"), - expect, recv_count, ACE_TEXT ("recv")), - 0); - buf[recv_count] = '\0'; - if (ACE_OS::strcmp (buf, ACE_ALPHABET) != 0) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) Recv 1 expected alphabet; got %s\n"), - buf)); - - // See documented return values for ACE_FIFO_Recv_Msg... - // We are being sent a message much longer than BUFSIZ. - // If this platform has STREAM pipes, the entire message will come - // through and we can grab it all. If not, then ACE_FIFO_Recv_Msg ditches - // the part of the message we don't read. This is rather a pain in the - // neck, but the API doesn't return info that more data is in the message - // (for STREAM pipes). When non-ACE_HAS_STREAM_PIPES discards data, the - // returned length will be larger than requested, though only the requested - // number of bytes are written to the buffer. -#if defined (ACE_HAS_STREAM_PIPES) - for (size_t remaining = big_size; - remaining > 0; - remaining -= recv_count) - { -#endif /* ACE_HAS_STREAM_PIPES */ - - // recv_count is sizeof(buf) on ACE_HAS_STREAM_PIPES; big_size on others. -#if defined (ACE_HAS_STREAM_PIPES) - expect = ACE_static_cast (ssize_t, sizeof (buf)); -#else - expect = ACE_static_cast (ssize_t, big_size); -#endif /* ACE_HAS_STREAM_PIPES */ - recv_count = fifo->recv (buf, sizeof (buf)); - if (recv_count != expect) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) Recv 2 expected %d, ") - ACE_TEXT ("got %d. %p\n"), - expect, recv_count, ACE_TEXT ("recv")), - 0); -#if defined (ACE_HAS_STREAM_PIPES) - } -#endif /* ACE_HAS_STREAM_PIPES */ - - expect = ACE_static_cast (ssize_t, ACE_OS::strlen (ACE_ALPHABET)); - recv_count = fifo->recv (buf, sizeof (buf)); - if (recv_count != expect) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) Recv 3 expected %d, got %d. %p\n"), - expect, recv_count, ACE_TEXT ("recv")), - 0); - buf[recv_count] = '\0'; - if (ACE_OS::strcmp (buf, ACE_ALPHABET) != 0) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) Recv 3 expected alphabet; got %s\n"), - buf)); - else - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) All receives ok\n"))); - return 0; -} - -static int -test_fifo_msg (void) -{ - // Reader side opens first - it may fail if fifo not supported on this - // platform. - ACE_TCHAR fifo_path[MAXPATHLEN]; - if (ACE_Lib_Find::get_temp_dir (fifo_path, MAXPATHLEN) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), - ACE_TEXT ("get_temp_dir")), 1); - ACE_OS_String::strcat (fifo_path, ACE_TEXT ("FIFO_Test")); - ACE_FIFO_Recv_Msg read_side; - // Open read only, not persistent (4th arg is 0) - if (-1 == read_side.open (fifo_path, - O_CREAT | O_RDONLY, - ACE_DEFAULT_FILE_PERMS, - 0)) - { -#if defined (ACE_WIN32) - if (errno == ENOTSUP) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("FIFO not supported on Win32; ") - ACE_TEXT ("this is correct.\n"))); - return 0; - } -#endif /* ACE_WIN32 */ - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), - ACE_TEXT ("ACE_FIFO_Recv_Msg::open")), - 1); - } - - // Ok, the FIFO opened clean for read. Now it's safe to spawn a - // process/thread and test some transfers. - - int status = 0; // Test status; innocent until proven guilty. - -#if !defined (ACE_LACKS_FORK) - switch (ACE_OS::fork ("child")) - { - case -1: - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("fork failed"))); - status = 1; - break; - case 0: - client (fifo_path); - ACE_OS::exit (0); - /* NOTREACHED */ - default: - server (&read_side); - ACE_OS::wait (); - } -#elif defined (ACE_HAS_THREADS) - if (ACE_Thread_Manager::instance ()->spawn - (ACE_THR_FUNC (server), - &read_side, - THR_NEW_LWP | THR_DETACHED) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("server spawn"))); - ++status; - } - - if (ACE_Thread_Manager::instance ()->spawn - (ACE_THR_FUNC (client), - fifo_path, - THR_NEW_LWP | THR_DETACHED) == -1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("client spawn"))); - ++status; - } - - // Wait for the threads to exit. - ACE_Thread_Manager::instance ()->wait (); -#else - ACE_ERROR ((LM_INFO, - ACE_TEXT ("This test requires multiple threads ") - ACE_TEXT ("or processes.\n"))); -#endif /* ACE_HAS_THREADS */ - - if (read_side.remove () != 0) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("fifo remove"))); - ++status; - } - - ACE_stat fifo_stat; - if (ACE_OS::stat (fifo_path, &fifo_stat) == 0) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("FIFO %s should be gone but isn't\n"), - fifo_path)); - ++status; - ACE_OS::unlink (fifo_path); // Try to get rid of it. - } - - return status; -} - -int -main (int, ACE_TCHAR *[]) -{ - ACE_START_TEST (ACE_TEXT ("FIFO_Test")); - - int errors = 0; - errors += test_fifo_msg (); - - ACE_END_TEST; - return errors; -} diff --git a/tests/INET_Addr_Test.cpp b/tests/INET_Addr_Test.cpp index e8a88293ae9..f0d69907248 100644 --- a/tests/INET_Addr_Test.cpp +++ b/tests/INET_Addr_Test.cpp @@ -23,37 +23,6 @@ #include "ace/INET_Addr.h" #include "ace/Log_Msg.h" -// Make sure that ACE_Addr::addr_type_ is the same -// as the family of the inet_addr_. -int check_type_consistency (const ACE_INET_Addr &addr) -{ - int family = -1; - - if (addr.get_type () == AF_INET) - { - struct sockaddr_in *sa4 = (struct sockaddr_in *)addr.get_addr(); - family = sa4->sin_family; - } -#if defined (ACE_HAS_IPV6) - else if (addr.get_type () == AF_INET6) - { - struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)addr.get_addr(); - family = sa6->sin6_family; - } -#endif - - if (addr.get_type () != family) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Inconsistency between ACE_SOCK::addr_type_ (%d) ") - ACE_TEXT ("and the sockaddr family (%d)\n"), - addr.get_type (), - family)); - return 1; - } - return 0; -} - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { @@ -69,7 +38,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) }; ACE_INET_Addr addr; - status |= check_type_consistency (addr); for (int i=0; ipv4_addresses[i] != 0; i++) { struct in_addr addrv4; @@ -80,7 +48,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_OS::memcpy (&addr32, &addrv4, sizeof (addr32)); addr.set (80, ipv4_addresses[i]); - status |= check_type_consistency (addr); /* ** Now check to make sure get_ip_address matches and get_host_addr @@ -110,7 +77,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Clear out the address by setting it to 1 and check addr.set (0, ACE_UINT32 (1), 1); - status |= check_type_consistency (addr); if (addr.get_ip_address () != 1) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Failed to set address to 1\n"))); @@ -120,8 +86,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Now set the address using a 32 bit number and check that we get // the right string out of get_host_addr(). addr.set (80, addr32, 0); // addr32 is already in network byte order - status |= check_type_consistency(addr); - if (0 != ACE_OS::strcmp (addr.get_host_addr (), ipv4_addresses[i])) { ACE_ERROR ((LM_ERROR, @@ -132,33 +96,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ipv4_addresses[i])); status = 1; } - - // Test for ACE_INET_Addr::set_addr(). - struct sockaddr_in sa4; - sa4.sin_family = AF_INET; - sa4.sin_addr = addrv4; - sa4.sin_port = ACE_HTONS(8080); - - addr.set (0, ACE_UINT32 (1), 1); - addr.set_addr (&sa4, sizeof(sa4)); - status |= check_type_consistency (addr); - - if (addr.get_port_number () != 8080) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_INET_Addr::set_addr() ") - ACE_TEXT ("failed to update port number.\n"))); - status = 1; - } - - if (addr.get_ip_address () != ACE_HTONL (addr32)) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_INET_Addr::set_addr() ") - ACE_TEXT ("failed to update address.\n"))); - status = 1; - } - } #if defined (ACE_HAS_IPV6) @@ -175,7 +112,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) for (int i=0; ipv6_addresses[i] != 0; i++) { ACE_INET_Addr addr (80, ipv6_addresses[i]); - status |= check_type_consistency (addr); if (0 != ACE_OS::strcmp (addr.get_host_addr (), ipv6_addresses[i])) { diff --git a/tests/Makefile b/tests/Makefile index 4be67934aff..149533febe6 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -36,7 +36,6 @@ BIN = Aio_Platform_Test \ DLL_Test\ Enum_Interfaces_Test \ Env_Value_Test \ - FIFO_Test \ Future_Test \ Future_Set_Test \ Get_Opt_Test \ @@ -63,7 +62,6 @@ BIN = Aio_Platform_Test \ Message_Queue_Test \ Message_Queue_Test_Ex \ Message_Queue_Notifications_Test \ - Multicast_Test \ Notify_Performance_Test \ Object_Manager_Test \ Obstack_Test \ @@ -329,8 +327,8 @@ realclean: clean $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - test_config.h $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/ace_wchar.inl test_config.h \ + $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.h \ @@ -393,8 +391,7 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp -.obj/ARGV_Test.o .obj/ARGV_Test.so .shobj/ARGV_Test.o .shobj/ARGV_Test.so: ARGV_Test.cpp \ - $(ACE_ROOT)/ace/ARGV.h \ +.obj/ARGV_Test.o .obj/ARGV_Test.so .shobj/ARGV_Test.o .shobj/ARGV_Test.so: ARGV_Test.cpp $(ACE_ROOT)/ace/ARGV.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/post.h \ @@ -432,8 +429,7 @@ realclean: clean $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/ARGV.i \ - test_config.h \ + $(ACE_ROOT)/ace/ARGV.i test_config.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ @@ -541,10 +537,8 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ $(ACE_ROOT)/ace/Atomic_Op.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Atomic_Op.cpp .obj/Auto_IncDec_Test.o .obj/Auto_IncDec_Test.so .shobj/Auto_IncDec_Test.o .shobj/Auto_IncDec_Test.so: Auto_IncDec_Test.cpp \ $(ACE_ROOT)/ace/Auto_IncDec_T.h \ @@ -559,15 +553,20 @@ realclean: clean $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Default_Constants.h \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS_String.inl \ $(ACE_ROOT)/ace/OS_Memory.h \ $(ACE_ROOT)/ace/OS_Memory.inl \ @@ -576,21 +575,13 @@ realclean: clean $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/Time_Value.inl \ $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(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/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ @@ -643,10 +634,8 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Atomic_Op.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Atomic_Op.cpp \ test_config.h .obj/Barrier_Test.o .obj/Barrier_Test.so .shobj/Barrier_Test.o .shobj/Barrier_Test.so: Barrier_Test.cpp test_config.h \ @@ -718,9 +707,6 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -771,8 +757,7 @@ realclean: clean $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Version.h \ - test_config.h \ + $(ACE_ROOT)/ace/Version.h test_config.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ @@ -892,9 +877,6 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -1041,9 +1023,6 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -1244,8 +1223,7 @@ realclean: clean $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Get_Opt.i \ - Cache_Map_Manager_Test.h + $(ACE_ROOT)/ace/Get_Opt.i Cache_Map_Manager_Test.h .obj/Cached_Accept_Conn_Test.o .obj/Cached_Accept_Conn_Test.so .shobj/Cached_Accept_Conn_Test.o .shobj/Cached_Accept_Conn_Test.so: Cached_Accept_Conn_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ @@ -1401,9 +1379,6 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -1656,8 +1631,7 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.h \ $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - Cached_Conn_Test.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ + Cached_Conn_Test.h $(ACE_ROOT)/ace/SOCK_Stream.h \ $(ACE_ROOT)/ace/SOCK_IO.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/Addr.h \ @@ -1682,9 +1656,6 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -1966,8 +1937,7 @@ realclean: clean $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Capabilities.i \ - test_config.h \ + $(ACE_ROOT)/ace/Capabilities.i test_config.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ @@ -2107,8 +2077,7 @@ realclean: clean $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Get_Opt.i \ - test_config.h \ + $(ACE_ROOT)/ace/Get_Opt.i test_config.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ @@ -2335,8 +2304,7 @@ realclean: clean $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - Collection_Test.h + $(ACE_ROOT)/ace/Containers_T.cpp Collection_Test.h .obj/Config_Test.o .obj/Config_Test.so .shobj/Config_Test.o .shobj/Config_Test.so: Config_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ @@ -2406,8 +2374,7 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.h \ $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - Config_Test.h \ - $(ACE_ROOT)/ace/Configuration.h \ + Config_Test.h $(ACE_ROOT)/ace/Configuration.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/String_Base.h \ $(ACE_ROOT)/ace/String_Base_Const.h \ @@ -2640,9 +2607,6 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -2708,8 +2672,7 @@ realclean: clean $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/Process_Mutex.h \ - $(ACE_ROOT)/ace/Process_Mutex.inl \ - Conn_Test.h + $(ACE_ROOT)/ace/Process_Mutex.inl Conn_Test.h .obj/Date_Time_Test.o .obj/Date_Time_Test.so .shobj/Date_Time_Test.o .shobj/Date_Time_Test.so: Date_Time_Test.cpp \ $(ACE_ROOT)/ace/Date_Time.h \ @@ -2740,8 +2703,7 @@ realclean: clean $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Date_Time.i \ - test_config.h \ + $(ACE_ROOT)/ace/Date_Time.i test_config.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ @@ -3148,8 +3110,7 @@ realclean: clean $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Set.cpp \ $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/SString.i \ - DLL_Test.h + $(ACE_ROOT)/ace/SString.i DLL_Test.h .obj/Enum_Interfaces_Test.o .obj/Enum_Interfaces_Test.so .shobj/Enum_Interfaces_Test.o .shobj/Enum_Interfaces_Test.so: Enum_Interfaces_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ @@ -3337,114 +3298,6 @@ realclean: clean $(ACE_ROOT)/ace/Env_Value_T.i \ $(ACE_ROOT)/ace/Env_Value_T.cpp -.obj/FIFO_Test.o .obj/FIFO_Test.so .shobj/FIFO_Test.o .shobj/FIFO_Test.so: FIFO_Test.cpp test_config.h \ - $(ACE_ROOT)/ace/pre.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_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Framework_Component_T.h \ - $(ACE_ROOT)/ace/Framework_Component_T.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/FIFO_Send_Msg.h \ - $(ACE_ROOT)/ace/FIFO_Send.h \ - $(ACE_ROOT)/ace/FIFO.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/FIFO.i \ - $(ACE_ROOT)/ace/FIFO_Send.i \ - $(ACE_ROOT)/ace/FIFO_Send_Msg.i \ - $(ACE_ROOT)/ace/FIFO_Recv_Msg.h \ - $(ACE_ROOT)/ace/FIFO_Recv.h \ - $(ACE_ROOT)/ace/FIFO_Recv.i \ - $(ACE_ROOT)/ace/FIFO_Recv_Msg.i \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ - $(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/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 \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(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/Thread_Manager.i - .obj/Future_Test.o .obj/Future_Test.so .shobj/Future_Test.o .shobj/Future_Test.so: Future_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ @@ -3523,9 +3376,6 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -3642,10 +3492,8 @@ realclean: clean $(ACE_ROOT)/ace/Activation_Queue.h \ $(ACE_ROOT)/ace/Activation_Queue.i \ $(ACE_ROOT)/ace/Atomic_Op.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Atomic_Op.cpp .obj/Future_Set_Test.o .obj/Future_Set_Test.so .shobj/Future_Set_Test.o .shobj/Future_Set_Test.so: Future_Set_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ @@ -3725,9 +3573,6 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -3846,13 +3691,10 @@ realclean: clean $(ACE_ROOT)/ace/Activation_Queue.h \ $(ACE_ROOT)/ace/Activation_Queue.i \ $(ACE_ROOT)/ace/Atomic_Op.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Atomic_Op.cpp -.obj/Get_Opt_Test.o .obj/Get_Opt_Test.so .shobj/Get_Opt_Test.o .shobj/Get_Opt_Test.so: Get_Opt_Test.cpp \ - $(ACE_ROOT)/ace/OS.h \ +.obj/Get_Opt_Test.o .obj/Get_Opt_Test.so .shobj/Get_Opt_Test.o .shobj/Get_Opt_Test.so: Get_Opt_Test.cpp $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -4330,7 +4172,6 @@ realclean: clean $(ACE_ROOT)/ace/Reactor_Impl.h .obj/Hash_Map_Bucket_Iterator_Test.o .obj/Hash_Map_Bucket_Iterator_Test.so .shobj/Hash_Map_Bucket_Iterator_Test.o .shobj/Hash_Map_Bucket_Iterator_Test.so: Hash_Map_Bucket_Iterator_Test.cpp \ - test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -4691,9 +4532,6 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -5018,8 +4856,7 @@ realclean: clean $(ACE_ROOT)/ace/FILE_Connector.i \ $(ACE_ROOT)/ace/Log_Msg_Callback.h \ $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - test_config.h \ + $(ACE_ROOT)/ace/Log_Record.i test_config.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ @@ -5153,9 +4990,6 @@ realclean: clean $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -5179,8 +5013,7 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i \ - test_config.h + $(ACE_ROOT)/ace/Get_Opt.i test_config.h .obj/Malloc_Test.o .obj/Malloc_Test.so .shobj/Malloc_Test.o .shobj/Malloc_Test.so: Malloc_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ @@ -5298,8 +5131,7 @@ realclean: clean $(ACE_ROOT)/ace/Based_Pointer_T.i \ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \ - $(ACE_ROOT)/ace/PI_Malloc.i \ - Malloc_Test.h + $(ACE_ROOT)/ace/PI_Malloc.i Malloc_Test.h .obj/Map_Test.o .obj/Map_Test.so .shobj/Map_Test.o .shobj/Map_Test.so: Map_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ @@ -5368,8 +5200,7 @@ realclean: clean $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Framework_Component_T.h \ $(ACE_ROOT)/ace/Framework_Component_T.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - Map_Test.h \ + $(ACE_ROOT)/ace/Framework_Component_T.cpp Map_Test.h \ $(ACE_ROOT)/ace/Active_Map_Manager.h \ $(ACE_ROOT)/ace/Active_Map_Manager.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ @@ -5729,9 +5560,6 @@ realclean: clean $(ACE_ROOT)/ace/SOCK_Stream.i \ $(ACE_ROOT)/ace/SOCK_Connector.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -5765,8 +5593,7 @@ realclean: clean $(ACE_ROOT)/ace/Thread_Manager.i \ Max_Default_Port_Test.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - test_config.h + $(ACE_ROOT)/ace/SOCK_Acceptor.i test_config.h .obj/MEM_Stream_Test.o .obj/MEM_Stream_Test.so .shobj/MEM_Stream_Test.o .shobj/MEM_Stream_Test.so: MEM_Stream_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ @@ -5887,9 +5714,6 @@ realclean: clean $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/MEM_Connector.h \ $(ACE_ROOT)/ace/SOCK_Connector.h \ @@ -6025,15 +5849,12 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(ACE_ROOT)/ace/Atomic_Op.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Atomic_Op.cpp \ $(ACE_ROOT)/ace/Process.h \ $(ACE_ROOT)/ace/Process.i \ $(ACE_ROOT)/ace/Process_Manager.h \ - $(ACE_ROOT)/ace/Process_Manager.i \ - MEM_Stream_Test.h + $(ACE_ROOT)/ace/Process_Manager.i MEM_Stream_Test.h .obj/Mem_Map_Test.o .obj/Mem_Map_Test.so .shobj/Mem_Map_Test.o .shobj/Mem_Map_Test.so: Mem_Map_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ @@ -6186,9 +6007,6 @@ realclean: clean $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ $(ACE_ROOT)/ace/Process_Semaphore.inl \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -6279,8 +6097,7 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.h \ $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - MT_Reactor_Timer_Test.h \ - $(ACE_ROOT)/ace/Reactor.h \ + MT_Reactor_Timer_Test.h $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ @@ -6307,9 +6124,6 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -6448,16 +6262,19 @@ realclean: clean $(ACE_ROOT)/ace/Token.i \ $(ACE_ROOT)/ace/Pipe.h \ $(ACE_ROOT)/ace/Pipe.i \ + $(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/Select_Reactor_Base.i \ $(ACE_ROOT)/ace/Select_Reactor_T.cpp \ $(ACE_ROOT)/ace/Timer_Heap.h \ $(ACE_ROOT)/ace/Timer_Heap_T.h \ $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ $(ACE_ROOT)/ace/Select_Reactor_T.i \ $(ACE_ROOT)/ace/TP_Reactor.i \ @@ -6470,12 +6287,6 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -6603,9 +6414,6 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -6724,9 +6532,6 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -6861,9 +6666,6 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -6972,9 +6774,6 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -7111,9 +6910,6 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -7157,197 +6953,8 @@ realclean: clean $(ACE_ROOT)/ace/Reactor_Notification_Strategy.h \ $(ACE_ROOT)/ace/Reactor_Notification_Strategy.inl \ $(ACE_ROOT)/ace/Atomic_Op.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i - -.obj/Multicast_Test.o .obj/Multicast_Test.so .shobj/Multicast_Test.o .shobj/Multicast_Test.so: Multicast_Test.cpp \ - test_config.h \ - $(ACE_ROOT)/ace/pre.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_Dirent.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(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/Time_Value.h \ - $(ACE_ROOT)/ace/Time_Value.inl \ - $(ACE_ROOT)/ace/Default_Constants.h \ - $(ACE_ROOT)/ace/Global_Macros.h \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(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/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Framework_Component_T.h \ - $(ACE_ROOT)/ace/Framework_Component_T.inl \ - $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/String_Base.h \ - $(ACE_ROOT)/ace/String_Base_Const.h \ - $(ACE_ROOT)/ace/String_Base.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/String_Base.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(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/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.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 \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(ACE_ROOT)/ace/Vector_T.h \ - $(ACE_ROOT)/ace/Array.h \ - $(ACE_ROOT)/ace/Vector_T.i \ - $(ACE_ROOT)/ace/Vector_T.cpp \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ - $(ACE_ROOT)/ace/SOCK_Dgram.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Dgram.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_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 \ - $(ACE_ROOT)/ace/DLL.h \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ - $(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 \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(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/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/Atomic_Op.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Atomic_Op.cpp .obj/Notify_Performance_Test.o .obj/Notify_Performance_Test.so .shobj/Notify_Performance_Test.o .shobj/Notify_Performance_Test.so: Notify_Performance_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ @@ -7472,9 +7079,6 @@ realclean: clean $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -7503,10 +7107,8 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ $(ACE_ROOT)/ace/Select_Reactor_T.i \ $(ACE_ROOT)/ace/Atomic_Op.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Atomic_Op.cpp .obj/Object_Manager_Test.o .obj/Object_Manager_Test.so .shobj/Object_Manager_Test.o .shobj/Object_Manager_Test.so: Object_Manager_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ @@ -7577,8 +7179,7 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp -.obj/Obstack_Test.o .obj/Obstack_Test.so .shobj/Obstack_Test.o .shobj/Obstack_Test.so: Obstack_Test.cpp \ - $(ACE_ROOT)/ace/OS.h \ +.obj/Obstack_Test.o .obj/Obstack_Test.so .shobj/Obstack_Test.o .shobj/Obstack_Test.so: Obstack_Test.cpp $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -7665,8 +7266,7 @@ realclean: clean $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Obchunk.i \ $(ACE_ROOT)/ace/Obstack_T.i \ - $(ACE_ROOT)/ace/Obstack_T.cpp \ - test_config.h \ + $(ACE_ROOT)/ace/Obstack_T.cpp test_config.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ @@ -7685,8 +7285,8 @@ realclean: clean $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - test_config.h $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/ace_wchar.inl test_config.h \ + $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.h \ @@ -7767,8 +7367,7 @@ realclean: clean $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp -.obj/OS_Test.o .obj/OS_Test.so .shobj/OS_Test.o .shobj/OS_Test.so: OS_Test.cpp \ - $(ACE_ROOT)/ace/OS.h \ +.obj/OS_Test.o .obj/OS_Test.so .shobj/OS_Test.o .shobj/OS_Test.so: OS_Test.cpp $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -7837,7 +7436,6 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.cpp .obj/Proactor_Scatter_Gather_Test.o .obj/Proactor_Scatter_Gather_Test.so .shobj/Proactor_Scatter_Gather_Test.o .shobj/Proactor_Scatter_Gather_Test.so: Proactor_Scatter_Gather_Test.cpp \ - test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -8068,9 +7666,6 @@ realclean: clean $(ACE_ROOT)/ace/Asynch_IO_Impl.h \ $(ACE_ROOT)/ace/Asynch_IO_Impl.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Timer_List.h \ $(ACE_ROOT)/ace/Timer_List_T.h \ @@ -8081,6 +7676,8 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Wheel.h \ $(ACE_ROOT)/ace/Timer_Wheel_T.h \ $(ACE_ROOT)/ace/Timer_Wheel_T.cpp \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i \ $(ACE_ROOT)/ace/Proactor.i \ $(ACE_ROOT)/ace/Asynch_Acceptor.h \ $(ACE_ROOT)/ace/Asynch_Acceptor.cpp \ @@ -8129,7 +7726,6 @@ realclean: clean $(ACE_ROOT)/ace/Select_Reactor_T.i \ $(ACE_ROOT)/ace/POSIX_Proactor.i \ $(ACE_ROOT)/ace/POSIX_CB_Proactor.h \ - $(ACE_ROOT)/ace/POSIX_CB_Proactor.i \ $(ACE_ROOT)/ace/SUN_Proactor.h .obj/Proactor_Timer_Test.o .obj/Proactor_Timer_Test.so .shobj/Proactor_Timer_Test.o .shobj/Proactor_Timer_Test.so: Proactor_Timer_Test.cpp test_config.h \ @@ -8219,9 +7815,6 @@ realclean: clean $(ACE_ROOT)/ace/Asynch_IO_Impl.h \ $(ACE_ROOT)/ace/Asynch_IO_Impl.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -8249,9 +7842,9 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Wheel.h \ $(ACE_ROOT)/ace/Timer_Wheel_T.h \ $(ACE_ROOT)/ace/Timer_Wheel_T.cpp \ - $(ACE_ROOT)/ace/Proactor.i \ $(ACE_ROOT)/ace/High_Res_Timer.h \ - $(ACE_ROOT)/ace/High_Res_Timer.i + $(ACE_ROOT)/ace/High_Res_Timer.i \ + $(ACE_ROOT)/ace/Proactor.i .obj/Process_Mutex_Test.o .obj/Process_Mutex_Test.so .shobj/Process_Mutex_Test.o .shobj/Process_Mutex_Test.so: Process_Mutex_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ @@ -8515,9 +8108,6 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -8594,8 +8184,7 @@ realclean: clean $(ACE_ROOT)/ace/SOCK_Connector.h \ $(ACE_ROOT)/ace/SOCK_Connector.i \ $(ACE_ROOT)/ace/File_Lock.h \ - $(ACE_ROOT)/ace/File_Lock.inl \ - Process_Strategy_Test.h + $(ACE_ROOT)/ace/File_Lock.inl Process_Strategy_Test.h .obj/Priority_Buffer_Test.o .obj/Priority_Buffer_Test.so .shobj/Priority_Buffer_Test.o .shobj/Priority_Buffer_Test.so: Priority_Buffer_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ @@ -8681,9 +8270,6 @@ realclean: clean $(ACE_ROOT)/ace/Notification_Strategy.inl \ $(ACE_ROOT)/ace/Message_Queue.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -8790,9 +8376,6 @@ realclean: clean $(ACE_ROOT)/ace/Notification_Strategy.inl \ $(ACE_ROOT)/ace/Message_Queue.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -8897,9 +8480,6 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -9109,9 +8689,6 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -9554,8 +9131,7 @@ realclean: clean $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/SString.i \ - RB_Tree_Test.h + $(ACE_ROOT)/ace/SString.i RB_Tree_Test.h .obj/Reactors_Test.o .obj/Reactors_Test.so .shobj/Reactors_Test.o .shobj/Reactors_Test.so: Reactors_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ @@ -9635,9 +9211,6 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -9696,10 +9269,8 @@ realclean: clean $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Atomic_Op.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Atomic_Op.cpp .obj/Reactor_Exceptions_Test.o .obj/Reactor_Exceptions_Test.so .shobj/Reactor_Exceptions_Test.o .shobj/Reactor_Exceptions_Test.so: Reactor_Exceptions_Test.cpp \ $(ACE_ROOT)/ace/Reactor.h \ @@ -9778,9 +9349,6 @@ realclean: clean $(ACE_ROOT)/ace/INET_Addr.i \ $(ACE_ROOT)/ace/SOCK_Dgram.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -9819,8 +9387,7 @@ realclean: clean $(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 \ - test_config.h + $(ACE_ROOT)/ace/Thread_Manager.i test_config.h .obj/Reactor_Notify_Test.o .obj/Reactor_Notify_Test.so .shobj/Reactor_Notify_Test.o .shobj/Reactor_Notify_Test.so: Reactor_Notify_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ @@ -9900,9 +9467,6 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -9978,7 +9542,6 @@ realclean: clean $(ACE_ROOT)/ace/Select_Reactor_T.i .obj/Reactor_Dispatch_Order_Test.o .obj/Reactor_Dispatch_Order_Test.so .shobj/Reactor_Dispatch_Order_Test.o .shobj/Reactor_Dispatch_Order_Test.so: Reactor_Dispatch_Order_Test.cpp \ - test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -10072,16 +9635,19 @@ realclean: clean $(ACE_ROOT)/ace/Token.i \ $(ACE_ROOT)/ace/Pipe.h \ $(ACE_ROOT)/ace/Pipe.i \ + $(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/Select_Reactor_Base.i \ $(ACE_ROOT)/ace/Select_Reactor_T.cpp \ $(ACE_ROOT)/ace/Timer_Heap.h \ $(ACE_ROOT)/ace/Timer_Heap_T.h \ $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ $(ACE_ROOT)/ace/Select_Reactor_T.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h @@ -10180,9 +9746,6 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -10484,9 +10047,6 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -10539,10 +10099,8 @@ realclean: clean $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/Atomic_Op.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Atomic_Op.cpp .obj/Recursive_Condition_Test.o .obj/Recursive_Condition_Test.so .shobj/Recursive_Condition_Test.o .shobj/Recursive_Condition_Test.so: Recursive_Condition_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ @@ -10614,34 +10172,12 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.cpp \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ - $(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/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 \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(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/Thread_Manager.i \ $(ACE_ROOT)/ace/Timer_Heap.h \ $(ACE_ROOT)/ace/Timer_Heap_T.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Test_and_Set.h \ $(ACE_ROOT)/ace/Test_and_Set.i \ $(ACE_ROOT)/ace/Test_and_Set.cpp \ @@ -10649,6 +10185,12 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ $(ACE_ROOT)/ace/Timer_Queue_Adapters.h \ $(ACE_ROOT)/ace/Task.h \ @@ -10658,6 +10200,19 @@ realclean: clean $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(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 \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_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 \ @@ -10802,9 +10357,6 @@ realclean: clean $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Thread_Manager.i .obj/Refcounted_Auto_Ptr_Test.o .obj/Refcounted_Auto_Ptr_Test.so .shobj/Refcounted_Auto_Ptr_Test.o .shobj/Refcounted_Auto_Ptr_Test.so: Refcounted_Auto_Ptr_Test.cpp test_config.h \ @@ -10885,9 +10437,6 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -11079,9 +10628,6 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -11203,9 +10749,6 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -11334,7 +10877,6 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.cpp .obj/Simple_Message_Block_Test.o .obj/Simple_Message_Block_Test.so .shobj/Simple_Message_Block_Test.o .shobj/Simple_Message_Block_Test.so: Simple_Message_Block_Test.cpp \ - test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -11477,9 +11019,6 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -11672,9 +11211,6 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -11782,9 +11318,6 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -12179,9 +11712,6 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ @@ -12318,9 +11848,6 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -12435,9 +11962,6 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -12562,9 +12086,6 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -12671,9 +12192,6 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -12903,8 +12421,8 @@ realclean: clean $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - test_config.h $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/ace_wchar.inl test_config.h \ + $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.h \ @@ -13128,9 +12646,6 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -13200,10 +12715,8 @@ realclean: clean $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Atomic_Op.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Atomic_Op.cpp \ $(ACE_ROOT)/ace/Auto_IncDec_T.h \ $(ACE_ROOT)/ace/Auto_IncDec_T.i \ $(ACE_ROOT)/ace/Auto_IncDec_T.cpp \ @@ -13285,8 +12798,7 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.h \ $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - TP_Reactor_Test.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ + TP_Reactor_Test.h $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ $(ACE_ROOT)/ace/INET_Addr.i \ @@ -13371,9 +12883,6 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -13523,9 +13032,6 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -13550,8 +13056,7 @@ realclean: clean $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.i \ - TSS_Test_Errno.h + $(ACE_ROOT)/ace/Signal.i TSS_Test_Errno.h .obj/Vector_Test.o .obj/Vector_Test.so .shobj/Vector_Test.o .shobj/Vector_Test.so: Vector_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ @@ -13737,9 +13242,6 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -13816,7 +13318,6 @@ realclean: clean $(ACE_ROOT)/ace/UPIPE_Connector.i .obj/Upgradable_RW_Test.o .obj/Upgradable_RW_Test.so .shobj/Upgradable_RW_Test.o .shobj/Upgradable_RW_Test.so: Upgradable_RW_Test.cpp Upgradable_RW_Test.h \ - test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -13894,9 +13395,6 @@ realclean: clean $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -13973,10 +13471,8 @@ realclean: clean $(ACE_ROOT)/ace/High_Res_Timer.i \ $(ACE_ROOT)/ace/Profile_Timer.i \ $(ACE_ROOT)/ace/Atomic_Op.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Atomic_Op.cpp .obj/Naming_Test.o .obj/Naming_Test.so .shobj/Naming_Test.o .shobj/Naming_Test.so: Naming_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ @@ -14306,9 +13802,6 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -14539,9 +14032,6 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -15059,9 +14549,6 @@ realclean: clean $(ACE_ROOT)/ace/Token_Request_Reply.i \ $(ACE_ROOT)/ace/Remote_Tokens.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Token_Invariants.h @@ -15327,9 +14814,6 @@ realclean: clean $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ diff --git a/tests/Makefile.bor b/tests/Makefile.bor index 59c411770d7..82cd4e55904 100644 --- a/tests/Makefile.bor +++ b/tests/Makefile.bor @@ -60,7 +60,6 @@ NAMES = \ MT_Reactor_Timer_Test \ MT_Reactor_Upcall_Test \ MT_SOCK_Test \ - Multicast_Test \ Naming_Test \ New_Fail_Test \ Notify_Performance_Test \ diff --git a/tests/Multicast_Test.cpp b/tests/Multicast_Test.cpp deleted file mode 100644 index 27039cbabb8..00000000000 --- a/tests/Multicast_Test.cpp +++ /dev/null @@ -1,935 +0,0 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// tests -// -// = DESCRIPTION -// This program tests ACE_SOCK_Dgram_Mcast class. -// It specifically tests subscribing to multiple groups on the same socket -// on one or more physical interfaces (if available). -// -// The test can be run as a producer, consumer, or both producer/consumer -// (default). The test requires at least two (2) multicast groups which can -// be configured as command line options. The consumer subscribes to a -// single group per instance and an additional instance tries to subscribe -// to all groups on a single socket (if the ACE_SOCK_Dgram_Mcast instance -// bind()'s the first address to the socket, additional joins will fail). -// The producer iterates through the list of group addresses and sends a -// single message containing the destination address and port to each one. -// It also sends messages to five (5) additional groups and a message to an -// additional port for each group in order to produce a bit of "noise" in -// order to help validate how well the multicast filtering works on a -// particular platform. -// -// The list of destination groups start at 239.255.0.1 (default) and -// increment by 1 up to 5 (default) groups. Both of these values, as well -// as others, can be overridden via command-line options. Use the -? -// option to display the usage message... -// -// = AUTHOR -// Don Hinton <dhinton@ieee.org> -// -// ============================================================================ - -#include "tests/test_config.h" -#include "ace/Get_Opt.h" -#include "ace/Vector_T.h" -#include "ace/SOCK_Dgram_Mcast.h" -#include "ace/ACE.h" -#include "ace/Reactor.h" -#include "ace/OS_String.h" -#include "ace/Task.h" -#include "ace/Atomic_Op.h" - -ACE_RCSID(tests, Multicast_Test, "$Id$") - -#if defined (ACE_HAS_IP_MULTICAST) && defined (ACE_HAS_THREADS) - -/* - * The 'finished' flag is used to break out of an infninite loop in the - * task::svc () method. The 'handler' will set the flag in respose to - * SIGINT (CTRL-C). - */ -static sig_atomic_t finished = 0; -extern "C" void handler (int) -{ - finished = 1; -} - -static const int MCT_ITERATIONS = 10; -static const int MCT_GROUPS = 5; -static const int MCT_MIN_GROUPS = 2; - -static const char MCT_START_GROUP[] = "239.255.0.1"; -static const int MCT_START_PORT = 16000; - -static const size_t MAX_STRING_SIZE = 200; - -int advance_addr (ACE_INET_Addr &addr); - -// Keep track of errors so we can report them on exit. -static sig_atomic_t error = 0; - -/* - * MCast_Config holds configuration data for this test. - */ -class MCT_Config -{ -public: - - enum - { - PRODUCER = 1, - CONSUMER = 2, - BOTH = PRODUCER | CONSUMER - }; - - MCT_Config (void) - : group_start_ (MCT_START_PORT, MCT_START_GROUP), - groups_ (0), - debug_ (0), - role_ (BOTH), - sdm_opts_ (ACE_SOCK_Dgram_Mcast::DEFOPTS), - iterations_ (MCT_ITERATIONS), - ttl_ (1), - wait_ (2) - { - if (IP_MAX_MEMBERSHIPS == 0) - this->groups_ = MCT_GROUPS; - else - this->groups_ = ACE_MIN (IP_MAX_MEMBERSHIPS, MCT_GROUPS); - } - ~MCT_Config (void) - {} - - int open (int argc, ACE_TCHAR *argv[]); - int debug (void) const { return this->debug_;} - void dump (void) const; - int groups (void) const { return this->groups_;} - const ACE_INET_Addr group_start (void) const { return this->group_start_;} - u_long role (void) const { return this->role_;} - int iterations (void) const { return this->iterations_;} - int ttl (void) const { return this->ttl_;} - int wait (void) const { return this->wait_;} - ACE_SOCK_Dgram_Mcast::options options (void) const - { - return ACE_static_cast (ACE_SOCK_Dgram_Mcast::options, this->sdm_opts_); - } - -private: - // Starting group address. (only IPv4 capable right now...) - ACE_INET_Addr group_start_; - - // Number of groups we will try to use in the test. - int groups_; - - // Debug flag. - int debug_; - - // Role, i.e., PRODUCER, CONSUMER, BOTH: defaults to BOTH - u_long role_; - - // ACE_SOCK_Dgram_Mcast ctor options - u_long sdm_opts_; - - // Producer iterations - int iterations_; - - // TTL, time to live, for use over routers. - int ttl_; - - // Time to wait on CONSUMER threads to end before killing test. - int wait_; -}; - -int -MCT_Config::open (int argc, ACE_TCHAR *argv[]) -{ - int retval = 0; - int help = 0; - - ACE_Get_Opt getopt (argc, argv, ACE_TEXT (":?"), 1, 1); - - if (getopt.long_option (ACE_TEXT ("GroupStart"), - 'g', - ACE_Get_Opt::ARG_REQUIRED) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT (" Unable to add GroupStart option.\n")), - 1); - - if (getopt.long_option (ACE_TEXT ("Groups"), - 'n', - ACE_Get_Opt::ARG_REQUIRED) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT (" Unable to add Groups option.\n")), 1); - - if (getopt.long_option (ACE_TEXT ("Debug"), - 'd', - ACE_Get_Opt::NO_ARG) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT (" Unable to add Debug option.\n")), 1); - - if (getopt.long_option (ACE_TEXT ("Role"), - 'r', - ACE_Get_Opt::ARG_REQUIRED) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT (" Unable to add Role option.\n")), 1); - - if (getopt.long_option (ACE_TEXT ("SDM_options"), - 'm', - ACE_Get_Opt::ARG_REQUIRED) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT (" Unable to add Multicast_Options option.\n")), - 1); - - if (getopt.long_option (ACE_TEXT ("Iterations"), - 'i', - ACE_Get_Opt::ARG_REQUIRED) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT (" Unable to add iterations option.\n")), - 1); - - if (getopt.long_option (ACE_TEXT ("TTL"), - 't', - ACE_Get_Opt::ARG_REQUIRED) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT (" Unable to add TTL option.\n")), - 1); - - if (getopt.long_option (ACE_TEXT ("Wait"), - 'w', - ACE_Get_Opt::ARG_REQUIRED) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT (" Unable to add wait option.\n")), - 1); - - if (getopt.long_option (ACE_TEXT ("help"), - 'h', - ACE_Get_Opt::NO_ARG) != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT (" Unable to add help option.\n")), - 1); - - // Now, let's parse it... - int c = 0; - while ((c = getopt ()) != EOF) - { - switch (c) - { - case 0: - // Long Option. This should never happen. - retval = -1; - break; - case 'g': - { - // @todo validate all these, i.e., must be within range - // 224.255.0.0 to 238.255.255.255, but we only allow the - // administrative "site local" range, 239.255.0.0 to - // 239.255.255.255. - ACE_TCHAR *group = getopt.opt_arg (); - if (this->group_start_.set (group) != 0) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Bad group address:%s\n"), - group)); - } - } - break; - case 'i': - this->iterations_ = ACE_OS::atoi (getopt.opt_arg ()); - break; - case 'n': - { - int n = ACE_OS::atoi (getopt.opt_arg ()); - // I'm assuming 0 means unlimited, so just use whatever the - // user provides. Seems to work okay on Solaris 5.8. - if (IP_MAX_MEMBERSHIPS == 0) - this->groups_ = n; - else - this->groups_ = ACE_MIN (ACE_MAX (n, MCT_MIN_GROUPS), - IP_MAX_MEMBERSHIPS); - break; - } - case 'd': - this->debug_ = 1; - break; - case 'r': - { - ACE_TCHAR *c = getopt.opt_arg (); - if (ACE_OS::strcasecmp (c, ACE_TEXT ("CONSUMER")) == 0) - this->role_ = CONSUMER; - else if (ACE_OS::strcasecmp (c, ACE_TEXT ("PRODUCER")) == 0) - this->role_ = PRODUCER; - else - { - help = 1; - retval = -1; - } - } - break; - case 'm': - { - //@todo add back OPT_BINDADDR_NO... - ACE_TCHAR *c = getopt.opt_arg (); - if (ACE_OS::strcasecmp (c, ACE_TEXT ("OPT_BINDADDR_YES")) == 0) - ACE_SET_BITS (this->sdm_opts_, - ACE_SOCK_Dgram_Mcast::OPT_BINDADDR_YES); - else if (ACE_OS::strcasecmp (c, ACE_TEXT ("OPT_BINDADDR_NO")) == 0) - ACE_CLR_BITS (this->sdm_opts_, - ACE_SOCK_Dgram_Mcast::OPT_BINDADDR_YES); - else if (ACE_OS::strcasecmp (c, ACE_TEXT ("DEFOPT_BINDADDR")) == 0) - { - ACE_CLR_BITS (this->sdm_opts_, - ACE_SOCK_Dgram_Mcast::OPT_BINDADDR_YES); - ACE_SET_BITS (this->sdm_opts_, - ACE_SOCK_Dgram_Mcast::DEFOPT_BINDADDR); - } - else if (ACE_OS::strcasecmp (c, ACE_TEXT ("OPT_NULLIFACE_ALL")) == 0) - ACE_SET_BITS (this->sdm_opts_, - ACE_SOCK_Dgram_Mcast::OPT_NULLIFACE_ALL); - else if (ACE_OS::strcasecmp (c, ACE_TEXT ("OPT_NULLIFACE_ONE")) == 0) - ACE_CLR_BITS (this->sdm_opts_, - ACE_SOCK_Dgram_Mcast::OPT_NULLIFACE_ALL); - else if (ACE_OS::strcasecmp (c, ACE_TEXT ("DEFOPT_NULLIFACE")) == 0) - { - ACE_CLR_BITS (this->sdm_opts_, - ACE_SOCK_Dgram_Mcast::OPT_NULLIFACE_ALL); - ACE_SET_BITS (this->sdm_opts_, - ACE_SOCK_Dgram_Mcast::DEFOPT_NULLIFACE); - } - else if (ACE_OS::strcasecmp (c, ACE_TEXT ("DEFOPTS")) == 0) - this->sdm_opts_ = ACE_SOCK_Dgram_Mcast::DEFOPTS; - else - { - help = 1; - retval = -1; - } - } - break; - case 't': - this->ttl_ = ACE_OS::atoi (getopt.opt_arg ()); - break; - case 'w': - this->wait_ = ACE_OS::atoi (getopt.opt_arg ()); - break; - case ':': - // This means an option requiring an argument didn't have one. - ACE_ERROR ((LM_ERROR, - ACE_TEXT (" Option '%c' requires an argument but ") - ACE_TEXT ("none was supplied\n"), - getopt.opt_opt ())); - help = 1; - retval = -1; - break; - case '?': - case 'h': - default: - if (ACE_OS::strcmp (argv[getopt.opt_ind () - 1], ACE_TEXT ("-?")) != 0 - && getopt.opt_opt () != 'h') - // Don't allow unknown options. - ACE_ERROR ((LM_ERROR, - ACE_TEXT (" Found an unknown option (%c) ") - ACE_TEXT ("we couldn't handle.\n"), - getopt.opt_opt ())); - // getopt.last_option ())); //readd with "%s" when - // last_option() is available. - help = 1; - retval = -1; - break; - } - } - - if (retval == -1) - { - if (help) - // print usage here - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("usage: %s [options]\n") - ACE_TEXT ("Options:\n") - ACE_TEXT (" -g {STRING} --GroupStart={STRING} ") - ACE_TEXT ("starting multicast group address\n") - ACE_TEXT (" ") - ACE_TEXT ("(default=239.255.0.1:16000)\n") - ACE_TEXT (" -n {#} --Groups={#} ") - ACE_TEXT ("number of groups (default=5)\n") - ACE_TEXT (" -d --Debug ") - ACE_TEXT ("debug flag (default=off)\n") - ACE_TEXT (" -r {STRING} --Role={STRING} ") - ACE_TEXT ("role {PRODUCER|CONSUMER|BOTH}\n") - ACE_TEXT (" ") - ACE_TEXT ("(default=BOTH)\n") - ACE_TEXT (" -m {STRING} --SDM_options={STRING} ") - ACE_TEXT ("ACE_SOCK_Dgram_Mcast ctor options\n") - ACE_TEXT (" ") - ACE_TEXT ("(default=DEFOPTS)\n") - ACE_TEXT (" -i {#} --Iterations={#} ") - ACE_TEXT ("number of iterations (default=100)\n") - ACE_TEXT (" -t {#} --TTL={#} ") - ACE_TEXT ("time to live (default=1)\n") - ACE_TEXT (" -w {#} --Wait={#} ") - ACE_TEXT ("number of seconds to wait on CONSUMER\n") - ACE_TEXT (" ") - ACE_TEXT ("(default=2)\n") - ACE_TEXT (" -h/? --help ") - ACE_TEXT ("show this message\n"), - argv[0])); - - return -1; - } - - return 0; -} - -void -MCT_Config::dump (void) const -{ - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" Dumping MCT_Config\n"))); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\tIP_MAX_MEMBERSHIPS = %d\n"), - IP_MAX_MEMBERSHIPS)); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\tgroups_ = %d\n"), - this->groups_)); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\trole_ = %s\n"), - (ACE_BIT_ENABLED (this->role_, PRODUCER) - && ACE_BIT_ENABLED (this->role_, CONSUMER)) - ? ACE_TEXT ("PRODUCER/CONSUMER") - : ACE_BIT_ENABLED (this->role_, PRODUCER) - ? ACE_TEXT ("PRODUCER") - : ACE_TEXT ("CONSUMER"))); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\tsdm_options_ = %d\n"), - this->sdm_opts_)); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\titerations_ = %d\n"), - this->iterations_)); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\tttl_ = %d\n"), - this->ttl_)); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\twait_ = %d\n"), - this->wait_)); - // Note that this call to get_host_addr is the non-reentrant - // version, but it's okay for us. - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\tgroups_start_ = %s:%d\n"), - this->group_start_.get_host_addr (), - this->group_start_.get_port_number ())); - - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); -} - -/******************************************************************************/ - -class MCT_Event_Handler : public ACE_Event_Handler -{ -public: - MCT_Event_Handler (ACE_SOCK_Dgram_Mcast::options options - = ACE_SOCK_Dgram_Mcast::DEFOPTS); - virtual ~MCT_Event_Handler (void); - - int join (const ACE_INET_Addr &mcast_addr, - int reuse_addr = 1, - const ACE_TCHAR *net_if = 0); - int leave (const ACE_INET_Addr &mcast_addr, - const ACE_TCHAR *net_if = 0); - - // = Event Handler hooks. - virtual int handle_input (ACE_HANDLE handle); - virtual int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask close_mask); - - virtual ACE_HANDLE get_handle (void) const; - -protected: - ACE_SOCK_Dgram_Mcast *mcast (void); - int find (const char *buf); - -private: - ACE_SOCK_Dgram_Mcast mcast_; - - // List of groups we've joined - ACE_Vector<ACE_CString*> address_vec_; - - // Flag used to set the 'finished' flag when the last event handler - // gets removed from the reactor. - static ACE_Atomic_Op<ACE_SYNCH_MUTEX, long> active_handlers_; -}; - -ACE_Atomic_Op<ACE_SYNCH_MUTEX, long> MCT_Event_Handler::active_handlers_ = 0; - -MCT_Event_Handler::MCT_Event_Handler (ACE_SOCK_Dgram_Mcast::options options) - : mcast_ (options) -{ - // Increment the number of active handlers in the reactor. Note this isn't - // really correct, but it should work for our simple example. - ++MCT_Event_Handler::active_handlers_; -} - -MCT_Event_Handler::~MCT_Event_Handler (void) -{ - size_t size = this->address_vec_.size (); - for (size_t i = 0; i < size; ++i) - { - delete this->address_vec_[i]; - this->address_vec_[i] = 0; - } -} - - -ACE_SOCK_Dgram_Mcast * -MCT_Event_Handler::mcast (void) -{ - return &this->mcast_; -} - -int -MCT_Event_Handler::find (const char *buf) -{ - size_t size = this->address_vec_.size (); - size_t i; - for (i = 0; i < size; ++i) - { - if (ACE_OS::strcasecmp (buf, this->address_vec_[i]->c_str ()) == 0) - return 0; - } - - // Not found, so output message we received along with a list of groups - // we've joined for debugging. - ACE_CString local; - for (i = 0; i < size; ++i) - { - local += "\t"; - local += this->address_vec_[i]->c_str (); - local += "\n"; - } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s not in:\n%s"), - buf, local.c_str ())); - - return -1; -} - - -int -MCT_Event_Handler::join (const ACE_INET_Addr &mcast_addr, - int reuse_addr, - const ACE_TCHAR *net_if) -{ - if (this->mcast_.join (mcast_addr, reuse_addr, net_if) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("MCT_Event_Handler::join - ") - ACE_TEXT ("Could not join group.\n")), - -1); - - char buf[MAX_STRING_SIZE]; - ACE_OS::sprintf (buf, "%s/%d", - mcast_addr.get_host_addr (), - mcast_addr.get_port_number ()); - ACE_CString *str; - ACE_NEW_RETURN (str, ACE_CString (ACE::strnew (buf)), -1); - this->address_vec_.push_back (str); - return 0; -} - -int -MCT_Event_Handler::leave (const ACE_INET_Addr &mcast_addr, - const ACE_TCHAR *net_if) -{ - if (this->mcast_.leave (mcast_addr, net_if) == 0) - { - char buf[MAX_STRING_SIZE]; - size_t size = 0; - for (size_t i = 0; i < size; ++i) - { - ACE_OS::sprintf (buf, "%s/%d", - mcast_addr.get_host_addr (), - mcast_addr.get_port_number ()); - if (ACE_OS::strcasecmp (buf, this->address_vec_[i]->c_str ()) == 0) - { - this->address_vec_[i]->set (""); - break; - } - } - return 0; - } - return -1; -} - -int -MCT_Event_Handler::handle_input (ACE_HANDLE /*handle*/) -{ - char buf[MAX_STRING_SIZE]; - ACE_OS::memset (buf, 0, sizeof buf); - ACE_INET_Addr addr; - - if (this->mcast ()->recv (buf, sizeof buf, addr) == -1) - { - ++error; - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("MCT_Event_Handler::handle_input - ") - ACE_TEXT ("calling recv\n")), -1); - } - - // Zero length buffer means we are done. - if (ACE_OS::strlen (buf) == 0) - return -1; - else if (this->find (buf) == -1) - { - ++error; - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("MCT_Event_Handler::handle_input - ") - ACE_TEXT ("Received dgram for a group we didn't join ") - ACE_TEXT ("(%s) \n"), - buf)); - } - return 0; -} - -int -MCT_Event_Handler::handle_close (ACE_HANDLE /*fd*/, - ACE_Reactor_Mask /*close_mask*/) -{ - // If this is the last handler, use the finished flag to signal - // the task to exit. - if (--MCT_Event_Handler::active_handlers_ == 0) - finished = 1; - - // The DONT_CALL flag keeps the reactor from calling handle_close () - // again, since we commit suicide below. - this->reactor ()->remove_handler (this, - ACE_Event_Handler::ALL_EVENTS_MASK | - ACE_Event_Handler::DONT_CALL); - this->reactor (0); - delete this; - return 0; -} - -ACE_HANDLE -MCT_Event_Handler::get_handle (void) const -{ - return this->mcast_.get_handle (); -} - -/******************************************************************************/ - -/* - * Our MCT_Task object will be an Active Object if we are running the Consumer - * side of the test. open() calls active() which creates a thread and calls - * the svc() method that calls runs the reactor event loop. - */ -class MCT_Task : public ACE_Task<ACE_NULL_SYNCH> -{ -public: - MCT_Task (const MCT_Config &config, - ACE_Reactor *reactor = ACE_Reactor::instance ()); - ~MCT_Task (void); - - // = Task hooks. - virtual int open (void *args = 0); - virtual int svc (void); - -private: - const MCT_Config &config_; - int iterations_; -}; - -MCT_Task::MCT_Task (const MCT_Config &config, - ACE_Reactor *reactor) - : config_ (config) -{ - this->reactor (reactor); -} - -MCT_Task::~MCT_Task (void) -{} - -int -MCT_Task::open (void *) -{ - MCT_Event_Handler *handler; - - ACE_INET_Addr addr = this->config_.group_start (); - int groups = this->config_.groups (); - for (int i = 0; i < groups; ++i) - { - ACE_NEW_RETURN (handler, - MCT_Event_Handler (this->config_.options ()), -1); - // We subscribe to all groups for the first one and one each for - // all the others. - if (i == 0) - { - // go ahead and hide the other one since we want our own. - ACE_INET_Addr addr = this->config_.group_start (); - for (int j = 0; j < groups; ++j) - { - // If OPT_BINDADDR_YES is set, this will fail after the first - // join, so just break and keep on going, otherwise it's a - // real error. - if (j > 0 - && ACE_BIT_ENABLED (ACE_SOCK_Dgram_Mcast::OPT_BINDADDR_YES, - this->config_.options ())) - break; - - if (handler->join (addr) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("MCT_Task::open - join error\n")), - -1); - advance_addr (addr); - } - } - else - { - if (handler->join (addr) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("MCT_Task::open - join error\n")), - -1); - } - - advance_addr (addr); - - if (this->reactor ()->register_handler (handler, READ_MASK) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("MCT_Task::open - cannot register ") - ACE_TEXT ("handler\n")), - -1); - } - - if (this->activate (THR_NEW_LWP) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("MCT_TASK:open - activate failed")), - -1); - return 0; -} - -int -MCT_Task::svc (void) -{ - // make sure this thread owns the reactor or handle_events () won't do - // anything. - this->reactor ()->owner (ACE_Thread::self ()); - - // loop and call handle_events... - while (!finished) - this->reactor ()->handle_events (); - - return 0; -} - -/******************************************************************************/ - -int send_dgram (ACE_SOCK_Dgram &socket, ACE_INET_Addr addr, int done = 0) -{ - - // Send each message twice, once to the right port, and once to the "wrong" - // port. This helps generate noise and lets us see if port filtering is - // working properly. - const char *address = addr.get_host_addr (); - int port = addr.get_port_number (); - - for (int i = 0; i < 2; ++i) - { - char buf[MAX_STRING_SIZE]; - if (done) - buf[0] = 0; - else - ACE_OS::sprintf (buf, "%s/%d", address, port); - //ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("sending (%s)\n"), buf)); - if (socket.send (buf, ACE_OS_String::strlen (buf),addr) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), - ACE_TEXT ("send_dgram - error calling send on ") - ACE_TEXT ("ACE_SOCK_Dgram.")), -1); - addr.set_port_number (++port); - } - return 0; -} - -int producer (MCT_Config &config) -{ - int retval = 0; - - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Starting producer...\n"))); - ACE_SOCK_Dgram socket (ACE_sap_any_cast (ACE_INET_Addr &)); - - // Note that is is IPv4 specific and needs to be changed once - // - if (config.ttl () > 1) - { - int ttl = config.ttl (); - if (socket.set_option (IPPROTO_IP, - IP_MULTICAST_TTL, - (void*) &ttl, - sizeof ttl) != 0) - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("could net set socket option IP_MULTICAST_TTL ") - ACE_TEXT ("= %d\n"), - ttl)); - else - ACE_DEBUG ((LM_INFO, ACE_TEXT ("set IP_MULTICAST_TTL = %d\n"), ttl)); - } - - int iterations = config.iterations (); - // we add an extra 5 groups for noise. - int groups = config.groups () + 5; - for (int i = 0; (i < iterations || iterations == 0) && !finished; ++i) - { - ACE_INET_Addr addr = config.group_start (); - for (int j = 0; j < groups && !finished; ++j) - { - if ((retval += send_dgram (socket, addr, - ((i + 1) == iterations))) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Calling send_dgram.\n"))); - if ((retval += advance_addr (addr)) == -1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Calling advance_addr.\n"))); - } - // Give the task thread a chance to run. - ACE_Thread::yield (); - } - return retval; -} - -/* - * Advance the address by 1, e.g., 239.255.0.1 => 239.255.0.2 - * Note that the algorithm is somewhat simplistic, but sufficient for our - * purpose. - */ -int advance_addr (ACE_INET_Addr &addr) -{ - int a, b, c, d; - ::sscanf (addr.get_host_addr (), "%d.%d.%d.%d", &a, &b, &c, &d); - if (d < 255) - ++d; - else if (c < 255) - { - d = 1; - ++c; - } - else if (b < 255) - { - d = 1; - c = 0; - ++b; - } - else if (a < 239) - { - d = 1; - c = 0; - b = 0; - ++a; - } - else - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("advance_addr - Cannot advance multicast ") - ACE_TEXT ("group address past %s\n"), - addr.get_host_addr ()), - -1); - - ACE_TCHAR buf[MAX_STRING_SIZE]; - ACE_OS::sprintf (buf, ACE_TEXT ("%d.%d.%d.%d:%d"), - a, b, c, d, addr.get_port_number ()); - addr.set (buf); - return 0; -} - -int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -{ - int retval = 0; - MCT_Config config; - retval = config.open (argc, argv); - if (retval != 0) - return 1; - - const ACE_TCHAR *temp = ACE_TEXT ("Multicast_Test"); - ACE_TString test = temp; - - u_long role = config.role (); - if (ACE_BIT_DISABLED (role, MCT_Config::PRODUCER) - || ACE_BIT_DISABLED (role, MCT_Config::CONSUMER)) - { - if (ACE_BIT_ENABLED (role, MCT_Config::PRODUCER)) - test += ACE_TEXT ("-PRODUCER"); - else - test += ACE_TEXT ("-CONSUMER"); - } - - // Start test only if options are valid. - ACE_START_TEST (test.c_str ()); - - // Register a signal handler to close down application gracefully. - ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT); - - // Dump the configuration info to the log if caller passed debug option. - if (config.debug ()) - config.dump (); - - ACE_Reactor *reactor = ACE_Reactor::instance (); - - MCT_Task *task = new MCT_Task (config, reactor); - - if (ACE_BIT_ENABLED (role, MCT_Config::CONSUMER)) - { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("Starting consumer...\n"))); - // Open makes it an active object. - retval += task->open (); - } - - // now produce the datagrams... - if (ACE_BIT_ENABLED (role, MCT_Config::PRODUCER)) - retval += producer (config); - - if (ACE_BIT_ENABLED (role, MCT_Config::CONSUMER)) - { - // and wait for everything to finish - ACE_DEBUG ((LM_INFO, - ACE_TEXT ("start waiting for consumer to finish...\n"))); - // Wait for the threads to exit. - // But, wait for a limited time since we could hang if the last udp - // message isn't received. - ACE_Time_Value max_wait ( config.wait ()/* seconds */); - ACE_Time_Value wait_time (ACE_OS::gettimeofday () + max_wait); - ACE_Time_Value *ptime = ACE_BIT_ENABLED (role, MCT_Config::PRODUCER) - ? &wait_time : 0; - if (ACE_Thread_Manager::instance ()->wait (ptime) == -1) - { - if (errno == ETIME) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("maximum wait time of %d msec exceeded\n"), - max_wait.msec ())); - else - ACE_OS::perror (ACE_TEXT ("wait")); - - ++error; - } - } - - delete task; - ACE_END_TEST; - return (retval == 0 && error == 0) ? 0 : 1; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Vector<ACE_CString *>; -template class ACE_Array_Base<ACE_String_Base<char> *>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Vector<ACE_CString *> -#pragma instantiate ACE_Array_Base<ACE_String_Base<char> *> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#else -int -ACE_TMAIN (int, ACE_TCHAR *argv[]) -{ - ACE_START_TEST (ACE_TEXT ("Multicast_Test")); - - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("error: %s must be run on a platform ") - ACE_TEXT ("that support IP multicast.\n"), - argv[0])); - ACE_END_TEST; - return 1; -} -#endif /* ACE_HAS_IP_MULTICAST && ACE_HAS_THREADS */ diff --git a/tests/Multicast_Test.dsp b/tests/Multicast_Test.dsp deleted file mode 100644 index 6bcd158a666..00000000000 --- a/tests/Multicast_Test.dsp +++ /dev/null @@ -1,162 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Multicast_Test" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=Multicast_Test - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "Multicast_Test.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "Multicast_Test.mak" CFG="Multicast_Test - Win32 Release"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Multicast_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Multicast_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Multicast_Test - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Multicast_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "Multicast_Test - Win32 Static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Static_Debug"
-# PROP BASE Intermediate_Dir "Static_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Static_Debug"
-# PROP Intermediate_Dir "Static_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Multicast_Test - Win32 Static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Static_Release"
-# PROP BASE Intermediate_Dir "Static_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Static_Release"
-# PROP Intermediate_Dir "Static_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Multicast_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Multicast_Test - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-
-!ENDIF
-
-# Begin Target
-
-# Name "Multicast_Test - Win32 Static Debug"
-# Name "Multicast_Test - Win32 Static Release"
-# Name "Multicast_Test - Win32 Release"
-# Name "Multicast_Test - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-# Begin Source File
-
-SOURCE=.\Multicast_Test.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=.\test_config.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/tests/OS_Test.cpp b/tests/OS_Test.cpp index 3c7de4ece39..8a634164216 100644 --- a/tests/OS_Test.cpp +++ b/tests/OS_Test.cpp @@ -231,24 +231,6 @@ string_emulation_test (void) ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (42, itoa1, 16), "2a") == 0); - - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (8, itoa1, 10), - "8") == 0); - - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (-8, itoa1, 10), - "-8") == 0); - - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (20345, itoa1, 10), - "20345") == 0); - - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (-20345, itoa1, 10), - "-20345") == 0); - - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (4566733, itoa1, 10), - "4566733") == 0); - - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (-4566733, itoa1, 10), - "-4566733") == 0); } #if defined (ACE_HAS_WCHAR) diff --git a/tests/Obstack_Test.cpp b/tests/Obstack_Test.cpp index 110fea4eba9..ad424254b98 100644 --- a/tests/Obstack_Test.cpp +++ b/tests/Obstack_Test.cpp @@ -29,8 +29,6 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) ACE_START_TEST (ACE_TEXT ("Obstack_Test")); int errors = 0; - // For this test, the length of the ACE_Obstack must be larger than - // both of these strings, but less than their sum. const ACE_TCHAR str1[] = ACE_TEXT ("Mary had a little lamb."); const ACE_TCHAR str2[] = ACE_TEXT ("It's fleece was white as snow; but...."); ACE_Obstack_T<ACE_TCHAR> stack (sizeof (str1) + 1); diff --git a/tests/Proactor_Test.cpp b/tests/Proactor_Test.cpp index 0d2230049a8..a99e8fffd49 100644 --- a/tests/Proactor_Test.cpp +++ b/tests/Proactor_Test.cpp @@ -219,7 +219,6 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) ACE_TEXT ("(%t) Create Proactor Type = AIOCB\n"))); break; -#if defined(ACE_HAS_POSIX_REALTIME_SIGNALS) case SIG: ACE_NEW_RETURN (proactor_impl, ACE_POSIX_SIG_Proactor (max_op), @@ -227,7 +226,6 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Create Proactor Type = SIG\n"))); break; -#endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ # if defined (sun) case SUN: @@ -315,7 +313,7 @@ MyTask::stop () if (this->proactor_ != 0) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT (" (%t) Calling End Proactor event loop\n"))); + ACE_TEXT ("End Proactor event loop\n"))); ACE_Proactor::end_event_loop (); } @@ -362,10 +360,6 @@ public: long get_total_w (void) { return this->total_w_; } long get_total_r (void) { return this->total_r_; } - // This is called to pass the new connection's addresses. - virtual void addresses (const ACE_INET_Addr& peer, - const ACE_INET_Addr& local); - /// This is called after the new connection has been accepted. virtual void open (ACE_HANDLE handle, ACE_Message_Block &message_block); @@ -397,12 +391,12 @@ private: ACE_HANDLE handle_; ACE_SYNCH_MUTEX lock_; - long io_count_; // Number of currently outstanding I/O requests + long io_count_; int flg_cancel_; - size_t total_snd_; // Number of bytes successfully sent - size_t total_rcv_; // Number of bytes successfully received - long total_w_; // Number of write operations - long total_r_; // Number of read operations + size_t total_snd_; + size_t total_rcv_; + long total_w_; + long total_r_; }; class Acceptor : public ACE_Asynch_Acceptor<Receiver> @@ -460,6 +454,9 @@ Acceptor::~Acceptor (void) void Acceptor::cancel_all (void) { + // This method can be called only after proactor event loop is done + // in all threads. + ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_); this->cancel (); @@ -495,8 +492,7 @@ Acceptor::on_new_receiver (Receiver & rcvr) this->sessions_++; this->list_receivers_[rcvr.index_] = &rcvr; ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) Acceptor: receiver %d up; now have %d.\n"), - rcvr.index_, + ACE_TEXT ("Receiver::CTOR sessions_ = %d\n"), this->sessions_)); } @@ -517,9 +513,22 @@ Acceptor::on_delete_receiver (Receiver & rcvr) && this->list_receivers_[rcvr.index_] == &rcvr) this->list_receivers_[rcvr.index_] = 0; + ACE_TCHAR bufs [256]; + ACE_TCHAR bufr [256]; + + ACE_OS::sprintf (bufs, ACE_TEXT ("%d(%ld)"), + rcvr.get_total_snd (), + rcvr.get_total_w ()); + + ACE_OS::sprintf (bufr, ACE_TEXT ("%d(%ld)"), + rcvr.get_total_rcv (), + rcvr.get_total_r ()); + ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) Acceptor: receiver %d gone; %d remain\n"), + ACE_TEXT ("Receiver::~DTOR index=%d snd=%s rcv=%s sessions_=%d\n"), rcvr.index_, + bufs, + bufr, this->sessions_)); } @@ -562,41 +571,6 @@ Receiver::Receiver (Acceptor * acceptor, int index) Receiver::~Receiver (void) { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) Receiver %d dtor; %d sends (%d bytes); ") - ACE_TEXT ("%d recvs (%d bytes)\n"), - this->index_, - this->total_w_, this->total_snd_, - this->total_r_, this->total_rcv_)); - if (this->io_count_ != 0) - ACE_ERROR ((LM_WARNING, - ACE_TEXT ("(%t) Receiver %d deleted with ") - ACE_TEXT ("%d I/O outstanding\n"), - this->index_, - this->io_count_)); - - // This test bounces data back and forth between Senders and Receivers. - // Therefore, if there was significantly more data in one direction, that's - // a problem. Remember, the byte counts are unsigned values. - int issue_data_warning = 0; - if (this->total_snd_ > this->total_rcv_) - { - if (this->total_rcv_ == 0) - issue_data_warning = 1; - else if (this->total_snd_ / this->total_rcv_ > 2) - issue_data_warning = 1; - } - else - { - if (this->total_snd_ == 0) - issue_data_warning = 1; - else if (this->total_rcv_ / this->total_snd_ > 2) - issue_data_warning = 1; - } - if (issue_data_warning) - ACE_DEBUG ((LM_WARNING, - ACE_TEXT ("(%t) Above byte counts look odd; need review\n"))); - if (this->acceptor_ != 0) this->acceptor_->on_delete_receiver (*this); @@ -620,45 +594,20 @@ Receiver::cancel () void -Receiver::addresses (const ACE_INET_Addr& peer, const ACE_INET_Addr&) -{ - ACE_TCHAR str[256]; - if (0 == peer.addr_to_string (str, sizeof (str) / sizeof (ACE_TCHAR))) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) Receiver %d connection from %s\n"), - this->index_, - str)); - else - ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) Receiver %d %p\n"), - this->index_, - ACE_TEXT ("addr_to_string"))); - return; -} - - -void Receiver::open (ACE_HANDLE handle, ACE_Message_Block &) { { ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->lock_); - // Don't buffer serial sends. this->handle_ = handle; - int nodelay = 1; - ACE_SOCK_Stream option_setter (handle); - if (-1 == option_setter.set_option (IPPROTO_TCP, - TCP_NODELAY, - &nodelay, - sizeof (nodelay))) - ACE_ERROR ((LM_ERROR, "%p\n", "set_option")); if (this->ws_.open (*this, this->handle_) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%t) %p\n"), + ACE_TEXT ("%p\n"), ACE_TEXT ("Receiver::ACE_Asynch_Write_Stream::open"))); else if (this->rs_.open (*this, this->handle_) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%t) %p\n"), + ACE_TEXT ("%p\n"), ACE_TEXT ("Receiver::ACE_Asynch_Read_Stream::open"))); else this->initiate_read_stream (); @@ -685,7 +634,7 @@ Receiver::initiate_read_stream (void) { mb->release (); ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%t) %p\n"), + ACE_TEXT ("%p\n"), ACE_TEXT ("Receiver::ACE_Asynch_Stream::read")), -1); } @@ -708,7 +657,7 @@ Receiver::initiate_write_stream (ACE_Message_Block &mb, size_t nbytes) { mb.release (); ACE_ERROR_RETURN((LM_ERROR, - ACE_TEXT ("(%t) Receiver::ACE_Asynch_Write_Stream::write nbytes <0 ")), + ACE_TEXT ("Receiver::ACE_Asynch_Write_Stream::write nbytes <0 ")), -1); } @@ -716,7 +665,7 @@ Receiver::initiate_write_stream (ACE_Message_Block &mb, size_t nbytes) { mb.release (); ACE_ERROR_RETURN((LM_ERROR, - ACE_TEXT ("(%t) %p\n"), + ACE_TEXT ("%p\n"), ACE_TEXT ("Receiver::ACE_Asynch_Write_Stream::write")), -1); } @@ -737,12 +686,14 @@ Receiver::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result) // Reset pointers. mb.rd_ptr ()[result.bytes_transferred ()] = '\0'; - if (loglevel == 0) + if (loglevel == 0 + || result.bytes_transferred () == 0 + || result.error () != 0) { LogLocker log_lock; ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) **** Receiver %d: handle_read_stream() ****\n"), + ACE_TEXT ("**** Receiver::handle_read_stream() SessionId = %d ****\n"), this->index_)); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s = %d\n"), @@ -779,31 +730,6 @@ Receiver::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("**** end of message ****************\n"))); } - else if (result.error () != 0) - { - ACE_Log_Priority prio; -#if defined (ACE_WIN32) - if (result.error () == ERROR_OPERATION_ABORTED) - prio = LM_DEBUG; -#else - if (result.error () == ECANCELED) - prio = LM_DEBUG; -#endif /* ACE_WIN32 */ - else - prio = LM_ERROR; - ACE_Log_Msg::instance ()->errnum (result.error ()); - ACE_Log_Msg::instance ()->log (prio, - ACE_TEXT ("(%t) Receiver %d; %p\n"), - this->index_, - ACE_TEXT ("read")); - } - else - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) Receiver %d: read %d bytes\n"), - this->index_, - result.bytes_transferred ())); - } if (result.error () == 0 && result.bytes_transferred () > 0) { @@ -834,7 +760,9 @@ Receiver::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result) ACE_Message_Block & mb = result.message_block (); - if (loglevel == 0) + if (loglevel == 0 || + result.bytes_transferred () == 0 || + result.error () != 0) { LogLocker log_lock; @@ -842,7 +770,7 @@ Receiver::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result) mb.rd_ptr (mb.rd_ptr () - result.bytes_transferred ()); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) **** Receiver %d: handle_write_stream() ****\n"), + ACE_TEXT ("**** Receiver::handle_write_stream() SessionId = %d ****\n"), this->index_)); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s = %d\n"), @@ -879,31 +807,6 @@ Receiver::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("**** end of message ****************\n"))); } - else if (result.error () != 0) - { - ACE_Log_Priority prio; -#if defined (ACE_WIN32) - if (result.error () == ERROR_OPERATION_ABORTED) - prio = LM_DEBUG; -#else - if (result.error () == ECANCELED) - prio = LM_DEBUG; -#endif /* ACE_WIN32 */ - else - prio = LM_ERROR; - ACE_Log_Msg::instance ()->errnum (result.error ()); - ACE_Log_Msg::instance ()->log (prio, - ACE_TEXT ("(%t) Receiver %d; %p\n"), - this->index_, - ACE_TEXT ("write")); - } - else - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) Receiver %d: wrote %d bytes ok\n"), - this->index_, - result.bytes_transferred ())); - } mb.release (); @@ -945,10 +848,6 @@ public: long get_total_w (void) { return this->total_w_; } long get_total_r (void) { return this->total_r_; } - // This is called to pass the new connection's addresses. - virtual void addresses (const ACE_INET_Addr& peer, - const ACE_INET_Addr& local); - virtual void handle_read_stream (const ACE_Asynch_Read_Stream::Result &result); // This is called when asynchronous reads from the socket complete @@ -958,8 +857,7 @@ public: private: int initiate_read_stream (void); int initiate_write_stream (void); - void cancel (void); - void close (void); + void cancel (); int index_; Connector * connector_; @@ -994,7 +892,6 @@ public: int start (const ACE_INET_Addr &addr, int num); void stop (void); void cancel_all (void); - void close_all (void); // Virtual from ACE_Asynch_Connector Sender *make_handler (void); @@ -1036,6 +933,8 @@ Connector::~Connector (void) void Connector::cancel_all(void) { + // This method can be called only after proactor event loop is done + // in all threads. ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_); this->cancel (); @@ -1048,21 +947,6 @@ Connector::cancel_all(void) return; } - -void -Connector::close_all (void) -{ - ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, monitor, this->lock_); - - for (int i = 0; i < MAX_SENDERS; ++i) - { - if (this->list_senders_[i] != 0) - this->list_senders_[i]->close (); - } - return; -} - - void Connector::stop (void) { @@ -1085,8 +969,7 @@ Connector::on_new_sender (Sender &sndr) this->sessions_++; this->list_senders_[sndr.index_] = &sndr; ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) Connector: sender %d up; now have %d.\n"), - sndr.index_, + ACE_TEXT ("Sender::CTOR sessions_ = %d\n"), this->sessions_)); } @@ -1106,9 +989,22 @@ Connector::on_delete_sender (Sender &sndr) && this->list_senders_[sndr.index_] == &sndr) this->list_senders_[sndr.index_] = 0; + ACE_TCHAR bufs [256]; + ACE_TCHAR bufr [256]; + + ACE_OS::sprintf (bufs, ACE_TEXT ("%d(%ld)"), + sndr.get_total_snd (), + sndr.get_total_w ()); + + ACE_OS::sprintf (bufr, ACE_TEXT ("%d(%ld)"), + sndr.get_total_rcv (), + sndr.get_total_r ()); + ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) Connector: sender %d gone; %d remain\n"), + ACE_TEXT ("Sender::~DTOR index=%d snd=%s rcv=%s sessions_=%d\n"), sndr.index_, + bufs, + bufr, this->sessions_)); } @@ -1156,7 +1052,7 @@ Connector::start (const ACE_INET_Addr& addr, int num) if (this->open (1, 0, 1) != 0) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("(%t) %p\n"), + ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("Connector::open failed"))); return rc; } @@ -1166,8 +1062,8 @@ Connector::start (const ACE_INET_Addr& addr, int num) if (this->connect (addr) != 0) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("Connector::connect failed"))); + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("Connector::connect failed"))); break; } } @@ -1192,40 +1088,6 @@ Sender::Sender (Connector * connector, int index) Sender::~Sender (void) { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) Sender %d dtor; %d sends (%d bytes); ") - ACE_TEXT ("%d recvs (%d bytes)\n"), - this->index_, - this->total_w_, this->total_snd_, - this->total_r_, this->total_rcv_)); - if (this->io_count_ != 0) - ACE_ERROR ((LM_WARNING, - ACE_TEXT ("(%t) Sender %d deleted with %d I/O outstanding\n"), - this->index_, - this->io_count_)); - - // This test bounces data back and forth between Senders and Receivers. - // Therefore, if there was significantly more data in one direction, that's - // a problem. Remember, the byte counts are unsigned values. - int issue_data_warning = 0; - if (this->total_snd_ > this->total_rcv_) - { - if (this->total_rcv_ == 0) - issue_data_warning = 1; - else if (this->total_snd_ / this->total_rcv_ > 2) - issue_data_warning = 1; - } - else - { - if (this->total_snd_ == 0) - issue_data_warning = 1; - else if (this->total_rcv_ / this->total_snd_ > 2) - issue_data_warning = 1; - } - if (issue_data_warning) - ACE_DEBUG ((LM_WARNING, - ACE_TEXT ("(%t) Above byte counts look odd; need review\n"))); - if (this->connector_ != 0) this->connector_->on_delete_sender (*this); @@ -1249,62 +1111,24 @@ Sender::cancel () return; } -void -Sender::close () -{ - ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->lock_); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) Closing Sender %d; %d I/O outstanding\n"), - this->index_, this->io_count_)); - ACE_OS::closesocket (this->handle_); - this->handle_ = ACE_INVALID_HANDLE; - return; -} - - -void -Sender::addresses (const ACE_INET_Addr& /* peer */, const ACE_INET_Addr& local) -{ - ACE_TCHAR str[256]; - if (0 == local.addr_to_string (str, sizeof (str) / sizeof (ACE_TCHAR))) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) Sender %d connected on %s\n"), - this->index_, - str)); - else - ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) Receiver %d %p\n"), - this->index_, - ACE_TEXT ("addr_to_string"))); - return; -} - void Sender::open (ACE_HANDLE handle, ACE_Message_Block &) { { ACE_GUARD (ACE_SYNCH_MUTEX, monitor, this->lock_); - - // Don't buffer serial sends. this->handle_ = handle; - int nodelay = 1; - ACE_SOCK_Stream option_setter (handle); - if (option_setter.set_option (IPPROTO_TCP, - TCP_NODELAY, - &nodelay, - sizeof (nodelay))) - ACE_ERROR ((LM_ERROR, "%p\n", "set_option")); // Open ACE_Asynch_Write_Stream if (this->ws_.open (*this, this->handle_) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%t) %p\n"), + ACE_TEXT ("%p\n"), ACE_TEXT ("Sender::ACE_Asynch_Write_Stream::open"))); // Open ACE_Asynch_Read_Stream else if (this->rs_.open (*this, this->handle_) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%t) %p\n"), + ACE_TEXT ("%p\n"), ACE_TEXT ("Sender::ACE_Asynch_Read_Stream::open"))); else if (this->initiate_write_stream () == 0) @@ -1361,7 +1185,7 @@ Sender::initiate_write_stream (void) { mb1->release (); ACE_ERROR_RETURN((LM_ERROR, - ACE_TEXT ("(%t) %p\n"), + ACE_TEXT ("%p\n"), ACE_TEXT ("Sender::ACE_Asynch_Stream::writev")), -1); } @@ -1379,7 +1203,7 @@ Sender::initiate_write_stream (void) { mb->release (); ACE_ERROR_RETURN((LM_ERROR, - ACE_TEXT ("(%t) %p\n"), + ACE_TEXT ("%p\n"), ACE_TEXT ("Sender::ACE_Asynch_Stream::write")), -1); } @@ -1443,7 +1267,7 @@ Sender::initiate_read_stream (void) { mb1->release (); ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%t) %p\n"), + ACE_TEXT ("%p\n"), ACE_TEXT ("Sender::ACE_Asynch_Read_Stream::readv")), -1); } @@ -1466,7 +1290,7 @@ Sender::initiate_read_stream (void) { mb->release (); ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%t) %p\n"), + ACE_TEXT ("%p\n"), ACE_TEXT ("Sender::ACE_Asynch_Read_Stream::read")), -1); } @@ -1485,12 +1309,14 @@ Sender::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result) ACE_Message_Block & mb = result.message_block (); - if (loglevel == 0) + if (loglevel == 0 + || result.bytes_transferred () == 0 + || result.error () != 0) { LogLocker log_lock; ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) **** Sender %d: handle_write_stream() ****\n"), + ACE_TEXT ("**** Sender::handle_write_stream() SessionId = %d ****\n"), index_)); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s = %d\n"), @@ -1566,31 +1392,6 @@ Sender::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("**** end of message ****************\n"))); } - else if (result.error () != 0) - { - ACE_Log_Priority prio; -#if defined (ACE_WIN32) - if (result.error () == ERROR_OPERATION_ABORTED) - prio = LM_DEBUG; -#else - if (result.error () == ECANCELED) - prio = LM_DEBUG; -#endif /* ACE_WIN32 */ - else - prio = LM_ERROR; - ACE_Log_Msg::instance ()->errnum (result.error ()); - ACE_Log_Msg::instance ()->log (prio, - ACE_TEXT ("(%t) Sender %d; %p\n"), - this->index_, - ACE_TEXT ("write")); - } - else - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) Sender %d: wrote %d bytes ok\n"), - this->index_, - result.bytes_transferred ())); - } mb.release (); @@ -1598,11 +1399,9 @@ Sender::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result) { this->total_snd_ += result.bytes_transferred (); - if (duplex != 0) // full duplex, continue write - { - if ((this->total_snd_- this->total_rcv_) < 1024*32 ) //flow control - this->initiate_write_stream (); - } + if (duplex != 0 && // full duplex, continue write + (this->total_snd_- this->total_rcv_) < 1024*32 ) //flow control + this->initiate_write_stream (); else // half-duplex read reply, after read we will start write this->initiate_read_stream (); } @@ -1622,12 +1421,14 @@ Sender::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result) ACE_Message_Block & mb = result.message_block (); - if (loglevel == 0) + if (loglevel == 0 + || result.bytes_transferred () == 0 + || result.error () != 0) { LogLocker log_lock; ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) **** Sender %d: handle_read_stream() ****\n"), + ACE_TEXT ("**** Sender::handle_read_stream() SessionId = %d ****\n"), index_)); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s = %d\n"), @@ -1686,31 +1487,6 @@ Sender::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("**** end of message ****************\n"))); } - else if (result.error () != 0) - { - ACE_Log_Priority prio; -#if defined (ACE_WIN32) - if (result.error () == ERROR_OPERATION_ABORTED) - prio = LM_DEBUG; -#else - if (result.error () == ECANCELED) - prio = LM_DEBUG; -#endif /* ACE_WIN32 */ - else - prio = LM_ERROR; - ACE_Log_Msg::instance ()->errnum (result.error ()); - ACE_Log_Msg::instance ()->log (prio, - ACE_TEXT ("(%t) Sender %d; %p\n"), - this->index_, - ACE_TEXT ("read")); - } - else - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) Sender %d: read %d bytes ok\n"), - this->index_, - result.bytes_transferred ())); - } mb.release (); @@ -1815,22 +1591,21 @@ parse_args (int argc, ACE_TCHAR *argv[]) max_aio_operations = 512; // POSIX Proactor params #if defined (sun) proactor_type = SUN; // Proactor type for SunOS - threads = 1; // aiosuspend() not MT Safe. #else proactor_type = DEFAULT; // Proactor type = default - threads = 3; // size of Proactor thread pool #endif + threads = 3; // size of Proactor thread pool #if defined(__sgi) || defined (ACE_LINUX_COMMON_H) ACE_DEBUG (( LM_DEBUG, - "Weak AIO implementation, test will work with 3 clients")); - senders = 3; // number of senders + "Weak AIO implementation, test will work with 1 client")); + senders = 1; // number of senders #else - senders = 10; // number of senders + senders = 20; // number of senders #endif loglevel = 1; // log level : 0 full/ 1 only errors - seconds = 15; // time to run in seconds + seconds = 20; // time to run in seconds return 0; } @@ -1931,44 +1706,29 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_OS::sleep (seconds); } - // Now close all the connector/senders. This should trip all the receivers - // to close as well. + //Cancel all pending AIO on Connector and Senders ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) Close Connector/Senders: sessions_=%d\n"), + ACE_TEXT ("Cancel Connector/Senders: sessions_=%d\n"), connector.get_number_sessions () )); - connector.close_all (); - - // Wait til all the sessions run down. - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Sleeping til sessions run down.\n"))); - while (acceptor.get_number_sessions () > 0 || - connector.get_number_sessions () > 0 ) - ACE_OS::sleep (1); -#if 0 - // Cancel all pending AIO on Connector and Senders - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) Cancel Connector/Senders: sessions_=%d\n"), - connector.get_number_sessions () - )); - connector.cancel_all (); -#endif + //connector.cancel_all (); //Cancel all pending AIO on Acceptor And Receivers ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) Cancel Acceptor/Receivers:sessions_=%d\n"), + ACE_TEXT ("Cancel Acceptor/Receivers:sessions_=%d\n"), acceptor.get_number_sessions () )); - acceptor.cancel_all (); + //acceptor.cancel_all (); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) Stop Thread Pool Task\n") + ACE_TEXT ("Stop Thread Pool Task\n") )); task1.stop (); // As Proactor event loop now is inactive it is safe to destroy all // Senders ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) Stop Connector/Senders: sessions_=%d\n"), + ACE_TEXT ("Stop Connector/Senders: sessions_=%d\n"), connector.get_number_sessions () )); connector.stop (); @@ -1976,7 +1736,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // As Proactor event loop now is inactive it is safe to destroy all // Receivers ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) Stop Acceptor/Receivers:sessions_=%d\n"), + ACE_TEXT ("Stop Acceptor/Receivers:sessions_=%d\n"), acceptor.get_number_sessions () )); acceptor.stop (); diff --git a/tests/README b/tests/README index af82f01eca5..2c151a04a01 100644 --- a/tests/README +++ b/tests/README @@ -19,17 +19,14 @@ $ACE_ROOT/tests: 1. Use appropriate ACE_START_TEST and ACE_END_TEST macros in main () -2. Add new project entry to the tests.mpc file. +2. Add test to Makefile -3. Add test to Makefile. * +3. Add test to MS project files (tests.dsp and + version_tests/version_tests.dsp) -4. Add a new MS project file, e.g., <test>.dsp, then add and entry for - it to the tests.dsp file. * +4. Add test to all or most of these: -5. Add test to run_test.lst. - -* Steps 3 and 4 will go away once the mpc architecture is fully integrated, - since the Makefile and project files can be created on-the-fly by mpc. + run_tests.lst, run_tests.bat, run_tests.psosim, and run_tests.vxworks. ________________________________________ @@ -78,5 +75,13 @@ Notes: UNIXserver.conf and UNIXclerk.conf (and for Win32, Win32server.conf and Win32clerk.conf). +Please see run_tests.vxworks for information on the status of tests on +VxWorks. + +Please see run_tests.psosim for information on the status of tests on +pSOSim. Run_tests.psosim is an executable shell script that runs all +tests that are (believed) relevant to the single threaded port to +pSOSim. + If you have any questions/suggestions, please send email to ace-users@cs.wustl.edu. diff --git a/tests/RMCast/Makefile b/tests/RMCast/Makefile index 3838516de1d..f7baaa22f24 100644 --- a/tests/RMCast/Makefile +++ b/tests/RMCast/Makefile @@ -131,9 +131,6 @@ endif $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -258,9 +255,6 @@ endif $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Node.h \ $(ACE_ROOT)/ace/Node.cpp \ @@ -365,7 +359,6 @@ endif $(ACE_ROOT)/ace/RMCast/RMCast_Reassembly.i .obj/RMCast_UDP_Best_Effort_Test.o .obj/RMCast_UDP_Best_Effort_Test.so .shobj/RMCast_UDP_Best_Effort_Test.o .shobj/RMCast_UDP_Best_Effort_Test.so: RMCast_UDP_Best_Effort_Test.cpp \ - ../test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -536,9 +529,6 @@ endif $(ACE_ROOT)/ace/RMCast/RMCast_Reassembly.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -675,9 +665,6 @@ endif $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ @@ -706,7 +693,6 @@ endif $(ACE_ROOT)/ace/Stream_Modules.cpp .obj/RMCast_Retransmission_Test.o .obj/RMCast_Retransmission_Test.so .shobj/RMCast_Retransmission_Test.o .shobj/RMCast_Retransmission_Test.so: RMCast_Retransmission_Test.cpp \ - ../test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -842,9 +828,6 @@ endif $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ @@ -1010,9 +993,6 @@ endif $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ diff --git a/tests/Recursive_Condition_Test.cpp b/tests/Recursive_Condition_Test.cpp index 6fa0eb56245..76dbb8c0abd 100644 --- a/tests/Recursive_Condition_Test.cpp +++ b/tests/Recursive_Condition_Test.cpp @@ -23,7 +23,7 @@ #include "test_config.h" #include "ace/Event_Handler.h" #include "ace/Synch.h" -#include "ace/Log_Msg.h" +#include "ace/Trace.h" #include "ace/Thread_Manager.h" #include "ace/Timer_Heap.h" #include "ace/Timer_Queue_Adapters.h" @@ -37,60 +37,39 @@ ACE_RCSID(tests, Recursive_Condition_Test, "$Id$") class Test_Handler : public ACE_Event_Handler { public: - Test_Handler () : nr_expirations_ (0) {} - int nr_expirations (void) { return this->nr_expirations_; } - virtual int handle_timeout (const ACE_Time_Value &, - const void *arg) + const void * /*arg*/) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Test_Handler::handle_timeout\n"))); - ++this->nr_expirations_; + ACE_TRACE ("Test_Handler::handle_timeout"); - void *nc_arg = ACE_const_cast (void *, arg); - Thread_Timer_Queue *timer_queue = - ACE_reinterpret_cast (Thread_Timer_Queue *, nc_arg); + /*Thread_Timer_Queue *timer_queue = + (Thread_Timer_Queue *) arg;*/ ACE_Time_Value timeout = ACE_OS::gettimeofday () + ACE_Time_Value (1, 0); + ACE_UNUSED_ARG (timeout); + ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) scheduling new timer 1 sec from now\n"))); - if (timer_queue->schedule (this, timer_queue, timeout) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("schedule failed"))); + ACE_TEXT ("(%P|%t) scheduling timer\n"))); + /* + int timer_id = + timer_queue->schedule (this, timer_queue, timeout); + */ return 0; } - -private: - int nr_expirations_; }; -// These are for the basic functionality tests. +// These are for the second test - simple wait/signal. ACE_SYNCH_RECURSIVE_MUTEX mutex_; ACE_SYNCH_RECURSIVE_CONDITION condition_(mutex_); -// Test driver sets this to non-zero before spawning and to zero for waiter. -int protected_int = 0; - -ACE_THR_FUNC_RETURN waiter (void *) -{ - if (mutex_.acquire () != 0) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("acquire")), 0); - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) waiting for cv signal...\n"))); - if (condition_.wait () == 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) woken up!!!\n"))); - else - ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) %p\n"), ACE_TEXT ("wait"))); - - int copy_int = protected_int; // Copy it in case it's erroneously changing - if (copy_int != 0) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) waiter found protected_int %d\n"), - copy_int)); - - if (mutex_.release () != 0) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) %p\n"), ACE_TEXT ("release"))); +ACE_THR_FUNC_RETURN waiter (void *) { + ACE_ASSERT (mutex_.acquire () == 0); + ACE_TRACE (ACE_TEXT ("(%t) waiting for cv signal...\n")); + condition_.wait(); + ACE_TRACE (ACE_TEXT ("(%t) woken up!!!\n")); + mutex_.release (); return 0; } @@ -98,28 +77,26 @@ ACE_THR_FUNC_RETURN waiter (void *) int test_1(void) { - protected_int = 1; if (ACE_Thread_Manager::instance()->spawn (waiter) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("test 1 spawn")), - 1); + { + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("spawn")), 1); + } ACE_OS::sleep (2); if (mutex_.acquire () == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("test 1 mutex acquire")), - 1); + { + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), + ACE_TEXT ("mutex acquire")), + 1); + } + ACE_TRACE (ACE_TEXT ("(%t) signaling condition...\n")); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) signaling condition...\n"))); - protected_int = 0; if (condition_.signal () == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("test 1 signal"))); - - if (mutex_.release () == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("test 1 release"))); + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("signal"))); + } + mutex_.release (); ACE_Thread_Manager::instance ()->wait (); return 0; } @@ -127,29 +104,27 @@ test_1(void) int test_2(void) { - protected_int = 1; if (ACE_Thread_Manager::instance()->spawn (waiter) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("test 2 spawn")), - 1); + { + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("spawn")), 1); + } ACE_OS::sleep (2); if (mutex_.acquire () == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("test 2 mutex acquire")), - 1); + { + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), + ACE_TEXT ("mutex acquire")), + 1); + } ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) signaling condition...\n"))); + if (condition_.signal () == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("test 2 signal"))); + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("signal"))); + } - // Wait to clear protected_int to be sure cv properly reacquires the - // mutex before returning control to caller. ACE_OS::sleep(2); - protected_int = 0; - if (mutex_.release () == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("test 2 release"))); - + mutex_.release (); ACE_Thread_Manager::instance ()->wait (); return 0; } @@ -157,26 +132,25 @@ test_2(void) int test_3() { - protected_int = 1; - if (ACE_Thread_Manager::instance()->spawn_n (4, waiter) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), - ACE_TEXT ("test 3 spawn")), 1); + if (ACE_Thread_Manager::instance()->spawn_n (4,waiter) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("spawn")), 1); + } ACE_OS::sleep (2); if (mutex_.acquire () == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("test 3 mutex acquire")), + { + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), + ACE_TEXT ("mutex acquire")), 1); + } + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) signaling condition...\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) broadcasting condition...\n"))); if (condition_.broadcast () == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("test 3 broadcast"))); - protected_int = 0; - if (mutex_.release () == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("test 3 release"))); - + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("signal"))); + } + mutex_.release (); ACE_Thread_Manager::instance ()->wait (); return 0; @@ -185,52 +159,44 @@ test_3() int test_4() { - const int recurse_count = 3; - - protected_int = recurse_count; if (ACE_Thread_Manager::instance()->spawn (waiter) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("spawn")), 1); + { + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("spawn")), 1); + } ACE_OS::sleep (2); - int i; - for (i = 0; i < recurse_count; ++i) + for(int i = 0; i < 3; ++i){ + if (mutex_.acquire () == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), + ACE_TEXT ("mutex acquire")), + 1); + } + } + + if (mutex_.get_nesting_level() != 3) { - if (mutex_.acquire () == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("pass %d, %p\n"), - i + 1, - ACE_TEXT ("recursive acquire")), - 1); - } + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%d\n"), + ACE_TEXT("get_nestling_level")), + 1); } - if (mutex_.get_nesting_level () != i) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("test 4 nesting level %d;"), - ACE_TEXT (" should be %d\n"), - mutex_.get_nesting_level (), i), - 1); - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) signaling condition...\n"))); + ACE_TRACE (ACE_TEXT ("(%t) signaling condition...\n")); if (condition_.signal () == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("test 4 signal")), - 1); - - for (i = 0; i < recurse_count; ++i) { - // Only decrement - be sure all the waiting threads are not released - // before we release the mutex the correct number of times. - --protected_int; - mutex_.release (); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("signal"))); } - if (mutex_.get_nesting_level() != 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT("(%t) nesting level %d; should be 0\n"), - mutex_.get_nesting_level ()), - 1); + for(int k = 0; k < 3; ++k){ + mutex_.release (); + } + if (mutex_.get_nesting_level() != 0) + { + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%d\n"), + ACE_TEXT("get_nestling_level")), + 1); + } ACE_Thread_Manager::instance ()->wait (); return 0; } @@ -242,57 +208,47 @@ ACE_TMAIN (int, ACE_TCHAR *[]) ACE_START_TEST (ACE_TEXT ("Recursive_Condition_Test")); #if defined (ACE_HAS_THREADS) +#if 0 + Thread_Timer_Queue timer_queue; + Test_Handler handler; + int status = timer_queue.activate (); + + ACE_ASSERT (status == 0); + + ACE_Time_Value timeout = + ACE_OS::gettimeofday() + ACE_Time_Value (1, 0); + + int timer_id = timer_queue.schedule (&handler, &timer_queue, timeout); - int status = 0; + ACE_OS::sleep (10); + timer_queue.deactivate (); + timer_queue.wait (); +#endif /* Test 1 - Simple test */ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Test 1...\n"))); if (test_1 () != 0) - ++status; + { + ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT("test #1")), 1); + } /* Test #2 - Sleep 2 seconds before releasing mutex */ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Test 2...\n"))); if (test_2 () != 0) - ++status; + { + ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT("test #2")), 1); + } /* Test #3 - One main thread - 4 subthreads */ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Test 3...\n"))); if (test_3 () != 0) - ++status; - - /* Test #4 - Multiple calls to mutex_.acquire and mutex_.release */ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Test 4...\n"))); - if (test_4 () != 0) - ++status; - - // Timer queue usage. - Thread_Timer_Queue timer_queue; - Test_Handler handler; - if (0 != timer_queue.activate ()) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) %p\n"), ACE_TEXT ("activate"))); - ++status; + ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT("test #3")), 1); } - ACE_Time_Value timeout = - ACE_OS::gettimeofday() + ACE_Time_Value (1, 0); - - if (-1 == timer_queue.schedule (&handler, &timer_queue, timeout)) + /* Test #4 - Multiple calls to mutex_.acquire and mutex_.release */ + if (test_4 () != 0) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) %p\n"), ACE_TEXT ("schedule"))); - ++status; + ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT("test #4")), 1); } - ACE_OS::sleep (10); - timer_queue.deactivate (); - timer_queue.wait (); - // Scheduling every second, waiting 10 seconds, should get at least 9 - int expirations = handler.nr_expirations (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Caught %d timer expirations\n"), - expirations)); - if (expirations < 9) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Should have caught at least 9\n"))); - #else ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE doesn't support recursive condition variables on this platform\n"))); diff --git a/tests/SSL/Makefile b/tests/SSL/Makefile index d8e8977b091..4956fc6e9c4 100644 --- a/tests/SSL/Makefile +++ b/tests/SSL/Makefile @@ -216,9 +216,6 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Exit.h \ - $(ACE_ROOT)/ace/Thread_Control.h \ - $(ACE_ROOT)/ace/Thread_Control.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ diff --git a/tests/Service_Config_Test.conf.xml b/tests/Service_Config_Test.conf.xml index f3273f0cb93..767e885c467 100644 --- a/tests/Service_Config_Test.conf.xml +++ b/tests/Service_Config_Test.conf.xml @@ -1,4 +1,5 @@ <?xml version='1.0'?> +<!DOCTYPE ACE_Svc_Conf "http://www.cs.wustl.edu/~kitty/svcconf.dtd"> <!-- Converted from Service_Config_Test.conf by svcconf-convert.pl --> <ACE_Svc_Conf> <!-- Dynamically loading each of the Service Objects below causes a --> diff --git a/tests/Simple_Message_Block_Test.cpp b/tests/Simple_Message_Block_Test.cpp index b98434885a7..1e6876cb584 100644 --- a/tests/Simple_Message_Block_Test.cpp +++ b/tests/Simple_Message_Block_Test.cpp @@ -171,41 +171,6 @@ ACE_TMAIN (int, ACE_TCHAR *[]) mb1->release (); } - { - // Checks failure of copy when "virtual" allocation (using mark) - // is too small - char message[]="abcdefghijklmnop"; - ACE_Message_Block mb1 (ACE_OS::strlen (message) + 1); - ACE_Message_Block mb2 (ACE_OS::strlen (message) + 1); - - // Resize mb2 so that we mark for use less than the allocated buffer - if (mb2.size (ACE_OS::strlen (message) + 1 - 10) == -1) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) Resize test failed ..\n"))); - } - - // We expect this to succeed - if (mb1.copy (message, ACE_OS::strlen (message) + 1) == -1) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) Copy test failed ..\n"))); - } - - // We expect this to fail - if (mb2.copy (message, ACE_OS::strlen (message) + 1) != -1) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) Copy test succeeded when it should have failed ..\n"))); - } - - // We also expect this to fail - if (mb2.copy (message) != -1) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) Copy test succeeded when it should have failed ..\n"))); - } - } ACE_END_TEST; return 0; } @@ -215,3 +180,4 @@ template class ACE_Lock_Adapter<ACE_SYNCH_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Lock_Adapter<ACE_SYNCH_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/tests/run_test.lst b/tests/run_test.lst index ff225f8dc6b..1b7233e1124 100644 --- a/tests/run_test.lst +++ b/tests/run_test.lst @@ -42,7 +42,6 @@ DLList_Test Dynamic_Priority_Test Enum_Interfaces_Test Env_Value_Test: !chorus -FIFO_Test: !Win32 Framework_Component_Test: !STATIC Future_Test Future_Set_Test @@ -70,7 +69,6 @@ MT_Reactor_Timer_Test: !VxWorks MT_Reactor_Upcall_Test: !VxWorks MT_SOCK_Test: !chorus Malloc_Test: !VxWorks -Multicast_Test: !ST Naming_Test: OTHER !chorus !LynxOS !Unicos !VxWorks New_Fail_Test: ALL !DISABLED Notify_Performance_Test @@ -110,7 +108,7 @@ SOCK_Connector_Test SOCK_Send_Recv_Test: !LynxOS SPIPE_Test: !VxWorks SString_Test -SV_Shared_Memory_Test: !MSVC !Unicos !VxWorks !RH_7.1 +SV_Shared_Memory_Test: !MSVC !Unicos !VxWorks Task_Test Thread_Manager_Test: !Unicos Thread_Mutex_Test: !chorus @@ -121,7 +119,7 @@ Timer_Queue_Test Timeprobe_Test Time_Service_Test: ALL !STATIC !DISABLED !missing_netsvcs TOKEN !chorus !Unicos Time_Value_Test -Token_Strategy_Test: !ST +Token_Strategy_Test Tokens_Test: ALL MSVC !DISABLED TOKEN !chorus !Unicos TP_Reactor_Test: ALL TSS_Test diff --git a/tests/run_tests_remote.lst b/tests/run_tests_remote.lst new file mode 100644 index 00000000000..3f993cdef22 --- /dev/null +++ b/tests/run_tests_remote.lst @@ -0,0 +1,92 @@ +ARGV_Test +Basic_Types_Test +Bound_Ptr_Test +chorus/Env_Value_Test +Capabilities_Test +Config_Test +Atomic_Op_Test +Auto_IncDec_Test +Object_Manager_Test +CDR_Array_Test +CDR_File_Test +CDR_Test +Dirent_Test +Semaphore_Test +TSS_Test +Log_Msg_Test +Timeprobe_Test +Time_Value_Test +High_Res_Timer_Test +SString_Test +Collection_Test +Unicos/libDLL_Test/DLL_Test +OTHER/chorus/LynxOS/Unicos/Naming_Test +Handle_Set_Test +OrdMultiSet_Test +chorus/Unicos/Mem_Map_Test +MEM_Stream_Test +Malloc_Test +Unicos/SV_Shared_Memory_Test +chorus/Unicos/MM_Shared_Memory_Test +DISABLED/Signal_Test +Sigset_Ops_Test +Timer_Queue_Test +DISABLED/MT_Reactor_Timer_Test +DISABLED/MT_Reactor_Upcall_Test +SOCK_Connector_Test +LynxOS/SOCK_Send_Recv_Test +Task_Test +Unicos/Thread_Manager_Test +DISABLED/Process_Manager_Test +LynxOS/Thread_Pool_Test +Future_Test +Future_Set_Test +RB_Tree_Test +Reactors_Test +Reactor_Exceptions_Test +Reactor_Notify_Test +Reactor_Dispatch_Order_Test +Reactor_Timer_Test +chorus/Reactor_Performance_Test +Notify_Performance_Test +Reader_Writer_Test +chorus/Priority_Reactor_Test +chorus/SOCK_Test +chorus/MT_SOCK_Test +SPIPE_Test +UPIPE_SAP_Test +Barrier_Test +Svc_Handler_Test +Buffer_Stream_Test +Priority_Buffer_Test +Dynamic_Priority_Test +Recursive_Mutex_Test +Reverse_Lock_Test +DISABLED/netsvcs_main/TOKEN/chorus/Unicos/Time_Service_Test +DISABLED/TOKEN/chorus/Unicos/Tokens_Test +Cache_Map_Manager_Test +LynxOS/Cached_Conn_Test +Cached_Accept_Conn_Test +Map_Manager_Test +Hash_Map_Manager_Test +Lazy_Map_Manager_Test +Hash_Map_Bucket_Iterator_Test +Map_Test +Message_Queue_Notifications_Test +chorus/Message_Queue_Test +chorus/Message_Queue_Test_Ex +chorus/Simple_Message_Block_Test +chorus/Message_Block_Test +chorus/Pipe_Test +chorus/Process_Mutex_Test +chorus/Thread_Mutex_Test +chorus/LynxOS/Process_Strategy_Test +Service_Config_Test +Unicos/Priority_Task_Test +IOStream_Test +Enum_Interfaces_Test +chorus/Upgradable_RW_Test +chorus/Conn_Test +DISABLED/New_Fail_Test +OS_Test +Refcounted_Auto_Ptr_Test diff --git a/tests/tests.dsw b/tests/tests.dsw index 47a6f8d263e..3d23d0440ce 100644 --- a/tests/tests.dsw +++ b/tests/tests.dsw @@ -681,18 +681,6 @@ Package=<4> ###############################################################################
-Project: "Multicast_Test"=".\Multicast_Test.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
Project: "Message_Queue_Test_Ex"=".\Message_Queue_Test_Ex.dsp" - Package Owner=<4>
Package=<5>
diff --git a/tests/tests.mpc b/tests/tests.mpc index 8b5bf53bdd9..79ff5c74016 100644 --- a/tests/tests.mpc +++ b/tests/tests.mpc @@ -503,15 +503,6 @@ project(Message Queue Notifications Test) : aceexe { } } -project(Multicast Test) : aceexe { - exename = Multicast_Test - Source_Files { - Multicast_Test.cpp - } - Header_Files { - } -} - project(Notify Performance Test) : aceexe { exename = Notify_Performance_Test Source_Files { |