diff options
54 files changed, 10089 insertions, 1209 deletions
diff --git a/ace/Makefile.ace b/ace/Makefile.ace index a20dc307cbc..efb4511fe84 100644 --- a/ace/Makefile.ace +++ b/ace/Makefile.ace @@ -117,6 +117,7 @@ CONNECTION_FILES = \ SOCKETS_FILES = \ Addr \ INET_Addr \ + Multihomed_INET_Addr \ IPC_SAP \ LSOCK \ LSOCK_Acceptor \ @@ -133,6 +134,9 @@ SOCKETS_FILES = \ SOCK_Dgram_Bcast \ SOCK_Dgram_Mcast \ SOCK_IO \ + SOCK_SEQPACK_Acceptor \ + SOCK_SEQPACK_Association \ + SOCK_SEQPACK_Connector \ SOCK_Stream IPC_FILES = \ ATM_Addr \ @@ -305,6 +309,7 @@ TEMPLATE_FILES = \ RB_Tree \ Select_Reactor_T \ Singleton \ + SOCK_Dgram_Mcast_T \ Strategies_T \ Stream \ Stream_Modules \ @@ -484,18 +489,6 @@ INSTALL = include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU -ifeq ($(shared_libs),1) -ifneq ($(SHLIB),) -CPPFLAGS += -DACE_BUILD_DLL -DACE_OS_BUILD_DLL -endif -endif - -ifeq ($(static_libs),1) -ifneq ($(LIB),) -CPPFLAGS += -DACE_AS_STATIC_LIBS -endif -endif - #---------------------------------------------------------------------------- # Local targets #---------------------------------------------------------------------------- @@ -627,7 +620,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -653,7 +645,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Template_Instantiations.cpp .obj/Time_Value.o .obj/Time_Value.so .shobj/Time_Value.o .shobj/Time_Value.so: Time_Value.cpp Time_Value.h \ @@ -661,7 +654,6 @@ endif # GHS OS_Export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -676,7 +668,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -702,7 +693,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Sched_Params.h \ Sched_Params.i \ OS_Thread_Adapter.h \ @@ -718,7 +710,6 @@ endif # GHS OS_Export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -738,13 +729,15 @@ endif # GHS Global_Macros.h \ Default_Constants.h \ Log_Priority.h \ - OS.h OS_TLI.h \ + OS.h \ + OS_TLI.h \ OS_TLI.inl \ Time_Value.h \ Time_Value.inl \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl @@ -753,7 +746,6 @@ endif # GHS OS_Export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -767,7 +759,6 @@ endif # GHS pre.h OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -793,14 +784,14 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i + Trace.h \ + OS.i .obj/OS_String.o .obj/OS_String.so .shobj/OS_String.o .shobj/OS_String.so: OS_String.cpp OS_String.h \ pre.h \ OS_Export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -819,7 +810,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -835,7 +825,6 @@ endif # GHS OS_Export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -849,7 +838,6 @@ endif # GHS OS_Log_Msg_Attributes.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -878,7 +866,8 @@ endif # GHS Default_Constants.h \ Global_Macros.h \ Min_Max.h \ - Trace.h OS.i + Trace.h \ + OS.i .obj/OS_Thread_Adapter.o .obj/OS_Thread_Adapter.so .shobj/OS_Thread_Adapter.o .shobj/OS_Thread_Adapter.so: OS_Thread_Adapter.cpp \ OS_Thread_Adapter.h \ @@ -887,7 +876,6 @@ endif # GHS OS_Log_Msg_Attributes.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -918,14 +906,14 @@ endif # GHS Default_Constants.h \ Global_Macros.h \ Min_Max.h \ - Trace.h OS.i + Trace.h \ + OS.i .obj/OS_Log_Msg_Attributes.o .obj/OS_Log_Msg_Attributes.so .shobj/OS_Log_Msg_Attributes.o .shobj/OS_Log_Msg_Attributes.so: OS_Log_Msg_Attributes.cpp \ OS_Log_Msg_Attributes.h \ pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -935,11 +923,11 @@ endif # GHS OS_Export.h \ OS_Log_Msg_Attributes.inl -.obj/Thread_Hook.o .obj/Thread_Hook.so .shobj/Thread_Hook.o .shobj/Thread_Hook.so: Thread_Hook.cpp Thread_Hook.h \ +.obj/Thread_Hook.o .obj/Thread_Hook.so .shobj/Thread_Hook.o .shobj/Thread_Hook.so: Thread_Hook.cpp \ + Thread_Hook.h \ pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -966,14 +954,14 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i + Trace.h \ + OS.i .obj/Sched_Params.o .obj/Sched_Params.so .shobj/Sched_Params.o .shobj/Sched_Params.so: Sched_Params.cpp \ Sched_Params.h \ pre.h OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -999,14 +987,14 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Sched_Params.i .obj/Handle_Set.o .obj/Handle_Set.so .shobj/Handle_Set.o .shobj/Handle_Set.so: Handle_Set.cpp Handle_Set.h \ pre.h OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -1032,7 +1020,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Handle_Set.i \ Log_Msg.h \ Log_Priority.h \ @@ -1045,7 +1034,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -1056,7 +1044,6 @@ endif # GHS pre.h OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -1082,7 +1069,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.h \ Flag_Manip.i \ Handle_Ops.h \ @@ -1112,7 +1100,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -1141,7 +1130,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -1160,7 +1150,6 @@ endif # GHS OS_Export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -1173,7 +1162,8 @@ endif # GHS Active_Map_Manager.i \ Active_Map_Manager_T.h \ Map_Manager.h \ - Synch.h OS.h \ + Synch.h \ + OS.h \ OS_Dirent.h \ OS_Errno.h \ OS_Errno.inl \ @@ -1188,7 +1178,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Synch.i \ Synch_T.h \ Synch_T.i \ @@ -1240,7 +1231,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -1275,12 +1267,12 @@ endif # GHS Active_Map_Manager_T.i \ Active_Map_Manager_T.cpp -.obj/Arg_Shifter.o .obj/Arg_Shifter.so .shobj/Arg_Shifter.o .shobj/Arg_Shifter.so: Arg_Shifter.cpp Arg_Shifter.h \ +.obj/Arg_Shifter.o .obj/Arg_Shifter.so .shobj/Arg_Shifter.o .shobj/Arg_Shifter.so: Arg_Shifter.cpp \ + Arg_Shifter.h \ pre.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -1301,7 +1293,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -1327,9 +1318,11 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Queue.inl \ Unbounded_Queue.cpp \ Malloc_Base.h \ @@ -1345,7 +1338,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -1367,7 +1359,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -1395,7 +1386,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Synch.i \ Synch_T.h \ Synch_T.i \ @@ -1411,7 +1403,8 @@ endif # GHS Log_Msg.h \ Log_Priority.h \ Hash_Map_Manager_T.h \ - Functor.h ACE.h \ + Functor.h \ + ACE.h \ Flag_Manip.h \ Flag_Manip.i \ Handle_Ops.h \ @@ -1422,7 +1415,8 @@ endif # GHS Init_ACE.i \ Sock_Connect.h \ Sock_Connect.i \ - ACE.i Functor.i \ + ACE.i \ + Functor.i \ Functor_T.h \ Functor_T.i \ Functor_T.cpp \ @@ -1430,7 +1424,8 @@ endif # GHS Hash_Map_Manager_T.cpp \ Service_Config.h \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Queue.inl \ Unbounded_Queue.cpp \ Malloc_Base.h \ @@ -1498,7 +1493,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -1506,7 +1500,8 @@ endif # GHS ace_wchar.inl \ Containers.i \ Containers_T.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Array_Base.h \ Global_Macros.h \ OS_Export.h \ @@ -1528,7 +1523,8 @@ endif # GHS Default_Constants.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Malloc_Base.h \ Array_Base.inl \ Array_Base.cpp \ @@ -1547,12 +1543,12 @@ endif # GHS .obj/Configuration.o .obj/Configuration.so .shobj/Configuration.o .shobj/Configuration.so: Configuration.cpp \ Configuration.h \ - pre.h SString.h \ + pre.h \ + SString.h \ String_Base.h \ ACE.h OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -1578,7 +1574,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.h \ Flag_Manip.i \ Handle_Ops.h \ @@ -1601,7 +1598,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -1630,7 +1628,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -1679,7 +1678,6 @@ endif # GHS ACE.h OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -1705,7 +1703,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.h \ Flag_Manip.i \ Handle_Ops.h \ @@ -1728,7 +1727,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -1757,7 +1757,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -1801,7 +1802,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -1830,7 +1830,8 @@ endif # GHS Time_Value.inl \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl @@ -1838,7 +1839,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -1864,7 +1864,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Dirent_Selector.h \ Dirent_Selector.inl @@ -1873,7 +1874,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -1881,7 +1881,8 @@ endif # GHS ace_wchar.inl \ Dynamic.i \ Singleton.h \ - Synch.h OS.h \ + Synch.h \ + OS.h \ OS_Dirent.h \ OS_Export.h \ OS_Errno.h \ @@ -1901,7 +1902,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Synch.i \ Synch_T.h \ Synch_T.i \ @@ -1946,7 +1948,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -1972,16 +1973,17 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i .obj/Framework_Component.o .obj/Framework_Component.so .shobj/Framework_Component.o .shobj/Framework_Component.so: Framework_Component.cpp \ Framework_Component.h \ - pre.h Synch.h \ + pre.h \ + Synch.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -2007,7 +2009,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Synch.i \ Synch_T.h \ Synch_T.i \ @@ -2075,18 +2078,19 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ SString.i .obj/Functor.o .obj/Functor.so .shobj/Functor.o .shobj/Functor.so: Functor.cpp Functor_T.h \ - pre.h Functor.h \ + pre.h \ + Functor.h \ ACE.h OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -2112,7 +2116,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.h \ Flag_Manip.i \ Handle_Ops.h \ @@ -2123,17 +2128,18 @@ endif # GHS Init_ACE.i \ Sock_Connect.h \ Sock_Connect.i \ - ACE.i Functor.i \ + ACE.i \ + Functor.i \ Functor_T.i \ Functor_T.cpp .obj/Get_Opt.o .obj/Get_Opt.so .shobj/Get_Opt.o .shobj/Get_Opt.so: Get_Opt.cpp Get_Opt.h \ - pre.h SString.h \ + pre.h \ + SString.h \ String_Base.h \ ACE.h OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -2159,7 +2165,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.h \ Flag_Manip.i \ Handle_Ops.h \ @@ -2182,7 +2189,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -2211,7 +2219,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -2237,7 +2246,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -2245,8 +2253,8 @@ endif # GHS ace_wchar.inl \ Hash_Map_Manager_T.h \ Default_Constants.h \ - Functor.h ACE.h \ - OS.h \ + Functor.h \ + ACE.h OS.h \ OS_Dirent.h \ OS_Export.h \ OS_Errno.h \ @@ -2266,7 +2274,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.h \ Flag_Manip.i \ Handle_Ops.h \ @@ -2277,7 +2286,8 @@ endif # GHS Init_ACE.i \ Sock_Connect.h \ Sock_Connect.i \ - ACE.i Functor.i \ + ACE.i \ + Functor.i \ Functor_T.h \ Functor_T.i \ Functor_T.cpp \ @@ -2286,7 +2296,8 @@ endif # GHS OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl \ Hash_Map_Manager_T.i \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -2299,7 +2310,8 @@ endif # GHS Hash_Map_Manager_T.cpp \ Service_Config.h \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Queue.inl \ Unbounded_Queue.cpp \ Malloc_Base.h \ @@ -2360,7 +2372,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -2373,7 +2384,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -2388,7 +2398,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -2414,7 +2423,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Event_Handler.i \ Notification_Strategy.inl @@ -2423,7 +2433,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -2437,7 +2446,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -2450,7 +2458,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -2476,7 +2483,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Handle_Ops.i .obj/Init_ACE.o .obj/Init_ACE.so .shobj/Init_ACE.o .shobj/Init_ACE.so: Init_ACE.cpp Init_ACE.h \ @@ -2484,7 +2492,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -2512,7 +2519,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Object_Manager.i \ Managed_Object.h \ Managed_Object.i \ @@ -2522,7 +2530,6 @@ endif # GHS pre.h OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -2548,7 +2555,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Lib_Find.i \ Log_Msg.h \ Log_Priority.h \ @@ -2561,7 +2569,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -2587,7 +2594,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Message_Block.i \ Message_Block_T.h \ Message_Block_T.i \ @@ -2598,7 +2606,8 @@ endif # GHS OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl \ Synch_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.i \ Thread.h \ Thread_Adapter.h \ @@ -2615,7 +2624,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -2629,7 +2637,6 @@ endif # GHS pre.h OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -2655,13 +2662,15 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Object_Manager.i \ Managed_Object.h \ Managed_Object.i \ Managed_Object.cpp \ Token_Manager.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -2713,7 +2722,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -2772,7 +2782,8 @@ endif # GHS Service_Manager.h \ SOCK_Stream.h \ SOCK_IO.h \ - SOCK.h Addr.h \ + SOCK.h \ + Addr.h \ Addr.i \ IPC_SAP.h \ IPC_SAP.i \ @@ -2799,7 +2810,6 @@ endif # GHS pre.h OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -2825,7 +2835,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i + Trace.h \ + OS.i .obj/String_Base_Const.o .obj/String_Base_Const.so .shobj/String_Base_Const.o .shobj/String_Base_Const.so: String_Base_Const.cpp \ String_Base_Const.h \ @@ -2833,7 +2844,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -2847,7 +2857,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -2873,14 +2882,16 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Log_Msg.h \ Log_Priority.h \ OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -2922,7 +2933,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -2941,14 +2953,14 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ ace_wchar.h \ ace_wchar.inl \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ OS_Memory.h \ OS_Export.h \ OS_Errno.h \ @@ -2972,7 +2984,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Log_Msg.h \ Log_Priority.h \ OS_Log_Msg_Attributes.h \ @@ -2988,7 +3001,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -3020,16 +3032,17 @@ endif # GHS Time_Value.inl \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl .obj/Filecache.o .obj/Filecache.so .shobj/Filecache.o .shobj/Filecache.so: Filecache.cpp Filecache.h \ - pre.h Mem_Map.h \ + pre.h \ + Mem_Map.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -3055,10 +3068,12 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Mem_Map.i \ Synch_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.i \ Thread.h \ Thread_Adapter.h \ @@ -3072,7 +3087,8 @@ endif # GHS Log_Msg.h \ Log_Priority.h \ Hash_Map_Manager_T.h \ - Functor.h ACE.h \ + Functor.h \ + ACE.h \ Flag_Manip.h \ Flag_Manip.i \ Handle_Ops.h \ @@ -3083,7 +3099,8 @@ endif # GHS Init_ACE.i \ Sock_Connect.h \ Sock_Connect.i \ - ACE.i Functor.i \ + ACE.i \ + Functor.i \ Functor_T.h \ Functor_T.i \ Functor_T.cpp \ @@ -3091,7 +3108,8 @@ endif # GHS Hash_Map_Manager_T.cpp \ Service_Config.h \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Queue.inl \ Unbounded_Queue.cpp \ Malloc_Base.h \ @@ -3149,11 +3167,11 @@ endif # GHS Managed_Object.cpp .obj/Dump.o .obj/Dump.so .shobj/Dump.o .shobj/Dump.so: Dump.cpp Synch_T.h \ - pre.h Synch.h \ + pre.h \ + Synch.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -3179,7 +3197,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Synch.i \ Synch_T.i \ Thread.h \ @@ -3193,7 +3212,8 @@ endif # GHS Synch_T.cpp \ Log_Msg.h \ Log_Priority.h \ - Dump.h Dump_T.h \ + Dump.h \ + Dump_T.h \ Dump_T.cpp \ Object_Manager.h \ Object_Manager.i \ @@ -3202,8 +3222,8 @@ endif # GHS Managed_Object.cpp .obj/Log_Msg.o .obj/Log_Msg.so .shobj/Log_Msg.o .shobj/Log_Msg.so: Log_Msg.cpp config-all.h \ - pre.h config.h \ - config-linux.h \ + pre.h \ + config.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -3230,7 +3250,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.h \ Flag_Manip.i \ Handle_Ops.h \ @@ -3254,14 +3275,16 @@ endif # GHS Thread_Exit.h \ Thread_Control.h \ Thread_Control.inl \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Synch_T.cpp \ Log_Msg.h \ Log_Priority.h \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Queue.inl \ Unbounded_Queue.cpp \ Malloc_Base.h \ @@ -3299,7 +3322,8 @@ endif # GHS SOCK_Connector.h \ SOCK_Stream.h \ SOCK_IO.h \ - SOCK.h Addr.h \ + SOCK.h \ + Addr.h \ Addr.i \ IPC_SAP.h \ IPC_SAP.i \ @@ -3320,7 +3344,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -3333,20 +3356,19 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ ace_wchar.h \ ace_wchar.inl -.obj/Log_Msg_IPC.o .obj/Log_Msg_IPC.so .shobj/Log_Msg_IPC.o .shobj/Log_Msg_IPC.so: Log_Msg_IPC.cpp Log_Msg_IPC.h \ +.obj/Log_Msg_IPC.o .obj/Log_Msg_IPC.so .shobj/Log_Msg_IPC.o .shobj/Log_Msg_IPC.so: Log_Msg_IPC.cpp \ + Log_Msg_IPC.h \ pre.h \ Log_Msg_Backend.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -3355,7 +3377,8 @@ endif # GHS SOCK_Connector.h \ SOCK_Stream.h \ SOCK_IO.h \ - SOCK.h Addr.h \ + SOCK.h \ + Addr.h \ Addr.i \ IPC_SAP.h \ Flag_Manip.h \ @@ -3379,10 +3402,12 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ - SOCK.i ACE.h \ + SOCK.i \ + ACE.h \ Handle_Ops.h \ Handle_Ops.i \ Lib_Find.h \ @@ -3391,7 +3416,8 @@ endif # GHS Init_ACE.i \ Sock_Connect.h \ Sock_Connect.i \ - ACE.i SOCK_IO.i \ + ACE.i \ + SOCK_IO.i \ INET_Addr.h \ INET_Addr.i \ SOCK_Stream.i \ @@ -3402,8 +3428,8 @@ endif # GHS .obj/Log_Msg_NT_Event_Log.o .obj/Log_Msg_NT_Event_Log.so .shobj/Log_Msg_NT_Event_Log.o .shobj/Log_Msg_NT_Event_Log.so: Log_Msg_NT_Event_Log.cpp \ config-all.h \ - pre.h config.h \ - config-linux.h \ + pre.h \ + config.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -3412,8 +3438,8 @@ endif # GHS .obj/Log_Msg_UNIX_Syslog.o .obj/Log_Msg_UNIX_Syslog.so .shobj/Log_Msg_UNIX_Syslog.o .shobj/Log_Msg_UNIX_Syslog.so: Log_Msg_UNIX_Syslog.cpp \ config-all.h \ - pre.h config.h \ - config-linux.h \ + pre.h \ + config.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -3440,7 +3466,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.h \ Flag_Manip.i \ Handle_Ops.h \ @@ -3451,7 +3478,8 @@ endif # GHS Init_ACE.i \ Sock_Connect.h \ Sock_Connect.i \ - ACE.i Log_Msg.h \ + ACE.i \ + Log_Msg.h \ Log_Priority.h \ OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl \ @@ -3464,7 +3492,6 @@ endif # GHS OS.h pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -3490,7 +3517,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Log_Priority.h \ Log_Record.i \ Log_Msg.h \ @@ -3510,13 +3538,13 @@ endif # GHS ACE.i .obj/Logging_Strategy.o .obj/Logging_Strategy.so .shobj/Logging_Strategy.o .shobj/Logging_Strategy.so: Logging_Strategy.cpp \ - Get_Opt.h pre.h \ + Get_Opt.h \ + pre.h \ SString.h \ String_Base.h \ ACE.h OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -3542,7 +3570,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.h \ Flag_Manip.i \ Handle_Ops.h \ @@ -3565,7 +3594,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -3594,7 +3624,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -3639,7 +3670,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -3666,18 +3696,19 @@ endif # GHS Time_Value.h \ Time_Value.inl \ Min_Max.h \ - streams.h OS.i \ + streams.h \ + OS.i \ OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl .obj/Activation_Queue.o .obj/Activation_Queue.so .shobj/Activation_Queue.o .shobj/Activation_Queue.so: Activation_Queue.cpp \ Activation_Queue.h \ - pre.h Synch_T.h \ + pre.h \ + Synch_T.h \ Synch.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -3703,7 +3734,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Synch.i \ Synch_T.i \ Thread.h \ @@ -3740,7 +3772,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -3768,7 +3799,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Synch.i \ Synch_T.h \ Synch_T.i \ @@ -3792,7 +3824,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -3818,7 +3849,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Process.h \ Handle_Set.h \ Handle_Set.i \ @@ -3847,7 +3879,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -3876,7 +3909,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -3892,12 +3926,12 @@ endif # GHS ARGV.i .obj/Process_Manager.o .obj/Process_Manager.so .shobj/Process_Manager.o .shobj/Process_Manager.so: Process_Manager.cpp \ - Synch_T.h pre.h \ + Synch_T.h \ + pre.h \ Synch.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -3923,7 +3957,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Synch.i \ Synch_T.i \ Thread.h \ @@ -3980,7 +4015,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -4012,7 +4048,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -4038,14 +4073,16 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ 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 ACE.h \ + Thread.i \ + ACE.h \ Flag_Manip.h \ Flag_Manip.i \ Handle_Ops.h \ @@ -4056,7 +4093,8 @@ endif # GHS Init_ACE.i \ Sock_Connect.h \ Sock_Connect.i \ - ACE.i Synch.h \ + ACE.i \ + Synch.h \ Synch.i \ Synch_T.h \ Synch_T.i \ @@ -4070,7 +4108,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -4085,11 +4122,11 @@ endif # GHS .obj/Process_Semaphore.o .obj/Process_Semaphore.so .shobj/Process_Semaphore.o .shobj/Process_Semaphore.so: Process_Semaphore.cpp \ Process_Semaphore.h \ - pre.h Synch.h \ + pre.h \ + Synch.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -4115,7 +4152,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Synch.i \ Synch_T.h \ Synch_T.i \ @@ -4141,7 +4179,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -4170,11 +4207,13 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Process_Mutex.inl \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -4208,7 +4247,6 @@ endif # GHS OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -4234,7 +4272,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ File_Lock.inl \ RW_Process_Mutex.inl \ Log_Msg.h \ @@ -4258,7 +4297,6 @@ endif # GHS pre.h OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -4284,7 +4322,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ File_Lock.inl \ Log_Msg.h \ Log_Priority.h \ @@ -4296,7 +4335,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -4322,7 +4360,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Thread_Adapter.h \ Base_Thread_Adapter.h \ OS_Log_Msg_Attributes.h \ @@ -4332,12 +4371,12 @@ endif # GHS Thread.i .obj/Thread_Manager.o .obj/Thread_Manager.so .shobj/Thread_Manager.o .shobj/Thread_Manager.so: Thread_Manager.cpp \ - Synch_T.h pre.h \ + Synch_T.h \ + pre.h \ Synch.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -4363,7 +4402,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Synch.i \ Synch_T.i \ Thread.h \ @@ -4382,7 +4422,8 @@ endif # GHS Thread_Control.h \ Thread_Control.inl \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Queue.inl \ Unbounded_Queue.cpp \ Malloc_Base.h \ @@ -4438,7 +4479,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -4469,21 +4509,24 @@ endif # GHS Default_Constants.h \ Global_Macros.h \ Min_Max.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Thread_Manager.h \ Thread.h \ Thread.i \ Thread_Exit.h \ Thread_Control.h \ Thread_Control.inl \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Synch_T.cpp \ Log_Msg.h \ Log_Priority.h \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Queue.inl \ Unbounded_Queue.cpp \ Malloc_Base.h \ @@ -4529,11 +4572,11 @@ endif # GHS Thread_Manager.i \ Thread_Hook.h -.obj/Thread_Exit.o .obj/Thread_Exit.so .shobj/Thread_Exit.o .shobj/Thread_Exit.so: Thread_Exit.cpp Thread_Exit.h \ +.obj/Thread_Exit.o .obj/Thread_Exit.so .shobj/Thread_Exit.o .shobj/Thread_Exit.so: Thread_Exit.cpp \ + Thread_Exit.h \ pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -4560,10 +4603,12 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Thread_Control.h \ Thread_Control.inl \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -4584,7 +4629,8 @@ endif # GHS Managed_Object.cpp \ Thread_Manager.h \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Queue.inl \ Unbounded_Queue.cpp \ Malloc_Base.h \ @@ -4626,8 +4672,8 @@ endif # GHS .obj/Thread_Control.o .obj/Thread_Control.so .shobj/Thread_Control.o .shobj/Thread_Control.so: Thread_Control.cpp \ config-all.h \ - pre.h config.h \ - config-linux.h \ + pre.h \ + config.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -4655,7 +4701,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Thread_Control.inl \ Thread_Manager.h \ Thread.h \ @@ -4667,14 +4714,16 @@ endif # GHS Thread_Adapter.inl \ Thread.i \ Thread_Exit.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Synch_T.cpp \ Log_Msg.h \ Log_Priority.h \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Queue.inl \ Unbounded_Queue.cpp \ Malloc_Base.h \ @@ -4724,7 +4773,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -4750,7 +4798,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Thread_Adapter.h \ Base_Thread_Adapter.h \ OS_Log_Msg_Attributes.h \ @@ -4758,7 +4807,8 @@ endif # GHS Base_Thread_Adapter.inl \ Thread_Adapter.inl \ Thread.i \ - Token.h Synch.h \ + Token.h \ + Synch.h \ Synch.i \ Synch_T.h \ Synch_T.i \ @@ -4773,7 +4823,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -4799,7 +4848,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Event_Handler.i \ Message_Block.h \ Message_Block.i \ @@ -4811,7 +4861,8 @@ endif # GHS Handle_Set.h \ Handle_Set.i \ Timer_Queue.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -4843,7 +4894,8 @@ endif # GHS Thread_Control.h \ Thread_Control.inl \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Queue.inl \ Unbounded_Queue.cpp \ Containers.h \ @@ -4888,7 +4940,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -4900,7 +4951,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -4911,8 +4961,8 @@ endif # GHS .obj/POSIX_Proactor.o .obj/POSIX_Proactor.so .shobj/POSIX_Proactor.o .shobj/POSIX_Proactor.so: POSIX_Proactor.cpp \ POSIX_Proactor.h \ config-all.h \ - pre.h config.h \ - config-linux.h \ + pre.h \ + config.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -4940,13 +4990,15 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Asynch_IO.h \ Reactor.h \ Handle_Set.h \ Handle_Set.i \ Timer_Queue.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -4975,12 +5027,14 @@ endif # GHS Signal.i \ Reactor.i \ Reactor_Impl.h \ - Pipe.h Pipe.i \ + Pipe.h \ + Pipe.i \ POSIX_Asynch_IO.h \ Asynch_IO_Impl.h \ Asynch_IO_Impl.i \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Queue.inl \ Unbounded_Queue.cpp \ Malloc_Base.h \ @@ -5035,7 +5089,8 @@ endif # GHS Select_Reactor.h \ Select_Reactor_T.h \ Select_Reactor_Base.h \ - Token.h Token.i \ + Token.h \ + Token.i \ Select_Reactor_Base.i \ Select_Reactor_T.cpp \ Timer_Heap.h \ @@ -5074,7 +5129,8 @@ endif # GHS Framework_Component_T.inl \ Framework_Component_T.cpp \ Thread_Manager.i \ - Task.i Task_T.h \ + Task.i \ + Task_T.h \ Message_Queue.h \ Message_Block.h \ Message_Block.i \ @@ -5100,8 +5156,8 @@ endif # GHS .obj/POSIX_CB_Proactor.o .obj/POSIX_CB_Proactor.so .shobj/POSIX_CB_Proactor.o .shobj/POSIX_CB_Proactor.so: POSIX_CB_Proactor.cpp \ POSIX_CB_Proactor.h \ config-all.h \ - pre.h config.h \ - config-linux.h \ + pre.h \ + config.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -5130,13 +5186,15 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Asynch_IO.h \ Reactor.h \ Handle_Set.h \ Handle_Set.i \ Timer_Queue.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -5165,12 +5223,14 @@ endif # GHS Signal.i \ Reactor.i \ Reactor_Impl.h \ - Pipe.h Pipe.i \ + Pipe.h \ + Pipe.i \ POSIX_Asynch_IO.h \ Asynch_IO_Impl.h \ Asynch_IO_Impl.i \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Queue.inl \ Unbounded_Queue.cpp \ Malloc_Base.h \ @@ -5225,7 +5285,8 @@ endif # GHS Select_Reactor.h \ Select_Reactor_T.h \ Select_Reactor_Base.h \ - Token.h Token.i \ + Token.h \ + Token.i \ Select_Reactor_Base.i \ Select_Reactor_T.cpp \ Timer_Heap.h \ @@ -5264,7 +5325,8 @@ endif # GHS Framework_Component_T.inl \ Framework_Component_T.cpp \ Thread_Manager.i \ - Task.i Task_T.h \ + Task.i \ + Task_T.h \ Message_Queue.h \ Message_Block.h \ Message_Block.i \ @@ -5293,7 +5355,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -5307,7 +5368,6 @@ endif # GHS Node.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -5338,7 +5398,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Log_Msg.h \ Log_Priority.h \ OS_Log_Msg_Attributes.h \ @@ -5347,7 +5408,8 @@ endif # GHS Select_Reactor_T.h \ Select_Reactor_Base.h \ Signal.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -5372,8 +5434,10 @@ endif # GHS Timer_Queue_T.cpp \ Handle_Set.h \ Handle_Set.i \ - Token.h Token.i \ - Pipe.h Pipe.i \ + Token.h \ + Token.i \ + Pipe.h \ + Pipe.i \ Reactor_Impl.h \ Select_Reactor_Base.i \ Reactor.h \ @@ -5418,7 +5482,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -5445,7 +5508,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Asynch_IO.h \ Asynch_IO_Impl.h \ Asynch_IO_Impl.i \ @@ -5461,14 +5525,16 @@ endif # GHS Thread_Exit.h \ Thread_Control.h \ Thread_Control.inl \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Synch_T.cpp \ Log_Msg.h \ Log_Priority.h \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Queue.inl \ Unbounded_Queue.cpp \ Malloc_Base.h \ @@ -5560,7 +5626,8 @@ endif # GHS Svc_Conf_Tokens.h \ DLL.h \ Service_Object.i \ - Task.i Task_T.i \ + Task.i \ + Task_T.i \ Task_T.cpp \ Module.h \ Module.i \ @@ -5595,7 +5662,8 @@ endif # GHS XML_Svc_Conf.h \ Service_Config.i \ POSIX_Proactor.h \ - Pipe.h Pipe.i \ + Pipe.h \ + Pipe.i \ POSIX_Asynch_IO.h \ Map_Manager.h \ Map_Manager.i \ @@ -5605,7 +5673,8 @@ endif # GHS Select_Reactor.h \ Select_Reactor_T.h \ Select_Reactor_Base.h \ - Token.h Token.i \ + Token.h \ + Token.i \ Select_Reactor_Base.i \ Select_Reactor_T.cpp \ Select_Reactor_T.i \ @@ -5617,7 +5686,6 @@ endif # GHS OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -5643,10 +5711,12 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Handle_Set.i \ Timer_Queue.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -5677,7 +5747,8 @@ endif # GHS Reactor_Impl.h \ Service_Config.h \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Queue.inl \ Unbounded_Queue.cpp \ Malloc_Base.h \ @@ -5726,8 +5797,10 @@ endif # GHS Select_Reactor.h \ Select_Reactor_T.h \ Select_Reactor_Base.h \ - Token.h Token.i \ - Pipe.h Pipe.i \ + Token.h \ + Token.i \ + Pipe.h \ + Pipe.i \ Select_Reactor_Base.i \ Select_Reactor_T.cpp \ Timer_Heap.h \ @@ -5757,7 +5830,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -5783,7 +5855,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Synch.i \ Synch_T.h \ Synch_T.i \ @@ -5813,8 +5886,10 @@ endif # GHS Timer_Queue_T.cpp \ Handle_Set.h \ Handle_Set.i \ - Token.h Token.i \ - Pipe.h Pipe.i \ + Token.h \ + Token.i \ + Pipe.h \ + Pipe.i \ Reactor_Impl.h \ Select_Reactor_Base.i \ Reactor.h \ @@ -5835,7 +5910,8 @@ endif # GHS Timer_Heap.h \ Timer_Heap_T.h \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Malloc_Base.h \ @@ -5844,12 +5920,12 @@ endif # GHS .obj/Select_Reactor_Base.o .obj/Select_Reactor_Base.so .shobj/Select_Reactor_Base.o .shobj/Select_Reactor_Base.so: Select_Reactor_Base.cpp \ Select_Reactor_Base.h \ - pre.h Signal.h \ + pre.h \ + Signal.h \ Synch.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -5875,7 +5951,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Synch.i \ Synch_T.h \ Synch_T.i \ @@ -5905,8 +5982,10 @@ endif # GHS Timer_Queue_T.cpp \ Handle_Set.h \ Handle_Set.i \ - Token.h Token.i \ - Pipe.h Pipe.i \ + Token.h \ + Token.i \ + Pipe.h \ + Pipe.i \ Reactor_Impl.h \ Select_Reactor_Base.i \ Reactor.h \ @@ -5914,13 +5993,15 @@ endif # GHS SOCK_Acceptor.h \ SOCK_Stream.h \ SOCK_IO.h \ - SOCK.h Addr.h \ + SOCK.h \ + Addr.h \ Addr.i \ IPC_SAP.h \ Flag_Manip.h \ Flag_Manip.i \ IPC_SAP.i \ - SOCK.i ACE.h \ + SOCK.i \ + ACE.h \ Handle_Ops.h \ Handle_Ops.i \ Lib_Find.h \ @@ -5929,7 +6010,8 @@ endif # GHS Init_ACE.i \ Sock_Connect.h \ Sock_Connect.i \ - ACE.i SOCK_IO.i \ + ACE.i \ + SOCK_IO.i \ INET_Addr.h \ INET_Addr.i \ SOCK_Stream.i \ @@ -5939,7 +6021,8 @@ endif # GHS Timer_Heap.h \ Timer_Heap_T.h \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Malloc_Base.h \ @@ -5948,8 +6031,8 @@ endif # GHS .obj/SUN_Proactor.o .obj/SUN_Proactor.so .shobj/SUN_Proactor.o .shobj/SUN_Proactor.so: SUN_Proactor.cpp \ SUN_Proactor.h \ config-all.h \ - pre.h config.h \ - config-linux.h \ + pre.h \ + config.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -5965,7 +6048,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -5991,7 +6073,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Synch.i \ Synch_T.h \ Synch_T.i \ @@ -6030,7 +6113,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -6056,7 +6138,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Synch.i \ Synch_T.h \ Synch_T.i \ @@ -6086,8 +6169,10 @@ endif # GHS Timer_Queue_T.cpp \ Handle_Set.h \ Handle_Set.i \ - Token.h Token.i \ - Pipe.h Pipe.i \ + Token.h \ + Token.i \ + Pipe.h \ + Pipe.i \ Reactor_Impl.h \ Select_Reactor_Base.i \ Reactor.h \ @@ -6108,7 +6193,8 @@ endif # GHS Timer_Heap.h \ Timer_Heap_T.h \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Malloc_Base.h \ @@ -6120,7 +6206,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -6132,7 +6217,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -6143,7 +6227,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -6154,7 +6237,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -6165,7 +6247,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -6192,7 +6273,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Proactor.h \ Asynch_IO_Impl.h \ Asynch_IO_Impl.i \ @@ -6208,14 +6290,16 @@ endif # GHS Thread_Exit.h \ Thread_Control.h \ Thread_Control.inl \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Synch_T.cpp \ Log_Msg.h \ Log_Priority.h \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Queue.inl \ Unbounded_Queue.cpp \ Malloc_Base.h \ @@ -6286,7 +6370,8 @@ endif # GHS Message_Block_T.i \ Message_Block_T.cpp \ INET_Addr.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ INET_Addr.i .obj/Asynch_IO_Impl.o .obj/Asynch_IO_Impl.so .shobj/Asynch_IO_Impl.o .shobj/Asynch_IO_Impl.so: Asynch_IO_Impl.cpp \ @@ -6294,7 +6379,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -6322,7 +6406,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Asynch_IO_Impl.i .obj/Asynch_Pseudo_Task.o .obj/Asynch_Pseudo_Task.so .shobj/Asynch_Pseudo_Task.o .shobj/Asynch_Pseudo_Task.so: Asynch_Pseudo_Task.cpp \ @@ -6330,7 +6415,6 @@ endif # GHS pre.h OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -6356,12 +6440,14 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Reactor.h \ Handle_Set.h \ Handle_Set.i \ Timer_Queue.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -6393,8 +6479,10 @@ endif # GHS Select_Reactor.h \ Select_Reactor_T.h \ Select_Reactor_Base.h \ - Token.h Token.i \ - Pipe.h Pipe.i \ + Token.h \ + Token.i \ + Pipe.h \ + Pipe.i \ Select_Reactor_Base.i \ Select_Reactor_T.cpp \ ACE.h \ @@ -6412,7 +6500,8 @@ endif # GHS Timer_Heap.h \ Timer_Heap_T.h \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Malloc_Base.h \ @@ -6454,7 +6543,8 @@ endif # GHS Framework_Component_T.inl \ Framework_Component_T.cpp \ Thread_Manager.i \ - Task.i Task_T.h \ + Task.i \ + Task_T.h \ Message_Queue.h \ Message_Block.h \ Message_Block.i \ @@ -6479,8 +6569,8 @@ endif # GHS .obj/POSIX_Asynch_IO.o .obj/POSIX_Asynch_IO.so .shobj/POSIX_Asynch_IO.o .shobj/POSIX_Asynch_IO.so: POSIX_Asynch_IO.cpp \ POSIX_Asynch_IO.h \ config-all.h \ - pre.h config.h \ - config-linux.h \ + pre.h \ + config.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -6507,12 +6597,14 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Asynch_IO_Impl.h \ Asynch_IO.h \ Asynch_IO_Impl.i \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Queue.inl \ Unbounded_Queue.cpp \ Malloc_Base.h \ @@ -6521,7 +6613,8 @@ endif # GHS OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl \ Map_Manager.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -6639,14 +6732,17 @@ endif # GHS Message_Block_T.i \ Message_Block_T.cpp \ INET_Addr.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ INET_Addr.i \ Asynch_Pseudo_Task.h \ Select_Reactor.h \ Select_Reactor_T.h \ Select_Reactor_Base.h \ - Token.h Token.i \ - Pipe.h Pipe.i \ + Token.h \ + Token.i \ + Pipe.h \ + Pipe.i \ Select_Reactor_Base.i \ Select_Reactor_T.cpp \ Select_Reactor_T.i \ @@ -6656,7 +6752,8 @@ endif # GHS Shared_Object.i \ DLL.h \ Service_Object.i \ - Task.i Task_T.h \ + Task.i \ + Task_T.h \ Message_Queue.h \ IO_Cntl_Msg.h \ Message_Queue_T.h \ @@ -6681,7 +6778,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -6693,7 +6789,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -6722,7 +6817,8 @@ endif # GHS Time_Value.inl \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl @@ -6732,7 +6828,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -6758,22 +6853,85 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Sock_Connect.i \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ INET_Addr.i \ Log_Msg.h \ Log_Priority.h \ OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl +.obj/Multihomed_INET_Addr.o .obj/Multihomed_INET_Addr.so .shobj/Multihomed_INET_Addr.o .shobj/Multihomed_INET_Addr.so: Multihomed_INET_Addr.cpp \ + Multihomed_INET_Addr.h \ + pre.h \ + INET_Addr.h \ + Sock_Connect.h \ + ACE_export.h \ + config-all.h \ + config.h \ + config-linux-common.h \ + config-g++-common.h \ + post.h \ + ace_wchar.h \ + ace_wchar.inl \ + OS.h \ + OS_Dirent.h \ + OS_Export.h \ + OS_Errno.h \ + OS_Errno.inl \ + OS_Dirent.inl \ + OS_String.h \ + Basic_Types.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 \ + Sock_Connect.i \ + Addr.h \ + Addr.i \ + INET_Addr.i \ + Containers_T.h \ + Containers.h \ + Containers.i \ + Node.h \ + Node.cpp \ + Array_Base.h \ + Malloc_Base.h \ + Array_Base.inl \ + Array_Base.cpp \ + Unbounded_Set.h \ + Unbounded_Set.inl \ + Unbounded_Set.cpp \ + Log_Msg.h \ + Log_Priority.h \ + OS_Log_Msg_Attributes.h \ + OS_Log_Msg_Attributes.inl \ + Unbounded_Queue.h \ + Unbounded_Queue.inl \ + Unbounded_Queue.cpp \ + Containers_T.i \ + Containers_T.cpp \ + Multihomed_INET_Addr.i + .obj/IPC_SAP.o .obj/IPC_SAP.so .shobj/IPC_SAP.o .shobj/IPC_SAP.so: IPC_SAP.cpp IPC_SAP.h \ pre.h \ Flag_Manip.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -6799,7 +6957,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ Log_Msg.h \ @@ -6811,7 +6970,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -6819,7 +6977,8 @@ endif # GHS ace_wchar.inl \ SOCK.h \ ACE_export.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ IPC_SAP.h \ Flag_Manip.h \ OS.h \ @@ -6842,10 +7001,12 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ - SOCK.i LSOCK.i \ + SOCK.i \ + LSOCK.i \ Log_Msg.h \ Log_Priority.h \ OS_Log_Msg_Attributes.h \ @@ -6856,7 +7017,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -6867,7 +7027,8 @@ endif # GHS SOCK_IO.h \ SOCK.h \ ACE_export.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ IPC_SAP.h \ Flag_Manip.h \ OS.h \ @@ -6890,10 +7051,12 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ - SOCK.i ACE.h \ + SOCK.i \ + ACE.h \ Handle_Ops.h \ Handle_Ops.i \ Lib_Find.h \ @@ -6902,7 +7065,8 @@ endif # GHS Init_ACE.i \ Sock_Connect.h \ Sock_Connect.i \ - ACE.i SOCK_IO.i \ + ACE.i \ + SOCK_IO.i \ INET_Addr.h \ INET_Addr.i \ SOCK_Stream.i \ @@ -6914,7 +7078,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ UNIX_Addr.i \ LSOCK_Stream.h \ - LSOCK.h LSOCK.i \ + LSOCK.h \ + LSOCK.i \ LSOCK_Stream.i .obj/LSOCK_CODgram.o .obj/LSOCK_CODgram.so .shobj/LSOCK_CODgram.o .shobj/LSOCK_CODgram.so: LSOCK_CODgram.cpp \ @@ -6922,15 +7087,16 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ ace_wchar.h \ ace_wchar.inl \ - LSOCK.h SOCK.h \ + LSOCK.h \ + SOCK.h \ ACE_export.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ IPC_SAP.h \ Flag_Manip.h \ OS.h \ @@ -6953,12 +7119,15 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ - SOCK.i LSOCK.i \ + SOCK.i \ + LSOCK.i \ SOCK_CODgram.h \ - SOCK_IO.h ACE.h \ + SOCK_IO.h \ + ACE.h \ Handle_Ops.h \ Handle_Ops.i \ Lib_Find.h \ @@ -6967,7 +7136,8 @@ endif # GHS Init_ACE.i \ Sock_Connect.h \ Sock_Connect.i \ - ACE.i SOCK_IO.i \ + ACE.i \ + SOCK_IO.i \ INET_Addr.h \ INET_Addr.i \ SOCK_CODgram.i \ @@ -6982,7 +7152,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -6993,7 +7162,8 @@ endif # GHS SOCK_IO.h \ SOCK.h \ ACE_export.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ IPC_SAP.h \ Flag_Manip.h \ OS.h \ @@ -7016,10 +7186,12 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ - SOCK.i ACE.h \ + SOCK.i \ + ACE.h \ Handle_Ops.h \ Handle_Ops.i \ Lib_Find.h \ @@ -7028,7 +7200,8 @@ endif # GHS Init_ACE.i \ Sock_Connect.h \ Sock_Connect.i \ - ACE.i SOCK_IO.i \ + ACE.i \ + SOCK_IO.i \ INET_Addr.h \ INET_Addr.i \ SOCK_Stream.i \ @@ -7040,15 +7213,16 @@ endif # GHS OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl \ UNIX_Addr.i \ - LSOCK.h LSOCK.i \ + LSOCK.h \ + LSOCK.i \ LSOCK_Stream.i \ LSOCK_Connector.i -.obj/LSOCK_Dgram.o .obj/LSOCK_Dgram.so .shobj/LSOCK_Dgram.o .shobj/LSOCK_Dgram.so: LSOCK_Dgram.cpp LSOCK_Dgram.h \ +.obj/LSOCK_Dgram.o .obj/LSOCK_Dgram.so .shobj/LSOCK_Dgram.o .shobj/LSOCK_Dgram.so: LSOCK_Dgram.cpp \ + LSOCK_Dgram.h \ pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -7057,7 +7231,8 @@ endif # GHS SOCK_Dgram.h \ SOCK.h \ ACE_export.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ IPC_SAP.h \ Flag_Manip.h \ OS.h \ @@ -7080,7 +7255,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ SOCK.i \ @@ -7089,7 +7265,8 @@ endif # GHS Sock_Connect.i \ INET_Addr.i \ SOCK_Dgram.i \ - LSOCK.h LSOCK.i \ + LSOCK.h \ + LSOCK.i \ LSOCK_Dgram.i \ Log_Msg.h \ Log_Priority.h \ @@ -7101,7 +7278,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -7111,7 +7287,8 @@ endif # GHS SOCK_IO.h \ SOCK.h \ ACE_export.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ IPC_SAP.h \ Flag_Manip.h \ OS.h \ @@ -7134,10 +7311,12 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ - SOCK.i ACE.h \ + SOCK.i \ + ACE.h \ Handle_Ops.h \ Handle_Ops.i \ Lib_Find.h \ @@ -7146,7 +7325,8 @@ endif # GHS Init_ACE.i \ Sock_Connect.h \ Sock_Connect.i \ - ACE.i SOCK_IO.i \ + ACE.i \ + SOCK_IO.i \ INET_Addr.h \ INET_Addr.i \ SOCK_Stream.i \ @@ -7156,7 +7336,8 @@ endif # GHS OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl \ UNIX_Addr.i \ - LSOCK.h LSOCK.i \ + LSOCK.h \ + LSOCK.i \ LSOCK_Stream.i .obj/SOCK.o .obj/SOCK.so .shobj/SOCK.o .shobj/SOCK.so: SOCK.cpp SOCK.h \ @@ -7164,13 +7345,13 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ ace_wchar.h \ ace_wchar.inl \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ IPC_SAP.h \ Flag_Manip.h \ OS.h \ @@ -7193,7 +7374,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ SOCK.i \ @@ -7211,13 +7393,13 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ ace_wchar.h \ ace_wchar.inl \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ IPC_SAP.h \ Flag_Manip.h \ OS.h \ @@ -7240,10 +7422,12 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ - SOCK.i ACE.h \ + SOCK.i \ + ACE.h \ Handle_Ops.h \ Handle_Ops.i \ Lib_Find.h \ @@ -7252,7 +7436,8 @@ endif # GHS Init_ACE.i \ Sock_Connect.h \ Sock_Connect.i \ - ACE.i SOCK_IO.i \ + ACE.i \ + SOCK_IO.i \ INET_Addr.h \ INET_Addr.i \ SOCK_Stream.i \ @@ -7262,7 +7447,8 @@ endif # GHS OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl \ OS_QoS.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -7275,18 +7461,19 @@ endif # GHS .obj/SOCK_CODgram.o .obj/SOCK_CODgram.so .shobj/SOCK_CODgram.o .shobj/SOCK_CODgram.so: SOCK_CODgram.cpp \ SOCK_CODgram.h \ - pre.h SOCK_IO.h \ + pre.h \ + SOCK_IO.h \ SOCK.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ ace_wchar.h \ ace_wchar.inl \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ IPC_SAP.h \ Flag_Manip.h \ OS.h \ @@ -7309,10 +7496,12 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ - SOCK.i ACE.h \ + SOCK.i \ + ACE.h \ Handle_Ops.h \ Handle_Ops.i \ Lib_Find.h \ @@ -7321,7 +7510,8 @@ endif # GHS Init_ACE.i \ Sock_Connect.h \ Sock_Connect.i \ - ACE.i SOCK_IO.i \ + ACE.i \ + SOCK_IO.i \ INET_Addr.h \ INET_Addr.i \ SOCK_CODgram.i \ @@ -7336,7 +7526,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -7362,10 +7551,12 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Sock_Connect.i \ INET_Addr.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ INET_Addr.i \ Log_Msg.h \ Log_Priority.h \ @@ -7395,7 +7586,8 @@ endif # GHS Malloc.h \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -7424,7 +7616,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -7439,13 +7632,13 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ ace_wchar.h \ ace_wchar.inl \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ IPC_SAP.h \ Flag_Manip.h \ OS.h \ @@ -7468,10 +7661,12 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ - SOCK.i ACE.h \ + SOCK.i \ + ACE.h \ Handle_Ops.h \ Handle_Ops.i \ Lib_Find.h \ @@ -7480,7 +7675,8 @@ endif # GHS Init_ACE.i \ Sock_Connect.h \ Sock_Connect.i \ - ACE.i SOCK_IO.i \ + ACE.i \ + SOCK_IO.i \ INET_Addr.h \ INET_Addr.i \ SOCK_Stream.i \ @@ -7492,17 +7688,18 @@ endif # GHS OS_QoS.h .obj/SOCK_Dgram.o .obj/SOCK_Dgram.so .shobj/SOCK_Dgram.o .shobj/SOCK_Dgram.so: SOCK_Dgram.cpp SOCK_Dgram.h \ - pre.h SOCK.h \ + pre.h \ + SOCK.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ ace_wchar.h \ ace_wchar.inl \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ IPC_SAP.h \ Flag_Manip.h \ OS.h \ @@ -7525,7 +7722,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ SOCK.i \ @@ -7536,7 +7734,8 @@ endif # GHS SOCK_Dgram.i \ Handle_Set.h \ Handle_Set.i \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -7567,7 +7766,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -7593,9 +7791,11 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Sock_Connect.i \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ INET_Addr.i \ SOCK_Dgram.h \ SOCK.h \ @@ -7627,13 +7827,13 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ ace_wchar.h \ ace_wchar.inl \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ IPC_SAP.h \ Flag_Manip.h \ OS.h \ @@ -7656,7 +7856,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ SOCK.i \ @@ -7672,17 +7873,18 @@ endif # GHS OS_Log_Msg_Attributes.inl .obj/SOCK_IO.o .obj/SOCK_IO.so .shobj/SOCK_IO.o .shobj/SOCK_IO.so: SOCK_IO.cpp SOCK_IO.h \ - pre.h SOCK.h \ + pre.h \ + SOCK.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ ace_wchar.h \ ace_wchar.inl \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ IPC_SAP.h \ Flag_Manip.h \ OS.h \ @@ -7705,10 +7907,12 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ - SOCK.i ACE.h \ + SOCK.i \ + ACE.h \ Handle_Ops.h \ Handle_Ops.i \ Lib_Find.h \ @@ -7717,23 +7921,268 @@ endif # GHS Init_ACE.i \ Sock_Connect.h \ Sock_Connect.i \ - ACE.i SOCK_IO.i \ + ACE.i \ + SOCK_IO.i \ Handle_Set.h \ Handle_Set.i -.obj/SOCK_Stream.o .obj/SOCK_Stream.so .shobj/SOCK_Stream.o .shobj/SOCK_Stream.so: SOCK_Stream.cpp SOCK_Stream.h \ - pre.h SOCK_IO.h \ +.obj/SOCK_SEQPACK_Acceptor.o .obj/SOCK_SEQPACK_Acceptor.so .shobj/SOCK_SEQPACK_Acceptor.o .shobj/SOCK_SEQPACK_Acceptor.so: SOCK_SEQPACK_Acceptor.cpp \ + SOCK_SEQPACK_Acceptor.h \ + pre.h \ + config.h \ + config-linux-common.h \ + config-g++-common.h \ + post.h \ + ACE_export.h \ + config-all.h \ + ace_wchar.h \ + ace_wchar.inl \ + SOCK_SEQPACK_Association.h \ + SOCK_IO.h \ + SOCK.h \ + Addr.h \ + Addr.i \ + IPC_SAP.h \ + Flag_Manip.h \ + OS.h \ + OS_Dirent.h \ + OS_Export.h \ + OS_Errno.h \ + OS_Errno.inl \ + OS_Dirent.inl \ + OS_String.h \ + Basic_Types.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 \ + Flag_Manip.i \ + IPC_SAP.i \ + SOCK.i \ + ACE.h \ + 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 \ + SOCK_IO.i \ + INET_Addr.h \ + INET_Addr.i \ + SOCK_SEQPACK_Association.i \ + Multihomed_INET_Addr.h \ + Containers_T.h \ + Containers.h \ + Containers.i \ + Node.h \ + Node.cpp \ + Array_Base.h \ + Malloc_Base.h \ + Array_Base.inl \ + Array_Base.cpp \ + Unbounded_Set.h \ + Unbounded_Set.inl \ + Unbounded_Set.cpp \ + Log_Msg.h \ + Log_Priority.h \ + OS_Log_Msg_Attributes.h \ + OS_Log_Msg_Attributes.inl \ + Unbounded_Queue.h \ + Unbounded_Queue.inl \ + Unbounded_Queue.cpp \ + Containers_T.i \ + Containers_T.cpp \ + Multihomed_INET_Addr.i \ + SOCK_SEQPACK_Acceptor.i \ + Synch.h \ + Synch.i \ + Synch_T.h \ + Synch_T.i \ + Thread.h \ + Thread_Adapter.h \ + Base_Thread_Adapter.h \ + Base_Thread_Adapter.inl \ + Thread_Adapter.inl \ + Thread.i \ + Synch_T.cpp \ + Auto_Ptr.h \ + Auto_Ptr.i \ + Auto_Ptr.cpp + +.obj/SOCK_SEQPACK_Association.o .obj/SOCK_SEQPACK_Association.so .shobj/SOCK_SEQPACK_Association.o .shobj/SOCK_SEQPACK_Association.so: SOCK_SEQPACK_Association.cpp \ + SOCK_SEQPACK_Association.h \ + pre.h \ + config.h \ + config-linux-common.h \ + config-g++-common.h \ + post.h \ + ACE_export.h \ + config-all.h \ + ace_wchar.h \ + ace_wchar.inl \ + SOCK_IO.h \ + SOCK.h \ + Addr.h \ + Addr.i \ + IPC_SAP.h \ + Flag_Manip.h \ + OS.h \ + OS_Dirent.h \ + OS_Export.h \ + OS_Errno.h \ + OS_Errno.inl \ + OS_Dirent.inl \ + OS_String.h \ + Basic_Types.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 \ + Flag_Manip.i \ + IPC_SAP.i \ + SOCK.i \ + ACE.h \ + 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 \ + SOCK_IO.i \ + INET_Addr.h \ + INET_Addr.i \ + SOCK_SEQPACK_Association.i \ + Auto_Ptr.h \ + Auto_Ptr.i \ + Auto_Ptr.cpp \ + Log_Msg.h \ + Log_Priority.h \ + OS_Log_Msg_Attributes.h \ + OS_Log_Msg_Attributes.inl + +.obj/SOCK_SEQPACK_Connector.o .obj/SOCK_SEQPACK_Connector.so .shobj/SOCK_SEQPACK_Connector.o .shobj/SOCK_SEQPACK_Connector.so: SOCK_SEQPACK_Connector.cpp \ + SOCK_SEQPACK_Connector.h \ + pre.h \ + config.h \ + config-linux-common.h \ + config-g++-common.h \ + post.h \ + ACE_export.h \ + config-all.h \ + ace_wchar.h \ + ace_wchar.inl \ + SOCK_SEQPACK_Association.h \ + SOCK_IO.h \ + SOCK.h \ + Addr.h \ + Addr.i \ + IPC_SAP.h \ + Flag_Manip.h \ + OS.h \ + OS_Dirent.h \ + OS_Export.h \ + OS_Errno.h \ + OS_Errno.inl \ + OS_Dirent.inl \ + OS_String.h \ + Basic_Types.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 \ + Flag_Manip.i \ + IPC_SAP.i \ + SOCK.i \ + ACE.h \ + 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 \ + SOCK_IO.i \ + INET_Addr.h \ + INET_Addr.i \ + SOCK_SEQPACK_Association.i \ + Multihomed_INET_Addr.h \ + Containers_T.h \ + Containers.h \ + Containers.i \ + Node.h \ + Node.cpp \ + Array_Base.h \ + Malloc_Base.h \ + Array_Base.inl \ + Array_Base.cpp \ + Unbounded_Set.h \ + Unbounded_Set.inl \ + Unbounded_Set.cpp \ + Log_Msg.h \ + Log_Priority.h \ + OS_Log_Msg_Attributes.h \ + OS_Log_Msg_Attributes.inl \ + Unbounded_Queue.h \ + Unbounded_Queue.inl \ + Unbounded_Queue.cpp \ + Containers_T.i \ + Containers_T.cpp \ + Multihomed_INET_Addr.i \ + SOCK_SEQPACK_Connector.i + +.obj/SOCK_Stream.o .obj/SOCK_Stream.so .shobj/SOCK_Stream.o .shobj/SOCK_Stream.so: SOCK_Stream.cpp \ + SOCK_Stream.h \ + pre.h \ + SOCK_IO.h \ SOCK.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ ace_wchar.h \ ace_wchar.inl \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ IPC_SAP.h \ Flag_Manip.h \ OS.h \ @@ -7756,10 +8205,12 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ - SOCK.i ACE.h \ + SOCK.i \ + ACE.h \ Handle_Ops.h \ Handle_Ops.i \ Lib_Find.h \ @@ -7768,7 +8219,8 @@ endif # GHS Init_ACE.i \ Sock_Connect.h \ Sock_Connect.i \ - ACE.i SOCK_IO.i \ + ACE.i \ + SOCK_IO.i \ INET_Addr.h \ INET_Addr.i \ SOCK_Stream.i @@ -7777,7 +8229,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -7789,7 +8240,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -7801,7 +8251,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -7812,7 +8261,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -7823,7 +8271,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -7834,7 +8281,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -7846,7 +8292,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -7854,12 +8299,12 @@ endif # GHS ace_wchar.inl .obj/DEV.o .obj/DEV.so .shobj/DEV.o .shobj/DEV.so: DEV.cpp DEV.h \ - pre.h IO_SAP.h \ + pre.h \ + IO_SAP.h \ Flag_Manip.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -7885,11 +8330,13 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IO_SAP.i \ DEV_Addr.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ DEV_Addr.i \ SString.h \ String_Base.h \ @@ -7914,7 +8361,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -7943,21 +8391,23 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ Auto_Ptr.h \ Auto_Ptr.i \ Auto_Ptr.cpp \ - SString.i DEV.i + SString.i \ + DEV.i .obj/DEV_Addr.o .obj/DEV_Addr.so .shobj/DEV_Addr.o .shobj/DEV_Addr.so: DEV_Addr.cpp DEV_Addr.h \ - pre.h Addr.h \ + pre.h \ + Addr.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -7983,7 +8433,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ DEV_Addr.i \ SString.h \ String_Base.h \ @@ -8010,7 +8461,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -8039,7 +8491,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -8050,13 +8503,14 @@ endif # GHS .obj/DEV_Connector.o .obj/DEV_Connector.so .shobj/DEV_Connector.o .shobj/DEV_Connector.so: DEV_Connector.cpp \ DEV_Connector.h \ - pre.h DEV_IO.h \ - DEV.h IO_SAP.h \ + pre.h \ + DEV_IO.h \ + DEV.h \ + IO_SAP.h \ Flag_Manip.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -8082,11 +8536,13 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IO_SAP.i \ DEV_Addr.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ DEV_Addr.i \ SString.h \ String_Base.h \ @@ -8111,7 +8567,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -8140,14 +8597,16 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ Auto_Ptr.h \ Auto_Ptr.i \ Auto_Ptr.cpp \ - SString.i DEV.i \ + SString.i \ + DEV.i \ DEV_IO.i \ DEV_Connector.i @@ -8158,7 +8617,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -8184,11 +8642,13 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IO_SAP.i \ DEV_Addr.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ DEV_Addr.i \ SString.h \ String_Base.h \ @@ -8213,7 +8673,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -8242,23 +8703,25 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ Auto_Ptr.h \ Auto_Ptr.i \ Auto_Ptr.cpp \ - SString.i DEV.i \ + SString.i \ + DEV.i \ DEV_IO.i .obj/FIFO.o .obj/FIFO.so .shobj/FIFO.o .shobj/FIFO.so: FIFO.cpp FIFO.h \ - pre.h IPC_SAP.h \ + pre.h \ + IPC_SAP.h \ Flag_Manip.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -8284,7 +8747,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ FIFO.i \ @@ -8294,13 +8758,13 @@ endif # GHS OS_Log_Msg_Attributes.inl .obj/FIFO_Recv.o .obj/FIFO_Recv.so .shobj/FIFO_Recv.o .shobj/FIFO_Recv.so: FIFO_Recv.cpp FIFO_Recv.h \ - pre.h FIFO.h \ + pre.h \ + FIFO.h \ IPC_SAP.h \ Flag_Manip.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -8326,10 +8790,12 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ - FIFO.i ACE.h \ + FIFO.i \ + ACE.h \ Handle_Ops.h \ Handle_Ops.i \ Lib_Find.h \ @@ -8355,7 +8821,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -8381,10 +8846,12 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ - FIFO.i ACE.h \ + FIFO.i \ + ACE.h \ Handle_Ops.h \ Handle_Ops.i \ Lib_Find.h \ @@ -8402,13 +8869,13 @@ endif # GHS OS_Log_Msg_Attributes.inl .obj/FIFO_Send.o .obj/FIFO_Send.so .shobj/FIFO_Send.o .shobj/FIFO_Send.so: FIFO_Send.cpp FIFO_Send.h \ - pre.h FIFO.h \ + pre.h \ + FIFO.h \ IPC_SAP.h \ Flag_Manip.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -8434,10 +8901,12 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ - FIFO.i ACE.h \ + FIFO.i \ + ACE.h \ Handle_Ops.h \ Handle_Ops.i \ Lib_Find.h \ @@ -8463,7 +8932,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -8489,10 +8957,12 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ - FIFO.i ACE.h \ + FIFO.i \ + ACE.h \ Handle_Ops.h \ Handle_Ops.i \ Lib_Find.h \ @@ -8510,11 +8980,11 @@ endif # GHS OS_Log_Msg_Attributes.inl .obj/FILE_Addr.o .obj/FILE_Addr.so .shobj/FILE_Addr.o .shobj/FILE_Addr.so: FILE_Addr.cpp FILE_Addr.h \ - pre.h Addr.h \ + pre.h \ + Addr.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -8542,7 +9012,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ FILE_Addr.i \ SString.h \ @@ -8568,7 +9039,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -8597,7 +9069,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -8607,12 +9080,12 @@ endif # GHS SString.i .obj/FILE.o .obj/FILE.so .shobj/FILE.o .shobj/FILE.so: FILE.cpp FILE.h \ - pre.h IO_SAP.h \ + pre.h \ + IO_SAP.h \ Flag_Manip.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -8638,11 +9111,13 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IO_SAP.i \ FILE_Addr.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ FILE_Addr.i \ SString.h \ String_Base.h \ @@ -8667,7 +9142,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -8696,7 +9172,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -8708,13 +9185,14 @@ endif # GHS .obj/FILE_Connector.o .obj/FILE_Connector.so .shobj/FILE_Connector.o .shobj/FILE_Connector.so: FILE_Connector.cpp \ FILE_Connector.h \ - pre.h FILE_IO.h \ - FILE.h IO_SAP.h \ + pre.h \ + FILE_IO.h \ + FILE.h \ + IO_SAP.h \ Flag_Manip.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -8740,11 +9218,13 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IO_SAP.i \ FILE_Addr.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ FILE_Addr.i \ SString.h \ String_Base.h \ @@ -8769,7 +9249,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -8798,7 +9279,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -8811,13 +9293,13 @@ endif # GHS FILE_Connector.i .obj/FILE_IO.o .obj/FILE_IO.so .shobj/FILE_IO.o .shobj/FILE_IO.so: FILE_IO.cpp FILE_IO.h \ - pre.h FILE.h \ + pre.h \ + FILE.h \ IO_SAP.h \ Flag_Manip.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -8843,11 +9325,13 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IO_SAP.i \ FILE_Addr.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ FILE_Addr.i \ SString.h \ String_Base.h \ @@ -8872,7 +9356,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -8901,7 +9386,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -8918,7 +9404,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -8944,7 +9429,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IO_SAP.i \ Log_Msg.h \ @@ -8956,7 +9442,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -8968,7 +9453,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -8994,18 +9478,20 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ - Pipe.i \ + Trace.h \ + OS.i Pipe.i \ SOCK_Acceptor.h \ SOCK_Stream.h \ SOCK_IO.h \ - SOCK.h Addr.h \ + SOCK.h \ + Addr.h \ Addr.i \ IPC_SAP.h \ Flag_Manip.h \ Flag_Manip.i \ IPC_SAP.i \ - SOCK.i ACE.h \ + SOCK.i \ + ACE.h \ Handle_Ops.h \ Handle_Ops.i \ Lib_Find.h \ @@ -9014,7 +9500,8 @@ endif # GHS Init_ACE.i \ Sock_Connect.h \ Sock_Connect.i \ - ACE.i SOCK_IO.i \ + ACE.i \ + SOCK_IO.i \ INET_Addr.h \ INET_Addr.i \ SOCK_Stream.i \ @@ -9027,11 +9514,11 @@ endif # GHS OS_Log_Msg_Attributes.inl .obj/Signal.o .obj/Signal.so .shobj/Signal.o .shobj/Signal.so: Signal.cpp Synch_T.h \ - pre.h Synch.h \ + pre.h \ + Synch.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -9057,7 +9544,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Synch.i \ Synch_T.i \ Thread.h \ @@ -9083,7 +9571,8 @@ endif # GHS Containers.h \ Containers.i \ Containers_T.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Array_Base.h \ Malloc_Base.h \ Array_Base.inl \ @@ -9102,14 +9591,13 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ ace_wchar.h \ ace_wchar.inl \ - Addr.h Addr.i \ - OS.h \ + Addr.h \ + Addr.i OS.h \ OS_Dirent.h \ OS_Export.h \ OS_Errno.h \ @@ -9129,7 +9617,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ SPIPE_Addr.i \ SString.h \ String_Base.h \ @@ -9156,7 +9645,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -9185,7 +9675,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -9195,12 +9686,12 @@ endif # GHS SString.i .obj/SPIPE.o .obj/SPIPE.so .shobj/SPIPE.o .shobj/SPIPE.so: SPIPE.cpp SPIPE.h \ - pre.h IPC_SAP.h \ + pre.h \ + IPC_SAP.h \ Flag_Manip.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -9226,11 +9717,13 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ SPIPE_Addr.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ SPIPE_Addr.i \ SString.h \ String_Base.h \ @@ -9255,7 +9748,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -9284,7 +9778,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -9304,7 +9799,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -9330,11 +9824,13 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ SPIPE_Addr.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ SPIPE_Addr.i \ SString.h \ String_Base.h \ @@ -9359,7 +9855,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -9388,7 +9885,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -9409,7 +9907,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -9435,11 +9932,13 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ SPIPE_Addr.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ SPIPE_Addr.i \ SString.h \ String_Base.h \ @@ -9464,7 +9963,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -9493,7 +9993,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -9507,13 +10008,13 @@ endif # GHS .obj/SPIPE_Stream.o .obj/SPIPE_Stream.so .shobj/SPIPE_Stream.o .shobj/SPIPE_Stream.so: SPIPE_Stream.cpp \ SPIPE_Stream.h \ - pre.h SPIPE.h \ + pre.h \ + SPIPE.h \ IPC_SAP.h \ Flag_Manip.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -9539,11 +10040,13 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ SPIPE_Addr.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ SPIPE_Addr.i \ SString.h \ String_Base.h \ @@ -9568,7 +10071,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -9597,7 +10101,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -9613,7 +10118,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -9639,7 +10143,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ SV_Message.i .obj/SV_Message_Queue.o .obj/SV_Message_Queue.so .shobj/SV_Message_Queue.o .shobj/SV_Message_Queue.so: SV_Message_Queue.cpp \ @@ -9647,7 +10152,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -9675,7 +10179,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ SV_Message.i \ SV_Message_Queue.i \ Log_Msg.h \ @@ -9690,7 +10195,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -9716,7 +10220,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Log_Msg.h \ @@ -9730,7 +10235,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -9756,7 +10260,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ SV_Semaphore_Simple.i \ Log_Msg.h \ Log_Priority.h \ @@ -9781,7 +10286,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -9807,7 +10311,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ SV_Shared_Memory.i \ Log_Msg.h \ Log_Priority.h \ @@ -9815,12 +10320,12 @@ endif # GHS OS_Log_Msg_Attributes.inl .obj/TLI.o .obj/TLI.so .shobj/TLI.o .shobj/TLI.so: TLI.cpp TLI.h \ - pre.h IPC_SAP.h \ + pre.h \ + IPC_SAP.h \ Flag_Manip.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -9846,10 +10351,12 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ Log_Msg.h \ Log_Priority.h \ OS_Log_Msg_Attributes.h \ @@ -9863,7 +10370,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -9889,10 +10395,12 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ TLI_Stream.h \ INET_Addr.h \ Sock_Connect.h \ @@ -9916,7 +10424,6 @@ endif # GHS pre.h OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -9942,15 +10449,18 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Handle_Set.i \ TLI_Connector.h \ TLI_Stream.h \ - TLI.h IPC_SAP.h \ + TLI.h \ + IPC_SAP.h \ Flag_Manip.h \ Flag_Manip.i \ IPC_SAP.i \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ INET_Addr.h \ Sock_Connect.h \ Sock_Connect.i \ @@ -9975,7 +10485,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -10001,10 +10510,12 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ INET_Addr.h \ Sock_Connect.h \ Sock_Connect.i \ @@ -10022,7 +10533,6 @@ endif # GHS OS.h pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -10048,14 +10558,17 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ - DEV_IO.h DEV.h \ + Trace.h \ + OS.i \ + DEV_IO.h \ + DEV.h \ IO_SAP.h \ Flag_Manip.h \ Flag_Manip.i \ IO_SAP.i \ DEV_Addr.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ DEV_Addr.i \ SString.h \ String_Base.h \ @@ -10080,7 +10593,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -10109,21 +10623,22 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ Auto_Ptr.h \ Auto_Ptr.i \ Auto_Ptr.cpp \ - SString.i DEV.i \ + SString.i \ + DEV.i \ DEV_IO.i .obj/UNIX_Addr.o .obj/UNIX_Addr.so .shobj/UNIX_Addr.o .shobj/UNIX_Addr.so: UNIX_Addr.cpp UNIX_Addr.h \ pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -10154,7 +10669,8 @@ endif # GHS Time_Value.inl \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl \ ACE.h \ @@ -10178,7 +10694,6 @@ endif # GHS Stream.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -10206,7 +10721,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Message_Block.h \ Message_Block.i \ Message_Block_T.h \ @@ -10216,7 +10732,8 @@ endif # GHS Module.h \ Task_T.h \ Message_Queue.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -10250,7 +10767,8 @@ endif # GHS Thread_Control.h \ Thread_Control.inl \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Queue.inl \ Unbounded_Queue.cpp \ Containers.h \ @@ -10293,7 +10811,8 @@ endif # GHS Framework_Component_T.inl \ Framework_Component_T.cpp \ Thread_Manager.i \ - Task.i Task_T.i \ + Task.i \ + Task_T.i \ Task_T.cpp \ Module.i \ Module.cpp \ @@ -10305,7 +10824,8 @@ endif # GHS IPC_SAP.h \ IPC_SAP.i \ SPIPE_Addr.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ SPIPE_Addr.i \ SString.h \ String_Base.h \ @@ -10348,7 +10868,6 @@ endif # GHS Stream.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -10376,7 +10895,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Message_Block.h \ Message_Block.i \ Message_Block_T.h \ @@ -10386,7 +10906,8 @@ endif # GHS Module.h \ Task_T.h \ Message_Queue.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -10420,7 +10941,8 @@ endif # GHS Thread_Control.h \ Thread_Control.inl \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Queue.inl \ Unbounded_Queue.cpp \ Containers.h \ @@ -10463,7 +10985,8 @@ endif # GHS Framework_Component_T.inl \ Framework_Component_T.cpp \ Thread_Manager.i \ - Task.i Task_T.i \ + Task.i \ + Task_T.i \ Task_T.cpp \ Module.i \ Module.cpp \ @@ -10475,7 +10998,8 @@ endif # GHS IPC_SAP.h \ IPC_SAP.i \ SPIPE_Addr.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ SPIPE_Addr.i \ SString.h \ String_Base.h \ @@ -10512,10 +11036,10 @@ endif # GHS .obj/UPIPE_Stream.o .obj/UPIPE_Stream.so .shobj/UPIPE_Stream.o .shobj/UPIPE_Stream.so: UPIPE_Stream.cpp \ UPIPE_Stream.h \ - pre.h Stream.h \ + pre.h \ + Stream.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -10543,7 +11067,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Message_Block.h \ Message_Block.i \ Message_Block_T.h \ @@ -10553,7 +11078,8 @@ endif # GHS Module.h \ Task_T.h \ Message_Queue.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -10587,7 +11113,8 @@ endif # GHS Thread_Control.h \ Thread_Control.inl \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Queue.inl \ Unbounded_Queue.cpp \ Containers.h \ @@ -10630,7 +11157,8 @@ endif # GHS Framework_Component_T.inl \ Framework_Component_T.cpp \ Thread_Manager.i \ - Task.i Task_T.i \ + Task.i \ + Task_T.i \ Task_T.cpp \ Module.i \ Module.cpp \ @@ -10642,7 +11170,8 @@ endif # GHS IPC_SAP.h \ IPC_SAP.i \ SPIPE_Addr.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ SPIPE_Addr.i \ SString.h \ String_Base.h \ @@ -10684,13 +11213,13 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ ace_wchar.h \ ace_wchar.inl \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ IPC_SAP.h \ Flag_Manip.h \ OS.h \ @@ -10713,10 +11242,12 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ - SOCK.i ACE.h \ + SOCK.i \ + ACE.h \ Handle_Ops.h \ Handle_Ops.i \ Lib_Find.h \ @@ -10725,7 +11256,8 @@ endif # GHS Init_ACE.i \ Sock_Connect.h \ Sock_Connect.i \ - ACE.i SOCK_IO.i \ + ACE.i \ + SOCK_IO.i \ INET_Addr.h \ INET_Addr.i \ SOCK_Stream.i \ @@ -10741,7 +11273,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -10771,7 +11304,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -10815,7 +11349,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -10843,9 +11376,11 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Sock_Connect.i \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ INET_Addr.i \ MEM_Addr.i \ Log_Msg.h \ @@ -10863,13 +11398,13 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ ace_wchar.h \ ace_wchar.inl \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ IPC_SAP.h \ Flag_Manip.h \ OS.h \ @@ -10892,10 +11427,12 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ - SOCK.i ACE.h \ + SOCK.i \ + ACE.h \ Handle_Ops.h \ Handle_Ops.i \ Lib_Find.h \ @@ -10904,7 +11441,8 @@ endif # GHS Init_ACE.i \ Sock_Connect.h \ Sock_Connect.i \ - ACE.i SOCK_IO.i \ + ACE.i \ + SOCK_IO.i \ INET_Addr.h \ INET_Addr.i \ SOCK_Stream.i \ @@ -10920,7 +11458,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -10950,7 +11489,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -10989,17 +11529,18 @@ endif # GHS MEM_Connector.i .obj/MEM_IO.o .obj/MEM_IO.so .shobj/MEM_IO.o .shobj/MEM_IO.so: MEM_IO.cpp MEM_IO.h \ - pre.h SOCK.h \ + pre.h \ + SOCK.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ ace_wchar.h \ ace_wchar.inl \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ IPC_SAP.h \ Flag_Manip.h \ OS.h \ @@ -11022,7 +11563,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ SOCK.i \ @@ -11035,7 +11577,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -11075,7 +11618,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -11117,13 +11661,13 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ ace_wchar.h \ ace_wchar.inl \ - Malloc.h OS.h \ + Malloc.h \ + OS.h \ OS_Dirent.h \ OS_Export.h \ OS_Errno.h \ @@ -11143,14 +11687,16 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Log_Msg.h \ Log_Priority.h \ OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -11192,7 +11738,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -11219,18 +11766,19 @@ endif # GHS MEM_SAP.i .obj/MEM_Stream.o .obj/MEM_Stream.so .shobj/MEM_Stream.o .shobj/MEM_Stream.so: MEM_Stream.cpp MEM_Stream.h \ - pre.h MEM_IO.h \ + pre.h \ + MEM_IO.h \ SOCK.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ ace_wchar.h \ ace_wchar.inl \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ IPC_SAP.h \ Flag_Manip.h \ OS.h \ @@ -11253,7 +11801,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.i \ IPC_SAP.i \ SOCK.i \ @@ -11266,7 +11815,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -11306,7 +11856,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -11343,11 +11894,11 @@ endif # GHS INET_Addr.i \ MEM_Stream.i -.obj/Basic_Stats.o .obj/Basic_Stats.so .shobj/Basic_Stats.o .shobj/Basic_Stats.so: Basic_Stats.cpp Basic_Stats.h \ +.obj/Basic_Stats.o .obj/Basic_Stats.so .shobj/Basic_Stats.o .shobj/Basic_Stats.so: Basic_Stats.cpp \ + Basic_Stats.h \ pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -11377,7 +11928,8 @@ endif # GHS Time_Value.inl \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl @@ -11387,7 +11939,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -11413,11 +11964,13 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ High_Res_Timer.i \ Stats.h \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Queue.inl \ Unbounded_Queue.cpp \ Malloc_Base.h \ @@ -11427,7 +11980,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Basic_Stats.h \ Basic_Stats.inl \ - Stats.i Synch.h \ + Stats.i \ + Synch.h \ Synch.i \ Synch_T.h \ Synch_T.i \ @@ -11449,7 +12003,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -11476,7 +12029,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ High_Res_Timer.h \ High_Res_Timer.i \ Profile_Timer.i \ @@ -11485,11 +12039,11 @@ endif # GHS OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl -.obj/System_Time.o .obj/System_Time.so .shobj/System_Time.o .shobj/System_Time.so: System_Time.cpp System_Time.h \ +.obj/System_Time.o .obj/System_Time.so .shobj/System_Time.o .shobj/System_Time.so: System_Time.cpp \ + System_Time.h \ pre.h OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -11515,7 +12069,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Memory_Pool.h \ ACE.h \ Flag_Manip.h \ @@ -11532,7 +12087,8 @@ endif # GHS Event_Handler.h \ Event_Handler.i \ Signal.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -11554,7 +12110,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Malloc_Base.h \ @@ -11577,7 +12134,6 @@ endif # GHS OS_Export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -11604,7 +12160,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.h \ Flag_Manip.i \ Handle_Ops.h \ @@ -11627,7 +12184,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -11656,7 +12214,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -11669,7 +12228,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -11695,7 +12253,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i + Trace.h \ + OS.i .obj/Timer_Hash.o .obj/Timer_Hash.so .shobj/Timer_Hash.o .shobj/Timer_Hash.so: Timer_Hash.cpp Timer_Hash.h \ pre.h \ @@ -11705,7 +12264,6 @@ endif # GHS OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -11731,9 +12289,11 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Synch_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.i \ Thread.h \ Thread_Adapter.h \ @@ -11762,7 +12322,8 @@ endif # GHS High_Res_Timer.i \ Timer_Heap_T.h \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Malloc_Base.h \ @@ -11778,7 +12339,6 @@ endif # GHS OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -11804,9 +12364,11 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Synch_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.i \ Thread.h \ Thread_Adapter.h \ @@ -11831,7 +12393,8 @@ endif # GHS Signal.h \ Signal.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Malloc_Base.h \ @@ -11845,7 +12408,6 @@ endif # GHS OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -11871,9 +12433,11 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Synch_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.i \ Thread.h \ Thread_Adapter.h \ @@ -11904,7 +12468,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -11912,7 +12475,8 @@ endif # GHS ace_wchar.inl \ Containers.i \ Containers_T.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Array_Base.h \ Global_Macros.h \ OS_Export.h \ @@ -11934,7 +12498,8 @@ endif # GHS Default_Constants.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Malloc_Base.h \ Array_Base.inl \ Array_Base.cpp \ @@ -11951,7 +12516,8 @@ endif # GHS Containers_T.i \ Containers_T.cpp \ Timer_Queue.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -11975,7 +12541,8 @@ endif # GHS Signal.h \ Signal.i -.obj/Timer_Wheel.o .obj/Timer_Wheel.so .shobj/Timer_Wheel.o .shobj/Timer_Wheel.so: Timer_Wheel.cpp Timer_Wheel.h \ +.obj/Timer_Wheel.o .obj/Timer_Wheel.so .shobj/Timer_Wheel.o .shobj/Timer_Wheel.so: Timer_Wheel.cpp \ + Timer_Wheel.h \ pre.h \ Timer_Wheel_T.h \ Timer_Queue_T.h \ @@ -11983,7 +12550,6 @@ endif # GHS OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -12009,9 +12575,11 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Synch_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.i \ Thread.h \ Thread_Adapter.h \ @@ -12041,7 +12609,6 @@ endif # GHS pre.h OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -12067,7 +12634,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Log_Msg.h \ Log_Priority.h \ OS_Log_Msg_Attributes.h \ @@ -12086,7 +12654,8 @@ endif # GHS ACE.i \ DLL_Manager.h \ Synch_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.i \ Thread.h \ Thread_Adapter.h \ @@ -12126,17 +12695,18 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ SString.i -.obj/DLL_Manager.o .obj/DLL_Manager.so .shobj/DLL_Manager.o .shobj/DLL_Manager.so: DLL_Manager.cpp DLL_Manager.h \ +.obj/DLL_Manager.o .obj/DLL_Manager.so .shobj/DLL_Manager.o .shobj/DLL_Manager.so: DLL_Manager.cpp \ + DLL_Manager.h \ pre.h OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -12162,9 +12732,11 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Synch_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.i \ Thread.h \ Thread_Adapter.h \ @@ -12220,7 +12792,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -12242,7 +12815,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -12250,7 +12822,8 @@ endif # GHS ace_wchar.inl \ Service_Config.h \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ OS_Memory.h \ OS_Export.h \ OS_Errno.h \ @@ -12274,7 +12847,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Log_Msg.h \ Log_Priority.h \ OS_Log_Msg_Attributes.h \ @@ -12302,7 +12876,8 @@ endif # GHS Malloc.h \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -12364,7 +12939,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -12391,11 +12965,13 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Parse_Node.i \ Service_Config.h \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Queue.inl \ Unbounded_Queue.cpp \ Malloc_Base.h \ @@ -12426,7 +13002,8 @@ endif # GHS Malloc.h \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -12509,7 +13086,8 @@ endif # GHS Framework_Component_T.inl \ Framework_Component_T.cpp \ Thread_Manager.i \ - Task.i Task_T.h \ + Task.i \ + Task_T.h \ Message_Queue.h \ Message_Block.h \ Message_Block.i \ @@ -12533,14 +13111,14 @@ endif # GHS .obj/Service_Config.o .obj/Service_Config.so .shobj/Service_Config.o .shobj/Service_Config.so: Service_Config.cpp \ Svc_Conf.h \ - pre.h Obstack.h \ + pre.h \ + Obstack.h \ Obstack_T.h \ Obchunk.h \ Malloc.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -12566,14 +13144,16 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Log_Msg.h \ Log_Priority.h \ OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -12615,7 +13195,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -12663,11 +13244,13 @@ endif # GHS Containers_T.i \ Containers_T.cpp \ Get_Opt.i \ - ARGV.h ARGV.i \ + ARGV.h \ + ARGV.i \ Service_Manager.h \ SOCK_Stream.h \ SOCK_IO.h \ - SOCK.h Addr.h \ + SOCK.h \ + Addr.h \ Addr.i \ IPC_SAP.h \ IPC_SAP.i \ @@ -12707,13 +13290,13 @@ endif # GHS Thread_Manager.i .obj/Service_Manager.o .obj/Service_Manager.so .shobj/Service_Manager.o .shobj/Service_Manager.so: Service_Manager.cpp \ - Get_Opt.h pre.h \ + Get_Opt.h \ + pre.h \ SString.h \ String_Base.h \ ACE.h OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -12739,7 +13322,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.h \ Flag_Manip.i \ Handle_Ops.h \ @@ -12762,7 +13346,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -12791,7 +13376,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -12832,7 +13418,8 @@ endif # GHS Service_Manager.h \ SOCK_Stream.h \ SOCK_IO.h \ - SOCK.h Addr.h \ + SOCK.h \ + Addr.h \ Addr.i \ IPC_SAP.h \ IPC_SAP.i \ @@ -12860,7 +13447,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -12886,7 +13472,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Shared_Object.i \ Svc_Conf_Tokens.h \ Event_Handler.h \ @@ -12905,7 +13492,8 @@ endif # GHS Init_ACE.i \ Sock_Connect.h \ Sock_Connect.i \ - ACE.i Synch.h \ + ACE.i \ + Synch.h \ Synch.i \ Synch_T.h \ Synch_T.i \ @@ -12928,14 +13516,14 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ ace_wchar.h \ ace_wchar.inl \ Default_Constants.h \ - Synch.h OS.h \ + Synch.h \ + OS.h \ OS_Dirent.h \ OS_Export.h \ OS_Errno.h \ @@ -12954,7 +13542,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Synch.i \ Synch_T.h \ Synch_T.i \ @@ -13006,7 +13595,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -13032,7 +13620,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Shared_Object.i \ Svc_Conf_Tokens.h \ Event_Handler.h \ @@ -13050,7 +13639,8 @@ endif # GHS Init_ACE.i \ Sock_Connect.h \ Sock_Connect.i \ - ACE.i Synch.h \ + ACE.i \ + Synch.h \ Synch.i \ Synch_T.h \ Synch_T.i \ @@ -13073,7 +13663,8 @@ endif # GHS Thread_Control.h \ Thread_Control.inl \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Queue.inl \ Unbounded_Queue.cpp \ Malloc_Base.h \ @@ -13105,7 +13696,8 @@ endif # GHS Framework_Component_T.inl \ Framework_Component_T.cpp \ Thread_Manager.i \ - Task.i Task_T.h \ + Task.i \ + Task_T.h \ Message_Queue.h \ Message_Block.h \ Message_Block.i \ @@ -13140,7 +13732,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -13166,14 +13757,16 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Log_Msg.h \ Log_Priority.h \ OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -13215,7 +13808,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -13285,7 +13879,8 @@ endif # GHS Shared_Object.h \ Shared_Object.i \ Service_Object.i \ - Task.i Task_T.h \ + Task.i \ + Task_T.h \ Message_Queue.h \ Message_Block.h \ Message_Block.i \ @@ -13315,7 +13910,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -13341,7 +13935,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Shared_Object.i .obj/XML_Svc_Conf.o .obj/XML_Svc_Conf.so .shobj/XML_Svc_Conf.o .shobj/XML_Svc_Conf.so: XML_Svc_Conf.cpp \ @@ -13350,7 +13945,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -13361,7 +13955,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -13387,7 +13980,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Object_Manager.h \ Object_Manager.i \ Managed_Object.h \ @@ -13404,7 +13998,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -13446,7 +14041,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -13487,14 +14083,14 @@ endif # GHS Svc_Conf_Lexer_Guard.h .obj/Svc_Conf_y.o .obj/Svc_Conf_y.so .shobj/Svc_Conf_y.o .shobj/Svc_Conf_y.so: Svc_Conf_y.cpp Svc_Conf.h \ - pre.h Obstack.h \ + pre.h \ + Obstack.h \ Obstack_T.h \ Obchunk.h \ Malloc.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -13520,14 +14116,16 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Log_Msg.h \ Log_Priority.h \ OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -13569,7 +14167,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -13607,7 +14206,8 @@ endif # GHS Parse_Node.h \ DLL.h \ Parse_Node.i \ - ARGV.h ARGV.i \ + ARGV.h \ + ARGV.i \ Module.h \ Task_T.h \ Message_Queue.h \ @@ -13654,7 +14254,8 @@ endif # GHS Framework_Component_T.inl \ Framework_Component_T.cpp \ Thread_Manager.i \ - Task.i Task_T.i \ + Task.i \ + Task_T.i \ Task_T.cpp \ Module.i \ Module.cpp \ @@ -13671,7 +14272,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -13703,14 +14303,16 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Log_Msg.h \ Log_Priority.h \ OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -13752,7 +14354,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -13795,7 +14398,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -13822,7 +14424,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ CDR_Base.inl \ Message_Block.h \ Message_Block.i \ @@ -13836,7 +14439,6 @@ endif # GHS CDR_Base.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -13863,7 +14465,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ CDR_Base.inl \ SString.h \ String_Base.h \ @@ -13890,7 +14493,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -13919,7 +14523,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -13939,13 +14544,212 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ ace_wchar.h \ ace_wchar.inl +.obj/Codeset_Registry.o .obj/Codeset_Registry.so .shobj/Codeset_Registry.o .shobj/Codeset_Registry.so: Codeset_Registry.cpp \ + Codeset_Registry.h \ + pre.h \ + SString.h \ + String_Base.h \ + ACE.h OS.h \ + config-all.h \ + config.h \ + config-linux-common.h \ + config-g++-common.h \ + post.h \ + ace_wchar.h \ + ace_wchar.inl \ + 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 \ + 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 \ + String_Base_Const.h \ + String_Base.i \ + Malloc_Base.h \ + String_Base.cpp \ + Malloc.h \ + Log_Msg.h \ + Log_Priority.h \ + OS_Log_Msg_Attributes.h \ + OS_Log_Msg_Attributes.inl \ + Malloc.i \ + Malloc_T.h \ + Synch.h \ + Synch.i \ + Synch_T.h \ + Synch_T.i \ + Thread.h \ + Thread_Adapter.h \ + Base_Thread_Adapter.h \ + Base_Thread_Adapter.inl \ + Thread_Adapter.inl \ + Thread.i \ + Synch_T.cpp \ + Malloc_Allocator.h \ + Malloc_Allocator.i \ + Free_List.h \ + Free_List.i \ + Free_List.cpp \ + Malloc_T.i \ + Malloc_T.cpp \ + Memory_Pool.h \ + Event_Handler.h \ + Event_Handler.i \ + Signal.h \ + Signal.i \ + 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 \ + Node.h \ + Node.cpp \ + Unbounded_Set.inl \ + Unbounded_Set.cpp \ + Memory_Pool.i \ + Auto_Ptr.h \ + Auto_Ptr.i \ + Auto_Ptr.cpp \ + SString.i \ + CDR_Base.h \ + CDR_Base.inl \ + Codeset_Registry.inl + +.obj/Codeset_Registry_db.o .obj/Codeset_Registry_db.so .shobj/Codeset_Registry_db.o .shobj/Codeset_Registry_db.so: Codeset_Registry_db.cpp \ + Codeset_Registry.h \ + pre.h \ + SString.h \ + String_Base.h \ + ACE.h OS.h \ + config-all.h \ + config.h \ + config-linux-common.h \ + config-g++-common.h \ + post.h \ + ace_wchar.h \ + ace_wchar.inl \ + 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 \ + 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 \ + String_Base_Const.h \ + String_Base.i \ + Malloc_Base.h \ + String_Base.cpp \ + Malloc.h \ + Log_Msg.h \ + Log_Priority.h \ + OS_Log_Msg_Attributes.h \ + OS_Log_Msg_Attributes.inl \ + Malloc.i \ + Malloc_T.h \ + Synch.h \ + Synch.i \ + Synch_T.h \ + Synch_T.i \ + Thread.h \ + Thread_Adapter.h \ + Base_Thread_Adapter.h \ + Base_Thread_Adapter.inl \ + Thread_Adapter.inl \ + Thread.i \ + Synch_T.cpp \ + Malloc_Allocator.h \ + Malloc_Allocator.i \ + Free_List.h \ + Free_List.i \ + Free_List.cpp \ + Malloc_T.i \ + Malloc_T.cpp \ + Memory_Pool.h \ + Event_Handler.h \ + Event_Handler.i \ + Signal.h \ + Signal.i \ + 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 \ + Node.h \ + Node.cpp \ + Unbounded_Set.inl \ + Unbounded_Set.cpp \ + Memory_Pool.i \ + Auto_Ptr.h \ + Auto_Ptr.i \ + Auto_Ptr.cpp \ + SString.i \ + CDR_Base.h \ + CDR_Base.inl \ + Codeset_Registry.inl + .obj/Message_Queue.o .obj/Message_Queue.so .shobj/Message_Queue.o .shobj/Message_Queue.so: Message_Queue.cpp \ Message_Queue.h \ pre.h \ @@ -13953,7 +14757,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -13979,14 +14782,16 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Message_Block.i \ Message_Block_T.h \ Message_Block_T.i \ Message_Block_T.cpp \ Malloc_Base.h \ IO_Cntl_Msg.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -14017,7 +14822,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -14043,7 +14847,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Event_Handler.i \ Notification_Strategy.inl \ Reactor_Notification_Strategy.inl \ @@ -14051,7 +14856,8 @@ endif # GHS Handle_Set.h \ Handle_Set.i \ Timer_Queue.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -14086,7 +14892,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -14112,7 +14917,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Shared_Object.i \ Svc_Conf_Tokens.h \ Event_Handler.h \ @@ -14131,14 +14937,16 @@ endif # GHS Thread_Exit.h \ Thread_Control.h \ Thread_Control.inl \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Synch_T.cpp \ Log_Msg.h \ Log_Priority.h \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Queue.inl \ Unbounded_Queue.cpp \ Malloc_Base.h \ @@ -14182,7 +14990,8 @@ endif # GHS Framework_Component_T.inl \ Framework_Component_T.cpp \ Thread_Manager.i \ - Task.i Task_T.h \ + Task.i \ + Task_T.h \ Message_Queue.h \ Message_Block.h \ Message_Block.i \ @@ -14209,7 +15018,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -14237,7 +15045,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Synch.i \ Synch_T.h \ Synch_T.i \ @@ -14289,7 +15098,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -14341,7 +15151,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -14367,14 +15176,16 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Log_Msg.h \ Log_Priority.h \ OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -14416,7 +15227,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -14431,13 +15243,13 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ ace_wchar.h \ ace_wchar.inl \ - Malloc.h OS.h \ + Malloc.h \ + OS.h \ OS_Dirent.h \ OS_Export.h \ OS_Errno.h \ @@ -14457,14 +15269,16 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Log_Msg.h \ Log_Priority.h \ OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -14506,7 +15320,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -14536,7 +15351,6 @@ endif # GHS pre.h OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -14562,7 +15376,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Malloc_Base.h \ Log_Msg.h \ Log_Priority.h \ @@ -14575,7 +15390,8 @@ endif # GHS Managed_Object.i \ Managed_Object.cpp \ Synch_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.i \ Thread.h \ Thread_Adapter.h \ @@ -14586,11 +15402,11 @@ endif # GHS Synch_T.cpp .obj/Malloc_Instantiations.o .obj/Malloc_Instantiations.so .shobj/Malloc_Instantiations.o .shobj/Malloc_Instantiations.so: Malloc_Instantiations.cpp \ - Malloc.h pre.h \ + Malloc.h \ + pre.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -14616,14 +15432,16 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Log_Msg.h \ Log_Priority.h \ OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -14665,7 +15483,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i @@ -14675,7 +15494,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -14701,19 +15519,20 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Mem_Map.i \ Log_Msg.h \ Log_Priority.h \ OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl -.obj/Memory_Pool.o .obj/Memory_Pool.so .shobj/Memory_Pool.o .shobj/Memory_Pool.so: Memory_Pool.cpp Memory_Pool.h \ +.obj/Memory_Pool.o .obj/Memory_Pool.so .shobj/Memory_Pool.o .shobj/Memory_Pool.so: Memory_Pool.cpp \ + Memory_Pool.h \ pre.h ACE.h \ OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -14739,7 +15558,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.h \ Flag_Manip.i \ Handle_Ops.h \ @@ -14754,7 +15574,8 @@ endif # GHS Event_Handler.h \ Event_Handler.i \ Signal.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -14776,7 +15597,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Malloc_Base.h \ @@ -14803,11 +15625,11 @@ endif # GHS Framework_Component_T.cpp .obj/Obchunk.o .obj/Obchunk.so .shobj/Obchunk.o .shobj/Obchunk.so: Obchunk.cpp Obchunk.h \ - pre.h Malloc.h \ + pre.h \ + Malloc.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -14833,14 +15655,16 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Log_Msg.h \ Log_Priority.h \ OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -14882,7 +15706,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -14896,7 +15721,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -14922,14 +15746,16 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Log_Msg.h \ Log_Priority.h \ OS_Log_Msg_Attributes.h \ OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -14971,7 +15797,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -14979,12 +15806,12 @@ endif # GHS Obstack_T.i \ Obstack_T.cpp -.obj/Read_Buffer.o .obj/Read_Buffer.so .shobj/Read_Buffer.o .shobj/Read_Buffer.so: Read_Buffer.cpp Read_Buffer.h \ +.obj/Read_Buffer.o .obj/Read_Buffer.so .shobj/Read_Buffer.o .shobj/Read_Buffer.so: Read_Buffer.cpp \ + Read_Buffer.h \ pre.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -15010,7 +15837,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Read_Buffer.i \ Log_Msg.h \ Log_Priority.h \ @@ -15019,7 +15847,8 @@ endif # GHS Malloc_Base.h \ Service_Config.h \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Queue.inl \ Unbounded_Queue.cpp \ Unbounded_Set.h \ @@ -15045,7 +15874,8 @@ endif # GHS Malloc.h \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -15100,7 +15930,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -15126,7 +15955,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i + Trace.h \ + OS.i .obj/Shared_Memory_MM.o .obj/Shared_Memory_MM.so .shobj/Shared_Memory_MM.o .shobj/Shared_Memory_MM.so: Shared_Memory_MM.cpp \ Shared_Memory_MM.h \ @@ -15135,7 +15965,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -15161,7 +15990,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Mem_Map.h \ Mem_Map.i \ Shared_Memory_MM.i @@ -15173,7 +16003,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -15199,7 +16028,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ SV_Shared_Memory.h \ SV_Shared_Memory.i \ Shared_Memory_SV.i @@ -15208,7 +16038,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -15234,7 +16063,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Codecs.h \ Log_Msg.h \ Log_Priority.h \ @@ -15246,7 +16076,6 @@ endif # GHS pre.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -15262,7 +16091,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -15288,9 +16116,11 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Sock_Connect.i \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ INET_Addr.i \ SOCK_Connector.h \ SOCK_Stream.h \ @@ -15300,14 +16130,16 @@ endif # GHS Flag_Manip.h \ Flag_Manip.i \ IPC_SAP.i \ - SOCK.i ACE.h \ + SOCK.i \ + ACE.h \ Handle_Ops.h \ Handle_Ops.i \ Lib_Find.h \ Lib_Find.i \ Init_ACE.h \ Init_ACE.i \ - ACE.i SOCK_IO.i \ + ACE.i \ + SOCK_IO.i \ SOCK_Stream.i \ SOCK_Connector.i \ Synch_Options.h \ @@ -15318,7 +16150,8 @@ endif # GHS Token_Request_Reply.i \ Remote_Tokens.i \ Singleton.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -15351,7 +16184,6 @@ endif # GHS Map_Manager.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -15379,7 +16211,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Synch.i \ Synch_T.h \ Synch_T.i \ @@ -15431,7 +16264,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -15469,11 +16303,11 @@ endif # GHS .obj/Token_Invariants.o .obj/Token_Invariants.so .shobj/Token_Invariants.o .shobj/Token_Invariants.so: Token_Invariants.cpp \ Token_Invariants.h \ - pre.h Synch.h \ + pre.h \ + Synch.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -15499,7 +16333,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Synch.i \ Synch_T.h \ Synch_T.i \ @@ -15552,7 +16387,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -15594,11 +16430,11 @@ endif # GHS .obj/Token_Manager.o .obj/Token_Manager.so .shobj/Token_Manager.o .shobj/Token_Manager.so: Token_Manager.cpp \ Token_Manager.h \ - pre.h Synch.h \ + pre.h \ + Synch.h \ ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -15624,7 +16460,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Synch.i \ Synch_T.h \ Synch_T.i \ @@ -15677,7 +16514,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -15724,7 +16562,6 @@ endif # GHS Local_Tokens.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -15742,7 +16579,6 @@ endif # GHS OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -15768,7 +16604,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.h \ Flag_Manip.i \ Handle_Ops.h \ @@ -15794,7 +16631,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -15823,7 +16661,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -15835,7 +16674,8 @@ endif # GHS Name_Space.h \ Name_Proxy.h \ INET_Addr.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ INET_Addr.i \ SOCK_Connector.h \ SOCK_Stream.h \ @@ -15904,7 +16744,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -15930,9 +16769,11 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Sock_Connect.i \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ INET_Addr.i \ SOCK_Connector.h \ SOCK_Stream.h \ @@ -15942,19 +16783,22 @@ endif # GHS Flag_Manip.h \ Flag_Manip.i \ IPC_SAP.i \ - SOCK.i ACE.h \ + SOCK.i \ + ACE.h \ Handle_Ops.h \ Handle_Ops.i \ Lib_Find.h \ Lib_Find.i \ Init_ACE.h \ Init_ACE.i \ - ACE.i SOCK_IO.i \ + ACE.i \ + SOCK_IO.i \ SOCK_Stream.i \ SOCK_Connector.i \ Service_Config.h \ Unbounded_Queue.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Queue.inl \ Unbounded_Queue.cpp \ Malloc_Base.h \ @@ -15973,7 +16817,8 @@ endif # GHS Malloc.h \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -16032,7 +16877,6 @@ endif # GHS OS_Export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -16059,7 +16903,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.h \ Flag_Manip.i \ Handle_Ops.h \ @@ -16082,7 +16927,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -16111,7 +16957,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -16125,7 +16972,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -16153,7 +16999,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.h \ Flag_Manip.i \ Handle_Ops.h \ @@ -16176,7 +17023,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -16205,7 +17053,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -16215,7 +17064,8 @@ endif # GHS SString.i \ Name_Proxy.h \ INET_Addr.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ INET_Addr.i \ SOCK_Connector.h \ SOCK_Stream.h \ @@ -16251,13 +17101,13 @@ endif # GHS Name_Request_Reply.h .obj/Naming_Context.o .obj/Naming_Context.so .shobj/Naming_Context.o .shobj/Naming_Context.so: Naming_Context.cpp \ - Get_Opt.h pre.h \ + Get_Opt.h \ + pre.h \ SString.h \ String_Base.h \ ACE.h OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -16283,7 +17133,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.h \ Flag_Manip.i \ Handle_Ops.h \ @@ -16306,7 +17157,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -16335,7 +17187,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -16364,7 +17217,8 @@ endif # GHS Service_Object.i \ Name_Proxy.h \ INET_Addr.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ INET_Addr.i \ SOCK_Connector.h \ SOCK_Stream.h \ @@ -16418,7 +17272,6 @@ endif # GHS pre.h OS.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -16444,7 +17297,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i + Trace.h \ + OS.i .obj/Remote_Name_Space.o .obj/Remote_Name_Space.so .shobj/Remote_Name_Space.o .shobj/Remote_Name_Space.so: Remote_Name_Space.cpp \ Remote_Name_Space.h \ @@ -16452,7 +17306,6 @@ endif # GHS ACE_export.h \ config-all.h \ config.h \ - config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ @@ -16480,7 +17333,8 @@ endif # GHS Global_Macros.h \ Min_Max.h \ streams.h \ - Trace.h OS.i \ + Trace.h \ + OS.i \ Flag_Manip.h \ Flag_Manip.i \ Handle_Ops.h \ @@ -16503,7 +17357,8 @@ endif # GHS OS_Log_Msg_Attributes.inl \ Malloc.i \ Malloc_T.h \ - Synch.h Synch.i \ + Synch.h \ + Synch.i \ Synch_T.h \ Synch_T.i \ Thread.h \ @@ -16532,7 +17387,8 @@ endif # GHS SV_Semaphore_Simple.i \ SV_Semaphore_Complex.i \ Unbounded_Set.h \ - Node.h Node.cpp \ + Node.h \ + Node.cpp \ Unbounded_Set.inl \ Unbounded_Set.cpp \ Memory_Pool.i \ @@ -16542,7 +17398,8 @@ endif # GHS SString.i \ Name_Proxy.h \ INET_Addr.h \ - Addr.h Addr.i \ + Addr.h \ + Addr.i \ INET_Addr.i \ SOCK_Connector.h \ SOCK_Stream.h \ diff --git a/ace/Multihomed_INET_Addr.cpp b/ace/Multihomed_INET_Addr.cpp new file mode 100644 index 00000000000..fe99c722855 --- /dev/null +++ b/ace/Multihomed_INET_Addr.cpp @@ -0,0 +1,187 @@ +// $Id$ + +// Extends ACE_INET_Addr with support for multi-homed addresses. + +#include /**/ "ace/Multihomed_INET_Addr.h" +#include /**/ "ace/Log_Msg.h" + +#if !defined (__ACE_INLINE__) +#include /**/ "ace/Multihomed_INET_Addr.i" +#endif /* __ACE_INLINE__ */ + +ACE_RCSID (ace, + Multihomed_INET_Addr, + "$Id$") + +ACE_ALLOC_HOOK_DEFINE(ACE_Multihomed_INET_Addr) + +// Default constructor + +ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr (void) + : secondaries(0) +{ + ACE_TRACE ("ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr"); +} + +ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, + const char host_name[], + int encode, + int address_family, + const char *(secondary_host_names[]), + size_t size){ + + // Initialize the primary INET addr + ACE_INET_Addr::set(port_number, host_name, encode, address_family); + + // check for secondary INET addrs + if (secondary_host_names && size){ + // we have a non-zero pointer and size + this->secondaries.size(size); // size the array + + size_t next_empty_slot = 0; + for (size_t i = 0; i < size; ++i) { + int ret = this->secondaries[next_empty_slot].set(port_number, + secondary_host_names[i], + encode, + address_family); + if (ret) { + ACE_DEBUG ((LM_DEBUG, + "Invalid INET addr (%s:%u) will be ignored\n", + secondary_host_names[i], port_number)); + this->secondaries.size(this->secondaries.size() - 1); + } + else + ++next_empty_slot; + } + } + + return; +} + +ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, + ACE_UINT32 primary_ip_addr, + int encode, + const ACE_UINT32 *secondary_ip_addrs, + size_t size){ + + // Initialize the primary INET addr + ACE_INET_Addr::set(port_number, primary_ip_addr, encode); + + // check for secondary INET addrs + if (secondary_ip_addrs && size){ + // we have a non-zero pointer and size + this->secondaries.size(size); // size the array + + size_t next_empty_slot = 0; + for (size_t i = 0; i < size; ++i) { + int ret = this->secondaries[next_empty_slot].set(port_number, + secondary_ip_addrs[i], + encode); + + if (ret) { + ACE_DEBUG ((LM_DEBUG, + "Invalid INET addr (%u:%u) will be ignored\n", + secondary_ip_addrs[i], port_number)); + this->secondaries.size(this->secondaries.size() - 1); + } + else + ++next_empty_slot; + } + } + + return; +} + +// Set implementations (NEED BETTER COMMENT HERE) +int +ACE_Multihomed_INET_Addr::set (u_short port_number, + const char host_name[], + int encode, + int address_family, + const char *(secondary_host_names[]), + size_t size) +{ + this->secondaries.size(size); + + for (size_t i = 0; i < size; ++i) { + + int ret = this->secondaries[i].set(port_number, + secondary_host_names[i], + encode, + address_family); + if (ret) { + return ret; + } + } + + return ACE_INET_Addr::set(port_number, host_name, encode, address_family); +} + +int +ACE_Multihomed_INET_Addr::set (u_short port_number, + ACE_UINT32 primary_ip_addr, + int encode, + const ACE_UINT32 *secondary_ip_addrs, + size_t size) +{ + this->secondaries.size(size); + + for (size_t i = 0; i < size; ++i) { + + int ret = this->secondaries[i].set(port_number, + secondary_ip_addrs[i], + encode); + + if (ret) { + return ret; + } + } + + return ACE_INET_Addr::set(port_number, primary_ip_addr, encode); +} + +int +ACE_Multihomed_INET_Addr::get_secondary_addresses(ACE_INET_Addr *secondary_addrs, + size_t size) const +{ + size_t top = size < this->secondaries.size() ? + size : this->secondaries.size(); + + for (size_t i = 0; i < top; ++i) { + + int ret = secondary_addrs[i].set(this->secondaries[i]); + + if (ret) { + return ret; + } + } + + return 0; +} + +void +ACE_Multihomed_INET_Addr::get_addresses(sockaddr_in *addrs, + size_t size) const +{ + // Copy primary address to the first slot of the user-supplied array + if (size > 0) { + addrs[0] = *ACE_reinterpret_cast (sockaddr_in*, this->get_addr()); + } + + // Copy secondary addresses to remaining slots of the user-supplied + // array. Secondary address [i] is copied to slot [i+1] + + size_t top = size - 1 < this->secondaries.size() ? + size - 1 : this->secondaries.size(); + + for (size_t i = 0; i < top; ++i) { + addrs[i+1] = *ACE_reinterpret_cast (sockaddr_in*, this->secondaries[i].get_addr()); + } +} + +// Default dtor. +ACE_Multihomed_INET_Addr::~ACE_Multihomed_INET_Addr (void) +{ + +} + diff --git a/ace/Multihomed_INET_Addr.h b/ace/Multihomed_INET_Addr.h new file mode 100644 index 00000000000..4198316d4e0 --- /dev/null +++ b/ace/Multihomed_INET_Addr.h @@ -0,0 +1,146 @@ +/* -*- C++ -*- */ + +//============================================================================= +/** + * @file Multihomed_INET_Addr.h + * + * $Id$ + * + * @author Edward R. Mulholland <emulholl@atl.lmco.com> + */ +//============================================================================= + +#ifndef ACE_MULTIHOMED_INET_ADDR_H +#define ACE_MULTIHOMED_INET_ADDR_H +#include /**/ "ace/pre.h" + +#include /**/ "ace/INET_Addr.h" +#include /**/ "ace/Containers_T.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +/** + * @class ACE_Multihomed_INET_Addr + * + * @brief Extends ACE_INET_Addr with support for multi-homed + * addresses. + */ +class ACE_Export ACE_Multihomed_INET_Addr : public ACE_INET_Addr +{ +public: + // = Initialization methods. + + /// Default constructor. + ACE_Multihomed_INET_Addr (void); + + /** + * Constructs an <ACE_Multihomed_INET_Addr> from a <port_number>, a + * <primary_host_name>, and an array of <secondary_host_names>. + * <size> is taken to be the length of the array. If <encode> is + * non-zero, then <port_number> is converted into network byte + * order; otherwise it is assumed to be in network byte order + * already and is passed straight through. <address_family> can be + * used to select IPv4/IPv6 if the OS has IPv6 capability + * (ACE_HAS_IPV6 is defined). To specify IPv6, use the value + * AF_INET6. To specify IPv4, use AF_INET. + */ + ACE_Multihomed_INET_Addr(u_short port_number, + const char primary_host_name[], + int encode = 1, + int address_family = AF_UNSPEC, + const char *(secondary_host_names[]) = 0, + size_t size = 0); + + /** + * Constructs an <ACE_Multihomed_INET_Addr> from a @a port_number, + * a @a primary_ip_addr, and an array of @a secondary_ip_addrs. @a + * size is taken to be the length of the array. If @a encode is + * non-zero, then the port number and the IP addresses are converted + * into network byte order; otherwise they are assumed to be in + * network byte order already and are passed straight through. + */ + ACE_Multihomed_INET_Addr(u_short port_number, + ACE_UINT32 primary_ip_addr = INADDR_ANY, + int encode = 1, + const ACE_UINT32 *secondary_ip_addrs = 0, + size_t size = 0); + + /// Use compiler-generated copy constructor. + + /// Use compiler-generated assignment operator. + + /// Default dtor. + ~ACE_Multihomed_INET_Addr (void); + + // = Direct initialization methods. + + // These methods are useful after the object has been constructed. + + /** + * Initializes an <ACE_Multihomed_INET_Addr> from a <port_number>, a + * <primary_host_name>, and an array of <secondary_host_names>. + * <size> is taken to be the length of the array. If <encode> is + * non-zero, then <port_number> is converted into network byte + * order; otherwise it is assumed to be in network byte order + * already and is passed straight through. <address_family> can be + * used to select IPv4/IPv6 if the OS has IPv6 capability + * (ACE_HAS_IPV6 is defined). To specify IPv6, use the value + * AF_INET6. To specify IPv4, use AF_INET. + */ + int set (u_short port_number, + const char primary_host_name[], + int encode = 1, + int address_family = AF_UNSPEC, + const char *(secondary_host_names[]) = 0, + size_t size = 0); + + /** + * Initializes an <ACE_Multihomed_INET_Addr> from a @a port_number, + * a @a primary_ip_addr, and an array of @a secondary_ip_addrs. @a + * size is taken to be the length of the array. If @a encode is + * non-zero, then the port number and the IP addresses are converted + * into network byte order; otherwise they are assumed to be in + * network byte order already and are passed straight through. + */ + int set (u_short port_number, + ACE_UINT32 primary_ip_addr = INADDR_ANY, + int encode = 1, + const ACE_UINT32 *secondary_ip_addrs = 0, + size_t size = 0); + + // = Accessor methods. + + /** + * Returns the number of secondary addresses. + */ + size_t get_num_secondary_addresses () const; + + /** + * Initialize user-supplied array <secondary_addrs> with the current + * secondary addresses. <size> is taken as the size of this array. + */ + int get_secondary_addresses(ACE_INET_Addr *secondary_addrs, + size_t size) const; + + /** + * Initialize user-supplied array <addrs> with the the current + * primary and secondary addresses. <size> is taken as the size of + * this array. + */ + void get_addresses(sockaddr_in *addrs, + size_t size) const; + +private: + + ACE_Array<ACE_INET_Addr> secondaries; +}; + +#if defined (__ACE_INLINE__) +#include /**/ "ace/Multihomed_INET_Addr.i" +#endif /* __ACE_INLINE__ */ + +#include /**/ "ace/post.h" +#endif /* ACE_MULTIHOMED_INET_ADDR_H */ + diff --git a/ace/Multihomed_INET_Addr.i b/ace/Multihomed_INET_Addr.i new file mode 100644 index 00000000000..2f3c17e7d0c --- /dev/null +++ b/ace/Multihomed_INET_Addr.i @@ -0,0 +1,12 @@ +/* -*- C++ -*- */ +// $Id$ + +// Multihomed_INET_Addr.i + +// Accessor implementations +ACE_INLINE +size_t +ACE_Multihomed_INET_Addr::get_num_secondary_addresses() const +{ + return this->secondaries.size(); +} @@ -777,6 +777,11 @@ private: # define ACE_SOCK_CONNECTOR ACE_SOCK_Connector # define ACE_SOCK_STREAM ACE_SOCK_Stream +// Handle ACE_SOCK_SEQPACK_* +# define ACE_SOCK_SEQPACK_ACCEPTOR ACE_SOCK_SEQPACK_Acceptor +# define ACE_SOCK_SEQPACK_CONNECTOR ACE_SOCK_SEQPACK_Connector +# define ACE_SOCK_SEQPACK_ASSOCIATION ACE_SOCK_SEQPACK_Association + // Handle ACE_MEM_* # define ACE_MEM_ACCEPTOR ACE_MEM_Acceptor # define ACE_MEM_CONNECTOR ACE_MEM_Connector @@ -858,6 +863,11 @@ private: # define ACE_SOCK_CONNECTOR ACE_SOCK_Connector, ACE_INET_Addr # define ACE_SOCK_STREAM ACE_SOCK_Stream, ACE_INET_Addr +// Handel ACE_SOCK_SEQPACK_* +# define ACE_SOCK_SEQPACK_ACCEPTOR ACE_SOCK_SEQPACK_Acceptor, ACE_INET_Addr +# define ACE_SOCK_SEQPACK_CONNECTOR ACE_SOCK_SEQPACK_Connector, ACE_INET_Addr +# define ACE_SOCK_SEQPACK_ASSOCIATION ACE_SOCK_SEQPACK_Association, ACE_INET_Addr + // Handle ACE_MEM_* # define ACE_MEM_ACCEPTOR ACE_MEM_Acceptor, ACE_MEM_Addr # define ACE_MEM_CONNECTOR ACE_MEM_Connector, ACE_INET_Addr @@ -1262,11 +1272,7 @@ struct cancel_state # if defined (ACE_HAS_WINCE) # include /**/ <types.h> -# if (_WIN32_WCE < 400) typedef unsigned long ptrdiff_t; // evc3, PocketPC don't defined ptrdiff_t -# else -# include /**/ <stddef.h> // WinCE .NET puts it in stddef.h -# endif //typedef DWORD nlink_t; @@ -1846,7 +1852,7 @@ typedef u_int ACE_thread_key_t; # include /**/ <sysLib.h> # include /**/ <taskLib.h> # include /**/ <taskHookLib.h> -# include /**/ <inetLib.h> + extern "C" struct sockaddr_un { short sun_family; // AF_UNIX. @@ -2907,19 +2913,6 @@ typedef ACE_UINT64 ACE_hrtime_t; // Win32 dummies to help compilation. -// These are used in SPIPE_Acceptor/Connector, but are ignored at runtime. -# if defined (ACE_HAS_WINCE) -# if !defined (PIPE_TYPE_MESSAGE) -# define PIPE_TYPE_MESSAGE 0 -# endif -# if !defined (PIPE_READMODE_MESSAGE) -# define PIPE_READMODE_MESSAGE 0 -# endif -# if !defined (PIPE_WAIT) -# define PIPE_WAIT 0 -# endif -# endif /* ACE_HAS_WINCE */ - # if !defined (__BORLANDC__) typedef DWORD nlink_t; # if !defined(__MINGW32__) @@ -4389,23 +4382,6 @@ extern "C" { typedef int (*ACE_COMPARE_FUNC)(const void *, const void *); } -#if defined (ACE_HAS_WINCE) -// WinCE doesn't have most of the standard C library time functions. It -// also doesn't define struct tm. SYSTEMTIME has pretty much the same -// info though, so we can map it when needed. Define struct tm here and -// use it when needed. This is taken from the standard C library. -struct tm { - int tm_sec; - int tm_min; - int tm_hour; - int tm_mday; // Day of the month - int tm_mon; - int tm_year; - int tm_wday; // Day of the week - int tm_yday; // Day in the year - int tm_isdst; // >0 if dst in effet; 0 if not; <0 if unknown -}; -#endif /* ACE_HAS_WINCE */ /// Helper for the ACE_OS::timezone() function @@ -4419,12 +4395,9 @@ struct tm { */ inline long ace_timezone() { -#if !defined (VXWORKS) && !defined (ACE_PSOS) && !defined (CHORUS) -# if defined (ACE_HAS_WINCE) - TIME_ZONE_INFORMATION tz; - GetTimeZoneInformation (&tz); - return tz.Bias * 60; -# elif defined (ACE_WIN32) +#if !defined (ACE_HAS_WINCE) && !defined (VXWORKS) && !defined (ACE_PSOS) \ + && !defined (CHORUS) +# if defined (ACE_WIN32) return _timezone; // For Win32. # elif ( defined (__Lynx__) || defined (__FreeBSD__) || defined (ACE_HAS_SUNOS4_GETTIMEOFDAY) ) && ( !defined (__linux__) ) long result = 0; @@ -5021,9 +4994,9 @@ public: //@} //@{ @name A set of wrappers for operations on time. - - // Get the current time. +# if !defined (ACE_HAS_WINCE) static time_t mktime (struct tm *timeptr); +# endif /* !ACE_HAS_WINCE */ // wrapper for time zone information. static void tzset (void); @@ -6873,20 +6846,18 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi } \ int ace_main_i -// Supporting legacy 'main' is A LOT easier for users than changing existing -// code on WinCE. Unfortunately, evc 3 can't grok a #include within the macro -// expansion, so it needs to go out here. -# include "ace/Argv_Type_Converter.h" +// Supporting legacy 'main' is A LOT easier for users than changing existing code on WinCE. # define main \ ace_main_i (int, char *[]); /* forward declaration */ \ +#include <ace/Argv_Type_Converter.h> \ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) \ { \ - ACE_CE_ARGV ce_argv (lpCmdLine); \ - ACE::init (); \ + ACE_CE_ARGV ce_argv(lpCmdLine); \ + ACE::init(); \ ACE_MAIN_OBJECT_MANAGER \ - ACE_Argv_Type_Converter command_line (ce_argv.argc (), ce_argv.argv ()); \ - int i = ace_main_i (command_line.get_argc(), command_line.get_ASCII_argv());\ - ACE::fini (); \ + ACE_Argv_Type_Converter command_line(ce_argv.argc(), ce_argv.argv()); \ + int i = ace_main_i (command_line.get_argc(), command_line.get_ASCII_argv()); \ + ACE::fini(); \ return i; \ } \ int ace_main_i diff --git a/ace/RMCast/Makefile b/ace/RMCast/Makefile index 6d128d02cc6..403728fc1ec 100644 --- a/ace/RMCast/Makefile +++ b/ace/RMCast/Makefile @@ -91,8 +91,8 @@ endif $(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 \ - RMCast_Export.h RMCast.i + $(ACE_ROOT)/ace/Trace.h \ + $(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 \ @@ -120,10 +120,11 @@ endif $(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 \ - 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/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/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ @@ -138,7 +139,8 @@ endif $(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/Functor.h $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -149,7 +151,8 @@ endif $(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/Functor.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ @@ -177,7 +180,8 @@ endif $(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/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 \ @@ -223,8 +227,9 @@ endif $(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 \ - RMCast_Export.h RMCast.i RMCast_Module.i RMCast_Fork.i + $(ACE_ROOT)/ace/Trace.h \ + $(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 \ @@ -252,9 +257,10 @@ endif $(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 \ - RMCast_Export.h RMCast.i RMCast_Module.i \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(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/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ @@ -301,11 +307,12 @@ endif $(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 \ - RMCast_Export.h RMCast.i RMCast_Module.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.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/SOCK_Dgram.h \ - $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.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/Flag_Manip.h \ @@ -320,14 +327,16 @@ endif $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.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 \ + $(ACE_ROOT)/ace/Functor.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/ACE.i $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ @@ -336,7 +345,8 @@ endif $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(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 \ @@ -349,7 +359,8 @@ endif $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Malloc_Base.h \ @@ -436,12 +447,13 @@ endif $(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 \ - RMCast_Export.h RMCast.i RMCast_Module.i \ - $(ACE_ROOT)/ace/Containers.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/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ @@ -458,7 +470,8 @@ endif $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(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 \ @@ -496,8 +509,9 @@ endif $(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 \ - RMCast_Export.h RMCast.i RMCast_Module.i + $(ACE_ROOT)/ace/Trace.h \ + $(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 \ @@ -525,8 +539,9 @@ endif $(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 \ - RMCast_Export.h RMCast.i RMCast_Module_Factory.i + $(ACE_ROOT)/ace/Trace.h \ + $(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 \ @@ -557,7 +572,8 @@ endif $(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/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Event_Handler.h \ @@ -576,14 +592,16 @@ endif $(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.h \ + $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Malloc_Base.h \ @@ -627,7 +645,8 @@ endif $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ @@ -647,7 +666,8 @@ endif $(ACE_ROOT)/ace/Module.i \ $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp RMCast_Partial_Message.i + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + 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 \ @@ -675,8 +695,9 @@ endif $(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 \ - RMCast_Export.h RMCast.i RMCast_Module.i RMCast_Proxy.i + $(ACE_ROOT)/ace/Trace.h \ + $(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 \ @@ -704,11 +725,12 @@ endif $(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 \ - RMCast_Export.h RMCast.i RMCast_Module.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager.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/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -719,7 +741,8 @@ endif $(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/Functor.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ @@ -728,7 +751,8 @@ endif $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(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 \ @@ -741,7 +765,8 @@ endif $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Malloc_Base.h \ @@ -826,7 +851,8 @@ endif $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ @@ -846,7 +872,8 @@ endif $(ACE_ROOT)/ace/Module.i \ $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp RMCast_Partial_Message.i + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + 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 \ @@ -874,9 +901,10 @@ endif $(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 \ - 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/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/Log_Priority.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl @@ -907,13 +935,15 @@ endif $(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 \ - 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/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/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -924,7 +954,8 @@ endif $(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/Functor.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ @@ -933,7 +964,8 @@ endif $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(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 \ @@ -946,7 +978,8 @@ endif $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Malloc_Base.h \ @@ -1029,10 +1062,11 @@ endif $(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 \ - 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/Trace.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 \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -1043,12 +1077,14 @@ endif $(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/Functor.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(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/RB_Tree.i \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(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 \ @@ -1085,7 +1121,8 @@ endif $(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/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 \ @@ -1133,7 +1170,8 @@ endif $(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/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Event_Handler.i RMCast_Resend_Handler.i \ RMCast_Retransmission.h RMCast_Module.h RMCast.h RMCast.i \ RMCast_Module.i RMCast_Copy_On_Write.h RMCast_Worker.h RMCast_Worker.i \ @@ -1153,7 +1191,8 @@ endif $(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/Functor.h $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -1164,7 +1203,8 @@ endif $(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/Functor.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ @@ -1190,7 +1230,8 @@ endif $(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/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 \ @@ -1231,9 +1272,10 @@ endif $(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 \ - 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/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/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ @@ -1277,10 +1319,11 @@ endif $(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 \ - 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/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/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ @@ -1295,7 +1338,8 @@ endif $(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/Functor.h $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -1306,7 +1350,8 @@ endif $(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/Functor.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ @@ -1334,7 +1379,8 @@ endif $(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/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 \ @@ -1382,9 +1428,10 @@ endif $(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 \ - RMCast_Export.h RMCast.i RMCast_Module.i \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(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/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ @@ -1425,9 +1472,9 @@ endif $(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 \ - RMCast_Export.h RMCast.i RMCast_Module_Factory.i \ - RMCast_Singleton_Factory.i + $(ACE_ROOT)/ace/Trace.h \ + $(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 \ @@ -1456,12 +1503,15 @@ endif $(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/Event_Handler.i RMCast_UDP_Event_Handler.i \ - RMCast_IO_UDP.h RMCast_Module.h RMCast.h RMCast.i RMCast_Module.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Event_Handler.i \ + RMCast_UDP_Event_Handler.i RMCast_IO_UDP.h RMCast_Module.h RMCast.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 \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -1476,14 +1526,16 @@ endif $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.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 \ + $(ACE_ROOT)/ace/Functor.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/ACE.i $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ @@ -1492,7 +1544,8 @@ endif $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(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 \ @@ -1505,7 +1558,8 @@ endif $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Malloc_Base.h \ @@ -1585,12 +1639,14 @@ endif $(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 \ - RMCast_Export.h RMCast.i RMCast_Module.i RMCast_Proxy.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(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/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/SOCK_Dgram.h \ @@ -1604,14 +1660,16 @@ endif $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.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 \ + $(ACE_ROOT)/ace/Functor.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/ACE.i $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ @@ -1620,7 +1678,8 @@ endif $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(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 \ @@ -1633,7 +1692,8 @@ endif $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Malloc_Base.h \ @@ -1720,13 +1780,15 @@ endif $(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 \ - 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/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/SOCK_Dgram_Mcast.h \ $(ACE_ROOT)/ace/SOCK_Dgram.h \ - $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.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/Flag_Manip.h \ @@ -1741,14 +1803,16 @@ endif $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.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 \ + $(ACE_ROOT)/ace/Functor.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/ACE.i $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ @@ -1757,7 +1821,8 @@ endif $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(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 \ @@ -1770,7 +1835,8 @@ endif $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Malloc_Base.h \ @@ -1854,12 +1920,14 @@ endif $(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 \ - 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/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/SOCK_Dgram_Mcast.h \ $(ACE_ROOT)/ace/SOCK_Dgram.h \ - $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.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/Flag_Manip.h \ @@ -1874,14 +1942,16 @@ endif $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.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 \ + $(ACE_ROOT)/ace/Functor.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/ACE.i $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ @@ -1890,7 +1960,8 @@ endif $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(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 \ @@ -1903,7 +1974,8 @@ endif $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Malloc_Base.h \ diff --git a/ace/SOCK_Connector.cpp b/ace/SOCK_Connector.cpp index cd75d000c7c..7f2b54fba2e 100644 --- a/ace/SOCK_Connector.cpp +++ b/ace/SOCK_Connector.cpp @@ -147,13 +147,14 @@ ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream, const ACE_Addr &local_sap, int reuse_addr, int /* flags */, - int /* perms */) + int /* perms */, + int protocol) { ACE_TRACE ("ACE_SOCK_Connector::connect"); if (this->shared_open (new_stream, remote_sap.get_type (), - 0, + protocol, reuse_addr) == -1) return -1; else if (this->shared_connect_start (new_stream, @@ -272,7 +273,8 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, const ACE_Addr &local_sap, int reuse_addr, int flags, - int perms) + int perms, + int protocol) { ACE_TRACE ("ACE_SOCK_Connector::ACE_SOCK_Connector"); @@ -282,7 +284,8 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, local_sap, reuse_addr, flags, - perms) == -1 + perms, + protocol) == -1 && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME || errno == ETIMEDOUT)) ACE_ERROR ((LM_ERROR, diff --git a/ace/SOCK_Connector.h b/ace/SOCK_Connector.h index 0c5861d981c..514abebd05c 100644 --- a/ace/SOCK_Connector.h +++ b/ace/SOCK_Connector.h @@ -89,7 +89,8 @@ public: const ACE_Addr &local_sap = ACE_Addr::sap_any, int reuse_addr = 0, int flags = 0, - int perms = 0); + int perms = 0, + int protocol = 0); #if !defined (ACE_HAS_WINCE) /** @@ -191,7 +192,8 @@ public: const ACE_Addr &local_sap = ACE_Addr::sap_any, int reuse_addr = 0, int flags = 0, - int perms = 0); + int perms = 0, + int protocol = 0); #if !defined (ACE_HAS_WINCE) /** diff --git a/ace/SOCK_SEQPACK_Acceptor.cpp b/ace/SOCK_SEQPACK_Acceptor.cpp new file mode 100644 index 00000000000..97a9f8d280d --- /dev/null +++ b/ace/SOCK_SEQPACK_Acceptor.cpp @@ -0,0 +1,513 @@ +// SOCK_SEQPACK_Acceptor.cpp +// $Id$ + +#include "ace/SOCK_SEQPACK_Acceptor.h" + +#include "ace/Log_Msg.h" + +#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#include "ace/SOCK_SEQPACK_Acceptor.i" +#endif /* ACE_LACKS_INLINE_FUNCTIONS */ + +#include "ace/Synch.h" +#include "ace/Auto_Ptr.h" + +ACE_RCSID(ace, SOCK_SEQPACK_Acceptor, "SOCK_SEQPACK_Acceptor.cpp,v 4.30 2002/03/08 23:18:09 spark Exp") + +ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_SEQPACK_Acceptor) + +// Do nothing routine for constructor. + +ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor (void) +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor"); +} + +// Performs the timed accept operation. + +int +ACE_SOCK_SEQPACK_Acceptor::shared_accept_start (ACE_Time_Value *timeout, + int restart, + int &in_blocking_mode) const +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::shared_accept_start"); + + ACE_HANDLE handle = this->get_handle (); + + // Handle the case where we're doing a timed <accept>. + if (timeout != 0) + { + if (ACE::handle_timed_accept (handle, + timeout, + restart) == -1) + return -1; + else + { + in_blocking_mode = ACE_BIT_DISABLED (ACE::get_flags (handle), + ACE_NONBLOCK); + // Set the handle into non-blocking mode if it's not already + // in it. + if (in_blocking_mode + && ACE::set_flags (handle, + ACE_NONBLOCK) == -1) + return -1; + } + } + + return 0; +} + +int +ACE_SOCK_SEQPACK_Acceptor::shared_accept_finish (ACE_SOCK_SEQPACK_Association new_association, + int in_blocking_mode, + int reset_new_handle) const +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::shared_accept_finish ()"); + + ACE_HANDLE new_handle = new_association.get_handle (); + + // Check to see if we were originally in blocking mode, and if so, + // set the <new_association>'s handle and <this> handle to be in blocking + // mode. + if (in_blocking_mode) + { + // Save/restore errno. + ACE_Errno_Guard error (errno); + + // Only disable ACE_NONBLOCK if we weren't in non-blocking mode + // originally. + ACE::clr_flags (this->get_handle (), + ACE_NONBLOCK); + ACE::clr_flags (new_handle, + ACE_NONBLOCK); + } + +#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) + if (reset_new_handle) + // Reset the event association inherited by the new handle. + ::WSAEventSelect ((SOCKET) new_handle, 0, 0); +#else + ACE_UNUSED_ARG (reset_new_handle); +#endif /* ACE_WIN32 */ + + return new_handle == ACE_INVALID_HANDLE ? -1 : 0; +} + +// General purpose routine for accepting new connections. + +int +ACE_SOCK_SEQPACK_Acceptor::accept (ACE_SOCK_SEQPACK_Association &new_association, + ACE_Addr *remote_addr, + ACE_Time_Value *timeout, + int restart, + int reset_new_handle) const +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::accept"); + + int in_blocking_mode = 0; + if (this->shared_accept_start (timeout, + restart, + in_blocking_mode) == -1) + return -1; + else + { + // On Win32 the third parameter to <accept> must be a NULL + // pointer if we want to ignore the client's address. + int *len_ptr = 0; + sockaddr *addr = 0; + int len = 0; + + if (remote_addr != 0) + { + len = remote_addr->get_size (); + len_ptr = &len; + addr = (sockaddr *) remote_addr->get_addr (); + } + + do + new_association.set_handle (ACE_OS::accept (this->get_handle (), + addr, + len_ptr)); + while (new_association.get_handle () == ACE_INVALID_HANDLE + && restart != 0 + && errno == EINTR + && timeout == 0); + + // Reset the size of the addr, so the proper UNIX/IPv4/IPv6 family + // is known. + if (new_association.get_handle () != ACE_INVALID_HANDLE + && remote_addr != 0) + { + remote_addr->set_size (len); + remote_addr->set_type (addr->sa_family); + } + } + + return this->shared_accept_finish (new_association, + in_blocking_mode, + reset_new_handle); +} + +void +ACE_SOCK_SEQPACK_Acceptor::dump (void) const +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::dump"); +} + +int +ACE_SOCK_SEQPACK_Acceptor::shared_open (const ACE_Addr &local_sap, + int protocol_family, + int backlog) +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::shared_open"); + int error = 0; + +#if defined (ACE_HAS_IPV6) + ACE_ASSERT (protocol_family == PF_INET || protocol_family == PF_INET6); + + if (protocol_family == PF_INET6) + { + sockaddr_in6 local_inet6_addr; + ACE_OS::memset (ACE_reinterpret_cast (void *, + &local_inet6_addr), + 0, + sizeof local_inet6_addr); + + if (local_sap == ACE_Addr::sap_any) + { + local_inet6_addr.sin6_family = AF_INET6; + local_inet6_addr.sin6_port = 0; + local_inet6_addr.sin6_addr = in6addr_any; + } + else + local_inet6_addr = *ACE_reinterpret_cast (sockaddr_in6 *, + local_sap.get_addr ()); + + // We probably don't need a bind_port written here. + // There are currently no supported OS's that define + // ACE_LACKS_WILDCARD_BIND. + if (ACE_OS::bind (this->get_handle (), + ACE_reinterpret_cast (sockaddr *, + &local_inet6_addr), + sizeof local_inet6_addr) == -1) + error = 1; + } + else +#endif + if (protocol_family == PF_INET) + { + sockaddr_in local_inet_addr; + ACE_OS::memset (ACE_reinterpret_cast (void *, + &local_inet_addr), + 0, + sizeof local_inet_addr); + + if (local_sap == ACE_Addr::sap_any) + { + local_inet_addr.sin_port = 0; + } + else + local_inet_addr = *ACE_reinterpret_cast (sockaddr_in *, + local_sap.get_addr ()); + if (local_inet_addr.sin_port == 0) + { + if (ACE::bind_port (this->get_handle ()) == -1) + error = 1; + } + else if (ACE_OS::bind (this->get_handle (), + ACE_reinterpret_cast (sockaddr *, + &local_inet_addr), + sizeof local_inet_addr) == -1) + error = 1; + } + else if (ACE_OS::bind (this->get_handle (), + (sockaddr *) local_sap.get_addr (), + local_sap.get_size ()) == -1) + error = 1; + + if (error != 0 + || ACE_OS::listen (this->get_handle (), + backlog) == -1) + { + error = 1; + this->close (); + } + + return error ? -1 : 0; +} + +// Multihomed version of same. + +int +ACE_SOCK_SEQPACK_Acceptor::shared_open (const ACE_Multihomed_INET_Addr &local_sap, + int protocol_family, + int backlog) +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::shared_open"); + int error = 0; + + // TODO: Add multi-address support to IPV6 +#if defined (ACE_HAS_IPV6) + ACE_ASSERT (protocol_family == PF_INET || protocol_family == PF_INET6); + + if (protocol_family == PF_INET6) + { + sockaddr_in6 local_inet6_addr; + ACE_OS::memset (ACE_reinterpret_cast (void *, + &local_inet6_addr), + 0, + sizeof local_inet6_addr); + + if (local_sap == ACE_Addr::sap_any) + { + local_inet6_addr.sin6_family = AF_INET6; + local_inet6_addr.sin6_port = 0; + local_inet6_addr.sin6_addr = in6addr_any; + } + else + local_inet6_addr = *ACE_reinterpret_cast (sockaddr_in6 *, + local_sap.get_addr ()); + + // We probably don't need a bind_port written here. + // There are currently no supported OS's that define + // ACE_LACKS_WILDCARD_BIND. + if (ACE_OS::bind (this->get_handle (), + ACE_reinterpret_cast (sockaddr *, + &local_inet6_addr), + sizeof local_inet6_addr) == -1) + error = 1; + } + else +#endif + if (protocol_family == PF_INET) + { + sockaddr_in local_inet_addr; + ACE_OS::memset (ACE_reinterpret_cast (void *, + &local_inet_addr), + 0, + sizeof local_inet_addr); + + if (local_sap.ACE_Addr::operator== (ACE_Addr::sap_any)) + { + local_inet_addr.sin_port = 0; + } + else + local_inet_addr = *ACE_reinterpret_cast (sockaddr_in *, + local_sap.get_addr ()); + if (local_inet_addr.sin_port == 0) + { + if (ACE::bind_port (this->get_handle ()) == -1) + error = 1; + } + else + { + // The total number of addresses is the number of secondary + // addresses plus one. + size_t num_addresses = local_sap.get_num_secondary_addresses() + 1; + + // Create an array of sockaddr_in to hold the underlying + // representations of the primary and secondary + // addresses. + sockaddr_in* local_inet_addrs = 0; + ACE_NEW_NORETURN(local_inet_addrs, + sockaddr_in[num_addresses]); + + if (!local_inet_addrs) + error = 1; + else + { + // Populate the array by invoking the get_addresses method + // on the Multihomed_INET_Addr + local_sap.get_addresses(local_inet_addrs, + num_addresses); + + // Call bind + if (ACE_OS::bind (this->get_handle (), + ACE_reinterpret_cast (sockaddr *, + local_inet_addrs), + (sizeof local_inet_addr)*num_addresses) == -1) + error = 1; + } + + delete [] local_inet_addrs; + } + } + else if (ACE_OS::bind (this->get_handle (), + (sockaddr *) local_sap.get_addr (), + local_sap.get_size ()) == -1) + error = 1; + + if (error != 0 + || ACE_OS::listen (this->get_handle (), + backlog) == -1) + { + error = 1; + this->close (); + } + + return error ? -1 : 0; +} + +int +ACE_SOCK_SEQPACK_Acceptor::open (const ACE_Addr &local_sap, + ACE_Protocol_Info *protocolinfo, + ACE_SOCK_GROUP g, + u_long flags, + int reuse_addr, + int protocol_family, + int backlog, + int protocol) +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::open"); + + if (protocol_family == PF_UNSPEC) + protocol_family = local_sap.get_type (); + + + if (ACE_SOCK::open (SOCK_SEQPACKET, + protocol_family, + protocol, + protocolinfo, + g, + flags, + reuse_addr) == -1) + return -1; + else + return this->shared_open (local_sap, + protocol_family, + backlog); +} + +ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor (const ACE_Addr &local_sap, + ACE_Protocol_Info *protocolinfo, + ACE_SOCK_GROUP g, + u_long flags, + int reuse_addr, + int protocol_family, + int backlog, + int protocol) +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor"); + if (this->open (local_sap, + protocolinfo, + g, + flags, + reuse_addr, + protocol_family, + backlog, + protocol) == -1) + ACE_ERROR ((LM_ERROR, + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_SOCK_SEQPACK_Acceptor"))); +} + +// General purpose routine for performing server ACE_SOCK creation. + +int +ACE_SOCK_SEQPACK_Acceptor::open (const ACE_Addr &local_sap, + int reuse_addr, + int protocol_family, + int backlog, + int protocol) +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::open"); + + if (local_sap != ACE_Addr::sap_any) + protocol_family = local_sap.get_type (); + else if (protocol_family == PF_UNSPEC) + { +#if defined (ACE_HAS_IPV6) + protocol_family = ACE_Sock_Connect::ipv6_enabled () ? PF_INET6 : PF_INET; +#else + protocol_family = PF_INET; +#endif /* ACE_HAS_IPV6 */ + } + + if (ACE_SOCK::open (SOCK_SEQPACKET, + protocol_family, + protocol, + reuse_addr) == -1) + return -1; + else + return this->shared_open (local_sap, + protocol_family, + backlog); +} + +// Multihomed version of same. + +int +ACE_SOCK_SEQPACK_Acceptor::open (const ACE_Multihomed_INET_Addr &local_sap, + int reuse_addr, + int protocol_family, + int backlog, + int protocol) +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::open"); + + if (local_sap.ACE_Addr::operator!= (ACE_Addr::sap_any)) + protocol_family = local_sap.get_type (); + else if (protocol_family == PF_UNSPEC) + { +#if defined (ACE_HAS_IPV6) + protocol_family = ACE_Sock_Connect::ipv6_enabled () ? PF_INET6 : PF_INET; +#else + protocol_family = PF_INET; +#endif /* ACE_HAS_IPV6 */ + } + + if (ACE_SOCK::open (SOCK_SEQPACKET, + protocol_family, + protocol, + reuse_addr) == -1) + return -1; + else + return this->shared_open (local_sap, + protocol_family, + backlog); +} + +// General purpose routine for performing server ACE_SOCK creation. + +ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor (const ACE_Addr &local_sap, + int reuse_addr, + int protocol_family, + int backlog, + int protocol) +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor"); + if (this->open (local_sap, + reuse_addr, + protocol_family, + backlog, + protocol) == -1) + ACE_ERROR ((LM_ERROR, + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_SOCK_SEQPACK_Acceptor"))); +} + +// Multihomed version of same. + +ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor (const ACE_Multihomed_INET_Addr &local_sap, + int reuse_addr, + int protocol_family, + int backlog, + int protocol) +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor"); + if (this->open (local_sap, + reuse_addr, + protocol_family, + backlog, + protocol) == -1) + ACE_ERROR ((LM_ERROR, + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_SOCK_SEQPACK_Acceptor"))); +} + +int +ACE_SOCK_SEQPACK_Acceptor::close (void) +{ + return ACE_SOCK::close (); +} + diff --git a/ace/SOCK_SEQPACK_Acceptor.h b/ace/SOCK_SEQPACK_Acceptor.h index 2cbc10a67b8..baf3e3a1779 100644 --- a/ace/SOCK_SEQPACK_Acceptor.h +++ b/ace/SOCK_SEQPACK_Acceptor.h @@ -1,6 +1,5 @@ /* -*- C++ -*- */ - //============================================================================= /** * @file SOCK_SEQPACK_Acceptor.h diff --git a/ace/SOCK_SEQPACK_Acceptor.i b/ace/SOCK_SEQPACK_Acceptor.i new file mode 100644 index 00000000000..73421d31d0c --- /dev/null +++ b/ace/SOCK_SEQPACK_Acceptor.i @@ -0,0 +1,12 @@ +/* -*- C++ -*- */ +// $Id$ + +// SOCK_SEQPACK_Acceptor.i + +ASYS_INLINE +ACE_SOCK_SEQPACK_Acceptor::~ACE_SOCK_SEQPACK_Acceptor (void) +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::~ACE_SOCK_SEQPACK_Acceptor"); +} + + diff --git a/ace/SOCK_SEQPACK_Association.cpp b/ace/SOCK_SEQPACK_Association.cpp new file mode 100644 index 00000000000..c132878cddb --- /dev/null +++ b/ace/SOCK_SEQPACK_Association.cpp @@ -0,0 +1,173 @@ +// SOCK_SEQPACK_Association.cpp + +#include /**/ "ace/SOCK_SEQPACK_Association.h" +#include /**/ "ace/Auto_Ptr.h" +#include /**/ "ace/Log_Msg.h" + +#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#include /**/ "ace/SOCK_SEQPACK_Association.i" +#endif + +ACE_RCSID(ace, SOCK_SEQPACK_Association, "$Id$") + +ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_SEQPACK_Association) + +void +ACE_SOCK_SEQPACK_Association::dump (void) const +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Association::dump"); +} + +int +ACE_SOCK_SEQPACK_Association::close (void) +{ +#if defined (ACE_WIN32) + // We need the following call to make things work correctly on + // Win32, which requires use to do a <close_writer> before doing the + // close in order to avoid losing data. Note that we don't need to + // do this on UNIX since it doesn't have this "feature". Moreover, + // this will cause subtle problems on UNIX due to the way that + // fork() works. + this->close_writer (); +#endif /* ACE_WIN32 */ + // Close down the socket. + return ACE_SOCK::close (); +} + +int +ACE_SOCK_SEQPACK_Association::get_local_addrs (ACE_INET_Addr *addrs, size_t &size) const +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Association::get_local_addrs"); + + /* + We will be calling ACE_OS::getsockname, which accepts (and + potentially modifies) two reference parameters: + + 1. a sockaddr_in* that points to a buffer + 2. an int* that points to the size of this buffer + + The OpenSS7 implementation of SCTP copies an array of ipv4 + sockaddr_in into the buffer. Then, if the size of the buffer is + greater than the size used, the size parameter is reduced + accordingly. + + */ + + // The array of sockaddr_in will be stored in an ACE_Auto_Array_Ptr, + // which causes dynamically-allocated memory to be released as soon + // as the ACE_Auto_Array_Ptr goes out of scope. + ACE_Auto_Array_Ptr<sockaddr_in> addr_structs; + + // Allocate memory for this array. Return -1 if the memory cannot + // be allocated. (This activity requires a temporary variable---a + // bare sockaddr_in* --- because ACE_NEW_RETURN cannot act directory on + // an ACE_Auto_Array_Ptr.) + { + sockaddr_in *addr_structs_bootstrap = 0; + ACE_NEW_RETURN(addr_structs_bootstrap, + sockaddr_in[size], + -1); + addr_structs.reset(addr_structs_bootstrap); + } + + // Physical size of this array is its logical size multiplied by + // the physical size of one of its elements. + int physical_size = size * sizeof(sockaddr_in); + + /* Clear the array */ + ACE_OS::memset(addr_structs.get(), + 0, + physical_size); + + /* Populate the array with real values from the getsockname system + call. The variables addr_structs and phycisal_size are + modified. */ + if (ACE_OS::getsockname (this->get_handle (), + ACE_reinterpret_cast (sockaddr *, + addr_structs.get()), + &physical_size) == -1) + return -1; + + /* Calculate the NEW physical size of the array */ + size = physical_size / sizeof (sockaddr_in); + + /* Copy each sockaddr_in to the address structure of an ACE_Addr from + the passed-in array */ + for (size_t i = 0; i < size; ++i) { + + addrs[i].set_addr(&(addr_structs[i]), sizeof(sockaddr_in)); + addrs[i].set_type(addr_structs[i].sin_family); + addrs[i].set_size(sizeof(sockaddr_in)); + } + + return 0; +} + +int +ACE_SOCK_SEQPACK_Association::get_remote_addrs (ACE_INET_Addr *addrs, size_t &size) const +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Association::get_remote_addrs"); + + /* + We will be calling ACE_OS::getpeername, which accepts (and + potentially modifies) two reference parameters: + + 1. a sockaddr_in* that points to a buffer + 2. an int* that points to the size of this buffer + + The OpenSS7 implementation of SCTP copies an array of ipv4 + sockaddr_in into the buffer. Then, if the size of the buffer is + greater than the size used, the size parameter is reduced + accordingly. + + */ + + // The array of sockaddr_in will be stored in an ACE_Auto_Array_Ptr, + // which causes dynamically-allocated memory to be released as soon + // as the ACE_Auto_Array_Ptr goes out of scope. + ACE_Auto_Array_Ptr<sockaddr_in> addr_structs; + + // Allocate memory for this array. Return -1 if the memory cannot + // be allocated. (This activity requires a temporary variable---a + // bare sockaddr_in* --- because ACE_NEW_RETURN cannot act directory on + // an ACE_Auto_Array_Ptr.) + { + sockaddr_in *addr_structs_bootstrap = 0; + ACE_NEW_RETURN(addr_structs_bootstrap, + sockaddr_in[size], + -1); + addr_structs.reset(addr_structs_bootstrap); + } + + // Physical size of this array is its logical size multiplied by + // the physical size of one of its elements. + int physical_size = size * sizeof(sockaddr_in); + + /* Clear the array */ + ACE_OS::memset(addr_structs.get(), + 0, + physical_size); + + /* Populate the array with real values from the getpeername system + call. The variables addr_structs and phycisal_size are + modified. */ + if (ACE_OS::getpeername (this->get_handle (), + ACE_reinterpret_cast (sockaddr *, + addr_structs.get()), + &physical_size) == -1) + return -1; + + /* Calculate the NEW physical size of the array */ + size = physical_size / sizeof (sockaddr_in); + + /* Copy each sockaddr_in to the address structure of an ACE_Addr from + the passed-in array */ + for (size_t i = 0; i < size; ++i) { + + addrs[i].set_addr(&(addr_structs[i]), sizeof(sockaddr_in)); + addrs[i].set_type(addr_structs[i].sin_family); + addrs[i].set_size(sizeof(sockaddr_in)); + } + + return 0; +} diff --git a/ace/SOCK_SEQPACK_Association.h b/ace/SOCK_SEQPACK_Association.h new file mode 100644 index 00000000000..3e285573615 --- /dev/null +++ b/ace/SOCK_SEQPACK_Association.h @@ -0,0 +1,192 @@ +/* -*- C++ -*- */ + +//============================================================================= +/** + * + * @file SOCK_SEQPACK_Association.h + * + * $Id$ + * + * @author Patrick J. Lardieri <plardier@atl.lmco.com> + * @author based on SOCK_Stream + * by Douglas C. Schmidt <schmidt@cs.wustl.edu> + * + */ +//============================================================================= + +#ifndef ACE_SOCK_SEQPACK_ASSOCIATION_H +#define ACE_SOCK_SEQPACK_ASSOCIATION_H + +#include "ace/pre.h" +#include "ace/config.h" +#include "ace/ACE_export.h" + +#include "ace/SOCK_IO.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "ace/INET_Addr.h" + +// Forward declarations. +class ACE_Message_Block; + +/** + * @class ACE_SOCK_SEQPACK_Association + * + * @brief Defines the methods in the <ACE_SOCK_SEQPACK_Association> abstraction. + * + * This adds additional wrapper methods atop the <ACE_SOCK_IO> + * class. + * + * <buf> is the buffer to write from or receive into. + * <len> is the number of bytes to transfer. + * The <timeout> parameter in the following methods indicates how + * long to blocking trying to transfer data. If <timeout> == 0, + * then the call behaves as a normal send/recv call, i.e., for + * blocking sockets, the call will block until action is possible; + * for non-blocking sockets, EWOULDBLOCK will be returned if no + * action is immediately possible. + * If <timeout> != 0, the call will wait for data to arrive no longer + * than the relative time specified in *<timeout>. + * The "_n()" I/O methods keep looping until all the data has been + * transferred. These methods also work for sockets in non-blocking + * mode i.e., they keep looping on EWOULDBLOCK. <timeout> is used + * to make sure we keep making progress, i.e., the same timeout + * value is used for every I/O operation in the loop and the timeout + * is not counted down. + * The return values for the "*_n()" methods match the return values + * from the non "_n()" methods and are specified as follows: + * - On complete transfer, the number of bytes transferred is returned. + * - On timeout, -1 is returned, errno == ETIME. + * - On error, -1 is returned, errno is set to appropriate error. + * - On EOF, 0 is returned, errno is irrelevant. + * + * On partial transfers, i.e., if any data is transferred before + * timeout/error/EOF, <bytes_transferred> will contain the number of + * bytes transferred. + * Methods with <iovec> parameter are I/O vector variants of the I/O + * operations. + * Methods with the extra <flags> argument will always result in + * <send> getting called. Methods without the extra <flags> argument + * will result in <send> getting called on Win32 platforms, and + * <write> getting called on non-Win32 platforms. + */ +class ACE_Export ACE_SOCK_SEQPACK_Association : public ACE_SOCK_IO +{ +public: + // Initialization and termination methods. + /// Constructor. + ACE_SOCK_SEQPACK_Association (void); + + /// Constructor (sets the underlying <ACE_HANDLE> with <h>). + ACE_SOCK_SEQPACK_Association (ACE_HANDLE h); + + /// Destructor. + ~ACE_SOCK_SEQPACK_Association (void); + + /** + * Return local endpoint addresses in the referenced array of + * <ACE_INET_Addr>, which should have the specified <size>. If the + * number of local endpoint addresses is less than <size>, then + * <size> will be set to this number. If successful, the method + * returns 0, otherwise returns -1. + */ + int get_local_addrs (ACE_INET_Addr *addrs, size_t &size) const; + + /** + * Return remote endpoint addresses in the referenced array of + * <ACE_INET_Addr>, which should have the specified <size>. If the + * number of remote endpoint addresses is less than <size>, then + * <size> will be set to this number. If successful, the method + * returns 0, otherwise returns -1. + */ + int get_remote_addrs (ACE_INET_Addr *addrs, size_t &size) const; + + // = I/O functions. + + /// Try to recv exactly <len> bytes into <buf> from the connected socket. + ssize_t recv_n (void *buf, + size_t len, + int flags, + const ACE_Time_Value *timeout = 0, + size_t *bytes_transferred = 0) const; + + /// Try to recv exactly <len> bytes into <buf> from the connected socket. + ssize_t recv_n (void *buf, + size_t len, + const ACE_Time_Value *timeout = 0, + size_t *bytes_transferred = 0) const; + + /// Receive an <iovec> of size <iovcnt> from the connected socket. + ssize_t recvv_n (iovec iov[], + size_t iovcnt, + const ACE_Time_Value *timeout = 0, + size_t *bytes_transferred = 0) const; + + /// Try to send exactly <len> bytes from <buf> to the connection socket. + ssize_t send_n (const void *buf, + size_t len, + int flags, + const ACE_Time_Value *timeout = 0, + size_t *bytes_transferred = 0) const; + + /// Try to send exactly <len> bytes from <buf> to the connected socket. + ssize_t send_n (const void *buf, + size_t len, + const ACE_Time_Value *timeout = 0, + size_t *bytes_transferred = 0) const; + + /// Send all the <message_block>s chained through their <next> and + /// <cont> pointers. This call uses the underlying OS gather-write + /// operation to reduce the domain-crossing penalty. + ssize_t send_n (const ACE_Message_Block *message_block, + const ACE_Time_Value *timeout = 0, + size_t *bytes_transferred = 0) const; + + /// Send an <iovec> of size <iovcnt> to the connected socket. + ssize_t sendv_n (const iovec iov[], + size_t iovcnt, + const ACE_Time_Value *timeout = 0, + size_t *bytes_transferred = 0) const; + + // = Send/receive ``urgent'' data (see TCP specs...). + ssize_t send_urg (const void *ptr, + size_t len = sizeof (char), + const ACE_Time_Value *timeout = 0) const; + + ssize_t recv_urg (void *ptr, + size_t len = sizeof (char), + const ACE_Time_Value *timeout = 0) const; + + // = Selectively close endpoints. + /// Close down the reader. + int close_reader (void); + + /// Close down the writer. + int close_writer (void); + + /** + * Close down the socket (we need this to make things work correctly + * on Win32, which requires use to do a <close_writer> before doing + * the close to avoid losing data). */ + int close (void); + + // = Meta-type info + typedef ACE_INET_Addr PEER_ADDR; + + /// Dump the state of an object. + void dump (void) const; + + /// Declare the dynamic allocation hooks. + ACE_ALLOC_HOOK_DECLARE; +}; + +#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#include "ace/SOCK_SEQPACK_Association.i" +#endif + +#include "ace/post.h" + +#endif /* ACE_SOCK_SEQPACK_ASSOCIATION_H */ diff --git a/ace/SOCK_SEQPACK_Association.i b/ace/SOCK_SEQPACK_Association.i new file mode 100644 index 00000000000..bcb837d40b8 --- /dev/null +++ b/ace/SOCK_SEQPACK_Association.i @@ -0,0 +1,172 @@ +/* -*- C++ -*- */ +// SOCK_SEQPACK_Association.i +// $Id$ + +#include "ace/SOCK_SEQPACK_Association.h" + +ASYS_INLINE +ACE_SOCK_SEQPACK_Association::ACE_SOCK_SEQPACK_Association (void) +{ + // ACE_TRACE ("ACE_SOCK_SEQPACK_Association::ACE_SOCK_SEQPACK_Association"); +} + +ASYS_INLINE +ACE_SOCK_SEQPACK_Association::ACE_SOCK_SEQPACK_Association (ACE_HANDLE h) +{ + // ACE_TRACE ("ACE_SOCK_SEQPACK_Association::ACE_SOCK_SEQPACK_Association"); + this->set_handle (h); +} + +ASYS_INLINE +ACE_SOCK_SEQPACK_Association::~ACE_SOCK_SEQPACK_Association (void) +{ + // ACE_TRACE ("ACE_SOCK_SEQPACK_Association::~ACE_SOCK_SEQPACK_Association"); +} + +ASYS_INLINE int +ACE_SOCK_SEQPACK_Association::close_reader (void) +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Association::close_reader"); + if (this->get_handle () != ACE_INVALID_HANDLE) + return ACE_OS::shutdown (this->get_handle (), ACE_SHUTDOWN_READ); + else + return 0; +} + +// Shut down just the writing end of a ACE_SOCK. + +ASYS_INLINE int +ACE_SOCK_SEQPACK_Association::close_writer (void) +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Association::close_writer"); + if (this->get_handle () != ACE_INVALID_HANDLE) + return ACE_OS::shutdown (this->get_handle (), ACE_SHUTDOWN_WRITE); + else + return 0; +} + +ASYS_INLINE ssize_t +ACE_SOCK_SEQPACK_Association::recv_n (void *buf, + size_t len, + int flags, + const ACE_Time_Value *timeout, + size_t *bytes_transferred) const +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Association::recv_n"); + return ACE::recv_n (this->get_handle (), + buf, + len, + flags, + timeout, + bytes_transferred); +} + +ASYS_INLINE ssize_t +ACE_SOCK_SEQPACK_Association::recv_n (void *buf, + size_t len, + const ACE_Time_Value *timeout, + size_t *bytes_transferred) const +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Association::recv_n"); + return ACE::recv_n (this->get_handle (), + buf, + len, + timeout, + bytes_transferred); +} + +ASYS_INLINE ssize_t +ACE_SOCK_SEQPACK_Association::recvv_n (iovec iov[], + size_t n, + const ACE_Time_Value *timeout, + size_t *bytes_transferred) const +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Association::recvv_n"); + return ACE::recvv_n (this->get_handle (), + iov, + n, + timeout, + bytes_transferred); +} + +ASYS_INLINE ssize_t +ACE_SOCK_SEQPACK_Association::send_n (const void *buf, + size_t len, + int flags, + const ACE_Time_Value *timeout, + size_t *bytes_transferred) const +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Association::send_n"); + return ACE::send_n (this->get_handle (), + buf, + len, + flags, + timeout, + bytes_transferred); +} + +ASYS_INLINE ssize_t +ACE_SOCK_SEQPACK_Association::send_n (const void *buf, + size_t len, + const ACE_Time_Value *timeout, + size_t *bytes_transferred) const +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Association::send_n"); + return ACE::send_n (this->get_handle (), + buf, + len, + timeout, + bytes_transferred); +} + +ASYS_INLINE ssize_t +ACE_SOCK_SEQPACK_Association::sendv_n (const iovec iov[], + size_t n, + const ACE_Time_Value *timeout, + size_t *bytes_transferred) const +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Association::sendv_n"); + return ACE::sendv_n (this->get_handle (), + iov, + n, + timeout, + bytes_transferred); +} + +ASYS_INLINE ssize_t +ACE_SOCK_SEQPACK_Association::send_n (const ACE_Message_Block *message_block, + const ACE_Time_Value *timeout, + size_t *bytes_transferred) const +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Association::send_n"); + return ACE::send_n (this->get_handle (), + message_block, + timeout, + bytes_transferred); +} + +ASYS_INLINE ssize_t +ACE_SOCK_SEQPACK_Association::send_urg (const void *ptr, + size_t len, + const ACE_Time_Value *timeout) const +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Association::send_urg"); + return ACE::send (this->get_handle (), + ptr, + len, + MSG_OOB, + timeout); +} + +ASYS_INLINE ssize_t +ACE_SOCK_SEQPACK_Association::recv_urg (void *ptr, + size_t len, + const ACE_Time_Value *timeout) const +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Association::recv_urg"); + return ACE::recv (this->get_handle (), + ptr, + len, + MSG_OOB, + timeout); +} diff --git a/ace/SOCK_SEQPACK_Connector.cpp b/ace/SOCK_SEQPACK_Connector.cpp new file mode 100644 index 00000000000..1fe36508a41 --- /dev/null +++ b/ace/SOCK_SEQPACK_Connector.cpp @@ -0,0 +1,365 @@ +// SOCK_SEQPACK_Connector.cpp +// $Id$ + +#include "ace/SOCK_SEQPACK_Connector.h" + +#include "ace/INET_Addr.h" +#include "ace/Log_Msg.h" + +#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#include "ace/SOCK_SEQPACK_Connector.i" +#endif /* ACE_LACKS_INLINE_FUNCTIONS */ + +ACE_RCSID(ace, SOCK_SEQPACK_Connector, "SOCK_SEQPACK_Connector.cpp,v 4.35 2002/03/08 23:18:09 spark Exp") + +ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_SEQPACK_Connector) + +void +ACE_SOCK_SEQPACK_Connector::dump (void) const +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::dump"); +} + +int +ACE_SOCK_SEQPACK_Connector::shared_open (ACE_SOCK_SEQPACK_Association &new_association, + int protocol_family, + int protocol, + int reuse_addr) +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::shared_open"); + + + + // Only open a new socket if we don't already have a valid handle. + if (new_association.get_handle () == ACE_INVALID_HANDLE + + && new_association.open (SOCK_SEQPACKET, + protocol_family, + protocol, + reuse_addr) == -1) + return -1; + else + return 0; +} + +int +ACE_SOCK_SEQPACK_Connector::shared_open (ACE_SOCK_SEQPACK_Association &new_association, + int protocol_family, + int protocol, + ACE_Protocol_Info *protocolinfo, + ACE_SOCK_GROUP g, + u_long flags, + int reuse_addr) +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::shared_open"); + + // Only open a new socket if we don't already have a valid handle. + if (new_association.get_handle () == ACE_INVALID_HANDLE + && new_association.open (SOCK_SEQPACKET, + protocol_family, + protocol, + protocolinfo, + g, + flags, + reuse_addr) == -1) + return -1; + else + return 0; +} + +int +ACE_SOCK_SEQPACK_Connector::shared_connect_start (ACE_SOCK_SEQPACK_Association &new_association, + const ACE_Time_Value *timeout, + const ACE_Addr &local_sap) +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::shared_connect_start"); + + if (local_sap != ACE_Addr::sap_any) + { + sockaddr *laddr = ACE_reinterpret_cast (sockaddr *, + local_sap.get_addr ()); + size_t size = local_sap.get_size (); + + if (ACE_OS::bind (new_association.get_handle (), + laddr, + size) == -1) + { + // Save/restore errno. + ACE_Errno_Guard error (errno); + new_association.close (); + return -1; + } + } + + // Enable non-blocking, if required. + if (timeout != 0 + && new_association.enable (ACE_NONBLOCK) == -1) + return -1; + else + return 0; +} + +// Multihomed version of same +int +ACE_SOCK_SEQPACK_Connector::shared_connect_start (ACE_SOCK_SEQPACK_Association &new_association, + const ACE_Time_Value *timeout, + const ACE_Multihomed_INET_Addr &local_sap) +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::shared_connect_start"); + + if (local_sap.ACE_Addr::operator!= (ACE_Addr::sap_any)) + { + // The total number of addresses is the number of secondary + // addresses plus one. + size_t num_addresses = local_sap.get_num_secondary_addresses() + 1; + + // Create an array of sockaddr_in to hold the underlying + // representations of the primary and secondary + // addresses. + sockaddr_in* local_inet_addrs = 0; + ACE_NEW_NORETURN(local_inet_addrs, + sockaddr_in[num_addresses]); + if (!local_inet_addrs) + return -1; + + // Populate the array by invoking the get_addresses method on + // the Multihomed_INET_Addr + local_sap.get_addresses(local_inet_addrs, num_addresses); + + // Call bind + if (ACE_OS::bind (new_association.get_handle (), + ACE_reinterpret_cast (sockaddr *, + local_inet_addrs), + (sizeof (sockaddr_in))*num_addresses) == -1) + { + // Save/restore errno. + ACE_Errno_Guard error (errno); + new_association.close (); + return -1; + } + + delete [] local_inet_addrs; + } + + // Enable non-blocking, if required. + if (timeout != 0 + && new_association.enable (ACE_NONBLOCK) == -1) + return -1; + else + return 0; +} + +int +ACE_SOCK_SEQPACK_Connector::shared_connect_finish (ACE_SOCK_SEQPACK_Association &new_association, + const ACE_Time_Value *timeout, + int result) +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::shared_connect_finish"); + // Save/restore errno. + ACE_Errno_Guard error (errno); + + if (result == -1 && timeout != 0) + { + // Check whether the connection is in progress. + if (error == EINPROGRESS || error == EWOULDBLOCK) + { + // This expression checks if we were polling. + if (timeout->sec () == 0 + && timeout->usec () == 0) + error = EWOULDBLOCK; + // Wait synchronously using timeout. + else if (this->complete (new_association, + 0, + timeout) == -1) + error = errno; + else + return 0; + } + } + + // EISCONN is treated specially since this routine may be used to + // check if we are already connected. + if (result != -1 || error == EISCONN) + // Start out with non-blocking disabled on the <new_association>. + new_association.disable (ACE_NONBLOCK); + else if (!(error == EWOULDBLOCK || error == ETIMEDOUT)) + new_association.close (); + + return result; +} + +// Actively connect and produce a new ACE_SOCK_SEQPACK_Association if things go well... + + +int +ACE_SOCK_SEQPACK_Connector::connect (ACE_SOCK_SEQPACK_Association &new_association, + const ACE_Addr &remote_sap, + const ACE_Time_Value *timeout, + const ACE_Addr &local_sap, + int reuse_addr, + int /* flags */, + int /* perms */, + int protocol) +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::connect"); + + if (this->shared_open (new_association, + remote_sap.get_type (), + protocol, + reuse_addr) == -1) + return -1; + else if (this->shared_connect_start (new_association, + timeout, + local_sap) == -1) + return -1; + + int result = ACE_OS::connect (new_association.get_handle (), + ACE_reinterpret_cast (sockaddr *, + remote_sap.get_addr ()), + remote_sap.get_size ()); + + return this->shared_connect_finish (new_association, + timeout, + result); +} + +// Multihomed version of same +int +ACE_SOCK_SEQPACK_Connector::connect (ACE_SOCK_SEQPACK_Association &new_association, + const ACE_Addr &remote_sap, + const ACE_Time_Value *timeout, + const ACE_Multihomed_INET_Addr &local_sap, + int reuse_addr, + int /* flags */, + int /* perms */, + int protocol) +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::connect"); + + if (this->shared_open (new_association, + remote_sap.get_type (), + protocol, + reuse_addr) == -1) + return -1; + else if (this->shared_connect_start (new_association, + timeout, + local_sap) == -1) + return -1; + + int result = ACE_OS::connect (new_association.get_handle (), + ACE_reinterpret_cast (sockaddr *, + remote_sap.get_addr ()), + remote_sap.get_size ()); + + return this->shared_connect_finish (new_association, + timeout, + result); +} + +// Try to complete a non-blocking connection. + +int +ACE_SOCK_SEQPACK_Connector::complete (ACE_SOCK_SEQPACK_Association &new_association, + ACE_Addr *remote_sap, + const ACE_Time_Value *tv) +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::complete"); + ACE_HANDLE h = ACE::handle_timed_complete (new_association.get_handle (), + tv); + // We failed to get connected. + if (h == ACE_INVALID_HANDLE) + { +#if defined (ACE_WIN32) + // Win32 has a timing problem - if you check to see if the + // connection has completed too fast, it will fail - so wait + // <ACE_NON_BLOCKING_BUG_DELAY> microseconds to let it catch up + // then retry to see if it's a real failure. + ACE_Time_Value time (0, ACE_NON_BLOCKING_BUG_DELAY); + ACE_OS::sleep (time); + h = ACE::handle_timed_complete (new_association.get_handle (), + tv); + if (h == ACE_INVALID_HANDLE) + { +#endif /* ACE_WIN32 */ + // Save/restore errno. + ACE_Errno_Guard error (errno); + new_association.close (); + return -1; +#if defined (ACE_WIN32) + } +#endif /* ACE_WIN32 */ + } + + if (remote_sap != 0) + { + int len = remote_sap->get_size (); + sockaddr *addr = ACE_reinterpret_cast (sockaddr *, + remote_sap->get_addr ()); + if (ACE_OS::getpeername (h, + addr, + &len) == -1) + { + // Save/restore errno. + ACE_Errno_Guard error (errno); + new_association.close (); + return -1; + } + } + + // Start out with non-blocking disabled on the <new_association>. + new_association.disable (ACE_NONBLOCK); + return 0; +} + +ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector (ACE_SOCK_SEQPACK_Association &new_association, + const ACE_Addr &remote_sap, + const ACE_Time_Value *timeout, + const ACE_Addr &local_sap, + int reuse_addr, + int flags, + int perms, + int protocol) +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector"); + + if (this->connect (new_association, + remote_sap, + timeout, + local_sap, + reuse_addr, + flags, + perms, + protocol) == -1 + && timeout != 0 + && !(errno == EWOULDBLOCK || errno == ETIME || errno == ETIMEDOUT)) + ACE_ERROR ((LM_ERROR, + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector"))); +} + +// Multihomed version of same +ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector (ACE_SOCK_SEQPACK_Association &new_association, + const ACE_Addr &remote_sap, + const ACE_Time_Value *timeout, + const ACE_Multihomed_INET_Addr &local_sap, + int reuse_addr, + int flags, + int perms, + int protocol) +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector"); + + if (this->connect (new_association, + remote_sap, + timeout, + local_sap, + reuse_addr, + flags, + perms, + protocol) == -1 + && timeout != 0 + && !(errno == EWOULDBLOCK || errno == ETIME || errno == ETIMEDOUT)) + ACE_ERROR ((LM_ERROR, + ACE_LIB_TEXT ("%p\n"), + ACE_LIB_TEXT ("ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector"))); +} diff --git a/ace/SOCK_SEQPACK_Connector.h b/ace/SOCK_SEQPACK_Connector.h new file mode 100644 index 00000000000..36c16bce31e --- /dev/null +++ b/ace/SOCK_SEQPACK_Connector.h @@ -0,0 +1,240 @@ +/* -*- C++ -*- */ + +//============================================================================= +/** + * @file SOCK_SEQPACK_Connector.h + * + * $Id$ + * + * @author Patrick J. Lardieri <plardier@atl.lmco.com> + * @author based on SOCK_STREAM_Connector + * by Douglas C. Schmidt <schmidt@cs.wustl.edu> + * + */ +//============================================================================= + +#ifndef ACE_SOCK_SEQPACK_CONNECTOR_H +#define ACE_SOCK_SEQPACK_CONNECTOR_H + +#include "ace/pre.h" +#include "ace/config.h" +#include "ace/ACE_export.h" + +#include "ace/SOCK_SEQPACK_Association.h" +#include "ace/Multihomed_INET_Addr.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "ace/Time_Value.h" + +/** + * @class ACE_SOCK_SEQPACK_Connector + * + * @brief Defines a factory that actively connects to a remote IP + * address and TCP port, creating a new @c ACE_SOCK_SEQPACK_Association object. + * + * The @c ACE_SOCK_SEQPACK_Connector doesn't have a socket of its own, + * i.e., it simply "borrows" the one from the @c ACE_SOCK_SEQPACK_Association + * that's being connected. The reason for this is that the + * underlying socket API doesn't use a factory socket to connect + * data mode sockets. Therefore, there's no need to inherit + * @c ACE_SOCK_SEQPACK_Connector from @c ACE_SOCK. A nice side-effect of + * this is that @c ACE_SOCK_SEQPACK_Connector objects do not store state so + * they can be used reentrantly in multithreaded programs. + */ +class ACE_Export ACE_SOCK_SEQPACK_Connector +{ +public: + // = Initialization and termination methods. + /// Default constructor. + ACE_SOCK_SEQPACK_Connector (void); + + /** + * Actively connect to a peer, producing a connected @c ACE_SOCK_SEQPACK_Association + * object if the connection succeeds. + * + * @param new_association The @c ACE_SOCK_SEQPACK_Association object that will be connected + * to the peer. + * @param remote_sap The address that we are trying to connect to. + * The protocol family of @c remote_sap is used for + * the connected socket. That is, if @c remote_sap + * contains an IPv6 address, a socket with family + * PF_INET6 will be used, else it will be PF_INET. + * @param timeout Pointer to an @c ACE_Time_Value object with amount + * of time to wait to connect. If the pointer is 0 + * then the call blocks until the connection attempt + * is complete, whether it succeeds or fails. If + * *timeout == {0, 0} then the connection is done + * using nonblocking mode. In this case, if the + * connection can't be made immediately, this method + * returns -1 and errno == EWOULDBLOCK. + * If *timeout > {0, 0} then this is the maximum amount + * of time to wait before timing out; if the specified + * amount of time passes before the connection is made, + * this method returns -1 and errno == ETIME. Note + * the difference between this case and when a blocking + * connect is attmpted that TCP times out - in the latter + * case, errno will be ETIMEDOUT. + * @param local_sap (optional) The local address to bind to. If it's + * the default value of @c ACE_Addr::sap_any then the + * OS will choose an unused port. + * @param reuse_addr (optional) If the value is 1, the local address + * (@c local_sap) is reused, even if it hasn't been + * cleaned up yet. + * @param flags Ignored. + * @param perms Ignored. + * + * @return Returns 0 if the connection succeeds. If it fails, + * -1 is returned and errno contains a specific error + * code. + */ + ACE_SOCK_SEQPACK_Connector (ACE_SOCK_SEQPACK_Association &new_association, + const ACE_Addr &remote_sap, + const ACE_Time_Value *timeout = 0, + const ACE_Addr &local_sap = ACE_Addr::sap_any, + int reuse_addr = 0, + int flags = 0, + int perms = 0, + int protocol = 0); + + ACE_SOCK_SEQPACK_Connector (ACE_SOCK_SEQPACK_Association &new_association, + const ACE_Addr &remote_sap, + const ACE_Time_Value *timeout, + const ACE_Multihomed_INET_Addr &local_sap, + int reuse_addr = 0, + int flags = 0, + int perms = 0, + int protocol = 0); + + /** + * Actively connect to a peer, producing a connected @c ACE_SOCK_SEQPACK_Association + * object if the connection succeeds. + * + * @param new_association The @c ACE_SOCK_SEQPACK_Association object that will be connected + * to the peer. + * @param remote_sap The address that we are trying to connect to. + * The protocol family of @c remote_sap is used for + * the connected socket. That is, if @c remote_sap + * contains an IPv6 address, a socket with family + * PF_INET6 will be used, else it will be PF_INET. + * @param timeout Pointer to an @c ACE_Time_Value object with amount + * of time to wait to connect. If the pointer is 0 + * then the call blocks until the connection attempt + * is complete, whether it succeeds or fails. If + * *timeout == {0, 0} then the connection is done + * using nonblocking mode. In this case, if the + * connection can't be made immediately, this method + * returns -1 and errno == EWOULDBLOCK. + * If *timeout > {0, 0} then this is the maximum amount + * of time to wait before timing out; if the specified + * amount of time passes before the connection is made, + * this method returns -1 and errno == ETIME. Note + * the difference between this case and when a blocking + * connect is attmpted that TCP times out - in the latter + * case, errno will be ETIMEDOUT. + * @param local_sap (optional) The local address to bind to. If it's + * the default value of @c ACE_Addr::sap_any then the + * OS will choose an unused port. + * @param reuse_addr (optional) If the value is 1, the local address + * (@c local_sap) is reused, even if it hasn't been + * cleaned up yet. + * @param flags Ignored. + * @param perms Ignored. + * + * @return Returns 0 if the connection succeeds. If it fails, + * -1 is returned and errno contains a specific error + * code. + */ + int connect (ACE_SOCK_SEQPACK_Association &new_association, + const ACE_Addr &remote_sap, + const ACE_Time_Value *timeout = 0, + const ACE_Addr &local_sap = ACE_Addr::sap_any, + int reuse_addr = 0, + int flags = 0, + int perms = 0, + int protocol = 0); + + int connect (ACE_SOCK_SEQPACK_Association &new_association, + const ACE_Addr &remote_sap, + const ACE_Time_Value *timeout, + const ACE_Multihomed_INET_Addr &local_sap, + int reuse_addr = 0, + int flags = 0, + int perms = 0, + int protocol = 0); + + /// Default dtor. + ~ACE_SOCK_SEQPACK_Connector (void); + + // = Completion routine. + /** + * Try to complete a nonblocking connection that was begun by a + * previous call to connect with a {0, 0} ACE_Time_Value timeout. + * @see connect(). + * + * @param new_association The @c ACE_SOCK_SEQPACK_Association object that will be connected + * to the peer. + * @param remote_sap If non-0, it points to the @c ACE_INET_Addr object + * that will contain the address of the connected peer. + * @param timeout Same values and return value possibilites as for + * connect(). @see connect(). + */ + int complete (ACE_SOCK_SEQPACK_Association &new_association, + ACE_Addr *remote_sap = 0, + const ACE_Time_Value *timeout = 0); + + /// Resets any event associations on this handle + int reset_new_handle (ACE_HANDLE handle); + + // = Meta-type info + typedef ACE_INET_Addr PEER_ADDR; + typedef ACE_SOCK_SEQPACK_Association PEER_STREAM; + + /// Dump the state of an object. + void dump (void) const; + + /// Declare the dynamic allocation hooks. + ACE_ALLOC_HOOK_DECLARE; + +protected: + /// Perform operations that ensure the socket is opened using + /// BSD-style semantics (no QoS). + int shared_open (ACE_SOCK_SEQPACK_Association &new_association, + int protocol_family, + int protocol, + int reuse_addr); + + /// Perform operations that ensure the socket is opened using + /// QoS-enabled semantics. + int shared_open (ACE_SOCK_SEQPACK_Association &new_association, + int protocol_family, + int protocol, + ACE_Protocol_Info *protocolinfo, + ACE_SOCK_GROUP g, + u_long flags, + int reuse_addr); + + /// Perform operations that must be called before <ACE_OS::connect>. + int shared_connect_start (ACE_SOCK_SEQPACK_Association &new_association, + const ACE_Time_Value *timeout, + const ACE_Addr &local_sap); + + int shared_connect_start (ACE_SOCK_SEQPACK_Association &new_association, + const ACE_Time_Value *timeout, + const ACE_Multihomed_INET_Addr &local_sap); + + /// Perform operations that must be called after <ACE_OS::connect>. + int shared_connect_finish (ACE_SOCK_SEQPACK_Association &new_association, + const ACE_Time_Value *timeout, + int result); +}; + +#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#include "ace/SOCK_SEQPACK_Connector.i" +#endif + +#include "ace/post.h" + +#endif /* ACE_SOCK_SEQPACK_CONNECTOR_H */ diff --git a/ace/SOCK_SEQPACK_Connector.i b/ace/SOCK_SEQPACK_Connector.i new file mode 100644 index 00000000000..319308bf30d --- /dev/null +++ b/ace/SOCK_SEQPACK_Connector.i @@ -0,0 +1,34 @@ +/* -*- C++ -*- */ +// SOCK_SEQPACK_Connector.i +// $Id$ + +// This constructor is used by a client when it wants to connect to +// the specified REMOTE_SAP address using a blocking open. + +ASYS_INLINE +ACE_SOCK_SEQPACK_Connector::~ACE_SOCK_SEQPACK_Connector (void) +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::~ACE_SOCK_SEQPACK_Connector"); +} + +// Do-nothing constructor... + +ASYS_INLINE +ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector (void) +{ + ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector"); +} + +ASYS_INLINE int +ACE_SOCK_SEQPACK_Connector::reset_new_handle (ACE_HANDLE handle) +{ +#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) + // Reset the event association + return ::WSAEventSelect ((SOCKET) handle, + NULL, + 0); +#else /* !defined ACE_HAS_WINSOCK2 */ + ACE_UNUSED_ARG (handle); + return 0; +#endif /* ACE_WIN32 */ +} diff --git a/ace/ace_dll.dsp b/ace/ace_dll.dsp index 176d632c23f..0611fd8c339 100644 --- a/ace/ace_dll.dsp +++ b/ace/ace_dll.dsp @@ -266,14 +266,6 @@ SOURCE=.\Codecs.cpp # End Source File
# Begin Source File
-SOURCE=.\Codeset_Registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Codeset_Registry_db.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\Configuration.cpp
# End Source File
# Begin Source File
@@ -586,6 +578,10 @@ SOURCE=.\Msg_WFMO_Reactor.cpp # End Source File
# Begin Source File
+SOURCE=.\Multihomed_INET_Addr.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Multiplexor.cpp
# End Source File
# Begin Source File
@@ -850,6 +846,18 @@ SOURCE=.\SOCK_IO.cpp # End Source File
# Begin Source File
+SOURCE=.\SOCK_SEQPACK_Acceptor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\SOCK_SEQPACK_Association.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\SOCK_SEQPACK_Connector.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\SOCK_Stream.cpp
# End Source File
# Begin Source File
@@ -1254,10 +1262,6 @@ SOURCE=.\Codecs.h # End Source File
# Begin Source File
-SOURCE=.\Codeset_Registry.h
-# End Source File
-# Begin Source File
-
SOURCE=".\config-all.h"
# End Source File
# Begin Source File
@@ -1690,6 +1694,10 @@ SOURCE=.\Msg_WFMO_Reactor.h # End Source File
# Begin Source File
+SOURCE=.\Multihomed_INET_Addr.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Multiplexor.h
# End Source File
# Begin Source File
@@ -2018,6 +2026,18 @@ SOURCE=.\SOCK_IO.h # End Source File
# Begin Source File
+SOURCE=.\SOCK_SEQPACK_Acceptor.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\SOCK_SEQPACK_Association.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\SOCK_SEQPACK_Connector.h
+# End Source File
+# Begin Source File
+
SOURCE=.\SOCK_Stream.h
# End Source File
# Begin Source File
@@ -2278,10 +2298,6 @@ SOURCE=.\Typed_SV_Message_Queue.h # End Source File
# Begin Source File
-SOURCE=.\Unbounded_Queue.h
-# End Source File
-# Begin Source File
-
SOURCE=.\UNIX_Addr.h
# End Source File
# Begin Source File
@@ -2458,10 +2474,6 @@ SOURCE=.\Cleanup_Strategies_T.i # End Source File
# Begin Source File
-SOURCE=.\Codeset_Registry.inl
-# End Source File
-# Begin Source File
-
SOURCE=.\Connector.i
# End Source File
# Begin Source File
@@ -2746,6 +2758,10 @@ SOURCE=.\Msg_WFMO_Reactor.i # End Source File
# Begin Source File
+SOURCE=.\Multihomed_INET_Addr.i
+# End Source File
+# Begin Source File
+
SOURCE=.\Multiplexor.i
# End Source File
# Begin Source File
@@ -2994,6 +3010,18 @@ SOURCE=.\SOCK_IO.i # End Source File
# Begin Source File
+SOURCE=.\SOCK_SEQPACK_Acceptor.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\SOCK_SEQPACK_Association.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\SOCK_SEQPACK_Connector.i
+# End Source File
+# Begin Source File
+
SOURCE=.\SOCK_Stream.i
# End Source File
# Begin Source File
diff --git a/bin/PerlACE/Process_Unix.pm b/bin/PerlACE/Process_Unix.pm index 4b8966cb2c0..fe75bdffb60 100644 --- a/bin/PerlACE/Process_Unix.pm +++ b/bin/PerlACE/Process_Unix.pm @@ -326,6 +326,8 @@ sub Wait () my $self = shift; waitpid ($self->{PROCESS}, 0); + + $self->{RUNNING} = 0; } sub TimedWait ($) diff --git a/bin/PerlACE/Process_Win32.pm b/bin/PerlACE/Process_Win32.pm index b63518224ef..b5827418af1 100644 --- a/bin/PerlACE/Process_Win32.pm +++ b/bin/PerlACE/Process_Win32.pm @@ -331,6 +331,8 @@ sub Wait () if ($self->{RUNNING}) { Win32::Process::Wait ($self->{PROCESS}, INFINITE); } + + $self->{RUNNING} = 0; } diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU index 94ecae2c5dd..aedb97be186 100644 --- a/include/makeinclude/platform_linux.GNU +++ b/include/makeinclude/platform_linux.GNU @@ -103,6 +103,15 @@ ifeq ($(threads),1) endif # ! PRELIB endif +# support for OpenSS7 SCTP +ifeq ($(sctp),openss7) + PLATFORM_SCTP_CPPFLAGS= -DACE_HAS_OPENSS7_SCTP + PLATFORM_SCTP_LDFLAGS= + PLATFORM_SCTP_LIBS= +endif + +# Eventually Other SCTP implementations will go here + #### GNU gas has a string limit of 4096 characters. On Alphas, #### builds will fail due to running over that limit. There are #### at least two workarounds: diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU index 46c89b04753..12754831195 100644 --- a/include/makeinclude/wrapper_macros.GNU +++ b/include/makeinclude/wrapper_macros.GNU @@ -59,6 +59,10 @@ # an application that is linked with ACE to extract _exactly_ what it # needs from the library, resulting in a smaller executable. # Setting this to 1 overrides debug to 0. +# sctp Build support for TAO SCIOP and for ACE SCTP +# wrapper-facades. The sctp macro should be set to a string +# value representing a particular SCTP implementation. +# Recognized values include: openss7 # # Usually, users do not need to be concerned with make targets. # Just enter "make" on the command line to build. A few notable @@ -120,6 +124,9 @@ # PLATFORM_RAPI_CPPFLAGS Platform CPP options for RAPI # PLATFORM_RAPI_LDFLAGS Platform LD options for RAPI # PLATFORM_RAPI_LIBS Platform libraries required with RAPI +# PLATFORM_SCTP_CPPFLAGS Platform CPP options required for SCTP +# PLATFORM_SCTP_LDFLAGS Platform LD options required for SCTP +# PLATFORM_SCTP_LIBS Platform libraries required for SCTP # PRELINK Executable to precede linking, such as quantify # PURELINK If set, contains purify executable as well as all options # PURE_CACHE_BASE_DIR @@ -453,6 +460,13 @@ ifneq ($(rapi),) LDFLAGS += $(PLATFORM_RAPI_LDFLAGS) endif # rapi +# if any sctp implementation is present then add +ifneq ($(sctp),) + CPPFLAGS += -DACE_HAS_SCTP $(PLATFORM_SCTP_CPPFLAGS) + LDFLAGS += $(PLATFORM_SCTP_LDFLAGS) + LIBS += $(PLATFORM_SCTP_LIBS) +endif + ifeq ($(ace_with_gl),0) override ace_with_gl = endif # ace_with_gl diff --git a/performance-tests/Makefile b/performance-tests/Makefile index 5da97ca3efd..84c97d360c5 100644 --- a/performance-tests/Makefile +++ b/performance-tests/Makefile @@ -13,6 +13,7 @@ INFO = README DIRS = Misc \ UDP \ TCP \ + SCTP \ Server_Concurrency # @@ This directory is currently under restructuring. It should be diff --git a/performance-tests/SCTP/Makefile b/performance-tests/SCTP/Makefile new file mode 100644 index 00000000000..b4437bc9bcd --- /dev/null +++ b/performance-tests/SCTP/Makefile @@ -0,0 +1,823 @@ +#---------------------------------------------------------------------------- +# $Id$ +# +# Makefile for tests of the miscellaneous ACE performance tests +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + + +SOCK_STREAM_CLT_SRC = SOCK_STREAM_clt.cpp Options_Manager.cpp hist.cpp +SOCK_STREAM_CLT_OBJ = $(SOCK_STREAM_CLT_SRC:%.cpp=%.o) + +SOCK_STREAM_SRV_SRC = SOCK_STREAM_srv.cpp Options_Manager.cpp +SOCK_STREAM_SRV_OBJ = $(SOCK_STREAM_SRV_SRC:%.cpp=%.o) + +SOCK_SEQPACK_CLT_SRC = SOCK_SEQPACK_clt.cpp Options_Manager.cpp hist.cpp +SOCK_SEQPACK_CLT_OBJ = $(SOCK_SEQPACK_CLT_SRC:%.cpp=%.o) + +SOCK_SEQPACK_SRV_SRC = SOCK_SEQPACK_srv.cpp Options_Manager.cpp +SOCK_SEQPACK_SRV_OBJ = $(SOCK_SEQPACK_SRV_SRC:%.cpp=%.o) + +#---------------------------------------------------------------------------- +# 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 +#---------------------------------------------------------------------------- + +# BIN and SRC are deliberately placed after incuded macros and targets +# so that default rules are not generated for the binaries. +BIN = SOCK_STREAM_clt SOCK_STREAM_srv SOCK_SEQPACK_clt SOCK_SEQPACK_srv +# For make depend. +SRC = $(SOCK_STREAM_CLT_SRC) $(SOCK_STREAM_SRV_SRC) $(SOCK_SEQPACK_CLT_SRC) $(SOCK_SEQPACK_SRV_SRC) + +all: SOCK_STREAM_clt SOCK_STREAM_srv SOCK_SEQPACK_clt SOCK_SEQPACK_srv + +SOCK_STREAM_clt: $(addprefix $(VDIR),$(SOCK_STREAM_CLT_OBJ)) + $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) + +SOCK_STREAM_srv: $(addprefix $(VDIR),$(SOCK_STREAM_SRV_OBJ)) + $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) + +SOCK_SEQPACK_clt: $(addprefix $(VDIR),$(SOCK_SEQPACK_CLT_OBJ)) + $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) + +SOCK_SEQPACK_srv: $(addprefix $(VDIR),$(SOCK_SEQPACK_SRV_OBJ)) + $(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $^ $(VLDLIBS) + +macro_test: + @echo "OBJ=" $(SOCK_STREAM_SRV_OBJ) $(SOCK_SEQPACK_SRV_OBJ) + @echo "TGT=" $(addprefix $(VDIR),$(SOCK_STREAM_SRV_OBJ) $(SOCK_SEQPACK_SRV_OBJ)) +#---------------------------------------------------------------------------- +# Dependencies +#---------------------------------------------------------------------------- + +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/SOCK_STREAM_clt.o .obj/SOCK_STREAM_clt.so .shobj/SOCK_STREAM_clt.o .shobj/SOCK_STREAM_clt.so: SOCK_STREAM_clt.cpp \ + $(ACE_ROOT)/ace/INET_Addr.h $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/Sock_Connect.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/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/Sock_Connect.i $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i $(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/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/SOCK.i $(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/ACE.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/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/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/Malloc_Base.h \ + $(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/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/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/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i Options_Manager.h hist.h + +.obj/Options_Manager.o .obj/Options_Manager.so .shobj/Options_Manager.o .shobj/Options_Manager.so: Options_Manager.cpp $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/String_Base.h $(ACE_ROOT)/ace/ACE.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/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.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 Options_Manager.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 + +.obj/hist.o .obj/hist.so .shobj/hist.o .shobj/hist.so: hist.cpp hist.h + +.obj/SOCK_STREAM_srv.o .obj/SOCK_STREAM_srv.so .shobj/SOCK_STREAM_srv.o .shobj/SOCK_STREAM_srv.so: SOCK_STREAM_srv.cpp \ + $(ACE_ROOT)/ace/INET_Addr.h $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/Sock_Connect.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/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/Sock_Connect.i $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i $(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/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/SOCK.i $(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/ACE.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 \ + $(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/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 $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(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/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/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.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/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/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/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 Options_Manager.h + +.obj/Options_Manager.o .obj/Options_Manager.so .shobj/Options_Manager.o .shobj/Options_Manager.so: Options_Manager.cpp $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/String_Base.h $(ACE_ROOT)/ace/ACE.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/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.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 Options_Manager.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 + +.obj/SOCK_SEQPACK_clt.o .obj/SOCK_SEQPACK_clt.so .shobj/SOCK_SEQPACK_clt.o .shobj/SOCK_SEQPACK_clt.so: SOCK_SEQPACK_clt.cpp \ + $(ACE_ROOT)/ace/INET_Addr.h $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/Sock_Connect.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/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/Sock_Connect.i $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_SEQPACK_Association.h \ + $(ACE_ROOT)/ace/SOCK_IO.h $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/SOCK.i $(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/ACE.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_SEQPACK_Association.i \ + $(ACE_ROOT)/ace/SOCK_SEQPACK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_SEQPACK_Connector.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/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/Malloc_Base.h \ + $(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/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/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/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i Options_Manager.h hist.h + +.obj/Options_Manager.o .obj/Options_Manager.so .shobj/Options_Manager.o .shobj/Options_Manager.so: Options_Manager.cpp $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/String_Base.h $(ACE_ROOT)/ace/ACE.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/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.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 Options_Manager.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 + +.obj/hist.o .obj/hist.so .shobj/hist.o .shobj/hist.so: hist.cpp hist.h + +.obj/SOCK_SEQPACK_srv.o .obj/SOCK_SEQPACK_srv.so .shobj/SOCK_SEQPACK_srv.o .shobj/SOCK_SEQPACK_srv.so: SOCK_SEQPACK_srv.cpp \ + $(ACE_ROOT)/ace/Multihomed_INET_Addr.h \ + $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/Sock_Connect.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/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/Sock_Connect.i $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(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/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/Multihomed_INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_SEQPACK_Association.h \ + $(ACE_ROOT)/ace/SOCK_IO.h $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/SOCK.i $(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/ACE.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_SEQPACK_Association.i \ + $(ACE_ROOT)/ace/SOCK_SEQPACK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_SEQPACK_Acceptor.i \ + $(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 $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Synch_T.cpp $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Singleton.h $(ACE_ROOT)/ace/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/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.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/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/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/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 Options_Manager.h + +.obj/Options_Manager.o .obj/Options_Manager.so .shobj/Options_Manager.o .shobj/Options_Manager.so: Options_Manager.cpp $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/String_Base.h $(ACE_ROOT)/ace/ACE.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/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.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 Options_Manager.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 + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/performance-tests/SCTP/Options_Manager.cpp b/performance-tests/SCTP/Options_Manager.cpp new file mode 100644 index 00000000000..d157b51a096 --- /dev/null +++ b/performance-tests/SCTP/Options_Manager.cpp @@ -0,0 +1,518 @@ +// -*- C++ -*- + +// $Id$ + +extern "C" { +#include <sys/types.h> +}; + +// make sure that the code compiles cleanly even if SCTP is not +// available. If SCTP is not installed, program will exit early in +// main() with an error message. +#ifdef ACE_HAS_SCTP +extern "C" { +#include <netinet/in.h> +#include <netinet/sctp.h> +}; +#else +#define IPPROTO_SCTP -1 +#endif + +#include "ace/Get_Opt.h" + +#include "Options_Manager.h" + +// Set default values +ACE_CDR::ULong Options_Manager::test_iterations=1000000; +ACE_CDR::Boolean Options_Manager::test_enable_nagle=0; +ACE_CDR::Long Options_Manager::test_transport_protocol=IPPROTO_SCTP; +ACE_CDR::Double Options_Manager::histogram_min_bin=0.0; +ACE_CDR::Double Options_Manager::histogram_max_bin=10000.0; +ACE_CDR::ULong Options_Manager::histogram_num_outliers=100; +ACE_CDR::ULong Options_Manager::histogram_bin_count=1000; +ACE_CDR::UShort Options_Manager::client_port = 0; +ACE_CDR::ULong Options_Manager::client_connect_addr=INADDR_ANY; +ACE_CDR::UShort Options_Manager::server_port = 45453; +ACE_TCHAR Options_Manager::server_host[Options_Manager::string_len]; +ACE_CDR::ULong Options_Manager::server_accept_addr=INADDR_ANY; +ACE_CDR::UShort Options_Manager::payload_size_power_of_2=31; +ACE_CDR::ULong Options_Manager::secondary_connect_addrs[max_num_secondary_connect_addrs]; +ACE_CDR::UShort Options_Manager::num_secondary_connect_addrs = 0; +ACE_CDR::ULong Options_Manager::secondary_accept_addrs[max_num_secondary_accept_addrs]; +ACE_CDR::UShort Options_Manager::num_secondary_accept_addrs = 0; +ACE_CDR::UShort Options_Manager::_usage = 0; +ACE_CDR::UShort Options_Manager::_error = 0; +ACE_TCHAR Options_Manager::__program_name[Options_Manager::string_len]; +ACE_CDR::Boolean Options_Manager::__initialized=0; +const ACE_TCHAR* Options_Manager::_error_message; + + +Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * const opts_set) +{ + if (!__initialized) { + // Set default values that were not set during static initialization + ACE_OS::strcpy(server_host, "localhost"); + + // Remember argv[0] + if (strlen(argv[0]) < Options_Manager::string_len) + ACE_OS::strcpy(__program_name, argv[0]); + else{ + ACE_OS::strncpy(__program_name, argv[0], (Options_Manager::string_len-1)); + __program_name[Options_Manager::string_len] = '\0'; + } + + // Declare options with ACE_Get_Opt + int c; + ACE_Get_Opt * get_opt=NULL; + if (!ACE_OS::strcmp("client-opts", opts_set)){ + get_opt = new ACE_Get_Opt(argc, argv, ACE_TEXT("c:nt:m:M:x:b:C:i:p:H:s:h")); + + get_opt->long_option("test_iterations", 'c', ACE_Get_Opt::ARG_REQUIRED); + get_opt->long_option("test_enable_nagle", 'n'); + get_opt->long_option("test_transport_protocol", 't', ACE_Get_Opt::ARG_REQUIRED); + get_opt->long_option("histogram_min_bin", 'm', ACE_Get_Opt::ARG_REQUIRED); + get_opt->long_option("histogram_max_bin", 'M', ACE_Get_Opt::ARG_REQUIRED); + get_opt->long_option("histogram_num_outliers", 'x', ACE_Get_Opt::ARG_REQUIRED); + get_opt->long_option("histogram_bin_count", 'b', ACE_Get_Opt::ARG_REQUIRED); + get_opt->long_option("client_port", 'C', ACE_Get_Opt::ARG_REQUIRED); + get_opt->long_option("client_accept_addr", 'i', ACE_Get_Opt::ARG_REQUIRED); + get_opt->long_option("server_port", 'p', ACE_Get_Opt::ARG_REQUIRED); + get_opt->long_option("server_host", 'H', ACE_Get_Opt::ARG_REQUIRED); + get_opt->long_option("payload_size_power_of_2", 's', ACE_Get_Opt::ARG_REQUIRED); + get_opt->long_option("help", 'h'); + } else if (!ACE_OS::strcmp("server-opts", opts_set)){ + get_opt = new ACE_Get_Opt(argc, argv, ACE_TEXT("nt:p:a:u")); + get_opt->long_option("test_enable_nagle", 'n'); + get_opt->long_option("test_transport_protocol", 't', ACE_Get_Opt::ARG_REQUIRED); + get_opt->long_option("server_port", 'p', ACE_Get_Opt::ARG_REQUIRED); + get_opt->long_option("server_accept_addr", 'a', ACE_Get_Opt::ARG_REQUIRED); + get_opt->long_option("help", 'h'); + } else { + _error = 1; + _error_message = "invalid options set specified"; + delete get_opt; + return; + } + + // Parse options with ACE_Get_Opt + while ((c = (*get_opt)()) != -1) + { + switch ((char) c) + { + case 'c': + test_iterations = ACE_OS::atoi(get_opt->opt_arg ()); + break; + case 'n': + test_enable_nagle = 1; + break; + case 't':{ + char const * const str=get_opt->opt_arg(); + if (!ACE_OS::strcmp(str, "tcp")) + test_transport_protocol = IPPROTO_TCP; + else if (!ACE_OS::strcmp(str, "sctp")) + test_transport_protocol = IPPROTO_SCTP; + else + test_transport_protocol = -1; + break; + } + case 'm': + histogram_min_bin = ACE_OS_String::strtod(get_opt->opt_arg (), 0); + break; + case 'M': + histogram_max_bin = ACE_OS_String::strtod(get_opt->opt_arg (), 0); + break; + case 'x': + histogram_num_outliers = ACE_OS::atoi(get_opt->opt_arg ()); + break; + case 'b': + histogram_bin_count = ACE_OS::atoi(get_opt->opt_arg ()); + break; + case 'C': + client_port = ACE_OS::atoi(get_opt->opt_arg ()); + break; + case 'i':{ + + // The argument to this option is a comma-separated list + // of dotted-decimal ipv4 addresses. + + // Create a writable copy of the options argument + char str[Options_Manager::string_len]; + ACE_OS::strncpy(str, get_opt->opt_arg(), Options_Manager::string_len); + + // Get a pointer to the first comma in the list + char *next_secondary_addr = ACE_OS::strchr(str, ','); + + // If found, the comma is replaced with \0 and pointer + // updated to point to the string that begins immediately + // after the comma. + if (next_secondary_addr) { + *next_secondary_addr = '\0'; + ++next_secondary_addr; + } + + // Obtain the 32-bit, host-byte-order representation of + // the primary address. + struct in_addr foo; + int aton_retval = ACE_OS::inet_aton(str, &foo); + + // If this representation was not obtained, terminate with + // an error. + if (!aton_retval) { + + char error_message[Options_Manager::string_len + 100]; + ACE_OS::sprintf(error_message, + "Could not make sense of primary " + "address: %s", + str); + + _error = 1; + _error_message = ACE_OS::strdup(error_message); + break; + } + + // Otherwise, store the representation in the + // client_connect_addr member variable. + client_connect_addr = ntohl(foo.s_addr); + +// ACE_DEBUG ((LM_DEBUG, +// "Primary connect addr: %s retval = %d\n", +// str, +// aton_retval)); + +// if (next_secondary_addr) { +// ACE_DEBUG ((LM_DEBUG, +// "Secondary addr(s) remaining to be parsed: %s\n", +// next_secondary_addr)); +// } else { +// ACE_DEBUG ((LM_DEBUG, +// "No secondary addr remaining to be parsed.\n")); +// } + + // The following loop parses secondary addresses from the + // list. The loop repeats as long as ACE_OS::strchr + // returns non-null (i.e., as long as yet another comma is + // found. + while (next_secondary_addr && + num_secondary_connect_addrs < + max_num_secondary_connect_addrs) { + + // Get a pointer to the next comma in the list. + char *next_next_secondary_addr = ACE_OS::strchr(next_secondary_addr, ','); + + // If found, the comma is replaced with \0 and pointer + // updated to point to the string that begins immediately + // after the comma. + if (next_next_secondary_addr) { + *next_next_secondary_addr = '\0'; + ++next_next_secondary_addr; + } + + // Obtain the 32-bit, host-byte-order representation of + // a secondary address. + aton_retval = ACE_OS::inet_aton(next_secondary_addr, &foo); + + // If the representation was obtained without error, + // store it in the next available slot of the + // secondary_connect_addrs array. Otherwise, terminate + // with an error. + if (aton_retval) { + secondary_connect_addrs[num_secondary_connect_addrs++] = + ntohl(foo.s_addr); + } else { + + char error_message[Options_Manager::string_len + 100]; + ACE_OS::sprintf(error_message, + "Could not make sense of secondary " + "address: %s", + next_secondary_addr); + + _error = 1; + _error_message = ACE_OS::strdup(error_message); + break; + } + +// ACE_DEBUG ((LM_DEBUG, +// "secondary_addr[%d] = %s retval = %d\n", +// num_secondary_connect_addrs - 1, +// next_secondary_addr, +// aton_retval)); + + next_secondary_addr = next_next_secondary_addr; + } + + break; + } + case 'p': + server_port = ACE_OS::atoi(get_opt->opt_arg ()); + break; + case 'a':{ + + // The argument to this option is a comma-separated list + // of dotted-decimal ipv4 addresses. + + // Create a writable copy of the options argument + char str[Options_Manager::string_len]; + ACE_OS::strncpy(str, get_opt->opt_arg(), Options_Manager::string_len); + + // Get a pointer to the first comma in the list + char *next_secondary_addr = ACE_OS::strchr(str, ','); + + // If found, the comma is replaced with \0 and pointer + // updated to point to the string that begins immediately + // after the comma. + if (next_secondary_addr) { + *next_secondary_addr = '\0'; + ++next_secondary_addr; + } + + // Obtain the 32-bit, host-byte-order representation of + // the primary address. + struct in_addr foo; + int aton_retval = ACE_OS::inet_aton(str, &foo); + + // If this representation was not obtained, terminate with + // an error. + if (!aton_retval) { + + char error_message[Options_Manager::string_len + 100]; + ACE_OS::sprintf(error_message, + "Could not make sense of primary " + "address: %s", + str); + + _error = 1; + _error_message = ACE_OS::strdup(error_message); + break; + } + + // Otherwise, store the representation in the + // server_accept_addr member variable. + server_accept_addr = ntohl(foo.s_addr); + +// ACE_DEBUG ((LM_DEBUG, +// "Primary accept addr: %s retval = %d\n", +// str, +// aton_retval)); + +// if (next_secondary_addr) { +// ACE_DEBUG ((LM_DEBUG, +// "Secondary addr(s) remaining to be parsed: %s\n", +// next_secondary_addr)); +// } else { +// ACE_DEBUG ((LM_DEBUG, +// "No secondary addr remaining to be parsed.\n")); +// } + + // The following loop parses secondary addresses from the + // list. The loop repeats as long as ACE_OS::strchr + // returns non-null (i.e., as long as yet another comma is + // found. + while (next_secondary_addr && + num_secondary_accept_addrs < + max_num_secondary_accept_addrs) { + + // Get a pointer to the next comma in the list. + char *next_next_secondary_addr = ACE_OS::strchr(next_secondary_addr, ','); + + // If found, the comma is replaced with \0 and pointer + // updated to point to the string that begins immediately + // after the comma. + if (next_next_secondary_addr) { + *next_next_secondary_addr = '\0'; + ++next_next_secondary_addr; + } + + // Obtain the 32-bit, host-byte-order representation of + // a secondary address. + aton_retval = ACE_OS::inet_aton(next_secondary_addr, &foo); + + // If the representation was obtained without error, + // store it in the next available slot of the + // secondary_accept_addrs array. Otherwise, terminate + // with an error. + if (aton_retval) { + secondary_accept_addrs[num_secondary_accept_addrs++] = + ntohl(foo.s_addr); + } else { + + char error_message[Options_Manager::string_len + 100]; + ACE_OS::sprintf(error_message, + "Could not make sense of secondary " + "address: %s", + next_secondary_addr); + + _error = 1; + _error_message = ACE_OS::strdup(error_message); + break; + } + +// ACE_DEBUG ((LM_DEBUG, +// "secondary_addr[%d] = %s retval = %d\n", +// num_secondary_accept_addrs - 1, +// next_secondary_addr, +// aton_retval)); + + next_secondary_addr = next_next_secondary_addr; + } + + break; + } + case 'H':{ + char const * const str=get_opt->opt_arg(); + if (strlen(str) < Options_Manager::string_len) + ACE_OS::strcpy(server_host, str); + else{ + ACE_OS::strncpy(server_host, str, (Options_Manager::string_len-1)); + server_host[Options_Manager::string_len] = '\0'; + } + break; + } + case 's': + payload_size_power_of_2 = ACE_OS::atoi(get_opt->opt_arg ()); + break; + case 'h': + _usage = 1; + break; + } + } + + // Check option values + if (test_iterations < 1) + { + _error = 1; + _error_message = "test_iterations must be no less than than 1"; + } + + if (histogram_min_bin < 0.0) + { + _error = 1; + _error_message = "histogram_min_bin must be no less than 0.0"; + } + + if (histogram_max_bin < histogram_min_bin) + { + _error = 1; + _error_message = "histogram_max_bin must be no less than histogram_min_bin"; + } + + if (histogram_num_outliers < 1) + { + _error = 1; + _error_message = "histogram_num_outliers must be no less than 1"; + } + + if (histogram_bin_count < 1) + { + _error = 1; + _error_message = "histogram_bin_count must be no less than 1"; + } + + if (server_port < 1010 || + server_port > 65000) + { + _error = 1; + _error_message = "server_port must be between 1010 and 65000 inclusive"; + } + + if ((!ACE_OS::strcmp("client-opts", opts_set)) && payload_size_power_of_2 > 17) + { + _error = 1; + _error_message = "payload_size_power_of_2 must be specified between 0 and 16 inclusive"; + } + + if (test_transport_protocol == -1) { + _error = 1; + _error_message = "test_transport_protocol may only take 'sctp' and 'tcp' as values"; + } + + __initialized = 1; + + delete get_opt; + } +} + +void Options_Manager::_show_usage(ostream& out, ACE_TCHAR const * const opts_set) +{ + // Show usage message. KEEP THE DEFAULTS DISPLAYED HERE IN SYNC + // WITH THE DEFAULTS SET AT THE BEGINNING OF THE CONSTRUCTOR. + + out << __program_name << " - Measures round trip latency statistics of ACE synchronous" << endl; + // indent past program name + for (unsigned int i=0;i<ACE_OS::strlen(__program_name);++i) + out << " "; + + if (ACE_OS::strstr(__program_name, "SOCK_STREAM_clt") || ACE_OS::strstr(__program_name, "SOCK_STREAM_srv")) { + out << " messaging (SOCK_Stream) using unmarshalled ACE_CDR::Octet." << endl; + } else { + out << " messaging (SOCK_SEQPACK) using unmarshalled ACE_CDR::Octet." << endl; + } + + out << "USAGE: " << __program_name << " [ -<flag> [<val>] | --<name> [<val>] ]..." << endl; + + out << endl; + + if (!ACE_OS::strcmp("client-opts", opts_set)){ + out << " Flag Args Option-Name Default" << endl; + out << " -c int test-iterations 1000000" << endl; + out << " -n none test-enable-nagle NO NAGLING" << endl; + if (ACE_OS::strstr(__program_name, "SOCK_STREAM_clt")) { + out << " -t str (sctp|tcp) test-transport-protocol sctp" << endl; + } + + out << endl; + + out << " -m dbl histogram-min-bin 0" << endl; + out << " -M dbl histogram-max-bin 10000" << endl; + out << " -x int histogram-num-outliers 100" << endl; + out << " -b int histogram-bin-count 1000" << endl; + + out << endl; + + out << " -C int client-port assigned by kernel" << endl; + out << " -i str client-connect-addr INADDR_ANY" << endl; + + out << endl; + + out << " -p int server-port 45453" << endl; + out << " -H str server-host localhost" << endl; + + out << endl; + + out << " -s int (0-16) payload-size-power-of-2 <MUST SET VALUE>" << endl; + + out << endl; + + out << " -h none help" << endl; + + out << endl; + + } else if (!ACE_OS::strcmp("server-opts", opts_set)){ + out << " Flag Args Option-Name Default" << endl; + out << " -n none test-enable-nagle NO NAGLING" << endl; + if (ACE_OS::strstr(__program_name, "SOCK_STREAM_srv")) { + out << " -t str (sctp|tcp) test-transport-protocol sctp" << endl; + } + + out << endl; + + out << " -p int server-port 45453" << endl; + + if (ACE_OS::strstr(__program_name, "SOCK_SEQPACK_srv")) { + out << " -a w.x.y.z,a.b.c.d,... server-accept-addr INADDR_ANY" << endl; + out << " (comma-separated " << endl; + out << " list of one or more " << endl; + out << " addresses) " << endl; + } else { + out << " -a w.x.y.z server-accept-addr INADDR_ANY" << endl; + } + + out << " -h none help" << endl; + + out << endl; + + } else { + out << "Invalid options set specified." << endl; + } + + return; +} diff --git a/performance-tests/SCTP/Options_Manager.h b/performance-tests/SCTP/Options_Manager.h new file mode 100644 index 00000000000..20e17c0596c --- /dev/null +++ b/performance-tests/SCTP/Options_Manager.h @@ -0,0 +1,64 @@ +// -*- C++ -*- + +// $Id$ + +// The types defined in ACE_CDR are more complete that those in Basic_Types.h + + +#ifndef OPTIONS_MANAGER_H +#define OPTIONS_MANAGER_H + +#ifndef ACE_CDR_BASE_H +#include "ace/CDR_Base.h" +#endif + +class Options_Manager +{ +public: + + Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * const opts_set); + + // constant string size + enum { string_len = 100 }; + + static ACE_CDR::ULong test_iterations; + static ACE_CDR::Boolean test_enable_nagle; + static ACE_CDR::Long test_transport_protocol; + + static ACE_CDR::Double histogram_min_bin; + static ACE_CDR::Double histogram_max_bin; + static ACE_CDR::ULong histogram_bin_count; + static ACE_CDR::ULong histogram_num_outliers; + + static ACE_CDR::UShort client_port; + static ACE_CDR::ULong client_connect_addr; + + static ACE_CDR::UShort server_port; + static ACE_TCHAR server_host[string_len]; + static ACE_CDR::ULong server_accept_addr; + + static ACE_CDR::UShort payload_size_power_of_2; + + // Secondary client_connect_addrs for SCTP SOCK_SEQPACK test + enum { max_num_secondary_connect_addrs = 100 }; + static ACE_CDR::ULong secondary_connect_addrs[max_num_secondary_connect_addrs]; + static ACE_CDR::UShort num_secondary_connect_addrs; + + // Secondary server_accept_addrs for SCTP SOCK_SEQPACK test + enum { max_num_secondary_accept_addrs = 100 }; + static ACE_CDR::ULong secondary_accept_addrs[max_num_secondary_accept_addrs]; + static ACE_CDR::UShort num_secondary_accept_addrs; + + static ACE_CDR::UShort _error; + static const ACE_TCHAR* _error_message; + + static ACE_CDR::UShort _usage; + void _show_usage(ostream& out, ACE_TCHAR const * const opts_set); + +private: + static ACE_CDR::Boolean __initialized; + static ACE_TCHAR __program_name[string_len]; + +}; + +#endif /* OPTIONS_MANAGER_H */ diff --git a/performance-tests/SCTP/README b/performance-tests/SCTP/README new file mode 100644 index 00000000000..beaf21ad79f --- /dev/null +++ b/performance-tests/SCTP/README @@ -0,0 +1,46 @@ +This directory provides programs that measure the round trip latency +of synchronous octet messaging using ACE wrapper-facades for the SCTP +protocol. Currently these programs provide the only example code on +how to use ACE's wrapper-facades for SCTP. In the future additonal +code will be placed in the ACE_wrappers/examples/IPC_SAP/SOCK_SAP +directory. + +SOCK_STREAM_clt and SOCK_STREAM_srv use the SOCK_STREAM service +provided by SCTP via ACE's SOCK_Connector, SOCK_Stream, +SOCK_Association wrapper-facade classes. + +SOCK_SEQPACK_clt and SOCK_SEQPACK_srv use the SOCK_SEQPACKET service +provided by SCTP via ACE's SOCK_SEQPACK_Connector, +SOCK_SEQPACK_Association and SOCK_SEQPACK_Acceptor wrapper-facade +classes. + +Additional information can be found in the following README files also +located in this directory. + + README.SCTP - Brief description of the major features and benefits + SCTP protocol and references for further information. + + README.SCTP_in_ACE - Description of the wrapper-facade classes that + ACE provides to use SCTP, general usage + guidance, release notes, technical point of + contact information. + + README.SCTP_PERF_TEST - Detailed description on how to use the + performance tests and the run_spectrum.pl + script contained in this directory. + Discussion of the baseline performance + results contained in the sctp-perf + sub-directory. + + THANKS - Documents all the people who contributed to the development + of the ACE wrapper-facades for SCTP and the SCIOP (SCTP + Inter-ORB Protocol) for TAO. Information on that can be + found in ACE_wrappers/TAO/tao/Strategies/README.SCIOP + +General requests for information beyond what is contained in these +files can be sent to either of the following individuals. + +Patrick Lardieri plardier@atl.lmco.com +Gautam Thaker gthaker@atl.lmco.com + +This work was sponsored by DARPA/IXO PCES Program. diff --git a/performance-tests/SCTP/README.SCTP b/performance-tests/SCTP/README.SCTP new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/performance-tests/SCTP/README.SCTP diff --git a/performance-tests/SCTP/README.SCTP_PERF_TEST b/performance-tests/SCTP/README.SCTP_PERF_TEST new file mode 100644 index 00000000000..81cacef02e0 --- /dev/null +++ b/performance-tests/SCTP/README.SCTP_PERF_TEST @@ -0,0 +1,405 @@ +$Id$ + +Release 1.0 - January 2003 + +*********************************** +* Performance Test Overview * +*********************************** + +This directory contains performance tests for measuring round-trip +latency statistics of ACE synchronous messaging using unmarshalled +ACE_CDR::Octet. + +In terms of protocol and service type, three different tests are +available: + + * TCP over SOCK_STREAM + * SCTP over SOCK_STREAM + * SCTP over SOCK_SEQPACK + +All three of these tests share the same architecture, which is +described in the following section. + +*************************** +* Test Architecture * +*************************** + +As mentioned above, the performance tests measure round-trip latency +statistics. We are talking about the round trip between two service +endpoints, a client and a server. The client sends the server an +arbitrary message with a specific length---up to 2^16 bytes---and the +server responds with a 2-byte reply. The client measures and records +the time it takes to complete this exchange. The whole test is then +repeated through many iterations, and finally the client outputs the +resulting statistics. + +In detail, + +1. The server program is started first. It creates a passive-mode + socket and runs an infinite loop waiting for clients to connect. + +2. The client program is started next. It may be configured with + numerous parameters, which include: + + * the hostname and port where the server's passive-mode socket + is listening, + * the desired message length, which may be any power of two + between 2^0 and 2^16, + * the desired number of iterations (by default 1 million) + +3. The client connects to the server's passive-mode socket. If all + goes well, the client and server will each obtain a data-mode + socket that serves as a communication endpoint. + +4. The client sends an initial header message containing the intended + number of iterations and the message length (which will be + the same for each iteration). Armed with this information, the + server spawns a separate thread to handle these iterations. + +5. The client creates an in-memory data structure that serves as a + histogram. The histogram is configured with a range of possible + round-trip latencies, and this range is divided into a number of + "bins". The latency measured for each test entry will either + fall into one of these "bins", or it will fall outside the entire + range and will be logged as an outlier. + +6. The client and server repeat the following interaction for each + test iteration. + + a. The client starts a stopwatch. + + b. The client sends the server an arbitrary message of the + established length. + + c. After receiving this entire message from the client, the + server sends the client a 2-byte reply. + + d. After receiving the 2-byte reply from the server, the client + stops the stopwatch. + + e. The round-trip latency, as measureed by the stopwatch, is + logged to the in-memory histogram. + +7. After all these iterations are complete, the client disconnects + from the server. The client then takes the in-memory histogram + and dumps its text representation to STDOUT. + +8. The client exits. The server thread dedicated to this client + exits. The main thread of the server continues to run an infinite + loop waiting for more clients to connect to the passive-mode + socket. + +************************** +* Test Executables * +************************** + +You must use a different pair of client and server executables +depending on whether you desire to use the SOCK_STREAM service or the +SOCK_SEQPACK service. + +The SOCK_STREAM client and server are called SOCK_STREAM_clt and +SOCK_STREAM_srv, respectively. The SOCK_SEQPACK client and server are +called SOCK_SEQPACK_clt and SOCK_SEQPACK_srv, respectively. + +Each of these executables uses SCTP as its default protocol. As an +extra feature, SOCK_STREAM_clt and SOCK_STREAM_srv offer TCP as an +alternate protocol. The choice between TCP and SCTP is exposed via +the '-t' option. (Individual instances of SOCK_STREAM_clt and +SOCK_STREAM_srv must use the same protocol in order to connect and +function.) + +Any of the four executables will show usage information if you run it +with the '-h' option. For instance, here is the usage message +produced by SOCK_STREAM_clt: + +./SOCK_STREAM_clt - Measures round trip latency statistics of ACE synchronous + messaging (SOCK_Stream) using unmarshalled ACE_CDR::Octet. +USAGE: ./SOCK_STREAM_clt [ -<flag> [<val>] | --<name> [<val>] ]... + + Flag Args Option-Name Default + -c int test-iterations 1000000 + -n none test-enable-nagle NO NAGLING + -t str (sctp|tcp) test-transport-protocol sctp + + -m dbl histogram-min-bin 0 + -M dbl histogram-max-bin 10000 + -x int histogram-num-outliers 100 + -b int histogram-bin-count 1000 + + -C int client-port assigned by kernel + -i str client-connect-addr INADDR_ANY + + -p int server-port 45453 + -H str server-host localhost + + -s int (0-16) payload-size-power-of-2 <MUST SET VALUE> + + -h none help + +For each option, the long "Option-Name" may be prefixed by two dashes +and used on the command line in place of the shorter "Flag". Hence + + ./SOCK_STREAM_clt -s 5 + +is equivalent to + + ./SOCK_STREAM_clt --payload-size-power-of-2 5 + +The options shown above for SOCK_STREAM_clt (and the similar options +available for SOCK_SEQPACK_clt) are discussed in the next section. + +***************************** +* Client-Side Options * +***************************** + +The following options are available for both SOCK_STREAM_clt and +SOCK_SEQPACK_clt. + + test-iterations [ -c int ] + + the number of times to repeat the round-trip-latency test + loop. The default is 1000000. + + test-enable-nagle [ -n ] + + Enable Nagle's algorithm (which is disabled by default). + + histogram-min-bin [ -m double ] + + the lower boundary on the range of the histogram. + The default is 0. The unit of measurement is the millisecond. + + histogram-max-bin [ -M double ] + + the upper boundary on the range of the histogram. + The default is 10000. The unit of measurement is the + millisecond. + + histogram-num-outliers [ -x int ] + + the maximum number of outliers to maintain in the histogram. + The default is 100. + + histogram-bin-count [ -b int ] + + the number of histogram bins. The default is 1000. The width + of each bin will be + + (histogram-max-bin - histogram-min-bin) / histogram-bin-count + + client-port [ -C int ] + client-connect-addr [ -i string ] + + the port and network address where the client's data-mode + socket is to be bound. By default, the port number is + assigned by the kernel, and the socket is bound to all network + interfaces. + + server-port [ -p int ] + server-host [ -H string ] + + the port and hostname where the server's passive-mode socket + is bound. The default port is 45453 and the default host is + localhost. + + payload-size-power-of-2 [ -s int ] + + an integer X. The size of the payload will be 2^X bytes. + + help [ -h ] + + Show usage message. + +The following option is available only for SOCK_STREAM_clt: + + test-transport-protocol [ -t (sctp|tcp) ] + + the protocol for the test. The default is sctp. + +In contrast, SOCK_SEQPACK_clt always uses SCTP as its protocol. + +***************************** +* Server-Side Options * +***************************** + +The following options are available for both SOCK_STREAM_srv and +SOCK_SEQPACK_srv: + + test-enable-nagle [ -n ] + + Enable Nagle's algorithm (which is disabled by default). + + server-port [ -p int ] + + the port where the server's passive-mode socket will be + bound. The default is 45453. + + help [ -h ] + + Show usage message. + +The following option is available for both SOCK_STREAM_srv and +SOCK_SEQPACK_srv, but the latter offers additional functionality: + + server-accept-addr [ -a w.x.y.z ] (for SOCK_STREAM_srv) + [ -a w.x.y.z,a.b.c.d,... ] (for SOCK_SEQPACK_srv) + + the network address (or addresses) to which the server's + passive-mode socket will be bound. + + The default value of INADDR_ANY should be sufficient for + machines that have only one network interface. + + If your machine has two interfaces, and you wish to bind the + socket only to one of these, then you may explicitly specify + the desired interface with an expression such as + "-a 192.168.221.104" or "-a 192.168.1.43". + + If your machine has three or more interfaces, and you wish to + bind the socket only to a subset of two or more, AND you are + using SOCK_SEQPACK_srv, THEN you may explicitly specify the + desired interface with an expression such as + "-a 192.168.221.104,192.168.1.43". The argument here is a + comma-delimited list of dotted-decimal IPv4 addresses with no + whitespace interspersed. This level of control is not + possible with SOCK_STREAM_srv. + +The following option is available only for SOCK_STREAM_srv: + + test-transport-protocol [ -t (sctp|tcp) ] + + the protocol for the test. The default is sctp. + +In contrast, SOCK_SEQPACK_srv always uses SCTP as its protocol. + +*************************** +* Test Walk-Through * +*************************** + +This section shows a walk-through of a typical scenario using +SOCK_STREAM_clt and SOCK_STREAM_srv to run an SCTP performance test. + +You can run the equivalent TCP performance test by adding "-t tcp" to +the command line of both programs. Alternately, you can run a +SOCK_SEQPACK-based SCTP performance test by substituting +SOCK_SEQPACK_clt and SOCK_SEQPACK_srv for SOCK_STREAM_clt and +SOCK_STREAM_srv, respectively. + +In this scenario, both client and server run on the same machine. We +use a message size of 2^7 bytes and a relatively small number of +iterations, 1000, in order to make the test go quickly. The server's +passive-mode socket binds to the default port, 45453, which is also +the default port expected by the client. We invoke no other special +or unusual options. + +For clarity, we envision starting the client and server in two +separate shells. + +The steps of the walk-through are as follows: + +1. Start the server. + + $ ./SOCK_STREAM_srv + (12761|1024) Accepting connections on port 45453 + on interface INADDR_ANY using IPPROTO_SCTP + (12761|1024) starting server at port 45453 + (12761|1024) select timed out + (12761|1024) select timed out + (12761|1024) select timed out + (12761|1024) select timed out + ... + + The server will continue to print, periodically, the message + "select timed out" as it waits for clients to connect. + +2. Start the client. + + $ ./SOCK_STREAM_clt -s 7 -c 1000 + +3. Observing the debugging output from the server, you should see + evidence that the client has connected. + + (12761|1024) select timed out + (12761|1024) select timed out + (12761|1024) select timed out + (12761|1024) spawning server + (12761|1024) client utica-b connected from 32768 + (12761|1024) Test for 1100 iterations + (12761|1024) select timed out + (12761|1024) select timed out + + Note that the server expects 1100 iterations, even though we + configured the client for only 1000 iterations. The reason for + this discrepencany is that the client always runs 100 primer + iterations before the requested test iterations. + +4. When the 1100 iterations are complete, observing the output from + the client, you should see the histogram: + + + Histogram ACE Unmarshalled Msg Synchronous Latency Test + (Message Size 128, Message Type octet) + version: 1.1 + minimum: 41 + maximum: 60182 + mean: 106.858 + variance: 3.62659e+06 + num_points: 1000 + num_bins: 1000 0 10000 + + Low - High Count Fraction Cumulative + below - 0.000 : 0 0.000 0.000 + 0.000 - 10.000 : 0 0.000 0.000 + 10.000 - 20.000 : 0 0.000 0.000 + 20.000 - 30.000 : 0 0.000 0.000 + 30.000 - 40.000 : 0 0.000 0.000 + 40.000 - 50.000 : 988 0.988 0.988 + 50.000 - 60.000 : 5 0.005 0.993 + 60.000 - 70.000 : 2 0.002 0.995 + 70.000 - 80.000 : 0 0.000 0.995 + 80.000 - 90.000 : 1 0.001 0.996 + 90.000 - 100.000 : 0 0.000 0.996 + 100.000 - 110.000 : 0 0.000 0.996 + ... + 9960.000 - 9970.000 : 0 0.000 0.999 + 9970.000 - 9980.000 : 0 0.000 0.999 + 9980.000 - 9990.000 : 0 0.000 0.999 + 9990.000 - 10000.000 : 0 0.000 0.999 + 10000.000 - above : 1 0.001 1.000 + + outliers: + 60182.000 + +****************************************** +* Running a Complete Test Spectrum * +****************************************** + +People who are interested in round-trip latency often want to see a +"spectrum" of statistics for a range of payload sizes. This directory +includes a script, run_spectrum.pl, that automates running +SOCK_STREAM_clt or SOCK_SEQPACK_clt multiple times in order to +generate a spectrum. (The appropriate server program must be started +manually.) + +The run_spectrum.pl script offers embedded documentation. To see the +full documentation, please run + + ./run_spectrum.pl --manual + +************************ +* Sample Results * +************************ + +The file sample-spectrum.png plots the spectrum data for a test run at +LM ATL facilities on the following systems: two Linux 2.4.18, 1600 MHz +Pentium 4 machines on an isolated 100Mbps Ethernet network. + +The test conditions include several critical parameters that were set +as follows: + + sctp_rto_initial = 20 + sctp_rto_min = 20 + sctp_rto_max = 20 + +Testing has shown that these parameters affect maximum round-trip +latency. diff --git a/performance-tests/SCTP/README.SCTP_in_ACE b/performance-tests/SCTP/README.SCTP_in_ACE new file mode 100644 index 00000000000..160739fd60e --- /dev/null +++ b/performance-tests/SCTP/README.SCTP_in_ACE @@ -0,0 +1,189 @@ +Release 1.0 - January 2003 + +SCTP Features Accessible Within ACE +----------------------------------- + + * SOCK_STREAM (byte stream oriented) data transport service + + * SOCK_SEQPACKET (message oriented) data transport service (this is + the service used by TAO's SCIOP pluggable protocol) + + * Explicit control of binding network interfaces (all, one, or any + subset) to server-side passive- and active- mode sockets on + multi-homed machines. (for SOCK_SEQPACKET service only. The + SOCK_STREAM service may only bind one or all interfaces because we + avoided changing the interface of ACE_SOCK_Acceptor.) + + * Setting and getting of all parameters exposed by SCTP + (e.g. retransmission timeout (RTO)) via ACE_SOCK::set_option(...) + and ACE_SOCK::get_option(...) for both SOCK_STREAM and + SOCK_SEQPACKET sockets + + * Multiplexing of lightweight "SCTP Streams" and "SCTP Associations" + (over the SOCK_STREAM and SOCK_SEQPACKET services, respectively) + via ACE_SOCK::set_option(...) + + * Network path multiplexing (provided opaquely by the protocol---no + explicit support required in ACE other than the ability to + configure various parameters and the set of interfaces as described + above) + + +Supported SCTP Implementations +------------------------------ + + * OpenSS7's Linux Implementation (Berkeley UNIX Network API) + (www.openss7.org) + + +BUGS +---- + + * OpenSS7 BUGS + + - implementation is flaky for message sizes greater than PATH MTU + SIZE where message size includes SCTP and IP headers and data. + + - Variably long delays in data transmission when + RTO_Init = RTO_Min = 0 and link failures are occurring. + + - Strange "connection refused" errors (even though link and server + are up) when RTO_Min = RTO_Init = 0. + +TO-DO +---- + + * Provide explicit control of binding network interfaces to + client-side active-mode sockets on multi-homed machines. Current + implementation supports all interfaces but not restriction to one + or to an arbitrary subset. (This will be done for SOCK_SEQPACKET + service only. We want to avoid changing the existing interfaces for + the SOCK_STREAM service). + + * Integrate management and use of "SCTP Associations" into the + ACE_SOCK_SEQPACK_* wrapper-facade. (currently they can only be + accessed indirectly through ACE_SOCK::set_option(...)) + + * Support the Draft-API Standard for SCTP. Current implementation is + written to the Berkeley Unix Networking API that is used by the + OpenSS7 implementation for Linux. + + * Support SOCK_RDM service within ACE. + +Usage +----- + + SOCK_STREAM - Use the ACE_SOCK_Connector, ACE_SOCK_Stream and + ACE_SOCK_Acceptor classes. In ACE_SOCK_Connector pass + the value IPPROTO_SCTP for the protocol parameter in + either the constructor or the connect(...) method + as shown in SOCK_STREAM_clt.cpp. In ACE_SOCK_Acceptor + pass the value IPPROTO_SCTP for the protocol parameter + in either the constructor or the open(...) method + as shown in SOCK_STREAM_srv.cpp. + + You must include the file sctp.h in order for + IPPROTO_SCTP to be defined. The OpenSS7 implementation + for Linux places this file in + /usr/include/netinet. + + Aside from these changes, the classes can be used as + they are under TCP (the protocol they use by + default). Be cautious to use SCTP protocol options when + setting socket options on SCTP sockets (e.g., use + SCTP_NODELAY, not TCP_NODELAY, to disable Nagle's + algorithm on an SCTP socket.) + + SOCK_SEQPACKET - Use the ACE_SOCK_SEQPACK_Connector, + ACE_SOCK_SEQPACK_Association, and + ACE_SOCK_SEQPACK_Acceptor classes, which parallel + the familiar ACE_SOCK_Connector, ACE_SOCK_Stream, + and ACE_SOCK_Acceptor classes, respectively. Please + see SOCK_SEQPACK_clt.cpp and SOCK_SEQPACK_srv.cpp for + more details. + + In the special case where you want to specify a set + of interfaces---other than one or all + interfaces---for an ACE_SOCK_SEQPACK_Acceptor, use + an ACE_Multihomed_INET_Addr in place of the familiar + ACE_INET_Addr. (See SOCK_SEQPACK_srv.cpp for an + example.) + + SCTP associations may have more than one local and + more than one remote address bound to them. + Accordingly, ACE_SOCK_SEQPACK_Association provides + methods get_local_addrs(...) and + get_remote_addrs(...). These methods return the list + of local and remote addresses bound to an active + mode SCTP socket. Alternately, the familiar + ACE_SOCK::get_local_addr(...) and + ACE_SOCK::get_remote_addr(...) methods will work + properly with an active mode SCTP socket, but each + will only return a single address. + + +DESIGN +------ + +Explanation TBD. Class diagram TBD. + +Here are the files under $(ACE_ROOT) that were either modified or +added. NO files were removed. + +$(ACE_ROOT)/ace/ace_dll.dsp MODIFIED +$(ACE_ROOT)/ace/OS.h MODIFIED +$(ACE_ROOT)/ace/Makefile.ace MODIFIED +$(ACE_ROOT)/ace/SOCK_Connector.h MODIFIED +$(ACE_ROOT)/ace/SOCK_Connector.cpp MODIFIED + +$(ACE_ROOT)/ace/SOCK_SEQPACK_Acceptor.h ADDED +$(ACE_ROOT)/ace/SOCK_SEQPACK_Acceptor.i ADDED +$(ACE_ROOT)/ace/SOCK_SEQPACK_Acceptor.cpp ADDED + +$(ACE_ROOT)/ace/SOCK_SEQPACK_Connector.h ADDED +$(ACE_ROOT)/ace/SOCK_SEQPACK_Connector.i ADDED +$(ACE_ROOT)/ace/SOCK_SEQPACK_Connector.cpp ADDED + +$(ACE_ROOT)/ace/SOCK_SEQPACK_Association.h ADDED +$(ACE_ROOT)/ace/SOCK_SEQPACK_Association.i ADDED +$(ACE_ROOT)/ace/SOCK_SEQPACK_Association.cpp ADDED + +$(ACE_ROOT)/ace/Multihomed_INET_Addr.h ADDED +$(ACE_ROOT)/ace/Multihomed_INET_Addr.i ADDED +$(ACE_ROOT)/ace/Multihomed_INET_Addr.cpp ADDED + +$(ACE_ROOT)/bin/PerlACE/Process_Unix.pm MODIFIED +$(ACE_ROOT)/bin/PerlACE/Process_Win32.pm MODIFIED + +$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU MODIFIED +$(ACE_ROOT)/include/makeinclude/platform_linux.GNU MODIFIED + +$(ACE_ROOT)/tests/Makefile MODIFIED +$(ACE_ROOT)/tests/Multihomed_INET_Addr_Test.cpp ADDED +$(ACE_ROOT)/tests/Multihomed_INET_Addr_Test.dsp ADDED +$(ACE_ROOT)/tests/SOCK_SEQPACK_Association_Test.cpp ADDED +$(ACE_ROOT)/tests/SOCK_SEQPACK_Association_Test.dsp ADDED +$(ACE_ROOT)/tests/run_test.lst MODIFIED +$(ACE_ROOT)/tests/run_tests.bat MODIFIED +$(ACE_ROOT)/tests/tests.dsw MODIFIED + +$(ACE_ROOT)/performance-tests/SCTP/THANKS ADDED +$(ACE_ROOT)/performance-tests/SCTP/README ADDED +$(ACE_ROOT)/performance-tests/SCTP/README.SCTP ADDED +$(ACE_ROOT)/performance-tests/SCTP/README.SCTP_in_ACE ADDED +$(ACE_ROOT)/performance-tests/SCTP/README.SCTP_PERF_TEST ADDED + +$(ACE_ROOT)/performance-tests/SCTP/Makefile ADDED +$(ACE_ROOT)/performance-tests/SCTP/run_spectrum.pl ADDED + +$(ACE_ROOT)/performance-tests/SCTP/hist.h ADDED +$(ACE_ROOT)/performance-tests/SCTP/hist.cpp ADDED + +$(ACE_ROOT)/performance-tests/SCTP/Options_Manager.h ADDED +$(ACE_ROOT)/performance-tests/SCTP/Options_Manager.cpp ADDED + +$(ACE_ROOT)/performance-tests/SCTP/SOCK_STREAM_clt.cpp ADDED +$(ACE_ROOT)/performance-tests/SCTP/SOCK_STREAM_srv.cpp ADDED + +$(ACE_ROOT)/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp ADDED +$(ACE_ROOT)/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp ADDED diff --git a/performance-tests/SCTP/SCTP.dsw b/performance-tests/SCTP/SCTP.dsw new file mode 100644 index 00000000000..c5e6a3390ac --- /dev/null +++ b/performance-tests/SCTP/SCTP.dsw @@ -0,0 +1,65 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "SOCK_STREAM_clt"=".\SOCK_STREAM_clt.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "SOCK_STREAM_srv"=".\SOCK_STREAM_srv.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "SOCK_SEQPACK_clt"=".\SOCK_SEQPACK_clt.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "SOCK_SEQPACK_srv"=".\SOCK_SEQPACK_srv.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp b/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp new file mode 100644 index 00000000000..8d964c01f98 --- /dev/null +++ b/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp @@ -0,0 +1,312 @@ +// $Id$ + +// On WIN32, math.h may contain template code, +// which cannot be wrapped by 'extern "C"' +#ifdef WIN32 +#include <math.h> +#endif /* WIN32 */ + +extern "C" { +#ifndef WIN32 +#include <math.h> +#endif /* WIN32 */ +#include <stdio.h> +}; + +#include "ace/INET_Addr.h" +#include "ace/SOCK_SEQPACK_Association.h" +#include "ace/SOCK_SEQPACK_Connector.h" +#include "ace/Log_Msg.h" +#include "ace/CDR_Stream.h" +#include "ace/High_Res_Timer.h" + +// make sure that the code compiles cleanly even if SCTP is not +// available. If SCTP is not installed, program will exit early in +// main() with an error message +#ifdef ACE_HAS_SCTP +extern "C" { +#include <netinet/sctp.h> +}; +#else +#define IPPROTO_SCTP 132 +#define SCTP_NODELAY 1 +#endif + +// class that manages setting of options +#include "Options_Manager.h" + +// histogram code +#include "hist.h" + +// global constants +ACE_CDR::UShort const primerIterations = 100; +// ace/High_Res_Timer.h describes the need for the following. +ACE_UINT32 const microsec_clock_scale_factor = ACE_High_Res_Timer::global_scale_factor(); + +// forward declations of functions. Bodies follow main() to improve +// file readability. +HIST runTest(ACE_SOCK_SEQPACK_Association &); + +int main(int argc, char **argv){ + + // Initialize the options manager + Options_Manager optsMgr(argc, argv, "client-opts"); + + // show usage is requested + if (optsMgr._usage) { + optsMgr._show_usage(cerr, "client-opts"); + return 1; + } + +#ifndef ACE_HAS_SCTP + ACE_ERROR_RETURN((LM_ERROR, + "SCTP was NOT installed/accessible when this binary was compiled.\n"), + 1); +#endif + + // check that valid options were specified + if (optsMgr._error) { + cerr << "ERROR: " << optsMgr._error_message << endl; + return 1; + } + + + // Create the address that we want the client to connect to + ACE_INET_Addr serverAddr(Options_Manager::server_port, + Options_Manager::server_host); + + // Create the address that we want the client to connect FROM + ACE_Multihomed_INET_Addr clientAddr; + clientAddr.set(optsMgr.client_port, + optsMgr.client_connect_addr, + 1, + optsMgr.secondary_connect_addrs, + optsMgr.num_secondary_connect_addrs); + + // object that manages the connection to the server + ACE_SOCK_SEQPACK_Connector connector; + + // object that manages the data xfer between the client and server + ACE_SOCK_SEQPACK_Association dataStream; + + // connect to the server + if (connector.connect (dataStream, + serverAddr, + 0,clientAddr, 0, 0, 0, optsMgr.test_transport_protocol) == -1) /*, // ALL DEFAULT ARGUMENTS + Options_Manager::test_transport_protocol) == -1) */ + ACE_ERROR_RETURN ((LM_ERROR, + "(%P|%t) %p\n", + "connection failed"), + 1); + + // run the test + HIST testResultsHistogram = NULL; + // connection is closed by runTest* functions + testResultsHistogram = runTest(dataStream); + + // report out the test statistics IF NO EXECPTIONS have been thrown + // all histograms created are placed onto a linked list that report() + // can access. So the histogram created in one of the *_test() functions + // will be reported out by the report() call + if (testResultsHistogram) + report(); + + return 0; +} + +// create a histogram to store test results +HIST createHistogram(ACE_CDR::ULong messageSize){ + // The histogram created below lives beyond the scope of this + // function. So the memory allocated here cannot be cleaned up when + // this function goes out of scope. Unfortunately the histogram + // implementation does not clean it up either. So it is a small + // memory leak. + char * histName = (char *) malloc(200); + + sprintf(histName, "%s Unmarshalled Msg Synchronous Latency Test\n\t\t\t\t\t(Message Size %u, Message Type octet)", + "ACE", messageSize); + + // actually create the histogram + HIST createdHist = histogram(histName, + Options_Manager::histogram_bin_count, + Options_Manager::histogram_min_bin, + Options_Manager::histogram_max_bin); + + // set the maximum number of outliers to maintain in the histogram + set_outer(Options_Manager::histogram_num_outliers, createdHist); + + return (createdHist); +} + +// send the test header (only contains number of iterations) +int sendHeader(ACE_SOCK_SEQPACK_Association & stream) { + + // create an ACE CDR output stream and place the header information + // into it + ACE_OutputCDR hdrCDR; + hdrCDR << ACE_OutputCDR::from_boolean (ACE_CDR_BYTE_ORDER); + hdrCDR << ACE_CDR::ULong(Options_Manager::test_iterations+primerIterations); + if (!hdrCDR.good_bit()) + return (0); + + // send the header to the server (HEADER is 8 BYTES LONG) + size_t bt; + if (stream.send_n(hdrCDR.begin(), 0, &bt) == -1) + return 0; + + return 1; +} + +// conduct the UnMarshalled Octet performance test using separate +// send_n calls with Nagle's algorithm disabled +HIST runUnmarshalledOctetTest(ACE_CDR::Octet *buf, size_t seqLen, ACE_SOCK_SEQPACK_Association & stream){ + + ACE_CDR::ULong const testIterations = Options_Manager::test_iterations; + + size_t bt; + ACE_CDR::ULong cnt = 0; + // variables for the timing measurements + ACE_hrtime_t startTime, endTime; + ACE_CDR::Double messageLatency_usec = 0.0; + ACE_CDR::ULong msgLen = seqLen*ACE_CDR::OCTET_SIZE; + + // explicity configure Nagling. Default is + // Options_Manager::test_enable_nagle=0 so default configurations is + // NO NAGLING + ACE_CDR::Long nagle; + if (Options_Manager::test_enable_nagle) + nagle=0; + else + nagle=1; + if (-1 == stream.set_option(IPPROTO_SCTP, SCTP_NODELAY, &nagle, sizeof nagle)) + ACE_ERROR_RETURN ((LM_ERROR, + "%p\n", + "set_option"), + 0); + + // prime the client and server before starting the test + for(cnt=0;cnt<primerIterations;++cnt){ + + // send message size + // TODO : The message length should be CDR encoded + ACE_CDR::ULong msgLenExpressed = ACE_HTONL(msgLen); + if (-1 == stream.send_n (&msgLenExpressed, ACE_CDR::LONG_SIZE, 0, &bt)) + ACE_ERROR_RETURN ((LM_ERROR, + "%p\n", + "send_n"), + 0); + + // send a message + if (-1 == stream.send_n (buf, msgLen, 0, &bt)) + ACE_ERROR_RETURN ((LM_ERROR, + "%p\n", + "send_n"), + 0); + + // block for a Short reply + ACE_CDR::Short reply; + if ((stream.recv_n(&reply, ACE_CDR::SHORT_SIZE, 0, &bt)) == -1) + ACE_ERROR_RETURN((LM_ERROR, + "%p\n", + "recv_n"), + 0); + } + + // AFTER PRIMING THE PUMP CREATE THE HISTOGRAM + HIST aceStream_hist=NULL; + aceStream_hist = createHistogram(msgLen); + if (NULL == aceStream_hist) + ACE_ERROR_RETURN((LM_ERROR, + "%p\n", + "histogram create failed"), + 0); + + iovec iov[2]; + // PERFORMANCE TEST LOOP + for (cnt = 0; cnt < testIterations; ++cnt){ + + // get the start time + startTime = ACE_OS::gethrtime(); + if (!startTime) + ACE_ERROR_RETURN((LM_ERROR, + "%p\n", + "ACE_OS::gethrtime()"), + 0); + + ACE_CDR::ULong msgLenExpressed = ACE_HTONL(msgLen); + iov[0].iov_base = ACE_reinterpret_cast(char *, &msgLenExpressed); + iov[0].iov_len = ACE_CDR::LONG_SIZE; + iov[1].iov_base = ACE_reinterpret_cast(char *, buf); + iov[1].iov_len = msgLen; + + if (-1 == stream.sendv_n (iov, 2)) + ACE_ERROR_RETURN ((LM_ERROR, + "%p\n", + "send_n"), + 0); + + // block for a Short reply + ACE_CDR::Short reply; + if ((stream.recv_n(&reply, ACE_CDR::SHORT_SIZE, 0, &bt)) == -1) + ACE_ERROR_RETURN((LM_ERROR, + "%p\n", + "recv_n"), + 0); + + // get the end time + endTime = ACE_OS::gethrtime(); + if (!endTime) + ACE_ERROR_RETURN((LM_ERROR, + "%p\n", + "ACE_OS::gethrtime()"), + 0); + + // compute the message latency in micro-seconds + messageLatency_usec = + + (ACE_static_cast(double, + ACE_UINT64_DBLCAST_ADAPTER(endTime)) - + ACE_static_cast(double, + ACE_UINT64_DBLCAST_ADAPTER(startTime))) + + / microsec_clock_scale_factor; + + + // record the message latency in the histogram + record(messageLatency_usec, aceStream_hist); + } + + // THE HEADER MESSAGE SENT TO THE SERVER CONTAINED THE NUMBER OF + // PRIMER AND TEST MESSAGES TO BE SENT AFTER WHICH THE SERVER WILL + // CLOSE THE STREAM SO ONCE WE REACH THIS POINT THE STREAM IS NO + // LONGER VALID AND WE CLOSE IT. + stream.close(); + + // allocated by runTest + delete[] buf; + return aceStream_hist; +} + +// sends the test information to the server and calls the correct test +// function. +HIST runTest(ACE_SOCK_SEQPACK_Association & stream){ + + size_t msgLen = + static_cast<int>(pow(2.0, Options_Manager::payload_size_power_of_2)); + + // send a header to the server that contains test parameters + if (sendHeader(stream) < 0) + ACE_ERROR_RETURN((LM_ERROR, + "Could NOT Send CDR Encoded Header"), + 0); + + // create the forward message buffer + + ACE_CDR::Octet *o_arr; + ACE_CDR::ULong seqLen = msgLen/ACE_CDR::OCTET_SIZE; + ACE_NEW_RETURN(o_arr, + ACE_CDR::Octet[seqLen], + 0); + // o_arr is deleted in run_octet_test + return(runUnmarshalledOctetTest(o_arr, seqLen, stream)); +} diff --git a/performance-tests/SCTP/SOCK_SEQPACK_clt.dsp b/performance-tests/SCTP/SOCK_SEQPACK_clt.dsp new file mode 100644 index 00000000000..5c0caacd800 --- /dev/null +++ b/performance-tests/SCTP/SOCK_SEQPACK_clt.dsp @@ -0,0 +1,120 @@ +# Microsoft Developer Studio Project File - Name="SOCK_SEQPACK_clt" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=SOCK_SEQPACK_clt - Win32 Debug
+!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 "SOCK_SEQPACK_clt.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 "SOCK_SEQPACK_clt.mak" CFG="SOCK_SEQPACK_clt - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "SOCK_SEQPACK_clt - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "SOCK_SEQPACK_clt - 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)" == "SOCK_SEQPACK_clt - 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" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /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 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 /out:"Release/SOCK_SEQPACK_clt.exe" /libpath:"..\..\ace"
+
+!ELSEIF "$(CFG)" == "SOCK_SEQPACK_clt - 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" /D "_MBCS" /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 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 /out:"SOCK_SEQPACK_clt.exe" /pdbtype:sept /libpath:"..\..\ace"
+
+!ENDIF
+
+# Begin Target
+
+# Name "SOCK_SEQPACK_clt - Win32 Release"
+# Name "SOCK_SEQPACK_clt - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\SOCK_SEQPACK_clt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Options_Manager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\hist.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\Options_Manager.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\hist.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp b/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp new file mode 100644 index 00000000000..c09f518e084 --- /dev/null +++ b/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp @@ -0,0 +1,405 @@ +// $Id$ + +#include "ace/Multihomed_INET_Addr.h" +#include "ace/SOCK_SEQPACK_Association.h" +#include "ace/SOCK_SEQPACK_Acceptor.h" +#include "ace/Log_Msg.h" +#include "ace/Thread_Manager.h" +#include "ace/Handle_Set.h" +#include "ace/CDR_Stream.h" + +// make sure that the code compiles cleanly even if SCTP is not +// available. If SCTP is not installed, program will exit early in +// main() with an error message +#ifdef ACE_HAS_SCTP +extern "C" { +#include <netinet/sctp.h> +}; +#else +#define IPPROTO_SCTP 132 +#define SCTP_NODELAY 1 +#endif + +// class that manages setting of options +#include "Options_Manager.h" + +// structure to bundle arguments for thread functions +struct ArgStruct { + ACE_SOCK_SEQPACK_Association * stream; + ACE_CDR::ULong numIters; +}; + +// thread function that serves the client for the UnMarshalled Octet +// test +static ACE_THR_FUNC_RETURN unmarshalledOctetServer (void *arg){ + + // unbundle the arguments + ArgStruct * args = ACE_reinterpret_cast(ArgStruct *,arg); + ACE_SOCK_SEQPACK_Association * dataModeStream = args->stream; + ACE_CDR::ULong numIterations = args->numIters; + delete args; + + // serve the client for numIterations synchronous invocations + do { + + // READ A MESSAGE FROM THE CLIENT + + size_t bt; + ACE_CDR::ULong msgBufSize=0; + // read the size of the buffer to follow + if ((dataModeStream->recv_n(&msgBufSize, ACE_CDR::LONG_SIZE, 0, &bt)) == -1) + ACE_ERROR_RETURN((LM_ERROR, + "%p\n", + "recv_n"), + 0); + msgBufSize = ACE_NTOHL(msgBufSize); + + // allocate the buffer for the message payload + ACE_CDR::Octet * msgBuf=NULL; + ACE_NEW_RETURN(msgBuf, + ACE_CDR::Octet[msgBufSize], + 0); + + // read the buffer + if ((dataModeStream->recv_n(msgBuf, msgBufSize, 0, &bt)) == -1) + ACE_ERROR_RETURN((LM_ERROR, + "%p\n", + "recv_n"), + 0); + + // clean up the allocated buffer + delete[] msgBuf; + + // SEND A REPLY TO THE CLIENT + + // send back a 2 byte reply + ACE_CDR::Short reply; + if ((dataModeStream->send_n(&reply, ACE_CDR::SHORT_SIZE, 0, &bt)) == -1) + ACE_ERROR_RETURN((LM_ERROR, + "%p\n", + "send_n"), + 0); + + } while (--numIterations); + + // close and destroy the stream + dataModeStream->close(); + delete dataModeStream; + + return NULL; +} + +// sets up the dataModeSocket Stream, reads the test header infomation +// and launches a thread to handle the requested test. +static void run_server (ACE_HANDLE handle) +{ + ACE_INET_Addr cli_addr; + // create a new stream and initialized with the handle returned by + // accept + ACE_SOCK_SEQPACK_Association * dataModeStream = new ACE_SOCK_SEQPACK_Association; + dataModeStream->set_handle (handle); + + // Make sure we're not in non-blocking mode. + if (dataModeStream->disable (ACE_NONBLOCK) == -1){ + ACE_ERROR ((LM_ERROR, + "%p\n", + "disable")); + return; + } + else if (dataModeStream->get_remote_addr (cli_addr) == -1){ + ACE_ERROR ((LM_ERROR, + "%p\n", + "get_remote_addr")); + return; + } + + // explicity configure Nagling. Default is + // Options_Manager::test_enable_nagle=0 so default configurations is + // NO NAGLING + ACE_CDR::Long nagle; + if (Options_Manager::test_enable_nagle) + nagle=0; + else + nagle=1; + + if (-1 == dataModeStream->set_option(IPPROTO_SCTP, SCTP_NODELAY, &nagle, sizeof nagle)){ + // can't ise ACE_ERROR_RETURN b/c function has void return value + ACE_ERROR((LM_ERROR, + "%p\n", + "set_option")); + return; + } + + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) client %s connected from %d\n", + cli_addr.get_host_name (), + cli_addr.get_port_number ())); + + // hdr bufSize is hardcoded to 8 bytes + // (4 for a CDR-encoded boolean and 4 for a CDR-encoded ULong) + ACE_CDR::ULong hdrBufSize = 8; + // allocate a raw buffer large enough to receive the header and be + // properly aligned for the CDR decoding. + ACE_CDR::Char * hdrBuf= new ACE_CDR::Char[hdrBufSize+ACE_CDR::MAX_ALIGNMENT]; + // align the raw buffer before reading data into it. + char * hdrBuf_a = ACE_ptr_align_binary(hdrBuf, ACE_CDR::MAX_ALIGNMENT); + + size_t bt; + // read the header + if ((dataModeStream->recv_n(hdrBuf_a, hdrBufSize, 0, &bt)) == -1){ + ACE_ERROR ((LM_ERROR, + "%p\n", + "recv_n")); + return; + } + + // pass the CDR encoded data into an ACE_InputCDR class. hdrCDR does + // NOT copy this data. Nor does it delete. It assumes the buffer + // remains valid while it is in scope. + ACE_InputCDR hdrCDR(hdrBuf_a, hdrBufSize); + + ACE_CDR::Boolean byteOrder; + ACE_CDR::ULong numIterations; + + // extract the data + hdrCDR >> ACE_InputCDR::to_boolean (byteOrder); + hdrCDR.reset_byte_order(byteOrder); + hdrCDR >> numIterations; + + // make sure the stream is good after the extractions + if (!hdrCDR.good_bit()){ + ACE_ERROR((LM_ERROR, + "%p\n", + "hdrCDR")); + + return; + } + + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Test for %u iterations\n", + numIterations)); + + // deallocate the header buffer + delete[] hdrBuf; + + // bundle up the arguments + ArgStruct * args = new ArgStruct; + args->stream = dataModeStream; + args->numIters = numIterations; + +#if defined (ACE_HAS_THREADS) + // Spawn a new thread and run the new connection in that thread of + // control using the <server> function as the entry point. + if (ACE_Thread_Manager::instance ()->spawn (unmarshalledOctetServer, + ACE_reinterpret_cast(void *,args), + THR_DETACHED) == -1) + ACE_ERROR ((LM_ERROR, + "(%P|%t) %p\n", + "spawn")); +#else + (*unmarshalledOctetServer) (ACE_reinterpret_cast(void *, args)); +#endif /* ACE_HAS_THREADS */ + +} + +int main(int argc, char **argv){ + + Options_Manager optsMgr(argc, argv, "server-opts"); + + // show usage is requested + if (optsMgr._usage) { + optsMgr._show_usage(cerr, "server-opts"); + return 1; + } + +#ifndef ACE_HAS_SCTP + // SCTP is not installed. Exit with informative error message. + ACE_ERROR_RETURN((LM_ERROR, + "SCTP was NOT installed/accessible when this binary was compiled.\n"), + 1); +#endif + + // check that valid options were specified + if (optsMgr._error) { + cerr << "ERROR: " << optsMgr._error_message << endl; + return 1; + } + + // this is the socket that the server will listen on + ACE_SOCK_SEQPACK_Acceptor acceptor_socket; + + // Create the address that we want to listen for connections on. If + // server_accept_addr=INADDR_ANY (the default), SCTP will listen for + // connections on all IP interfaces. If an address is specified, + // SCTP will listen for connections on that address ONLY. + ACE_Multihomed_INET_Addr serverAddr; + + serverAddr.set(optsMgr.server_port, + optsMgr.server_accept_addr, + 1, + optsMgr.secondary_accept_addrs, + optsMgr.num_secondary_accept_addrs); + + // this operation creates a socket, binds the specified internet + // address to it and calls listen. As this is a wrapper facade + // approach, the ACE_OS::{socket,bind,listen} calls are invoked in + // the implementation of open. + if (acceptor_socket.open(serverAddr, 1, + AF_INET, + ACE_DEFAULT_BACKLOG, + optsMgr.test_transport_protocol) == -1) + ACE_ERROR_RETURN ((LM_ERROR, + "%p\n", + "open"), + 1); + + // this function checks that the port that was actually bound was + // the port we asked for. Apparently some operating systems will + // automatically select new ports if the specified port is currently + // used. + else if (acceptor_socket.get_local_addr(serverAddr) == -1) + ACE_ERROR_RETURN ((LM_ERROR, + "%p\n", + "get_local_addr"), + 1); + + if (optsMgr.num_secondary_accept_addrs) { + + const size_t printbuf_size = 1024; + char printbuf[printbuf_size]; + + int printbuf_remaining_size = printbuf_size; + char* printbuf_ptr = printbuf; + + size_t substring_length = 0; + + // Put primary address into the buffer + serverAddr.get_host_addr(printbuf_ptr, printbuf_remaining_size); + substring_length = ACE_OS::strlen(printbuf_ptr); + printbuf_ptr = &printbuf_ptr[substring_length]; + printbuf_remaining_size -= substring_length; + + // Get secondary addresses + ACE_INET_Addr* secondaries; + if (optsMgr.num_secondary_accept_addrs) { + ACE_NEW_NORETURN(secondaries, + ACE_INET_Addr[optsMgr.num_secondary_accept_addrs]); + + if (!secondaries) { + ACE_ERROR_RETURN((LM_ERROR, + "%p\n", + "new"), + 1); + } + + serverAddr.get_secondary_addresses(secondaries, + optsMgr.num_secondary_accept_addrs); + } + + // Put all but the last secondary address into the buffer + int top = optsMgr.num_secondary_accept_addrs - 1; + for (int i = 0; i < top; ++i) { + + ACE_OS::strncpy(printbuf_ptr, ", ", printbuf_remaining_size); + printbuf_ptr = &printbuf_ptr[2]; + printbuf_remaining_size -= 2; + + secondaries[i].get_host_addr(printbuf_ptr, printbuf_remaining_size); + substring_length = ACE_OS::strlen(printbuf_ptr); + printbuf_ptr = &printbuf_ptr[substring_length]; + printbuf_remaining_size -= substring_length; + } + + // Put the last secondary address into the buffer + if (top >= 0) { + + ACE_OS::strncpy(printbuf_ptr, " and ", printbuf_remaining_size); + printbuf_ptr = &printbuf_ptr[5]; + printbuf_remaining_size -= 5; + + secondaries[top].get_host_addr(printbuf_ptr, printbuf_remaining_size); + } + + ACE_DEBUG((LM_DEBUG, + "(%P|%t) Accepting connections on port %u " + "on interfaces %s " + "using %s\n", + serverAddr.get_port_number(), + printbuf, + (optsMgr.test_transport_protocol == IPPROTO_SCTP) ? "IPPROTO_SCTP" : "IPPROTO_TCP")); + + } else { + + ACE_DEBUG((LM_DEBUG, + "(%P|%t) Accepting connections on port %u on interface %s using %s\n", + serverAddr.get_port_number(), + (optsMgr.server_accept_addr == INADDR_ANY) ? "INADDR_ANY" : serverAddr.get_host_addr(), + (optsMgr.test_transport_protocol == IPPROTO_SCTP) ? "IPPROTO_SCTP" : "IPPROTO_TCP")); + + } + + // this is the stream object that will associated with a completed + // connection (aka the data mode socket). It will be set when accept + // is called below. + ACE_SOCK_SEQPACK_Association new_stream; + + // a file decriptor set + ACE_Handle_Set handle_set; + // add the acceptor socket to the file descriptor set. + handle_set.set_bit(acceptor_socket.get_handle()); + + for (;;){ + + ACE_Time_Value timeout(ACE_DEFAULT_TIMEOUT); + ACE_Handle_Set temp = handle_set; + + // wait for connect() call from client. In the original test there + // were two different acceptor sockets for two different + // services. So select was needed to wait on both sockets + // simultaneously. In this test we could just call accept on the + // one socket. + int result = ACE_OS::select((int) (acceptor_socket.get_handle()) +1, + (fd_set *) temp, + 0, + 0, + timeout); + + // check that select did not end with an error. + if (result == -1) + ACE_ERROR ((LM_ERROR, + "(%P|%t) %p\n", + "select")); + // check to see if select timed out. + else if (result == 0){ + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) select timed out\n")); + + } + else { // case where a file descriptor was actually set + if (!(temp.is_set(acceptor_socket.get_handle()))){ + // CANNOT BE REACHED + ACE_ERROR ((LM_ERROR, + "(%P|%t) %p\n", + "select: NO ERROR BUT NO FD SET")); + } else { + // call accept to set up the new stream. + if (acceptor_socket.accept(new_stream) == -1) { + ACE_ERROR ((LM_ERROR, + "%p\n", + "accept")); + continue; + } + else{ + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) spawning server\n")); + + } + // Run the server. + run_server (new_stream.get_handle ()); + } + + } + + } + return 0; +} diff --git a/performance-tests/SCTP/SOCK_SEQPACK_srv.dsp b/performance-tests/SCTP/SOCK_SEQPACK_srv.dsp new file mode 100644 index 00000000000..fec82582a9f --- /dev/null +++ b/performance-tests/SCTP/SOCK_SEQPACK_srv.dsp @@ -0,0 +1,120 @@ +# Microsoft Developer Studio Project File - Name="SOCK_SEQPACK_srv" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=SOCK_SEQPACK_srv - Win32 Debug
+!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 "SOCK_SEQPACK_srv.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 "SOCK_SEQPACK_srv.mak" CFG="SOCK_SEQPACK_srv - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "SOCK_SEQPACK_srv - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "SOCK_SEQPACK_srv - 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)" == "SOCK_SEQPACK_srv - 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" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /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 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 /out:"Release/SOCK_SEQPACK_srv.exe" /libpath:"..\..\ace"
+
+!ELSEIF "$(CFG)" == "SOCK_SEQPACK_srv - 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" /D "_MBCS" /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 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 /out:"SOCK_SEQPACK_srv.exe" /pdbtype:sept /libpath:"..\..\ace"
+
+!ENDIF
+
+# Begin Target
+
+# Name "SOCK_SEQPACK_srv - Win32 Release"
+# Name "SOCK_SEQPACK_srv - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\SOCK_SEQPACK_srv.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Options_Manager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\hist.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\Options_Manager.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\hist.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/performance-tests/SCTP/SOCK_STREAM_clt.cpp b/performance-tests/SCTP/SOCK_STREAM_clt.cpp new file mode 100644 index 00000000000..81bd75aa362 --- /dev/null +++ b/performance-tests/SCTP/SOCK_STREAM_clt.cpp @@ -0,0 +1,321 @@ +// $Id$ + +// On WIN32, math.h may contain template code, +// which cannot be wrapped by 'extern "C"' +#ifdef WIN32 +#include <math.h> +#endif /* WIN32 */ + +extern "C" { +#ifndef WIN32 +#include <math.h> +#endif /* WIN32 */ +#include <stdio.h> +}; + +#include "ace/INET_Addr.h" +#include "ace/SOCK_Stream.h" +#include "ace/SOCK_Connector.h" +#include "ace/Log_Msg.h" +#include "ace/CDR_Stream.h" +#include "ace/High_Res_Timer.h" + +// make sure that the code compiles cleanly even if SCTP is not +// available. If SCTP is not installed, program will exit early in +// main() with an error message +#ifdef ACE_HAS_SCTP +extern "C" { +#include <netinet/sctp.h> +}; +#else +#define IPPROTO_SCTP -1 +#define SCTP_NODELAY -1 +#endif + +// class that manages setting of options +#include "Options_Manager.h" + +// histogram code +#include "hist.h" + +// global constants +ACE_CDR::UShort const primerIterations = 100; +// ace/High_Res_Timer.h describes the need for the following. +ACE_UINT32 const microsec_clock_scale_factor = ACE_High_Res_Timer::global_scale_factor(); + +// forward declations of functions. Bodies follow main() to improve +// file readability. +HIST runTest(ACE_SOCK_Stream &); + +int main(int argc, char **argv){ + + // Initialize the options manager + Options_Manager optsMgr(argc, argv, "client-opts"); + + // show usage if requested + if (optsMgr._usage) { + optsMgr._show_usage(cerr, "client-opts"); + return 1; + } + + // If SCTP is not installed then terminate the program, unless TCP + // was specified. +#ifndef ACE_HAS_SCTP + if (optsMgr.test_transport_protocol == IPPROTO_SCTP) + ACE_ERROR_RETURN((LM_ERROR, + "SCTP was NOT installed when this binary was compiled.\nSOCK_STREAM_clt may still be run using TCP via the '-t tcp' option.\n"), + 1); +#endif + + // check that valid options were specified + if (optsMgr._error) { + cerr << "ERROR: " << optsMgr._error_message << endl; + return 1; + } + + + // Create the address that we want the client to connect to + ACE_INET_Addr serverAddr(Options_Manager::server_port, + Options_Manager::server_host); + + // Create the address that we want the client to connect FROM + ACE_INET_Addr clientAddr(Options_Manager::client_port, + Options_Manager::client_connect_addr); + + // object that manages the connection to the server + ACE_SOCK_Connector connector; + + // object that manages the data xfer between the client and server + ACE_SOCK_Stream dataStream; + + // connect to the server + if (connector.connect (dataStream, + serverAddr, + 0,clientAddr, 0, 0, 0, // ALL DEFAULT ARGUMENTS + Options_Manager::test_transport_protocol) == -1) + ACE_ERROR_RETURN ((LM_ERROR, + "(%P|%t) %p\n", + "connection failed"), + 1); + + // run the test + HIST testResultsHistogram = NULL; + // connection is closed by runTest* functions + testResultsHistogram = runTest(dataStream); + + // report out the test statistics. + // all histograms created are placed onto a linked list that report() + // can access. So the histogram created in one of the *_test() functions + // will be reported out by the report() call + if (testResultsHistogram) + report(); + + return 0; +} + +// create a histogram to store test results +HIST createHistogram(ACE_CDR::ULong messageSize){ + // The histogram created below lives beyond the scope of this + // function. So the memory allocated here cannot be cleaned up when + // this function goes out of scope. Unfortunately the histogram + // implementation does not clean it up either. So it is a small + // memory leak. + char * histName = (char *) malloc(200); + + sprintf(histName, "%s Unmarshalled Msg Synchronous Latency Test\n\t\t\t\t\t(Message Size %u, Message Type octet)", + "ACE", messageSize); + + // actually create the histogram + HIST createdHist = histogram(histName, + Options_Manager::histogram_bin_count, + Options_Manager::histogram_min_bin, + Options_Manager::histogram_max_bin); + + // set the maximum number of outliers to maintain in the histogram + set_outer(Options_Manager::histogram_num_outliers, createdHist); + + return (createdHist); +} + +// send the test header (only contains number of iterations) +int sendHeader(ACE_SOCK_Stream & stream) { + + // create an ACE CDR output stream and place the header information + // into it + ACE_OutputCDR hdrCDR; + hdrCDR << ACE_OutputCDR::from_boolean (ACE_CDR_BYTE_ORDER); + hdrCDR << ACE_CDR::ULong(Options_Manager::test_iterations+primerIterations); + if (!hdrCDR.good_bit()) + return (0); + + // send the header to the server (HEADER IS 8 BYTES LONG) + size_t bt; + if (stream.send_n(hdrCDR.begin(), 0, &bt) == -1) + return 0; + + return 1; +} + +// conduct the UnMarshalled Octet performance test using separate +// send_n calls with Nagle's algorithm disabled +HIST runUnmarshalledOctetTest(ACE_CDR::Octet *buf, size_t seqLen, ACE_SOCK_Stream & stream){ + + ACE_CDR::ULong const testIterations = Options_Manager::test_iterations; + + size_t bt; + ACE_CDR::ULong cnt = 0; + // variables for the timing measurements + ACE_hrtime_t startTime, endTime; + ACE_CDR::Double messageLatency_usec = 0.0; + ACE_CDR::ULong msgLen = seqLen*ACE_CDR::OCTET_SIZE; + + // explicity configure Nagling. Default is + // Options_Manager::test_enable_nagle=0 so default configurations is + // NO NAGLING + ACE_CDR::Long nagle; + if (Options_Manager::test_enable_nagle) + nagle=0; + else + nagle=1; + if (Options_Manager::test_transport_protocol == IPPROTO_SCTP){ + // default - sctp case + if (-1 == stream.set_option(IPPROTO_SCTP, SCTP_NODELAY, &nagle, sizeof nagle)) + ACE_ERROR_RETURN ((LM_ERROR, + "%p\n", + "set_option"), + 0); + } else { + // tcp case + if (-1 == stream.set_option(IPPROTO_TCP, TCP_NODELAY, &nagle, sizeof nagle)) + ACE_ERROR_RETURN ((LM_ERROR, + "%p\n", + "set_option"), + 0); + } + + // prime the client and server before starting the test + for(cnt=0;cnt<primerIterations;++cnt){ + + // send message size + // TODO : The message length should be CDR encoded + ACE_CDR::ULong msgLenExpressed = ACE_HTONL(msgLen); + if (-1 == stream.send_n (&msgLenExpressed, ACE_CDR::LONG_SIZE, 0, &bt)) + ACE_ERROR_RETURN ((LM_ERROR, + "%p\n", + "send_n"), + 0); + + // send a message + if (-1 == stream.send_n (buf, msgLen, 0, &bt)) + ACE_ERROR_RETURN ((LM_ERROR, + "%p\n", + "send_n"), + 0); + + // block for a Short reply + ACE_CDR::Short reply; + if ((stream.recv_n(&reply, ACE_CDR::SHORT_SIZE, 0, &bt)) == -1) + ACE_ERROR_RETURN((LM_ERROR, + "%p\n", + "recv_n"), + 0); + } + + // AFTER PRIMING THE PUMP CREATE THE HISTOGRAM + HIST aceStream_hist=NULL; + aceStream_hist = createHistogram(msgLen); + if (NULL == aceStream_hist) + ACE_ERROR_RETURN((LM_ERROR, + "%p\n", + "histogram create failed"), + 0); + + iovec iov[2]; + // PERFORMANCE TEST LOOP + for (cnt = 0; cnt < testIterations; ++cnt){ + + // get the start time + startTime = ACE_OS::gethrtime(); + if (!startTime) + ACE_ERROR_RETURN((LM_ERROR, + "%p\n", + "ACE_OS::gethrtime()"), + 0); + + + ACE_CDR::ULong msgLenExpressed = ACE_HTONL(msgLen); + iov[0].iov_base = ACE_reinterpret_cast(char *, &msgLenExpressed); + iov[0].iov_len = ACE_CDR::LONG_SIZE; + iov[1].iov_base = ACE_reinterpret_cast(char *, buf); + iov[1].iov_len = msgLen; + + if (-1 == stream.sendv_n (iov, 2)) + ACE_ERROR_RETURN ((LM_ERROR, + "%p\n", + "send_n"), + 0); + + // block for a Short reply + ACE_CDR::Short reply; + if ((stream.recv_n(&reply, ACE_CDR::SHORT_SIZE, 0, &bt)) == -1) + ACE_ERROR_RETURN((LM_ERROR, + "%p\n", + "recv_n"), + 0); + + // get the end time + endTime = ACE_OS::gethrtime(); + if (!endTime) + ACE_ERROR_RETURN((LM_ERROR, + "%p\n", + "ACE_OS::gethrtime()"), + 0); + + // compute the message latency in micro-seconds + messageLatency_usec = + + (ACE_static_cast(double, + ACE_UINT64_DBLCAST_ADAPTER(endTime)) - + ACE_static_cast(double, + ACE_UINT64_DBLCAST_ADAPTER(startTime))) + + / microsec_clock_scale_factor; + + // record the message latency in the histogram + record(messageLatency_usec, aceStream_hist); + } + + // THE HEADER MESSAGE SENT TO THE SERVER CONTAINED THE NUMBER OF + // PRIMER AND TEST MESSAGES TO BE SENT AFTER WHICH THE SERVER WILL + // CLOSE THE STREAM SO ONCE WE REACH THIS POINT THE STREAM IS NO + // LONGER VALID AND WE CLOSE IT. + stream.close(); + + // allocated by runTest + delete[] buf; + return aceStream_hist; +} + +// sends the test information to the server and calls the correct test +// function. +HIST runTest(ACE_SOCK_Stream & stream){ + + size_t msgLen = + static_cast<int>(pow(2.0, Options_Manager::payload_size_power_of_2)); + + // send a header to the server that contains test parameters + if (sendHeader(stream) < 0) + ACE_ERROR_RETURN((LM_ERROR, + "Could NOT Send CDR Encoded Header"), + 0); + + // create the forward message buffer + + ACE_CDR::Octet *o_arr; + ACE_CDR::ULong seqLen = msgLen/ACE_CDR::OCTET_SIZE; + ACE_NEW_RETURN(o_arr, + ACE_CDR::Octet[seqLen], + 0); + // o_arr is deleted in run_octet_test + return(runUnmarshalledOctetTest(o_arr, seqLen, stream)); +} diff --git a/performance-tests/SCTP/SOCK_STREAM_clt.dsp b/performance-tests/SCTP/SOCK_STREAM_clt.dsp new file mode 100644 index 00000000000..993b28fdf57 --- /dev/null +++ b/performance-tests/SCTP/SOCK_STREAM_clt.dsp @@ -0,0 +1,120 @@ +# Microsoft Developer Studio Project File - Name="SOCK_STREAM_clt" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=SOCK_STREAM_clt - Win32 Debug
+!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 "SOCK_STREAM_clt.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 "SOCK_STREAM_clt.mak" CFG="SOCK_STREAM_clt - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "SOCK_STREAM_clt - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "SOCK_STREAM_clt - 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)" == "SOCK_STREAM_clt - 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" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /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 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 /out:"Release/SOCK_STREAM_clt.exe" /libpath:"..\..\ace"
+
+!ELSEIF "$(CFG)" == "SOCK_STREAM_clt - 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" /D "_MBCS" /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 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 /out:"SOCK_STREAM_clt.exe" /pdbtype:sept /libpath:"..\..\ace"
+
+!ENDIF
+
+# Begin Target
+
+# Name "SOCK_STREAM_clt - Win32 Release"
+# Name "SOCK_STREAM_clt - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\SOCK_STREAM_clt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Options_Manager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\hist.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\Options_Manager.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\hist.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/performance-tests/SCTP/SOCK_STREAM_srv.cpp b/performance-tests/SCTP/SOCK_STREAM_srv.cpp new file mode 100644 index 00000000000..a5bbce9fffd --- /dev/null +++ b/performance-tests/SCTP/SOCK_STREAM_srv.cpp @@ -0,0 +1,349 @@ +// $Id$ + +#include "ace/INET_Addr.h" +#include "ace/SOCK_Stream.h" +#include "ace/SOCK_Acceptor.h" +#include "ace/Log_Msg.h" +#include "ace/Thread_Manager.h" +#include "ace/Handle_Set.h" +#include "ace/CDR_Stream.h" + +// make sure that the code compiles cleanly even if SCTP is not +// available. If SCTP is not installed, program will exit early in +// main() with an error message +#ifdef ACE_HAS_SCTP +extern "C" { +#include <netinet/sctp.h> +}; +#else +#define IPPROTO_SCTP -1 +#define SCTP_NODELAY -1 +#endif + +// class that manages setting of options +#include "Options_Manager.h" + +// structure to bundle arguments for thread functions +struct ArgStruct { + ACE_SOCK_Stream * stream; + ACE_CDR::ULong numIters; +}; + +// thread function that serves the client for the UnMarshalled Octet +// test +static ACE_THR_FUNC_RETURN unmarshalledOctetServer (void *arg){ + + // unbundle the arguments + ArgStruct * args = ACE_reinterpret_cast(ArgStruct *,arg); + ACE_SOCK_Stream * dataModeStream = args->stream; + ACE_CDR::ULong numIterations = args->numIters; + delete args; + + // serve the client for numIterations synchronous invocations + do { + + // READ A MESSAGE FROM THE CLIENT + + size_t bt; + ACE_CDR::ULong msgBufSize=0; + // read the size of the buffer to follow + if ((dataModeStream->recv_n(&msgBufSize, ACE_CDR::LONG_SIZE, 0, &bt)) == -1) + ACE_ERROR_RETURN((LM_ERROR, + "%p\n", + "recv_n"), + 0); + msgBufSize = ACE_NTOHL(msgBufSize); + + // allocate the buffer for the message payload + ACE_CDR::Octet * msgBuf=NULL; + ACE_NEW_RETURN(msgBuf, + ACE_CDR::Octet[msgBufSize], + 0); + + // read the buffer + if ((dataModeStream->recv_n(msgBuf, msgBufSize, 0, &bt)) == -1) + ACE_ERROR_RETURN((LM_ERROR, + "%p\n", + "recv_n"), + 0); + + // clean up the allocated buffer + delete[] msgBuf; + + // SEND A REPLY TO THE CLIENT + + // send back a 2 byte reply + ACE_CDR::Short reply; + if ((dataModeStream->send_n(&reply, ACE_CDR::SHORT_SIZE, 0, &bt)) == -1) + ACE_ERROR_RETURN((LM_ERROR, + "%p\n", + "send_n"), + 0); + + } while (--numIterations); + + // close and destroy the stream + dataModeStream->close(); + delete dataModeStream; + + return NULL; +} + +// sets up the dataModeSocket Stream, reads the test header infomation +// and launches a thread to handle the requested test. +static void run_server (ACE_HANDLE handle) +{ + ACE_INET_Addr cli_addr; + // create a new stream and initialized with the handle returned by + // accept + ACE_SOCK_Stream * dataModeStream = new ACE_SOCK_Stream; + dataModeStream->set_handle (handle); + + // Make sure we're not in non-blocking mode. + if (dataModeStream->disable (ACE_NONBLOCK) == -1){ + ACE_ERROR ((LM_ERROR, + "%p\n", + "disable")); + return; + } + else if (dataModeStream->get_remote_addr (cli_addr) == -1){ + ACE_ERROR ((LM_ERROR, + "%p\n", + "get_remote_addr")); + return; + } + + // explicity configure Nagling. Default is + // Options_Manager::test_enable_nagle=0 so default configurations is + // NO NAGLING + ACE_CDR::Long nagle; + if (Options_Manager::test_enable_nagle) + nagle=0; + else + nagle=1; + + if (Options_Manager::test_transport_protocol == IPPROTO_SCTP){ + // default - sctp case + if (-1 == dataModeStream->set_option(IPPROTO_SCTP, SCTP_NODELAY, &nagle, sizeof nagle)){ + ACE_ERROR((LM_ERROR, + "%p\n", + "set_option")); + return; + } + } else { + // tcp case + if (-1 == dataModeStream->set_option(IPPROTO_TCP, TCP_NODELAY, &nagle, sizeof nagle)){ + ACE_ERROR ((LM_ERROR, + "%p\n", + "set_option")); + return; + } + } + + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) client %s connected from %d\n", + cli_addr.get_host_name (), + cli_addr.get_port_number ())); + + // hdr bufSize is hardcoded to 8 bytes + // (4 for a CDR-encoded boolean and 4 for a CDR-encoded ULong) + ACE_CDR::ULong hdrBufSize = 8; + // allocate a raw buffer large enough to receive the header and be + // properly aligned for the CDR decoding. + ACE_CDR::Char * hdrBuf= new ACE_CDR::Char[hdrBufSize+ACE_CDR::MAX_ALIGNMENT]; + // align the raw buffer before reading data into it. + char * hdrBuf_a = ACE_ptr_align_binary(hdrBuf, ACE_CDR::MAX_ALIGNMENT); + + size_t bt; + // read the header + if ((dataModeStream->recv_n(hdrBuf_a, hdrBufSize, 0, &bt)) == -1){ + ACE_ERROR ((LM_ERROR, + "%p\n", + "recv_n")); + return; + } + + // pass the CDR encoded data into an ACE_InputCDR class. hdrCDR does + // NOT copy this data. Nor does it delete. It assumes the buffer + // remains valid while it is in scope. + ACE_InputCDR hdrCDR(hdrBuf_a, hdrBufSize); + + ACE_CDR::Boolean byteOrder; + ACE_CDR::ULong numIterations; + + // extract the data + hdrCDR >> ACE_InputCDR::to_boolean (byteOrder); + hdrCDR.reset_byte_order(byteOrder); + hdrCDR >> numIterations; + + // make sure the stream is good after the extractions + if (!hdrCDR.good_bit()){ + ACE_ERROR((LM_ERROR, + "%p\n", + "hdrCDR")); + + return; + } + + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Test for %u iterations\n", + numIterations)); + + // deallocate the header buffer + delete[] hdrBuf; + + // bundle up the arguments + ArgStruct * args = new ArgStruct; + args->stream = dataModeStream; + args->numIters = numIterations; + +#if defined (ACE_HAS_THREADS) + // Spawn a new thread and run the new connection in that thread of + // control using the <server> function as the entry point. + if (ACE_Thread_Manager::instance ()->spawn (unmarshalledOctetServer, + ACE_reinterpret_cast(void *,args), + THR_DETACHED) == -1) + ACE_ERROR ((LM_ERROR, + "(%P|%t) %p\n", + "spawn")); +#else + (*unmarshalledOctetServer) (ACE_reinterpret_cast(void *, args)); +#endif /* ACE_HAS_THREADS */ + +} + +int main(int argc, char **argv){ + + Options_Manager optsMgr(argc, argv, "server-opts"); + + // show usage is requested + if (optsMgr._usage) { + optsMgr._show_usage(cerr, "server-opts"); + return 1; + } + + // If SCTP is not installed then terminate the program, unless TCP + // was specified. +#ifndef ACE_HAS_SCTP + if (optsMgr.test_transport_protocol == IPPROTO_SCTP) + ACE_ERROR_RETURN((LM_ERROR, + "SCTP was NOT installed when this binary was compiled.\n" + "SOCK_STREAM_srv may still be run using TCP " + "via the '-t tcp' option.\n"), + 1); +#endif + + // check that valid options were specified + if (optsMgr._error) { + cerr << "ERROR: " << optsMgr._error_message << endl; + return 1; + } + + // this is the socket that the server will listen on + ACE_SOCK_Acceptor acceptor_socket; + + // Create the address that we want to listen for connections on. If + // server_accept_addr=INADDR_ANY (the default), SCTP will listen for + // connections on all IP interfaces. If an address is specified, + // SCTP will listen for connections on that address ONLY. + ACE_INET_Addr serverAddr(optsMgr.server_port, + optsMgr.server_accept_addr); + + ACE_DEBUG((LM_DEBUG, + "(%P|%t) Accepting connections on port %u on interface %s using %s\n", + serverAddr.get_port_number(), + (optsMgr.server_accept_addr == INADDR_ANY) ? "INADDR_ANY" : serverAddr.get_host_addr(), + (optsMgr.test_transport_protocol == IPPROTO_SCTP) ? "IPPROTO_SCTP" : "IPPROTO_TCP")); + + // this operation creates a socket, binds the specified internet + // address to it and calls listen. As this is a wrapper facade + // approach, the ACE_OS::{socket,bind,listen} calls are invoked in + // the implementation of open. + if (acceptor_socket.open(serverAddr, 1, + AF_INET, + ACE_DEFAULT_BACKLOG, + optsMgr.test_transport_protocol) == -1) + ACE_ERROR_RETURN ((LM_ERROR, + "%p\n", + "open"), + 1); + + // this function checks that the port that was actually bound was + // the port we asked for. Apparently some operating systems will + // automatically select new ports if the specified port is currently + // used. + else if (acceptor_socket.get_local_addr(serverAddr) == -1) + ACE_ERROR_RETURN ((LM_ERROR, + "%p\n", + "get_local_addr"), + 1); + + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) starting server at port %d\n", + serverAddr.get_port_number())); + + // this is the stream object that will associated with a completed + // connection (aka the data mode socket). It will be set when accept + // is called below. + ACE_SOCK_Stream new_stream; + + // a file decriptor set + ACE_Handle_Set handle_set; + // add the acceptor socket to the file descriptor set. + handle_set.set_bit(acceptor_socket.get_handle()); + + for (;;){ + + ACE_Time_Value timeout(ACE_DEFAULT_TIMEOUT); + ACE_Handle_Set temp = handle_set; + + // wait for connect() call from client. In the original test there + // were two different acceptor sockets for two different + // services. So select was needed to wait on both sockets + // simultaneously. In this test we could just call accept on the + // one socket. + int result = ACE_OS::select((int) (acceptor_socket.get_handle()) +1, + (fd_set *) temp, + 0, + 0, + timeout); + + // check that select did not end with an error. + if (result == -1) + ACE_ERROR ((LM_ERROR, + "(%P|%t) %p\n", + "select")); + // check to see if select timed out. + else if (result == 0){ + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) select timed out\n")); + + } + else { // case where a file descriptor was actually set + if (!(temp.is_set(acceptor_socket.get_handle()))){ + // CANNOT BE REACHED + ACE_ERROR ((LM_ERROR, + "(%P|%t) %p\n", + "select: NO ERROR BUT NO FD SET")); + } else { + // call accept to set up the new stream. + if (acceptor_socket.accept(new_stream) == -1) { + ACE_ERROR ((LM_ERROR, + "%p\n", + "accept")); + continue; + } + else{ + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) spawning server\n")); + + } + // Run the server. + run_server (new_stream.get_handle ()); + } + + } + + } + return 0; +} diff --git a/performance-tests/SCTP/SOCK_STREAM_srv.dsp b/performance-tests/SCTP/SOCK_STREAM_srv.dsp new file mode 100644 index 00000000000..ccced6350ce --- /dev/null +++ b/performance-tests/SCTP/SOCK_STREAM_srv.dsp @@ -0,0 +1,120 @@ +# Microsoft Developer Studio Project File - Name="SOCK_STREAM_srv" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=SOCK_STREAM_srv - Win32 Debug
+!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 "SOCK_STREAM_srv.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 "SOCK_STREAM_srv.mak" CFG="SOCK_STREAM_srv - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "SOCK_STREAM_srv - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "SOCK_STREAM_srv - 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)" == "SOCK_STREAM_srv - 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" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /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 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 /out:"Release/SOCK_STREAM_srv.exe" /libpath:"..\..\ace"
+
+!ELSEIF "$(CFG)" == "SOCK_STREAM_srv - 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" /D "_MBCS" /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 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 /out:"SOCK_STREAM_srv.exe" /pdbtype:sept /libpath:"..\..\ace"
+
+!ENDIF
+
+# Begin Target
+
+# Name "SOCK_STREAM_srv - Win32 Release"
+# Name "SOCK_STREAM_srv - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\SOCK_STREAM_srv.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Options_Manager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\hist.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\Options_Manager.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\hist.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/performance-tests/SCTP/THANKS b/performance-tests/SCTP/THANKS new file mode 100644 index 00000000000..eb646d9dae1 --- /dev/null +++ b/performance-tests/SCTP/THANKS @@ -0,0 +1,30 @@ +Lockheed Martin Advanced Technology Laboratories (LM ATL) development +of the SCIOP pluggable protocol for TAO was funded under DARPA/IXO's +Program Composition for Embedded Systems (PCES) program. + +The LM ATL PCES project leads, Patrick Lardieri and Gautam Thaker, +thank the following individuals for their contributions to the +development TAO's SCIOP pluggable protocol. + +Jason Cohen LM ATL +Edward Mulholland LM ATL +Keith O'Hara LM ATL +Chuck Winters LM ATL + +We also thank Mr. Brian Bidulock of OpenSS7 (www.openss7.org) for his +rapid development of a fully functional Linux implementation of SCTP +which made this work possible. + +We also thank the following individuals for their valuable review and +critiques of our SCIOP designs and for the expert advice on the more +arcane and subtle aspects of ACE and TAO. + +Dr. Chris Gill DOC Group +Balachandran Natarajan DOC Group + +Dr. Douglas Schmidt DARPA/IXO, DOC Group + +Steve Houston OCI + + + diff --git a/performance-tests/SCTP/hist.cpp b/performance-tests/SCTP/hist.cpp new file mode 100644 index 00000000000..fbac95d1a98 --- /dev/null +++ b/performance-tests/SCTP/hist.cpp @@ -0,0 +1,304 @@ +// $Id$ + +/* Replacement for CSIM histogram created by Alex Carobus 7/20/98 + #include <std/disclaimer.h> + */ +/* +// +// Update history: +// +// [99.10.18] jcohen +// version 1.3 +// added optional fields to header +// to use: add_field("key","value",histogram); +// or: add_field_n("key",45,histogram); +// +// [99.01.08] jcohen +// version 1.2 +// histogram includes skew and kurtosis +// call enable_skew(h) to enable skew and kurtosis on histogram h +// +// [98.07.29] jcohen +// added add_histogram function +// added version 1.1 display, added num_bins display +// added read_hist +// +*/ + +#include <stdio.h> +#include <stdlib.h> +#include <float.h> +#include <string.h> +#include <math.h> +#include "hist.h" + +hist_t *head_hist, *tail_hist; + +hist_t *histogram(char *name, unsigned int num_bins, double first, + double last) { + hist_t *hist; + if ((hist = (hist_t *)malloc(sizeof(hist_t))) == NULL) { + fprintf(stderr, "unable to allocate memory for histogram : %s", name); + exit(-1); + } + if ((hist->hs = (unsigned int *)malloc(sizeof(unsigned int) * (num_bins+2))) == NULL){ + fprintf(stderr, "unable to allocate memory for histogram : %s", name); + exit(-1); + } + memset(hist->hs, 0, sizeof(unsigned int) * (num_bins+2)); + hist->name = name; + hist->num_bins = num_bins; + hist->first = first; + hist->last = last; + hist->num_points = 0; + hist->max_num_outer = hist->num_outer = 0; + hist->sum = 0.0; + hist->sum2 = 0.0; + hist->sum3 = 0.0; + hist->sum4 = 0.0; + hist->max = DBL_MIN; + hist->min = DBL_MAX; + hist->outer = NULL; + hist->next = NULL; + hist->skew = 0; + hist->firstoptheader = NULL; + if(head_hist == NULL) + head_hist = tail_hist = hist; + else { + tail_hist->next = hist; + tail_hist = tail_hist->next; + } + return hist; +} + + +void set_outer(unsigned int max_num_outer, hist_t *hist) { + hist->outer = (double *)realloc(hist->outer,sizeof(double) * max_num_outer); + hist->max_num_outer = max_num_outer; +} + + +void enable_skew(hist_t *hist) { + hist->skew = 1; +} + + +void add_field(char *key, char *value, hist_t *hist) { + struct optheader *nextoptheader, *trace; + + /* create and prepare nextoptheader */ + nextoptheader = (struct optheader *) malloc(sizeof(struct optheader)); + nextoptheader->key = (char *) malloc(strlen(key)+1); + nextoptheader->value = (char *) malloc(strlen(value)+1); + nextoptheader->next = NULL; + strcpy(nextoptheader->key,key); + strcpy(nextoptheader->value,value); + + /* tack nextoptheader onto end of optheader list */ + if (hist->firstoptheader == NULL) { + hist->firstoptheader = nextoptheader; + } else { + trace = hist->firstoptheader; + while (trace->next != NULL) { + trace = trace->next; + } + trace->next = nextoptheader; + } +} + + +void add_field_n(char *key, int value, hist_t *hist) { + char textvalue[40]; + + sprintf(textvalue,"%d",value); + add_field(key,textvalue,hist); +} + + +void record(double point, hist_t *hist) { + unsigned int bin; + double incsum; + if (point < hist->min) hist->min = point; + if (point > hist->max) hist->max = point; + if (point < hist->first) { + bin = 0; + if (hist->max_num_outer > hist->num_outer) + hist->outer[hist->num_outer++] = point; + } + else if (point >= hist->last) { + bin = hist->num_bins+1; + if (hist->max_num_outer > hist->num_outer) + hist->outer[hist->num_outer++] = point; + } + else + bin = (unsigned int)(((point - hist->first)*(hist->num_bins))/(hist->last - hist->first)+1); + + hist->hs[bin]++; + hist->num_points++; + hist->sum+=point; + incsum = point*point; + hist->sum2 += incsum; + if (hist->skew) { + incsum *= point; + hist->sum3 += incsum; + incsum *= point; + hist->sum4 += incsum; + } + +/* printf("point : %g, bin %u, points in bin %u\n", point, bin, hist->hs[bin]); */ +} + +void report_to(FILE *strm, hist_t *hist) { + unsigned int sofar, i; + double p1, p2, d, mean; + double variance; + struct optheader *trace; + + if (hist->num_points == 0) { + fprintf(strm, "\n\n\t\t\t\tHistogram %s is empty\n\n", hist->name); + return; + } + fprintf(strm, "\n\n\t\t\t\tHistogram %s\n", hist->name); + if (hist->skew) fprintf(strm, "version: %s\n", HIST_VERSION); + else fprintf(strm, "version: 1.1\n"); + fprintf(strm, "minimum: %g\n", hist->min); + fprintf(strm, "maximum: %g\n", hist->max); + fprintf(strm, "mean: %g\n", mean = hist->sum/hist->num_points); + variance = (hist->sum2 - + 2*hist->sum*mean + + hist->num_points*mean*mean) / (hist->num_points-1); + fprintf(strm, "variance: %g\n", variance); + if (hist->skew) { + fprintf(strm, "skew: %g\n", ((hist->sum3 - + 3*hist->sum2*mean + + 3*hist->sum*mean*mean - + hist->num_points*mean*mean*mean) / + pow(sqrt(variance),3) / hist->num_points)); + fprintf(strm, "kurtosis: %g\n", ((hist->sum4 - + 4*hist->sum3*mean + + 6*hist->sum2*mean*mean - + 4*hist->sum*mean*mean*mean + + hist->num_points*mean*mean*mean*mean) / + pow(sqrt(variance),4)) / hist->num_points - 3); + } + fprintf(strm, "num_points: %u\n", hist->num_points); + fprintf(strm, "num_bins: %d %g %g\n", hist->num_bins,hist->first,hist->last); + if (hist->firstoptheader) { + trace = hist->firstoptheader; + while(trace->next != NULL) { + fprintf(strm, "%s: %s\n", trace->key, trace->value); + trace = trace->next; + } + fprintf(strm, "%s: %s\n", trace->key, trace->value); + } + fprintf(strm, "\n"); + sofar = hist->hs[0]; + fprintf(strm, "\t Low - High Count Fraction Cumulative\n"); + fprintf(strm, "\t below - %12.3f : %5u %0.3f %0.3f\n", hist->first, + hist->hs[0], (double)hist->hs[0]/hist->num_points, + (double)histfloor(1000.0*sofar/hist->num_points)/1000.0); + p2 = hist->first; + d = (hist->last - hist->first)/hist->num_bins; + for(i = 1; i <= hist->num_bins; i++) { + p1 = p2; + p2 = i*d+hist->first; + sofar += hist->hs[i]; + fprintf(strm, "\t%12.3f - %12.3f : %5u %0.3f %0.3f\n", p1, p2, hist->hs[i], + (double)hist->hs[i]/hist->num_points, + (double)histfloor(1000.0*sofar/hist->num_points)/1000.0); + } + sofar += hist->hs[hist->num_bins+1]; + fprintf(strm, "\t%12.3f - above : %5u %0.3f %0.3f\n\n", + hist->last, hist->hs[hist->num_bins+1], + (double)hist->hs[hist->num_bins+1]/hist->num_points, + (double)histfloor(1000.0*sofar/hist->num_points)/1000.0); + if (hist->num_outer) { + fprintf(strm, "outliers:\n"); + for(i = 0; i < hist->num_outer; i++) fprintf(strm, "\t%12.3f\n", + hist->outer[i]); + } + fprintf(strm, "\n\n"); +} + +void report() { + hist_t *temp = head_hist; + for(; temp; temp = temp->next) + report_to(stdout, temp); +} + +void stats_init() { + /* this is not necessary */ +} + +double get_mean(HIST hist) { + return(hist->sum/hist->num_points); +} + +double get_min(HIST hist) { + return(hist->min); +} + +double get_max(HIST hist) { + return(hist->max); +} + +double get_variance(HIST hist) { + double mean = hist->sum/hist->num_points; + return((hist->sum2 - 2*hist->sum*mean + hist->num_points*mean*mean)/ + (hist->num_points-1)); +} + +double get_num(HIST hist) { + return(hist->num_points); +} + +void set_mean(HIST hist, double mean) { + hist->sum = mean*hist->num_points; +} + +void set_min(HIST hist, double min) { + hist->min = min; +} + +void set_max(HIST hist, double max) { + hist->max = max; +} + +void set_variance(HIST hist, double variance) { + /* do this after seting mean */ + double mean = hist->sum/hist->num_points; + hist->sum2 = variance *(hist->num_points-1) + 2*hist->sum*mean - hist->num_points*mean*mean; +} + +void add_histogram(HIST dest, HIST source) { + unsigned int i,j; + double d,midpoint; + + d = (source->last - source->first)/source->num_bins; + + for(i=1;i<=source->num_bins;i++) { + midpoint = source->first + ((i - 0.5) * d); + for(j=0;j<source->hs[i];j++) { + record(midpoint,dest); + } + } + + for(i=0;i<source->num_outer;i++) + record(source->outer[i],dest); + + set_min(dest, get_min(source)); + set_max(dest, get_max(source)); + set_mean(dest, get_mean(source)); + set_variance(dest, get_variance(source)); +} + +double histfloor(double x) { + +#ifdef WIN32 + return floor(x); +#else + return((long long)x); +#endif + +} + diff --git a/performance-tests/SCTP/hist.h b/performance-tests/SCTP/hist.h new file mode 100644 index 00000000000..46999d39182 --- /dev/null +++ b/performance-tests/SCTP/hist.h @@ -0,0 +1,68 @@ +// $Id$ + +#include <stdio.h> + +#define HIST_VERSION "1.3" + + +struct optheader { + char *key; + char *value; + struct optheader *next; +}; + +typedef struct hist_s { + char *name; + double max, min, sum, sum2, sum3, sum4; + double first, last; + unsigned int num_points, num_bins; + unsigned int *hs; + unsigned int num_outer, max_num_outer; + double *outer; + struct hist_s *next; + int skew; + struct optheader *firstoptheader; +} hist_t; + +#define HIST hist_t * + +hist_t *histogram(char *name, unsigned int num_bins, double first, + double last); + +void set_outer(unsigned int max_num_outer, hist_t *hist); + +void enable_skew(hist_t *hist); + +void add_field(char *key, char *value, hist_t *hist); + +void add_field_n(char *key, int value, hist_t *hist); + +void record(double point, hist_t *hist); + +void report_to(FILE *strm, hist_t *hist); + +void report(); + +void stats_init(); + +double get_mean(HIST hist); + +double get_min(HIST hist); + +double get_max(HIST hist); + +double get_variance(HIST hist); + +double get_num(HIST hist); + +void set_mean(HIST hist, double mean); + +void set_min(HIST hist, double min); + +void set_max(HIST hist, double max); + +void set_variance(HIST hist, double variance); + +void add_histogram(HIST dest, HIST source); + +double histfloor(double x); diff --git a/performance-tests/SCTP/run_spectrum.config b/performance-tests/SCTP/run_spectrum.config new file mode 100644 index 00000000000..cb2beb17f5e --- /dev/null +++ b/performance-tests/SCTP/run_spectrum.config @@ -0,0 +1,12 @@ +# +# $Id$ +# +# This is the default configuration file for run_spectrum.pl. +# Configuration options given in this file will be passed to +# SOCK_STREAM_clt or SOCK_SEQPACK_clt. +# +# Note that the configuration options are defined as "the first +# double-quote string that is not to the right of a pound sign." +# (Double-quotes and pound signs cannot be escaped). + +"-c 1000" diff --git a/performance-tests/SCTP/run_spectrum.pl b/performance-tests/SCTP/run_spectrum.pl new file mode 100755 index 00000000000..40eb9d74525 --- /dev/null +++ b/performance-tests/SCTP/run_spectrum.pl @@ -0,0 +1,257 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ + +use warnings; +use strict; + +use lib '../../bin'; +use PerlACE::Run_Test; +use Getopt::Long; +use Pod::Usage; + +#### Program Documentation #### + +=head1 NAME + +run_spectrum.pl - Run a spectrum of performance tests. + +=head1 SYNOPSIS + + run_spectrum.pl [ --help ] + [ --manual ] + [ --service (STREAM|SEQPACK) ] + [ --protocol (TCP|SCTP) ] + [ --config_file filename ] + +=head1 OPTIONS + +=over 8 + +=item B<--help, -h> + +Print this help message and exit. + +=item B<--manual, -m> + +Print full documentation and exit. + +=item B<--service, -s> (STREAM|SEQPACK) + +Select SOCK_STREAM or SOCK_SEQPACK service respectively. The default +is SOCK_STREAM. + +=item B<--protocol, -p> (TCP|SCTP) + +Select TCP or SCTP transport protocol. The default is TCP. Note that +TCP cannot be used together with the SEQPACK service. + +=item B<--config_file, -c> filename + +Read configuration parameters from the nominated file. By default, +parameters are read from C<run_spectrum.config> in the current +directory. + +=back + +=head1 DESCRIPTION + +This directory contains performance tests for measuring round-trip +latency statistics of ACE synchronous messaging using unmarshalled +ACE_CDR::Octet. + +The SOCK_STREAM performance test comprises SOCK_STREAM_clt on the +client side and SOCK_STREAM_srv on the server side. The SOCK_SEQPACK +performance test comprises SOCK_SEQPACK_clt on the client side and +SOCK_SEQPACK_srv on the server side. + +People who are interested in round-trip latency often want to see a +I<spectrum> of statistics for a range of payload sizes. The job of +this script, B<run_spectrum.pl>, is to run the client-side +performance-test program repeatedly, so as to generate a spectrum of +statistics. + +The script supports two types of services (SOCK_STREAM and +SOCK_SEQPACK) and two protocols (TCP and UDP). All combinations are +valid except TCP over SOCK_SEQPACK. Please see L<"OPTIONS"> for +information about the command-line options that specify the service +and the protocol. + +By default, B<run_spectrum.pl> will execute SOCK_STREAM_clt (or +SOCK_SEQPACK_clt) with a minimal set of command-line options. You can +specify additional options in an external configuration file. By +default, the configuration file is called C<run_spectrum.config>. You +may name an alternate configuration file using the B<--config_file> +option. + +The configuration file should contain the options that you would +ordinarly give to SOCK_STREAM_clt or SOCK_SEQPACK_clt on the command +line. To see the command-line options available for these programs, +please run C<SOCK_STREAM_clt --help> or C<SOCK_SEQPACK_clt --help>. +Note that the options B<-s> and B<-t> are used by this script when it +launches the client. An occurrence of either of these options in the +configuration file will be ignored as redundant. + +The client is executed 15 times: once for each payload size from 2^2 +bytes to 2^16 bytes. (SCTP tests only go up to 2^15 bytes because of +limitations in our SCTP implementation.) Histograms summarizing the +round-trip latency performance are dumped to a file called +C<TIMESTAMP.spectrum> where C<TIMESTAMP> is the current time in +hyphen-delimited form. + +=head1 EXAMPLES + +B<Example 1>: Run a spectrum of TCP performance tests using +SOCK_STREAM with both endpoints on the local machine. Each test in +the spectrum should have 10,000 data points. + +=over 4 + +=item 1. + +Start the SOCK_STREAM server on the local machine with the S<C<-t +tcp>> option: + + % ./SOCK_STREAM_srv -t tcp + +=item 2. + +Configure the client to run 10,000 individual trials: + + % echo '"-c 10000"' > run_spectrum.config + +=item 3. + +Execute B<run_spectrum.pl>: + + % ./run_spectrum.pl + +(The script uses TCP and SOCK_STREAM by default.) + +=back + +B<Example 2>: Run a spectrum of SCTP performance tests using +SOCK_SEQPACK with one endpoint on the local machine and one endpoint +on a remote machine that happens to be named oneida. Each test in the +spectrum should have 50,000 data points. + +=over 4 + +=item 1. + +On the remote host oneida, start the SOCK_SEQPACK server: + + % ./SOCK_SEQPACK_srv + +=item 2. + +On the local host, configure the client to run 50,000 individual +trials and to look for the server on oneida: + + % echo '"-c 50000 -H oneida"' > run_spectrum.config + +=item 3. + +On the local host, execute B<run_spectrum.pl>: + + % ./run_spectrum.pl --service SEQPACK --protocol SCTP + +=back + +=cut + +# Global variable declarations +my $help = 0; +my $manual = 0; +my $service = "stream"; +my $protocol = "tcp"; +my $config_file = "run_spectrum.config"; +my $options = ""; +my $output_file; + +# Map from services to client programs +my %client_programs = (stream => "SOCK_STREAM_clt", + seqpack => "SOCK_SEQPACK_clt"); + +#### MAIN PROGRAM #### + +# Canonicalize arguments to lower-case +tr/A-Z/a-z/ for @ARGV; + +# Use Getopt::Long to parse options +GetOptions ("help" => \$help, + "manual" => \$manual, + "service=s" => \$service, + "protocol=s" => \$protocol, + "config_file=s" => \$config_file + ); + +# Show help if requested +pod2usage(1) if $help; + +# Show manual if requested +pod2usage(-verbose => 2) if $manual; + +# Validate service option +$service =~ s/seqpacket/seqpack/; # Accept "seqpacket" as synonym for "seqpack" +$service =~ /^(stream|seqpack)$/ + or pod2usage("Service must be STREAM or SEQPACK\n"); + +$protocol =~ /^(tcp|sctp)$/ + or pod2usage("Protocol must be TCP or SCTP\n"); + +$service eq "seqpack" and $protocol eq "tcp" + and pod2usage("Cannot use SEQPACK service with TCP\n"); + +# Open config file +open CONFIG, "< $config_file" + or die "cannot open file: $config_file\n"; + +# Read options from the config file. The options are defined as the +# first double-quoted string that is not to the right of a pound sign. +# (Pound signs and quotes cannot be escaped.) + +while (<CONFIG>) { + chomp; + if (/^[^\#]*?\"(.*?)\"/) { + $options = $1; + last; + } +} + +# Close config file +close CONFIG; + +# Print options +print "Read options from $config_file: \"$options\"\n\n"; + +# Name a unique file to store the results in. +($output_file = localtime() . ".spectrum") =~ tr/ /-/; + +# Run the test for message sizes ranging from 2^2 bytes to 2^16 bytes +# (SCTP tests only go up to 2^15 bytes because of limitations in our +# SCTP implementation) +my $max_size = 16; +$max_size = 15 if $protocol eq "sctp"; +for (my $i = 2; $i <= $max_size; ++$i) { + + # Assemble client parameters and print out the command line + my $client_params = "-t $protocol -s $i $options >> $output_file"; + print "$client_programs{$service} $client_params\n"; + + # Configure client + my $client = + new PerlACE::Process($client_programs{$service}, $client_params); + + # Spawn client + $client->Spawn(); + + # Wait for client to finish + $client->Wait(); + + # Sleep for a while + sleep 5; +} + diff --git a/performance-tests/SCTP/sample-spectrum.png b/performance-tests/SCTP/sample-spectrum.png Binary files differnew file mode 100644 index 00000000000..d6fc94f205b --- /dev/null +++ b/performance-tests/SCTP/sample-spectrum.png diff --git a/protocols/ace/RMCast/Makefile b/protocols/ace/RMCast/Makefile index 6d128d02cc6..403728fc1ec 100644 --- a/protocols/ace/RMCast/Makefile +++ b/protocols/ace/RMCast/Makefile @@ -91,8 +91,8 @@ endif $(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 \ - RMCast_Export.h RMCast.i + $(ACE_ROOT)/ace/Trace.h \ + $(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 \ @@ -120,10 +120,11 @@ endif $(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 \ - 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/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/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ @@ -138,7 +139,8 @@ endif $(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/Functor.h $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -149,7 +151,8 @@ endif $(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/Functor.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ @@ -177,7 +180,8 @@ endif $(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/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 \ @@ -223,8 +227,9 @@ endif $(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 \ - RMCast_Export.h RMCast.i RMCast_Module.i RMCast_Fork.i + $(ACE_ROOT)/ace/Trace.h \ + $(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 \ @@ -252,9 +257,10 @@ endif $(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 \ - RMCast_Export.h RMCast.i RMCast_Module.i \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(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/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ @@ -301,11 +307,12 @@ endif $(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 \ - RMCast_Export.h RMCast.i RMCast_Module.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.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/SOCK_Dgram.h \ - $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.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/Flag_Manip.h \ @@ -320,14 +327,16 @@ endif $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.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 \ + $(ACE_ROOT)/ace/Functor.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/ACE.i $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ @@ -336,7 +345,8 @@ endif $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(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 \ @@ -349,7 +359,8 @@ endif $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Malloc_Base.h \ @@ -436,12 +447,13 @@ endif $(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 \ - RMCast_Export.h RMCast.i RMCast_Module.i \ - $(ACE_ROOT)/ace/Containers.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/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ @@ -458,7 +470,8 @@ endif $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(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 \ @@ -496,8 +509,9 @@ endif $(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 \ - RMCast_Export.h RMCast.i RMCast_Module.i + $(ACE_ROOT)/ace/Trace.h \ + $(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 \ @@ -525,8 +539,9 @@ endif $(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 \ - RMCast_Export.h RMCast.i RMCast_Module_Factory.i + $(ACE_ROOT)/ace/Trace.h \ + $(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 \ @@ -557,7 +572,8 @@ endif $(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/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Event_Handler.h \ @@ -576,14 +592,16 @@ endif $(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.h \ + $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Malloc_Base.h \ @@ -627,7 +645,8 @@ endif $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ @@ -647,7 +666,8 @@ endif $(ACE_ROOT)/ace/Module.i \ $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp RMCast_Partial_Message.i + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + 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 \ @@ -675,8 +695,9 @@ endif $(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 \ - RMCast_Export.h RMCast.i RMCast_Module.i RMCast_Proxy.i + $(ACE_ROOT)/ace/Trace.h \ + $(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 \ @@ -704,11 +725,12 @@ endif $(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 \ - RMCast_Export.h RMCast.i RMCast_Module.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager.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/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -719,7 +741,8 @@ endif $(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/Functor.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ @@ -728,7 +751,8 @@ endif $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(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 \ @@ -741,7 +765,8 @@ endif $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Malloc_Base.h \ @@ -826,7 +851,8 @@ endif $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ @@ -846,7 +872,8 @@ endif $(ACE_ROOT)/ace/Module.i \ $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp RMCast_Partial_Message.i + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + 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 \ @@ -874,9 +901,10 @@ endif $(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 \ - 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/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/Log_Priority.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl @@ -907,13 +935,15 @@ endif $(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 \ - 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/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/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -924,7 +954,8 @@ endif $(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/Functor.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ @@ -933,7 +964,8 @@ endif $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(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 \ @@ -946,7 +978,8 @@ endif $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Malloc_Base.h \ @@ -1029,10 +1062,11 @@ endif $(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 \ - 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/Trace.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 \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -1043,12 +1077,14 @@ endif $(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/Functor.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(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/RB_Tree.i \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(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 \ @@ -1085,7 +1121,8 @@ endif $(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/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 \ @@ -1133,7 +1170,8 @@ endif $(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/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Event_Handler.i RMCast_Resend_Handler.i \ RMCast_Retransmission.h RMCast_Module.h RMCast.h RMCast.i \ RMCast_Module.i RMCast_Copy_On_Write.h RMCast_Worker.h RMCast_Worker.i \ @@ -1153,7 +1191,8 @@ endif $(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/Functor.h $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -1164,7 +1203,8 @@ endif $(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/Functor.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ @@ -1190,7 +1230,8 @@ endif $(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/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 \ @@ -1231,9 +1272,10 @@ endif $(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 \ - 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/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/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ @@ -1277,10 +1319,11 @@ endif $(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 \ - 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/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/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ @@ -1295,7 +1338,8 @@ endif $(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/Functor.h $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -1306,7 +1350,8 @@ endif $(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/Functor.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ @@ -1334,7 +1379,8 @@ endif $(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/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 \ @@ -1382,9 +1428,10 @@ endif $(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 \ - RMCast_Export.h RMCast.i RMCast_Module.i \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(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/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ @@ -1425,9 +1472,9 @@ endif $(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 \ - RMCast_Export.h RMCast.i RMCast_Module_Factory.i \ - RMCast_Singleton_Factory.i + $(ACE_ROOT)/ace/Trace.h \ + $(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 \ @@ -1456,12 +1503,15 @@ endif $(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/Event_Handler.i RMCast_UDP_Event_Handler.i \ - RMCast_IO_UDP.h RMCast_Module.h RMCast.h RMCast.i RMCast_Module.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Event_Handler.i \ + RMCast_UDP_Event_Handler.i RMCast_IO_UDP.h RMCast_Module.h RMCast.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 \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ $(ACE_ROOT)/ace/IPC_SAP.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -1476,14 +1526,16 @@ endif $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.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 \ + $(ACE_ROOT)/ace/Functor.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/ACE.i $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ @@ -1492,7 +1544,8 @@ endif $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(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 \ @@ -1505,7 +1558,8 @@ endif $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Malloc_Base.h \ @@ -1585,12 +1639,14 @@ endif $(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 \ - RMCast_Export.h RMCast.i RMCast_Module.i RMCast_Proxy.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(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/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/SOCK_Dgram.h \ @@ -1604,14 +1660,16 @@ endif $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.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 \ + $(ACE_ROOT)/ace/Functor.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/ACE.i $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ @@ -1620,7 +1678,8 @@ endif $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(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 \ @@ -1633,7 +1692,8 @@ endif $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Malloc_Base.h \ @@ -1720,13 +1780,15 @@ endif $(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 \ - 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/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/SOCK_Dgram_Mcast.h \ $(ACE_ROOT)/ace/SOCK_Dgram.h \ - $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.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/Flag_Manip.h \ @@ -1741,14 +1803,16 @@ endif $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.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 \ + $(ACE_ROOT)/ace/Functor.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/ACE.i $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ @@ -1757,7 +1821,8 @@ endif $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(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 \ @@ -1770,7 +1835,8 @@ endif $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Malloc_Base.h \ @@ -1854,12 +1920,14 @@ endif $(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 \ - 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/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/SOCK_Dgram_Mcast.h \ $(ACE_ROOT)/ace/SOCK_Dgram.h \ - $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.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/Flag_Manip.h \ @@ -1874,14 +1942,16 @@ endif $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.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 \ + $(ACE_ROOT)/ace/Functor.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/ACE.i $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ $(ACE_ROOT)/ace/Functor_T.i \ $(ACE_ROOT)/ace/Functor_T.cpp \ @@ -1890,7 +1960,8 @@ endif $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(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 \ @@ -1903,7 +1974,8 @@ endif $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Malloc_Base.h \ diff --git a/tests/Makefile b/tests/Makefile index fd11dbf1a6c..8040959da67 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -65,6 +65,7 @@ BIN = ACE_Test \ Message_Queue_Test_Ex \ Message_Queue_Notifications_Test \ Multicast_Test \ + Multihomed_INET_Addr_Test \ Notify_Performance_Test \ Object_Manager_Test \ Obstack_Test \ @@ -101,6 +102,7 @@ BIN = ACE_Test \ SOCK_Test \ SOCK_Connector_Test \ SOCK_Send_Recv_Test \ + SOCK_SEQPACK_Association_Test \ SPIPE_Test \ SString_Test \ SV_Shared_Memory_Test \ @@ -258,8 +260,7 @@ realclean: clean .obj/ACE_Test.o .obj/ACE_Test.so .shobj/ACE_Test.o .shobj/ACE_Test.so: ACE_Test.cpp $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/pre.h \ - $(ACE_ROOT)/ace/OS.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 \ @@ -813,8 +814,7 @@ realclean: clean $(ACE_ROOT)/ace/Thread_Manager.i .obj/Basic_Types_Test.o .obj/Basic_Types_Test.so .shobj/Basic_Types_Test.o .shobj/Basic_Types_Test.so: Basic_Types_Test.cpp \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/OS.h $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1144,8 +1144,7 @@ realclean: clean $(ACE_ROOT)/ace/Stream.cpp .obj/Cache_Map_Manager_Test.o .obj/Cache_Map_Manager_Test.so .shobj/Cache_Map_Manager_Test.o .shobj/Cache_Map_Manager_Test.so: Cache_Map_Manager_Test.cpp \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/OS.h $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -1305,8 +1304,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 \ @@ -2383,8 +2381,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 \ @@ -2453,8 +2450,8 @@ 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 \ - Config_Test.h $(ACE_ROOT)/ace/Configuration.h \ + $(ACE_ROOT)/ace/Framework_Component_T.cpp 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 \ @@ -3880,8 +3877,7 @@ realclean: clean $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ $(ACE_ROOT)/ace/Atomic_Op.i -.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 \ @@ -4915,8 +4911,7 @@ realclean: clean $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp -.obj/Log_Msg_Test.o .obj/Log_Msg_Test.so .shobj/Log_Msg_Test.o .shobj/Log_Msg_Test.so: Log_Msg_Test.cpp \ - $(ACE_ROOT)/ace/streams.h \ +.obj/Log_Msg_Test.o .obj/Log_Msg_Test.so .shobj/Log_Msg_Test.o .shobj/Log_Msg_Test.so: Log_Msg_Test.cpp $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ @@ -5037,8 +5032,7 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.cpp .obj/Logging_Strategy_Test.o .obj/Logging_Strategy_Test.so .shobj/Logging_Strategy_Test.o .shobj/Logging_Strategy_Test.so: Logging_Strategy_Test.cpp \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/OS.h $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -5361,8 +5355,8 @@ 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/Active_Map_Manager.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 \ $(ACE_ROOT)/ace/Map_Manager.h \ @@ -5618,8 +5612,7 @@ realclean: clean $(ACE_ROOT)/ace/Caching_Strategies_T.cpp .obj/Max_Default_Port_Test.o .obj/Max_Default_Port_Test.so .shobj/Max_Default_Port_Test.o .shobj/Max_Default_Port_Test.so: Max_Default_Port_Test.cpp \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/OS.h $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -5739,8 +5732,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 \ - Max_Default_Port_Test.h \ + $(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 @@ -6007,8 +5999,7 @@ realclean: clean $(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 \ @@ -6254,8 +6245,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 \ @@ -6987,8 +6977,7 @@ realclean: clean $(ACE_ROOT)/ace/Notification_Strategy.inl \ $(ACE_ROOT)/ace/Message_Queue.i \ $(ACE_ROOT)/ace/High_Res_Timer.h \ - $(ACE_ROOT)/ace/High_Res_Timer.i \ - Message_Queue_Test_Ex.h + $(ACE_ROOT)/ace/High_Res_Timer.i Message_Queue_Test_Ex.h .obj/Message_Queue_Notifications_Test.o .obj/Message_Queue_Notifications_Test.so .shobj/Message_Queue_Notifications_Test.o .shobj/Message_Queue_Notifications_Test.so: Message_Queue_Notifications_Test.cpp \ $(ACE_ROOT)/ace/pre.h \ @@ -7323,6 +7312,98 @@ realclean: clean $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ $(ACE_ROOT)/ace/Atomic_Op.i +.obj/Multihomed_INET_Addr_Test.o .obj/Multihomed_INET_Addr_Test.so .shobj/Multihomed_INET_Addr_Test.o .shobj/Multihomed_INET_Addr_Test.so: Multihomed_INET_Addr_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/Multihomed_INET_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)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Malloc_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/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/Multihomed_INET_Addr.i + .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 \ $(ACE_ROOT)/ace/post.h \ @@ -7551,8 +7632,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 \ @@ -8562,8 +8642,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 \ @@ -10118,8 +10197,7 @@ realclean: clean $(ACE_ROOT)/ace/Framework_Component_T.h \ $(ACE_ROOT)/ace/Framework_Component_T.inl \ $(ACE_ROOT)/ace/Framework_Component_T.cpp \ - Reactor_Performance_Test.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ + Reactor_Performance_Test.h $(ACE_ROOT)/ace/SOCK_Stream.h \ $(ACE_ROOT)/ace/SOCK_IO.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/Addr.h \ @@ -11818,6 +11896,83 @@ realclean: clean $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i +.obj/SOCK_SEQPACK_Association_Test.o .obj/SOCK_SEQPACK_Association_Test.so .shobj/SOCK_SEQPACK_Association_Test.o .shobj/SOCK_SEQPACK_Association_Test.so: SOCK_SEQPACK_Association_Test.cpp \ + $(ACE_ROOT)/ace/OS.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_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/SOCK_SEQPACK_Association.h \ + $(ACE_ROOT)/ace/SOCK_IO.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/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(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/SOCK_IO.i \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_SEQPACK_Association.i \ + $(ACE_ROOT)/ace/SOCK_SEQPACK_Connector.h \ + $(ACE_ROOT)/ace/Multihomed_INET_Addr.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Malloc_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/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/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/Multihomed_INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_SEQPACK_Connector.i + .obj/SPIPE_Test.o .obj/SPIPE_Test.so .shobj/SPIPE_Test.o .shobj/SPIPE_Test.so: SPIPE_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ @@ -13988,7 +14143,41 @@ realclean: clean $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Unbounded_Set_Ex.inl \ $(ACE_ROOT)/ace/Unbounded_Set_Ex.cpp \ - $(ACE_ROOT)/ace/Malloc_Base.h + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Auto_Ptr.h \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ + $(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/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/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/SString.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 \ $(ACE_ROOT)/ace/pre.h \ diff --git a/tests/Multihomed_INET_Addr_Test.cpp b/tests/Multihomed_INET_Addr_Test.cpp new file mode 100644 index 00000000000..4950602ca23 --- /dev/null +++ b/tests/Multihomed_INET_Addr_Test.cpp @@ -0,0 +1,469 @@ +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// tests +// +// = FILENAME +// Multihomed_INET_Addr_Test.cpp +// +// = DESCRIPTION +// Performs several tests on the Multihomed_ACE_INET_Addr class. +// It creates several IPv4 addresses and checks that the +// address formed by the class is valid. +// +// = AUTHOR +// Edward Mulholland (emulholl@atl.lmco.com) +// +// ============================================================================ + +#include /**/ "test_config.h" +#include /**/ "ace/OS.h" +#include /**/ "ace/Multihomed_INET_Addr.h" +#include /**/ "ace/Log_Msg.h" + +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) +{ + ACE_UNUSED_ARG (argc); + ACE_UNUSED_ARG (argv); + + ACE_START_TEST (ACE_TEXT ("Multihomed_INET_Addr_Test")); + + int status = 0; // Innocent until proven guilty + + // loop variables + size_t i, j; + sockaddr_in *pointer; + + // The port will always be this + u_short port = 80; + + // The primary address will always be this + const char *primary_dotted_decimal = "138.38.180.251"; + + // The secondary addresses will always be these... + const char *secondary_dotted_decimals[] = { + "64.219.54.121", + "127.0.0.1", + "21.242.14.51", + "53.141.124.24", + "42.12.44.9" + }; + + // ... and as you can see, there are 5 of them + const size_t num_secondaries = 5; + + // We also need the primary address and the secondary addresses + // in ACE_UINT32 format in host byte order + ACE_UINT32 primary_addr32; + ACE_UINT32 secondary_addr32[5]; + + { + struct in_addr addrv4; + ACE_OS::inet_pton (AF_INET, primary_dotted_decimal, &addrv4); + ACE_OS::memcpy (&primary_addr32, &addrv4, sizeof (primary_addr32)); + primary_addr32 = ACE_NTOHL(primary_addr32); + } + + for (i = 0; i < num_secondaries; ++i) { + struct in_addr addrv4; + ACE_OS::inet_pton (AF_INET, secondary_dotted_decimals[i], &addrv4); + ACE_OS::memcpy (&secondary_addr32[i], &addrv4, sizeof (primary_addr32)); + secondary_addr32[i] = ACE_NTOHL(secondary_addr32[i]); + } + + // Test subject + ACE_Multihomed_INET_Addr addr; + + // Array of ones (used to clear the secondary addresses of the test + // subject) + ACE_UINT32 array_of_threes[5] = { ACE_UINT32 (3), + ACE_UINT32 (3), + ACE_UINT32 (3), + ACE_UINT32 (3), + ACE_UINT32 (3) }; + + // Array of INET_Addrs that will repeatedly be passed into the + // get_secondary_addresses accessor of Multihomed_INET_Addr + ACE_INET_Addr in_out[5]; + + // Array of INET_Addrs against which the above array will be tested. + ACE_INET_Addr stay_out[5]; + + // Array of sockaddrs that will repeatedly be passed into the + // get_addresses accessor of Multihomed_INET_Addr + const size_t num_sockaddrs = 6; + sockaddr_in in_out_sockaddr[num_sockaddrs]; + + // Run the test with a varying number of secondary addresses + for (i = 0; i <= num_secondaries; ++i) { + + + /****** Clear the in_out array and test subject ******/ + + + // Clear the in_out array by setting every port to 0 and every + // address to 1 + for (j = 0; j < num_secondaries; ++j) { + in_out[j].set(0, ACE_UINT32 (1), 1); + } + + // Clear the in_out_sockaddr array by setting every port to 0 and + // every address to 1 + ACE_OS::memset(in_out_sockaddr, 0, num_sockaddrs * sizeof(sockaddr)); + + // Clear the test subject by setting the port to 2 and every + // address (both the primary and the secondaries) to 3 + addr.set (2, ACE_UINT32 (3), 1, array_of_threes, num_secondaries); + + // Check that the port is 2 + if (addr.get_port_number() != 2) { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Failed get_port_number check\n") + ACE_TEXT ("%d != %d\n"), + addr.get_port_number(), + 2)); + status = 1; + } + + // Check that the primary address is 3 + if (addr.get_ip_address() != ACE_UINT32 (3)) { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Failed get_ip_address check\n") + ACE_TEXT ("0x%x != 0x%x\n"), + addr.get_ip_address(), + ACE_UINT32 (3))); + status = 1; + } + + // Check that the test subject reports the correct number of + // secondary addresses. + size_t returned_num_secondaries = addr.get_num_secondary_addresses(); + if (returned_num_secondaries == num_secondaries) { + + // Set a stay_out element to the state that we expect to see + // from every in_out element after the in_out array is passed to + // the accessor of the test subject. + stay_out[0].set(2, ACE_UINT32 (3), 1); + + // Pass the in_out array to the accessor + addr.get_secondary_addresses(in_out, num_secondaries); + + // Check that the in_out array matches stay_out element + for (j = 0; j < num_secondaries; ++j) { + + if (in_out[j] != stay_out[0]) { + + ACE_TCHAR in_out_string[100]; + ACE_TCHAR stay_out_string[100]; + + in_out[j].addr_to_string(in_out_string, 100); + stay_out[0].addr_to_string(stay_out_string, 100); + + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Failed get_secondary_addresses check\n") + ACE_TEXT ("%s != %s\n"), + in_out_string, + stay_out_string)); + + status = 1; + } + } + + // Pass the in_out_sockaddr array to the accessor + addr.get_addresses(in_out_sockaddr, num_secondaries + 1); + + // Check that the in_out_sockaddr array matches stay_out element + for (j = 0, pointer = in_out_sockaddr; + j < num_secondaries + 1; + ++j, ++pointer) { + + if (memcmp(pointer, stay_out[0].get_addr(), sizeof(sockaddr))) { + + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Failed get_addresses check\n"))); + + status = 1; + } + } + + } else { + + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Failed get_num_secondary_addresses check\n") + ACE_TEXT ("%d != %d\n"), + returned_num_secondaries, + num_secondaries)); + status = 1; + + } + + + /**** Test set (u_short, const char[], int, int, const char *([]), size_t) ****/ + + + addr.set(port, + primary_dotted_decimal, + 1, + AF_INET, + secondary_dotted_decimals, + i); + + // Check the port number + if (addr.get_port_number() != port) { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Failed second get_port_number check\n") + ACE_TEXT ("%d != %d\n"), + addr.get_port_number(), + port)); + status = 1; + } + + // Check the primary address + if (0 != ACE_OS::strcmp (addr.get_host_addr(), primary_dotted_decimal)) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("%s failed get_host_addr() check\n") + ACE_TEXT ("%s != %s\n"), + primary_dotted_decimal, + addr.get_host_addr (), + primary_dotted_decimal)); + status = 1; + } + + // Check that the test subject reports the correct number of + // secondary addresses. + returned_num_secondaries = addr.get_num_secondary_addresses(); + if (returned_num_secondaries == i) { + + // Initialize the stay_out array with the secondary addresses + for (j = 0; j < i; ++j) { + stay_out[j].set(port, secondary_dotted_decimals[j]); + } + + // Pass the in_out array to the accessor + addr.get_secondary_addresses(in_out, i); + + // Check that the in_out array matches stay_out array + for (j = 0; j < i; ++j) { + + if (in_out[j] != stay_out[j]) { + + ACE_TCHAR in_out_string[100]; + ACE_TCHAR stay_out_string[100]; + + in_out[j].addr_to_string(in_out_string, 100); + stay_out[j].addr_to_string(stay_out_string, 100); + + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Failed second get_secondary_addresses check\n") + ACE_TEXT ("%s != %s\n"), + in_out_string, + stay_out_string)); + + status = 1; + } + } + + // Pass the in_out_sockaddr array to the accessor + addr.get_addresses(in_out_sockaddr, i + 1); + + // Check that the primary address in the in_out_sockaddr array + // matches the primary address reported by the superclass + if (memcmp(in_out_sockaddr, addr.get_addr(), sizeof(sockaddr))) { + + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Failed second get_addresses check ") + ACE_TEXT ("(for primary address)\n"))); + + status = 1; + + } + + // Check that the secondary addresses in the in_out_sockaddr + // array match the stay_out array + for (j = 1, pointer = &in_out_sockaddr[1]; + j < i + 1; + ++j, ++pointer) { + + if (memcmp(pointer, stay_out[j-1].get_addr(), sizeof(sockaddr))) { + + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Failed second get_addresses check ") + ACE_TEXT ("(for secondary addresses)\n"))); + + status = 1; + } + } + + } else { + + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Failed second get_num_secondary_addresses check\n") + ACE_TEXT ("%d != %d\n"), + returned_num_secondaries, + i)); + status = 1; + } + + + /****** Clear the in_out array and test subject AGAIN ******/ + + + // Clear the in_out array by setting every port to 0 and every + // address to 1 + for (j = 0; j < num_secondaries; ++j) { + in_out[j].set(0, ACE_UINT32 (1), 1); + } + + // Clear the test subject by setting the port to 2 and every + // address (both the primary and the secondaries) to 3 + addr.set (2, ACE_UINT32 (3), 1, array_of_threes, num_secondaries); + + // Check that the port is 2 + if (addr.get_port_number() != 2) { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Failed third get_port_number check\n") + ACE_TEXT ("%d != %d\n"), + addr.get_port_number(), + 2)); + status = 1; + } + + // Check that the primary address is 3 + if (addr.get_ip_address() != ACE_UINT32 (3)) { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Failed third get_ip_address check\n") + ACE_TEXT ("0x%x != 0x%x\n"), + addr.get_ip_address(), + ACE_UINT32 (3))); + status = 1; + } + + // Check that the test subject reports the correct number of + // secondary addresses. + returned_num_secondaries = addr.get_num_secondary_addresses(); + if (returned_num_secondaries == num_secondaries) { + + // Set a stay_out element to the state that we expect to see + // from every in_out element after the in_out array is passed to + // the accessor of the test subject. + stay_out[0].set(2, ACE_UINT32 (3), 1); + + // Pass the in_out array to the accessor + addr.get_secondary_addresses(in_out, num_secondaries); + + // Check that the in_out array matches stay_out array + for (j = 0; j < num_secondaries; ++j) { + + if (in_out[j] != stay_out[0]) { + + ACE_TCHAR in_out_string[100]; + ACE_TCHAR stay_out_string[100]; + + in_out[j].addr_to_string(in_out_string, 100); + stay_out[0].addr_to_string(stay_out_string, 100); + + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Failed third get_secondary_addresses check\n") + ACE_TEXT ("%s != %s\n"), + in_out_string, + stay_out_string)); + + status = 1; + } + } + + } else { + + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Failed third get_num_secondary_addresses check\n") + ACE_TEXT ("%d != %d\n"), + returned_num_secondaries, + num_secondaries)); + status = 1; + + } + + + /**** Test set (u_short, ACE_UINT32, int, const ACE_UINT32 *, size_t) ****/ + + addr.set(port, + primary_addr32, + 1, + secondary_addr32, + i); + + // Check the port number + if (addr.get_port_number() != port) { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Failed forth get_port_number check\n") + ACE_TEXT ("%d != %d\n"), + addr.get_port_number(), + port)); + status = 1; + } + + // Check the primary address + if (0 != ACE_OS::strcmp (addr.get_host_addr(), primary_dotted_decimal)) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("%s failed second get_ip_address() check\n") + ACE_TEXT ("%s != %s\n"), + primary_dotted_decimal, + addr.get_host_addr (), + primary_dotted_decimal)); + status = 1; + } + + // Check that the test subject reports the correct number of + // secondary addresses. + returned_num_secondaries = addr.get_num_secondary_addresses(); + if (returned_num_secondaries == i) { + + // Initialize the stay_out array with the secondary addresses + for (j = 0; j < i; ++j) { + stay_out[j].set(port, secondary_addr32[j]); + } + + // Pass the in_out array to the accessor + addr.get_secondary_addresses(in_out, j); + + // Check that the in_out array matches stay_out array + for (j = 0; j < i; ++j) { + + if (in_out[j] != stay_out[j]) { + + ACE_TCHAR in_out_string[100]; + ACE_TCHAR stay_out_string[100]; + + in_out[j].addr_to_string(in_out_string, 100); + stay_out[j].addr_to_string(stay_out_string, 100); + + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Failed forth get_secondary_addresses check\n") + ACE_TEXT ("%s != %s\n"), + in_out_string, + stay_out_string)); + + status = 1; + } + } + + } else { + + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Failed forth get_num_secondary_addresses check\n") + ACE_TEXT ("%d != %d\n"), + returned_num_secondaries, + i)); + status = 1; + } + + } + + ACE_END_TEST; + return status; + +} diff --git a/tests/Multihomed_INET_Addr_Test.dsp b/tests/Multihomed_INET_Addr_Test.dsp new file mode 100644 index 00000000000..165417ab0bc --- /dev/null +++ b/tests/Multihomed_INET_Addr_Test.dsp @@ -0,0 +1,155 @@ +# Microsoft Developer Studio Project File - Name="Multihomed_INET_Addr_Test" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Multihomed_INET_Addr_Test - Win32 Static Debug
+!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 "Multihomed_INET_Addr_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 "Multihomed_INET_Addr_Test.mak" CFG="Multihomed_INET_Addr_Test - Win32 Static Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "Multihomed_INET_Addr_Test - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Multihomed_INET_Addr_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Multihomed_INET_Addr_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Multihomed_INET_Addr_Test - Win32 Static Release" (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)" == "Multihomed_INET_Addr_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 Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /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 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)" == "Multihomed_INET_Addr_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 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"
+
+!ELSEIF "$(CFG)" == "Multihomed_INET_Addr_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 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 "_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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "Multihomed_INET_Addr_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 Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /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 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"
+
+!ENDIF
+
+# Begin Target
+
+# Name "Multihomed_INET_Addr_Test - Win32 Release"
+# Name "Multihomed_INET_Addr_Test - Win32 Debug"
+# Name "Multihomed_INET_Addr_Test - Win32 Static Debug"
+# Name "Multihomed_INET_Addr_Test - Win32 Static Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\Multihomed_INET_Addr_Test.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/tests/RMCast/Makefile b/tests/RMCast/Makefile index 3c80cf99a7e..a9a34553363 100644 --- a/tests/RMCast/Makefile +++ b/tests/RMCast/Makefile @@ -49,6 +49,7 @@ endif .obj/RMCast_Fragment_Test.o .obj/RMCast_Fragment_Test.so .shobj/RMCast_Fragment_Test.o .shobj/RMCast_Fragment_Test.so: RMCast_Fragment_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 \ @@ -73,9 +74,11 @@ endif $(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/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.h \ + $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ @@ -133,7 +136,8 @@ endif $(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/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Containers.h \ @@ -151,7 +155,8 @@ endif $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ @@ -176,6 +181,7 @@ endif $(ACE_ROOT)/ace/RMCast/RMCast_Fragment.i .obj/RMCast_Reassembly_Test.o .obj/RMCast_Reassembly_Test.so .shobj/RMCast_Reassembly_Test.o .shobj/RMCast_Reassembly_Test.so: RMCast_Reassembly_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 \ @@ -200,9 +206,11 @@ endif $(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/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.h \ + $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ @@ -254,7 +262,8 @@ endif $(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/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 \ @@ -273,7 +282,8 @@ endif $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ @@ -353,6 +363,7 @@ 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 \ + $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -377,9 +388,11 @@ endif $(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/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.h \ + $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ @@ -425,7 +438,8 @@ endif $(ACE_ROOT)/ace/RMCast/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 \ + $(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 \ @@ -445,7 +459,8 @@ endif $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Malloc_Base.h \ @@ -528,7 +543,8 @@ endif $(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/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 \ @@ -551,6 +567,7 @@ endif $(ACE_ROOT)/ace/Stream_Modules.cpp .obj/RMCast_Membership_Test.o .obj/RMCast_Membership_Test.so .shobj/RMCast_Membership_Test.o .shobj/RMCast_Membership_Test.so: RMCast_Membership_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 \ @@ -575,9 +592,11 @@ endif $(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/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.h \ + $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ @@ -626,7 +645,8 @@ endif $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ $(ACE_ROOT)/ace/Array_Base.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Array_Base.inl \ @@ -657,7 +677,8 @@ endif $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ @@ -680,6 +701,7 @@ 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 \ + $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -704,9 +726,11 @@ endif $(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/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.h \ + $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ @@ -788,7 +812,8 @@ endif $(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/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 \ @@ -826,7 +851,8 @@ endif $(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/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 \ @@ -849,6 +875,7 @@ endif $(ACE_ROOT)/ace/Stream_Modules.cpp .obj/RMCast_Reordering_Test.o .obj/RMCast_Reordering_Test.so .shobj/RMCast_Reordering_Test.o .shobj/RMCast_Reordering_Test.so: RMCast_Reordering_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 \ @@ -873,9 +900,11 @@ endif $(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/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.h \ + $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ @@ -951,7 +980,8 @@ endif $(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/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 \ @@ -989,7 +1019,8 @@ endif $(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/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 \ diff --git a/tests/SOCK_SEQPACK_Association_Test.cpp b/tests/SOCK_SEQPACK_Association_Test.cpp new file mode 100644 index 00000000000..d5bc6a3b3ec --- /dev/null +++ b/tests/SOCK_SEQPACK_Association_Test.cpp @@ -0,0 +1,153 @@ +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// tests +// +// = FILENAME +// SOCK_SEQPACK_Association_Test.cpp +// +// = DESCRIPTION +// +// Tests the methods get_local_addrs and get_remote_addrs of class +// ACE_SOCK_SEQPACK_Association. +// +// This is not an automated "one-button" test. Rather, it prints +// some output to a log file, so that an interested human can +// inspect the output and get a vague notion of whether or not +// the methods are working properly. +// +// = AUTHOR +// Edward Mulholland (emulholl@atl.lmco.com) +// +// ============================================================================ + +#include /**/ "ace/OS.h" +#include /**/ "ace/SOCK_SEQPACK_Association.h" +#include /**/ "ace/SOCK_SEQPACK_Connector.h" +#include /**/ "ace/INET_Addr.h" +#include /**/ "ace/Log_Msg.h" + +void dump_names(const ACE_SOCK_SEQPACK_Association& assoc); + +int main (int argc, ACE_TCHAR *argv[]) +{ + int status = 0; // Innocent until proven guilty + + // object that manages the connection to the server + ACE_SOCK_SEQPACK_Connector connector; + + // object that manages the data xfer between the client and server + ACE_SOCK_SEQPACK_Association dataStream; + + // object that represents the server's IP address and port + ACE_INET_Addr serverAddr; + + if (argc < 2) { + + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Usage: SOCK_SEQPACK_Association_Test hostname:port\n"))); + status = 1; + + } else if (serverAddr.set(argv[1])) { + + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_INET_Addr::set"))); + status = 1; + + } else if (connector.connect (dataStream, serverAddr)) { + + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_SOCK_SEQPACK_Connector::connect"))); + status = 1; + + } else { + + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("Connected to server at %s\n"), + argv[1])); + + dump_names(dataStream); + } + + dataStream.close(); + + return status; +} + +void dump_names(const ACE_SOCK_SEQPACK_Association& assoc) +{ + // Pre-declare for-loop index + size_t i = 0; + + size_t in_out_size = 100; + ACE_INET_Addr in_out[100]; + + // Output char buffer + const size_t outbuf_size = 1024; + char outbuf[outbuf_size]; + + // Get local addresses of the association + if (assoc.get_local_addrs(in_out, in_out_size)) { + + ACE_ERROR((LM_ERROR, + "%p\n", + "get_local_addrs")); + return; + } + + ACE_DEBUG((LM_DEBUG, "Called get_local_addrs\n")); + + // Print individual results of get_local_addrs + for (i = 0; i < in_out_size; ++i) { + + if (in_out[i].addr_to_string(outbuf, outbuf_size)) { + + ACE_ERROR((LM_ERROR, + "%p\n", + "addr_to_string")); + return; + } + + ACE_DEBUG((LM_DEBUG, + "get_local_addrs[%i] = %s\n", + i, + outbuf)); + } + + // Reset in_out_size + in_out_size = 100; + + // Get remote addresses of the association + if (assoc.get_remote_addrs(in_out, in_out_size)) { + + ACE_ERROR((LM_ERROR, + "%p\n", + "get_remote_addrs")); + return; + } + + ACE_DEBUG((LM_DEBUG, "Called get_remote_addrs\n")); + + // Print individual results of get_remote_addrs + for (i = 0; i < in_out_size; ++i) { + + if (in_out[i].addr_to_string(outbuf, outbuf_size)) { + + ACE_ERROR((LM_ERROR, + "%p\n", + "addr_to_string")); + return; + } + + ACE_DEBUG((LM_DEBUG, + "get_remote_addrs[%i] = %s\n", + i, + outbuf)); + } +} + + diff --git a/tests/SOCK_SEQPACK_Association_Test.dsp b/tests/SOCK_SEQPACK_Association_Test.dsp new file mode 100644 index 00000000000..5c9e02d00f0 --- /dev/null +++ b/tests/SOCK_SEQPACK_Association_Test.dsp @@ -0,0 +1,155 @@ +# Microsoft Developer Studio Project File - Name="SOCK_SEQPACK_Association_Test" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=SOCK_SEQPACK_Association_Test - Win32 Static Debug
+!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 "SOCK_SEQPACK_Association_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 "SOCK_SEQPACK_Association_Test.mak" CFG="SOCK_SEQPACK_Association_Test - Win32 Static Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "SOCK_SEQPACK_Association_Test - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "SOCK_SEQPACK_Association_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "SOCK_SEQPACK_Association_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "SOCK_SEQPACK_Association_Test - Win32 Static Release" (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)" == "SOCK_SEQPACK_Association_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 Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /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 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)" == "SOCK_SEQPACK_Association_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 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"
+
+!ELSEIF "$(CFG)" == "SOCK_SEQPACK_Association_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 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 "_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 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
+
+!ELSEIF "$(CFG)" == "SOCK_SEQPACK_Association_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 Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /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 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"
+
+!ENDIF
+
+# Begin Target
+
+# Name "SOCK_SEQPACK_Association_Test - Win32 Release"
+# Name "SOCK_SEQPACK_Association_Test - Win32 Debug"
+# Name "SOCK_SEQPACK_Association_Test - Win32 Static Debug"
+# Name "SOCK_SEQPACK_Association_Test - Win32 Static Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\SOCK_SEQPACK_Association_Test.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/tests/run_test.lst b/tests/run_test.lst index 20a81cb1f3a..73eacad34b7 100644 --- a/tests/run_test.lst +++ b/tests/run_test.lst @@ -72,6 +72,7 @@ MT_Reactor_Upcall_Test: !VxWorks MT_SOCK_Test: !chorus Malloc_Test: !VxWorks Multicast_Test: !ST +Multihomed_INET_Addr_Test Naming_Test: OTHER !chorus !LynxOS !Unicos !VxWorks New_Fail_Test: ALL !DISABLED Notify_Performance_Test diff --git a/tests/run_tests.bat b/tests/run_tests.bat index 6345eb9c583..cf51b2f4389 100644 --- a/tests/run_tests.bat +++ b/tests/run_tests.bat @@ -132,6 +132,7 @@ call %run_cmd% %dopure% %platform% MT_Reactor_Timer_Test call %run_cmd% %dopure% %platform% MT_Reactor_Upcall_Test call %run_cmd% %dopure% %platform% MT_SOCK_Test call %run_cmd% %dopure% %platform% Malloc_Test +call %run_cmd% %dopure% %platform% Multihomed_INET_Addr_Test call %run_cmd% %dopure% %platform% Naming_Test rem call %run_cmd% %dopure% %platform% New_Fail_Test call %run_cmd% %dopure% %platform% Notify_Performance_Test |
