diff options
| author | jxh <jxh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-25 07:44:34 +0000 |
|---|---|---|
| committer | jxh <jxh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-25 07:44:34 +0000 |
| commit | 6d95aeb9084e23859cbefd35e14669ea6f721453 (patch) | |
| tree | feb51e0cd1cc2d99e46521ba8187578e38aa9c29 /apps | |
| parent | cbf3598e3cb4e0167a6485e5e7a967ffb4daf44d (diff) | |
| download | ATCD-6d95aeb9084e23859cbefd35e14669ea6f721453.tar.gz | |
Updated dependencies in Makefiles. Renamed header files that contained
templates. Renamed some classes to use a JAWS prefix. Changed IO_Handler
to deal with new Asynch_IO API changes.
Diffstat (limited to 'apps')
27 files changed, 1515 insertions, 1489 deletions
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/Makefile b/apps/JAWS/PROTOTYPE/HTTPU/Makefile index da5c43cc9b7..ca4e4b71bf6 100644 --- a/apps/JAWS/PROTOTYPE/HTTPU/Makefile +++ b/apps/JAWS/PROTOTYPE/HTTPU/Makefile @@ -49,41 +49,44 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/parse_url.o .obj/parse_url.so .shobj/parse_url.o .shobj/parse_url.so: parse_url.cpp $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ $(ACE_ROOT)/ace/config-sunos5.5.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - ../HTTPU/parse_url.h ../HTTPU/http_export.h + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Log_Record.i ../HTTPU/parse_url.h \ + ../HTTPU/http_export.h .obj/parse_http_request.o .obj/parse_http_request.so .shobj/parse_http_request.o .shobj/parse_http_request.so: parse_http_request.cpp \ - ../HTTPU/parse_http_request.h \ - $(ACE_ROOT)/ace/OS.h \ + ../HTTPU/parse_http_request.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ $(ACE_ROOT)/ace/config-sunos5.5.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - ../HTTPU/http_headers.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Log_Record.i ../HTTPU/http_headers.h \ $(ACE_ROOT)/ace/RB_Tree.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ $(ACE_ROOT)/ace/RB_Tree.i \ $(ACE_ROOT)/ace/RB_Tree.cpp \ $(ACE_ROOT)/ace/Singleton.h \ @@ -92,13 +95,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Singleton.i \ @@ -107,12 +108,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - ../JAWS/Parse_Headers.h ../JAWS/Export.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp ../JAWS/Parse_Headers.h \ + ../JAWS/Export.h $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ @@ -131,61 +129,59 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ - ../JAWS/Headers.h ../HTTPU/http_export.h ../HTTPU/http_headers.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp ../JAWS/Headers.h \ + ../HTTPU/http_export.h ../HTTPU/http_headers.i \ ../HTTPU/parse_http_request.i .obj/parse_http_response.o .obj/parse_http_response.so .shobj/parse_http_response.o .shobj/parse_http_response.so: parse_http_response.cpp \ - ../HTTPU/parse_http_response.h \ - $(ACE_ROOT)/ace/OS.h \ + ../HTTPU/parse_http_response.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ $(ACE_ROOT)/ace/config-sunos5.5.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - ../HTTPU/http_export.h ../HTTPU/parse_http_response.i + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Log_Record.i ../HTTPU/http_export.h \ + ../HTTPU/parse_http_response.i .obj/http_request.o .obj/http_request.so .shobj/http_request.o .shobj/http_request.so: http_request.cpp ../HTTPU/http_request.h \ $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ $(ACE_ROOT)/ace/config-sunos5.5.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Free_List.h \ @@ -210,52 +206,55 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ - ../JAWS/Parse_Headers.h ../JAWS/Export.h \ - $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp ../JAWS/Parse_Headers.h \ + ../JAWS/Export.h $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - ../JAWS/Headers.h ../HTTPU/http_export.h ../HTTPU/http_base.h \ - ../HTTPU/http_status.h ../HTTPU/http_status.i ../HTTPU/http_headers.h \ + $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/Headers.h \ + ../HTTPU/http_export.h ../HTTPU/http_base.h ../HTTPU/http_status.h \ + ../HTTPU/http_status.i ../HTTPU/http_headers.h \ $(ACE_ROOT)/ace/RB_Tree.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ $(ACE_ROOT)/ace/RB_Tree.i \ - $(ACE_ROOT)/ace/RB_Tree.cpp \ - ../HTTPU/http_headers.i ../HTTPU/http_base.i \ - ../HTTPU/parse_http_request.h ../HTTPU/parse_http_request.i \ - ../HTTPU/parse_url.h ../HTTPU/http_request.i + $(ACE_ROOT)/ace/RB_Tree.cpp ../HTTPU/http_headers.i \ + ../HTTPU/http_base.i ../HTTPU/parse_http_request.h \ + ../HTTPU/parse_http_request.i ../HTTPU/parse_url.h \ + ../HTTPU/http_request.i .obj/http_response.o .obj/http_response.so .shobj/http_response.o .shobj/http_response.so: http_response.cpp ../HTTPU/http_response.h \ $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ $(ACE_ROOT)/ace/config-sunos5.5.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Free_List.h \ @@ -280,34 +279,40 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ - ../JAWS/Parse_Headers.h ../JAWS/Export.h \ - $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp ../JAWS/Parse_Headers.h \ + ../JAWS/Export.h $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - ../JAWS/Headers.h ../HTTPU/http_export.h ../HTTPU/http_base.h \ - ../HTTPU/http_status.h ../HTTPU/http_status.i ../HTTPU/http_headers.h \ + $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/Headers.h \ + ../HTTPU/http_export.h ../HTTPU/http_base.h ../HTTPU/http_status.h \ + ../HTTPU/http_status.i ../HTTPU/http_headers.h \ $(ACE_ROOT)/ace/RB_Tree.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ $(ACE_ROOT)/ace/RB_Tree.i \ - $(ACE_ROOT)/ace/RB_Tree.cpp \ - ../HTTPU/http_headers.i ../HTTPU/http_base.i \ - ../HTTPU/parse_http_response.h ../HTTPU/parse_http_response.i \ - ../HTTPU/http_response.i + $(ACE_ROOT)/ace/RB_Tree.cpp ../HTTPU/http_headers.i \ + ../HTTPU/http_base.i ../HTTPU/parse_http_response.h \ + ../HTTPU/parse_http_response.i ../HTTPU/http_response.i .obj/http_base.o .obj/http_base.so .shobj/http_base.o .shobj/http_base.so: http_base.cpp ../JAWS/Parse_Headers.h ../JAWS/Export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ $(ACE_ROOT)/ace/config-sunos5.5.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ @@ -315,13 +320,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Singleton.i \ @@ -332,9 +335,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ @@ -353,42 +354,48 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ - ../JAWS/Headers.h ../HTTPU/http_base.h ../HTTPU/http_export.h \ - ../HTTPU/http_status.h ../HTTPU/http_status.i ../HTTPU/http_headers.h \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp ../JAWS/Headers.h \ + ../HTTPU/http_base.h ../HTTPU/http_export.h ../HTTPU/http_status.h \ + ../HTTPU/http_status.i ../HTTPU/http_headers.h \ $(ACE_ROOT)/ace/RB_Tree.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ $(ACE_ROOT)/ace/RB_Tree.i \ - $(ACE_ROOT)/ace/RB_Tree.cpp \ - ../HTTPU/http_headers.i ../HTTPU/http_base.i + $(ACE_ROOT)/ace/RB_Tree.cpp ../HTTPU/http_headers.i \ + ../HTTPU/http_base.i .obj/http_status.o .obj/http_status.so .shobj/http_status.o .shobj/http_status.so: http_status.cpp ../HTTPU/http_status.h \ $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ $(ACE_ROOT)/ace/config-sunos5.5.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.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/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Singleton.i \ @@ -397,41 +404,43 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - ../HTTPU/http_export.h ../HTTPU/http_status.i -.obj/http_headers.o .obj/http_headers.so .shobj/http_headers.o .shobj/http_headers.so: http_headers.cpp ../HTTPU/http_headers.h \ - $(ACE_ROOT)/ace/RB_Tree.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp ../HTTPU/http_export.h \ + ../HTTPU/http_status.i +.obj/http_headers.o .obj/http_headers.so .shobj/http_headers.o .shobj/http_headers.so: http_headers.cpp $(ACE_ROOT)/ace/RB_Tree.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ $(ACE_ROOT)/ace/config-sunos5.5.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ $(ACE_ROOT)/ace/RB_Tree.i \ - $(ACE_ROOT)/ace/RB_Tree.cpp \ + $(ACE_ROOT)/ace/RB_Tree.cpp ../HTTPU/http_headers.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Singleton.i \ @@ -440,12 +449,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - ../JAWS/Parse_Headers.h ../JAWS/Export.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp ../JAWS/Parse_Headers.h \ + ../JAWS/Export.h $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ @@ -464,6 +470,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ - ../JAWS/Headers.h ../HTTPU/http_export.h ../HTTPU/http_headers.i + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp ../JAWS/Headers.h \ + ../HTTPU/http_export.h ../HTTPU/http_headers.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/apps/JAWS/PROTOTYPE/HTTP_10_Parse.cpp b/apps/JAWS/PROTOTYPE/HTTP_10_Parse.cpp index 22d3b959083..ad104a993e9 100644 --- a/apps/JAWS/PROTOTYPE/HTTP_10_Parse.cpp +++ b/apps/JAWS/PROTOTYPE/HTTP_10_Parse.cpp @@ -76,6 +76,7 @@ JAWS_HTTP_10_Parse_Task::handle_put (JAWS_Data_Block *data, ACE_Time_Value *) } // request completely parsed + info->dump (); return 0; } diff --git a/apps/JAWS/PROTOTYPE/HTTP_10_Write.cpp b/apps/JAWS/PROTOTYPE/HTTP_10_Write.cpp index 0cd187324b0..e22bfef849b 100644 --- a/apps/JAWS/PROTOTYPE/HTTP_10_Write.cpp +++ b/apps/JAWS/PROTOTYPE/HTTP_10_Write.cpp @@ -97,19 +97,30 @@ JAWS_HTTP_10_Write_Task::handle_put (JAWS_Data_Block *data, ACE_Time_Value *) } else { - io->transmit_file (handler, - info->path (), - "", - 0, - "", - 0); + if (ACE_OS::strcmp (info->version (), "HTTP/0.9") == 0) + io->transmit_file (handler, + info->path (), + "", + 0, + "", + 0); + else + io->transmit_file (handler, + info->path (), + "HTTP/1.0 200 Ok\r\n\r\n", + 19, + "", + 0); switch (handler->status ()) { case JAWS_IO_Handler::TRANSMIT_OK_A: - data->payload (0); - delete info; - return 1; + { + JAWS_TRACE ("JAWS_HTTP_10_Write_Task::handle_put, OK_A"); + data->payload (0); + delete info; + return 1; + } case JAWS_IO_Handler::TRANSMIT_OK: { @@ -119,12 +130,18 @@ JAWS_HTTP_10_Write_Task::handle_put (JAWS_Data_Block *data, ACE_Time_Value *) return 0; } case JAWS_IO_Handler::TRANSMIT_ERROR: - case JAWS_IO_Handler::TRANSMIT_ERROR_A: { JAWS_TRACE ("JAWS_HTTP_10_Write_Task::handle_put, ERROR"); data->payload (0); delete info; - return -1; + return 0; + } + case JAWS_IO_Handler::TRANSMIT_ERROR_A: + { + JAWS_TRACE ("JAWS_HTTP_10_Write_Task::handle_put, ERROR_A"); + data->payload (0); + delete info; + return 1; } default: { diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Hash_T.cpp b/apps/JAWS/PROTOTYPE/JAWS/Cache_Hash_T.cpp index 95be98cb02c..cc406850df6 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Hash_T.cpp +++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_Hash_T.cpp @@ -1,19 +1,19 @@ // $Id$ -#ifndef ACE_CACHE_HASH_T_CPP -#define ACE_CACHE_HASH_T_CPP +#ifndef JAWS_CACHE_HASH_T_CPP +#define JAWS_CACHE_HASH_T_CPP #include "JAWS/Cache_Hash_T.h" #include "JAWS/Hash_Bucket_T.h" template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> unsigned long -ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::hash (const EXT_ID &ext_id) const +JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::hash (const EXT_ID &ext_id) const { return HASH_FUNC (ext_id) % this->size_; } template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> int -ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::isprime (unsigned long number) const +JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::isprime (unsigned long number) const { unsigned long d = 3; @@ -31,7 +31,7 @@ ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::isprime (unsigned long number) const } template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> int -ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::new_cachebucket (size_t hash_idx) +JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::new_cachebucket (size_t hash_idx) { if (this->hashtable_[hash_idx] == 0) { @@ -46,7 +46,7 @@ ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::new_cachebucket (size_t hash_idx) } template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> -ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::ACE_Cache_Hash (ACE_Allocator *alloc, +JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::JAWS_Cache_Hash (ACE_Allocator *alloc, size_t size) : allocator_ (alloc), hashtable_ (0) @@ -77,7 +77,7 @@ ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::ACE_Cache_Hash (ACE_Allocator *alloc, } template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> -ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::~ACE_Cache_Hash (void) +JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::~JAWS_Cache_Hash (void) { if (this->hashtable_) { @@ -98,7 +98,7 @@ ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::~ACE_Cache_Hash (void) } template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> int -ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::find (const EXT_ID &ext_id) const +JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::find (const EXT_ID &ext_id) const { unsigned long hash_idx = this->hash (ext_id); @@ -109,8 +109,8 @@ ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::find (const EXT_ID &ext_id) const } template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> int -ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::find (const EXT_ID &ext_id, - ACE_Cache_Object *&int_id) const +JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::find (const EXT_ID &ext_id, + JAWS_Cache_Object *&int_id) const { unsigned long hash_idx = this->hash (ext_id); @@ -121,8 +121,8 @@ ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::find (const EXT_ID &ext_id, } template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> int -ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::bind (const EXT_ID &ext_id, - ACE_Cache_Object *const &int_id) +JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::bind (const EXT_ID &ext_id, + JAWS_Cache_Object *const &int_id) { int result; unsigned long hash_idx = this->hash (ext_id); @@ -143,8 +143,8 @@ ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::bind (const EXT_ID &ext_id, } template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> int -ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::trybind (const EXT_ID &ext_id, - ACE_Cache_Object *&int_id) +JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::trybind (const EXT_ID &ext_id, + JAWS_Cache_Object *&int_id) { int result; unsigned long hash_idx = this->hash (ext_id); @@ -165,10 +165,10 @@ ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::trybind (const EXT_ID &ext_id, } template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> int -ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::rebind (const EXT_ID &ext_id, - ACE_Cache_Object *const &int_id, +JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::rebind (const EXT_ID &ext_id, + JAWS_Cache_Object *const &int_id, EXT_ID &old_ext_id, - ACE_Cache_Object *&old_int_id) + JAWS_Cache_Object *&old_int_id) { int result; unsigned long hash_idx = this->hash (ext_id); @@ -192,7 +192,7 @@ ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::rebind (const EXT_ID &ext_id, template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> int -ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::unbind (const EXT_ID &ext_id) +JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::unbind (const EXT_ID &ext_id) { unsigned long hash_idx = this->hash (ext_id); @@ -203,8 +203,8 @@ ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::unbind (const EXT_ID &ext_id) } template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> int -ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::unbind (const EXT_ID &ext_id, - ACE_Cache_Object *&int_id) +JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::unbind (const EXT_ID &ext_id, + JAWS_Cache_Object *&int_id) { unsigned long hash_idx = this->hash (ext_id); @@ -216,7 +216,7 @@ ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::unbind (const EXT_ID &ext_id, template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> size_t -ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::size (void) const +JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::size (void) const { return this->size_; } @@ -224,4 +224,4 @@ ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::size (void) const -#endif /* UTL_CACHEHASH_T_CPP */ +#endif /* JAWS_CACHEHASH_T_CPP */ diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Hash_T.h b/apps/JAWS/PROTOTYPE/JAWS/Cache_Hash_T.h index 1d8a0a2c4ae..2d310873cb2 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Hash_T.h +++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_Hash_T.h @@ -1,40 +1,40 @@ /* -*- c++ -*- */ // $Id$ -#ifndef ACE_CACHE_HASH_T_H -#define ACE_CACHE_HASH_T_H +#ifndef JAWS_CACHE_HASH_T_H +#define JAWS_CACHE_HASH_T_H #include "ace/OS.h" #include "JAWS/Cache_Object.h" // Forward declaration template <class EXT_ID, class INT_ID, class EQ_FUNC> -class ACE_Hash_Bucket_Manager; +class JAWS_Hash_Bucket_Manager; template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> -class ACE_Cache_Hash +class JAWS_Cache_Hash { public: - typedef ACE_Hash_Bucket_Manager<EXT_ID, ACE_Cache_Object *, EQ_FUNC> + typedef JAWS_Hash_Bucket_Manager<EXT_ID, JAWS_Cache_Object *, EQ_FUNC> CACHE_BUCKET_MANAGER; - ACE_Cache_Hash (ACE_Allocator *alloc = 0, size_t size = 521); + JAWS_Cache_Hash (ACE_Allocator *alloc = 0, size_t size = 521); // 521 == smallest number > 512 that is prime. Why is a prime // number important? I am trying to maximize scattering when using // mod on the hashed value. This might be bogus though. - virtual ~ACE_Cache_Hash (void); + virtual ~JAWS_Cache_Hash (void); int find (const EXT_ID &ext_id) const; - int find (const EXT_ID &ext_id, ACE_Cache_Object *&int_id) const; - int bind (const EXT_ID &ext_id, ACE_Cache_Object *const &int_id); - int trybind (const EXT_ID &ext_id, ACE_Cache_Object *&int_id); - int rebind (const EXT_ID &ext_id, ACE_Cache_Object *const &int_id, - EXT_ID &old_ext_id, ACE_Cache_Object *&old_int_id); + int find (const EXT_ID &ext_id, JAWS_Cache_Object *&int_id) const; + int bind (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id); + int trybind (const EXT_ID &ext_id, JAWS_Cache_Object *&int_id); + int rebind (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id, + EXT_ID &old_ext_id, JAWS_Cache_Object *&old_int_id); int unbind (const EXT_ID &ext_id); - int unbind (const EXT_ID &ext_id, ACE_Cache_Object *&int_id); + int unbind (const EXT_ID &ext_id, JAWS_Cache_Object *&int_id); size_t size (void) const; diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Heap_T.cpp b/apps/JAWS/PROTOTYPE/JAWS/Cache_Heap_T.cpp index 7b26f02d36a..36575ef2741 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Heap_T.cpp +++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_Heap_T.cpp @@ -1,13 +1,13 @@ // $Id$ -#ifndef ACE_CACHE_HEAP_T_CPP -#define ACE_CACHE_HEAP_T_CPP +#ifndef JAWS_CACHE_HEAP_T_CPP +#define JAWS_CACHE_HEAP_T_CPP #include "JAWS/Cache_Heap_T.h" #include "JAWS/Cache_Manager_T.h" template <class EXT_ID, class FACT, class H_FN, class E_FN> -ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::ACE_Cache_Heap (ACE_Allocator *alloc, +JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::JAWS_Cache_Heap (ACE_Allocator *alloc, size_t maxsize) : allocator_ (alloc), maxsize_ (maxsize), @@ -33,7 +33,7 @@ ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::ACE_Cache_Heap (ACE_Allocator *alloc, } template <class EXT_ID, class FACT, class H_FN, class E_FN> -ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::~ACE_Cache_Heap (void) +JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::~JAWS_Cache_Heap (void) { if (this->heap_ != 0) { @@ -54,31 +54,31 @@ ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::~ACE_Cache_Heap (void) } template <class EXT_ID, class FACT, class H_FN, class E_FN> int -ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::is_empty (void) const +JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::is_empty (void) const { return (this->size_ == 0); } template <class EXT_ID, class FACT, class H_FN, class E_FN> int -ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::is_full (void) const +JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::is_full (void) const { return (this->size_ == this->maxsize_); } template <class EXT_ID, class FACT, class H_FN, class E_FN> size_t -ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::size (void) const +JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::size (void) const { return this->size_; } template <class EXT_ID, class FACT, class H_FN, class E_FN> size_t -ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::maxsize (void) const +JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::maxsize (void) const { return this->maxsize_; } template <class EXT_ID, class FACT, class H_FN, class E_FN> int -ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::maxsize (Cache_Manager *cm, +JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::maxsize (Cache_Manager *cm, size_t new_maxsize) { int result = -1; @@ -110,7 +110,7 @@ ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::maxsize (Cache_Manager *cm, } template <class EXT_ID, class FACT, class H_FN, class E_FN> void -ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::insert_i (Cache_Heap_Item *item) +JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::insert_i (Cache_Heap_Item *item) { /* ASSERT: this->size_ < this->maxsize_ */ @@ -131,8 +131,8 @@ ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::insert_i (Cache_Heap_Item *item) } template <class EXT_ID, class FACT, class H_FN, class E_FN> int -ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::insert (const EXT_ID &ext_id, - ACE_Cache_Object *const &int_id) +JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::insert (const EXT_ID &ext_id, + JAWS_Cache_Object *const &int_id) { if (this->is_full ()) return -1; @@ -149,7 +149,7 @@ ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::insert (const EXT_ID &ext_id, } template <class EXT_ID, class FACT, class H_FN, class E_FN> void -ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove_i (void) +JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove_i (void) { /* ASSERT: this->size_ > 0 */ this->size_--; @@ -181,7 +181,7 @@ ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove_i (void) } template <class EXT_ID, class FACT, class H_FN, class E_FN> void -ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove_i (size_t pos) +JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove_i (size_t pos) { Cache_Heap_Item *item = this->heap_[pos]; @@ -203,8 +203,8 @@ ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove_i (size_t pos) } template <class EXT_ID, class FACT, class H_FN, class E_FN> int -ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove (EXT_ID &ext_id, - ACE_Cache_Object *&int_id) +JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove (EXT_ID &ext_id, + JAWS_Cache_Object *&int_id) { if (this->is_empty ()) return -1; @@ -223,7 +223,7 @@ ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove (EXT_ID &ext_id, } template <class EXT_ID, class FACT, class H_FN, class E_FN> int -ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove (void *item) +JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove (void *item) { if (item == 0) return 0; @@ -244,7 +244,7 @@ ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove (void *item) } template <class EXT_ID, class FACT, class H_FN, class E_FN> int -ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::adjust (void *item) +JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::adjust (void *item) { if (item == 0) return 0; @@ -263,8 +263,8 @@ ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::adjust (void *item) template <class EXT_ID, class FACT, class H_FN, class E_FN> -ACE_Cache_Heap_Item<EXT_ID,FACT,H_FN,E_FN>:: -ACE_Cache_Heap_Item (const EXT_ID &ext_id, ACE_Cache_Object *const &int_id) +JAWS_Cache_Heap_Item<EXT_ID,FACT,H_FN,E_FN>:: +JAWS_Cache_Heap_Item (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id) : ext_id_ (ext_id), int_id_ (int_id), heap_idx_ (0) @@ -273,10 +273,10 @@ ACE_Cache_Heap_Item (const EXT_ID &ext_id, ACE_Cache_Object *const &int_id) } template <class EXT_ID, class FACT, class H_FN, class E_FN> unsigned int -ACE_Cache_Heap_Item<EXT_ID,FACT,H_FN,E_FN>::priority (void) +JAWS_Cache_Heap_Item<EXT_ID,FACT,H_FN,E_FN>::priority (void) { return this->int_id_->priority (); } -#endif /* ACE_CACHE_HEAP_T_CPP */ +#endif /* JAWS_CACHE_HEAP_T_CPP */ diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Heap_T.h b/apps/JAWS/PROTOTYPE/JAWS/Cache_Heap_T.h index f900ca29955..16fbe890fe6 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Heap_T.h +++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_Heap_T.h @@ -1,35 +1,35 @@ /* -*- c++ -*- */ // $Id$ -#ifndef ACE_CACHE_HEAP_T_H -#define ACE_CACHE_HEAP_T_H +#ifndef JAWS_CACHE_HEAP_T_H +#define JAWS_CACHE_HEAP_T_H #include "ace/Malloc.h" #include "JAWS/Cache_Object.h" // Forward declarations template <class EXT_ID, class FACTORY, class HASH_FUNC, class EQ_FUNC> -class ACE_Cache_Manager; +class JAWS_Cache_Manager; template <class EXT_ID, class FACTORY, class HASH_FUNC, class EQ_FUNC> -class ACE_Cache_Heap_Item; +class JAWS_Cache_Heap_Item; template <class EXT_ID, class FACT, class H_FN, class E_FN> -class ACE_Cache_Heap +class JAWS_Cache_Heap // Roll my own heap here. Eventually, a heap should be its own // standalone data structure. { public: - typedef ACE_Cache_Manager<EXT_ID, FACT, H_FN, E_FN> Cache_Manager; - typedef ACE_Cache_Heap_Item<EXT_ID, FACT, H_FN, E_FN> Cache_Heap_Item; + typedef JAWS_Cache_Manager<EXT_ID, FACT, H_FN, E_FN> Cache_Manager; + typedef JAWS_Cache_Heap_Item<EXT_ID, FACT, H_FN, E_FN> Cache_Heap_Item; - ACE_Cache_Heap (ACE_Allocator *alloc = 0, size_t maxsize = 8192); + JAWS_Cache_Heap (ACE_Allocator *alloc = 0, size_t maxsize = 8192); // maxsize is the total number of objects the in memory cache is // willing to manage - ~ACE_Cache_Heap (void); + ~JAWS_Cache_Heap (void); int is_empty (void) const; int is_full (void) const; @@ -41,10 +41,10 @@ public: // attempt to grow (or shrink) the heap. Return 0 on success, -1 on // error. - int insert (const EXT_ID &ext_id, ACE_Cache_Object *const &int_id); + int insert (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id); // attempt to insert int_id into heap. - int remove (EXT_ID &ext_id, ACE_Cache_Object *&int_id); + int remove (EXT_ID &ext_id, JAWS_Cache_Object *&int_id); // attempt to remove the top element of heap. int remove (void *item); @@ -77,20 +77,20 @@ private: template <class EXT_ID, class FACT, class H_FN, class E_FN> -class ACE_Cache_Heap_Item +class JAWS_Cache_Heap_Item { - friend class ACE_Cache_Heap<EXT_ID, FACT, H_FN, E_FN>; + friend class JAWS_Cache_Heap<EXT_ID, FACT, H_FN, E_FN>; public: - ACE_Cache_Heap_Item (const EXT_ID &ext_id, ACE_Cache_Object *const &int_id); + JAWS_Cache_Heap_Item (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id); unsigned int priority (void); private: EXT_ID ext_id_; - ACE_Cache_Object *int_id_; + JAWS_Cache_Object *int_id_; size_t heap_idx_; @@ -100,4 +100,4 @@ private: #include "JAWS/Cache_Heap_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ -#endif /* ACE_CACHE_HEAP_T_H */ +#endif /* JAWS_CACHE_HEAP_T_H */ diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.cpp b/apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.cpp index dd9a54a6ad4..f62c990ba1c 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.cpp +++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.cpp @@ -1,13 +1,13 @@ // $Id$ -#ifndef ACE_CACHE_LIST_T_CPP -#define ACE_CACHE_LIST_T_CPP +#ifndef JAWS_CACHE_LIST_T_CPP +#define JAWS_CACHE_LIST_T_CPP #include "JAWS/Cache_List_T.h" #include "JAWS/Cache_Manager_T.h" template <class EXT_ID, class FACT, class H_FN, class E_FN> -ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::ACE_Cache_List (ACE_Allocator *alloc, +JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::JAWS_Cache_List (ACE_Allocator *alloc, size_t maxsize) : allocator_ (alloc), maxsize_ (maxsize), @@ -20,7 +20,7 @@ ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::ACE_Cache_List (ACE_Allocator *alloc, } template <class EXT_ID, class FACT, class H_FN, class E_FN> -ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::~ACE_Cache_List (void) +JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::~JAWS_Cache_List (void) { while (this->head_ != 0) this->remove (this->head_); @@ -29,31 +29,31 @@ ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::~ACE_Cache_List (void) } template <class EXT_ID, class FACT, class H_FN, class E_FN> int -ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::is_empty (void) const +JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::is_empty (void) const { return (this->size_ == 0); } template <class EXT_ID, class FACT, class H_FN, class E_FN> int -ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::is_full (void) const +JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::is_full (void) const { return (this->size_ == this->maxsize_); } template <class EXT_ID, class FACT, class H_FN, class E_FN> size_t -ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::size (void) const +JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::size (void) const { return this->size_; } template <class EXT_ID, class FACT, class H_FN, class E_FN> size_t -ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::maxsize (void) const +JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::maxsize (void) const { return this->maxsize_; } template <class EXT_ID, class FACT, class H_FN, class E_FN> int -ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::maxsize (Cache_Manager *, +JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::maxsize (Cache_Manager *, size_t new_maxsize) { this->maxsize_ = new_maxsize; @@ -61,7 +61,7 @@ ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::maxsize (Cache_Manager *, } template <class EXT_ID, class FACT, class H_FN, class E_FN> void -ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::insert_i (Cache_List_Item *item) +JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::insert_i (Cache_List_Item *item) { /* ASSERT: this->size_ < this->maxsize_ */ item->next_ = 0; @@ -78,8 +78,8 @@ ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::insert_i (Cache_List_Item *item) } template <class EXT_ID, class FACT, class H_FN, class E_FN> int -ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::insert (const EXT_ID &ext_id, - ACE_Cache_Object *const &int_id) +JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::insert (const EXT_ID &ext_id, + JAWS_Cache_Object *const &int_id) { if (this->is_full ()) return -1; @@ -96,7 +96,7 @@ ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::insert (const EXT_ID &ext_id, } template <class EXT_ID, class FACT, class H_FN, class E_FN> void -ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove_i (void) +JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove_i (void) { /* ASSERT: this->size_ > 0 */ this->size_--; @@ -113,7 +113,7 @@ ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove_i (void) } template <class EXT_ID, class FACT, class H_FN, class E_FN> void -ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove_i (Cache_List_Item *item) +JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove_i (Cache_List_Item *item) { this->size_--; this->item_ = item; @@ -143,8 +143,8 @@ ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove_i (Cache_List_Item *item) } template <class EXT_ID, class FACT, class H_FN, class E_FN> int -ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove (EXT_ID &ext_id, - ACE_Cache_Object *&int_id) +JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove (EXT_ID &ext_id, + JAWS_Cache_Object *&int_id) { if (this->is_empty ()) return -1; @@ -161,7 +161,7 @@ ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove (EXT_ID &ext_id, } template <class EXT_ID, class FACT, class H_FN, class E_FN> int -ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove (void *item) +JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove (void *item) { if (item == 0) return 0; @@ -176,7 +176,7 @@ ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove (void *item) } template <class EXT_ID, class FACT, class H_FN, class E_FN> int -ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::adjust (void *item) +JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::adjust (void *item) { if (item == 0) return 0; @@ -192,8 +192,8 @@ ACE_Cache_List<EXT_ID,FACT,H_FN,E_FN>::adjust (void *item) template <class EXT_ID, class FACT, class H_FN, class E_FN> -ACE_Cache_List_Item<EXT_ID,FACT,H_FN,E_FN>:: -ACE_Cache_List_Item (const EXT_ID &ext_id, ACE_Cache_Object *const &int_id) +JAWS_Cache_List_Item<EXT_ID,FACT,H_FN,E_FN>:: +JAWS_Cache_List_Item (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id) : ext_id_ (ext_id), int_id_ (int_id) { @@ -201,10 +201,10 @@ ACE_Cache_List_Item (const EXT_ID &ext_id, ACE_Cache_Object *const &int_id) } template <class EXT_ID, class FACT, class H_FN, class E_FN> unsigned int -ACE_Cache_List_Item<EXT_ID,FACT,H_FN,E_FN>::priority (void) +JAWS_Cache_List_Item<EXT_ID,FACT,H_FN,E_FN>::priority (void) { return this->int_id_->priority (); } -#endif /* ACE_CACHE_LIST_T_CPP */ +#endif /* JAWS_CACHE_LIST_T_CPP */ diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.h b/apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.h index 49680af9987..7dd9c7c8ca1 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.h +++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.h @@ -1,22 +1,22 @@ /* -*- c++ -*- */ // $Id$ -#ifndef ACE_CACHE_LIST_T_H -#define ACE_CACHE_LIST_T_H +#ifndef JAWS_CACHE_LIST_T_H +#define JAWS_CACHE_LIST_T_H #include "ace/Malloc.h" #include "JAWS/Cache_Object.h" // Forward declarations template <class EXT_ID, class FACTORY, class HASH_FUNC, class EQ_FUNC> -class ACE_Cache_Manager; +class JAWS_Cache_Manager; template <class EXT_ID, class FACTORY, class HASH_FUNC, class EQ_FUNC> -class ACE_Cache_List_Item; +class JAWS_Cache_List_Item; template <class EXT_ID, class FACT, class H_FN, class E_FN> -class ACE_Cache_List +class JAWS_Cache_List // Roll my own heap here. Eventually, a heap should be its own // standalone data structure. // @@ -25,14 +25,14 @@ class ACE_Cache_List { public: - typedef ACE_Cache_Manager<EXT_ID, FACT, H_FN, E_FN> Cache_Manager; - typedef ACE_Cache_List_Item<EXT_ID, FACT, H_FN, E_FN> Cache_List_Item; + typedef JAWS_Cache_Manager<EXT_ID, FACT, H_FN, E_FN> Cache_Manager; + typedef JAWS_Cache_List_Item<EXT_ID, FACT, H_FN, E_FN> Cache_List_Item; - ACE_Cache_List (ACE_Allocator *alloc = 0, size_t maxsize = 8192); + JAWS_Cache_List (ACE_Allocator *alloc = 0, size_t maxsize = 8192); // maxsize is the total number of objects the in memory cache is // willing to manage - ~ACE_Cache_List (void); + ~JAWS_Cache_List (void); int is_empty (void) const; int is_full (void) const; @@ -44,10 +44,10 @@ public: // attempt to grow (or shrink) the heap. Return 0 on success, -1 on // error. - int insert (const EXT_ID &ext_id, ACE_Cache_Object *const &int_id); + int insert (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id); // attempt to insert int_id into heap. - int remove (EXT_ID &ext_id, ACE_Cache_Object *&int_id); + int remove (EXT_ID &ext_id, JAWS_Cache_Object *&int_id); // attempt to remove the top element of heap. int remove (void *item); @@ -83,29 +83,29 @@ private: template <class EXT_ID, class FACT, class H_FN, class E_FN> -class ACE_Cache_List_Item +class JAWS_Cache_List_Item { - friend class ACE_Cache_List<EXT_ID, FACT, H_FN, E_FN>; + friend class JAWS_Cache_List<EXT_ID, FACT, H_FN, E_FN>; public: - typedef ACE_Cache_List<EXT_ID, FACT, H_FN, E_FN> Cache_List; + typedef JAWS_Cache_List<EXT_ID, FACT, H_FN, E_FN> Cache_List; - ACE_Cache_List_Item (const EXT_ID &ext_id, ACE_Cache_Object *const &int_id); + JAWS_Cache_List_Item (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id); unsigned int priority (void); private: EXT_ID ext_id_; - ACE_Cache_Object *int_id_; + JAWS_Cache_Object *int_id_; - ACE_Cache_List_Item *next_; - ACE_Cache_List_Item *prev_; + JAWS_Cache_List_Item *next_; + JAWS_Cache_List_Item *prev_; }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "JAWS/Cache_List_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ -#endif /* ACE_CACHE_LIST_T_H */ +#endif /* JAWS_CACHE_LIST_T_H */ diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager.cpp b/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager.cpp index 0b1d300d0d1..a91ac38375a 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager.cpp +++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager.cpp @@ -7,36 +7,36 @@ #include "JAWS/Cache_Manager.h" #include "JAWS/Cache_List_T.h" -ACE_String_Hash_Functor::ACE_String_Hash_Functor (const char *s) +JAWS_String_Hash_Functor::JAWS_String_Hash_Functor (const char *s) : i_ (0) { this->i_ = ACE::hash_pjw (s); } -ACE_String_Hash_Functor::operator unsigned long (void) const +JAWS_String_Hash_Functor::operator unsigned long (void) const { return this->i_; } -ACE_String_Equal_Functor::ACE_String_Equal_Functor (const char *s1, +JAWS_String_Equal_Functor::JAWS_String_Equal_Functor (const char *s1, const char *s2) : i_ (0) { this->i_ = ACE_OS::strcmp (s1, s2); } -ACE_String_Equal_Functor::operator int (void) const +JAWS_String_Equal_Functor::operator int (void) const { return this->i_ == 0; } -ACE_Strdup_String::ACE_Strdup_String (void) +JAWS_Strdup_String::JAWS_Strdup_String (void) : c_ (0), s_ (0) { } -ACE_Strdup_String::ACE_Strdup_String (const char *s) +JAWS_Strdup_String::JAWS_Strdup_String (const char *s) : c_ (0), s_ (0) { @@ -44,14 +44,14 @@ ACE_Strdup_String::ACE_Strdup_String (const char *s) this->s_ = ACE_OS::strdup (s); } -ACE_Strdup_String::ACE_Strdup_String (const ACE_Strdup_String &s) +JAWS_Strdup_String::JAWS_Strdup_String (const JAWS_Strdup_String &s) : c_ (s.c_), s_ (s.s_) { ++*(this->c_); } -ACE_Strdup_String::~ACE_Strdup_String (void) +JAWS_Strdup_String::~JAWS_Strdup_String (void) { if (this->c_ && --*(this->c_) == 0) { @@ -63,13 +63,13 @@ ACE_Strdup_String::~ACE_Strdup_String (void) this->c_ = 0; } -ACE_Strdup_String::operator const char * (void) const +JAWS_Strdup_String::operator const char * (void) const { return this->s_; } void -ACE_Strdup_String::operator = (const char *s) +JAWS_Strdup_String::operator = (const char *s) { if (this->c_ && --*(this->c_) == 0) { @@ -82,7 +82,7 @@ ACE_Strdup_String::operator = (const char *s) } void -ACE_Strdup_String::operator = (const ACE_Strdup_String &s) +JAWS_Strdup_String::operator = (const JAWS_Strdup_String &s) { if (this->c_ && --*(this->c_) == 0) { @@ -97,93 +97,93 @@ ACE_Strdup_String::operator = (const ACE_Strdup_String &s) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Hash_Bucket_Item<ACE_Strdup_String, ACE_Cache_Object *>; -template class ACE_Hash_Bucket_DLCStack<ACE_Strdup_String, ACE_Cache_Object *>; -template class ACE_Hash_Bucket_DLCStack_Iterator<ACE_Strdup_String, - ACE_Cache_Object *>; -template class ACE_Hash_Bucket_Manager<ACE_Strdup_String, - ACE_Cache_Object *, - ACE_String_Equal_Functor>; -template class ACE_Cache_Hash<ACE_Strdup_String, - ACE_String_Hash_Functor, - ACE_String_Equal_Functor>; -template class ACE_Cache_List_Item<ACE_Strdup_String, - ACE_Referenced_Cache_Object_Factory, - ACE_String_Hash_Functor, - ACE_String_Equal_Functor>; -template class ACE_Cache_List<ACE_Strdup_String, - ACE_Referenced_Cache_Object_Factory, - ACE_String_Hash_Functor, - ACE_String_Equal_Functor>; -template class ACE_Cache_Manager<ACE_Strdup_String, - ACE_Referenced_Cache_Object_Factory, - ACE_String_Hash_Functor, - ACE_String_Equal_Functor>; -template class ACE_Cache_List_Item<ACE_Strdup_String, - ACE_Counted_Cache_Object_Factory, - ACE_String_Hash_Functor, - ACE_String_Equal_Functor>; -template class ACE_Cache_List<ACE_Strdup_String, - ACE_Counted_Cache_Object_Factory, - ACE_String_Hash_Functor, - ACE_String_Equal_Functor>; -template class ACE_Cache_Manager<ACE_Strdup_String, - ACE_Counted_Cache_Object_Factory, - ACE_String_Hash_Functor, - ACE_String_Equal_Functor>; -template class ACE_Singleton<ACE_Referenced_Cache_Object_Factory, +template class JAWS_Hash_Bucket_Item<JAWS_Strdup_String, JAWS_Cache_Object *>; +template class JAWS_Hash_Bucket_DLCStack<JAWS_Strdup_String, JAWS_Cache_Object *>; +template class JAWS_Hash_Bucket_DLCStack_Iterator<JAWS_Strdup_String, + JAWS_Cache_Object *>; +template class JAWS_Hash_Bucket_Manager<JAWS_Strdup_String, + JAWS_Cache_Object *, + JAWS_String_Equal_Functor>; +template class JAWS_Cache_Hash<JAWS_Strdup_String, + JAWS_String_Hash_Functor, + JAWS_String_Equal_Functor>; +template class JAWS_Cache_List_Item<JAWS_Strdup_String, + JAWS_Referenced_Cache_Object_Factory, + JAWS_String_Hash_Functor, + JAWS_String_Equal_Functor>; +template class JAWS_Cache_List<JAWS_Strdup_String, + JAWS_Referenced_Cache_Object_Factory, + JAWS_String_Hash_Functor, + JAWS_String_Equal_Functor>; +template class JAWS_Cache_Manager<JAWS_Strdup_String, + JAWS_Referenced_Cache_Object_Factory, + JAWS_String_Hash_Functor, + JAWS_String_Equal_Functor>; +template class JAWS_Cache_List_Item<JAWS_Strdup_String, + JAWS_Counted_Cache_Object_Factory, + JAWS_String_Hash_Functor, + JAWS_String_Equal_Functor>; +template class JAWS_Cache_List<JAWS_Strdup_String, + JAWS_Counted_Cache_Object_Factory, + JAWS_String_Hash_Functor, + JAWS_String_Equal_Functor>; +template class JAWS_Cache_Manager<JAWS_Strdup_String, + JAWS_Counted_Cache_Object_Factory, + JAWS_String_Hash_Functor, + JAWS_String_Equal_Functor>; +template class ACE_Singleton<JAWS_Referenced_Cache_Object_Factory, ACE_SYNCH_MUTEX>; -template class ACE_Singleton<ACE_Counted_Cache_Object_Factory, +template class ACE_Singleton<JAWS_Counted_Cache_Object_Factory, ACE_SYNCH_MUTEX>; -template class ACE_Singleton<ACE_String_Referenced_Cache_Manager, +template class ACE_Singleton<JAWS_String_Referenced_Cache_Manager, ACE_SYNCH_MUTEX>; -template class ACE_Singleton<ACE_String_Counted_Cache_Manager, +template class ACE_Singleton<JAWS_String_Counted_Cache_Manager, ACE_SYNCH_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Hash_Bucket_Item<ACE_Strdup_String, ACE_Cache_Object *> -#pragma instantiate ACE_Hash_Bucket_DLCStack<ACE_Strdup_String, \ - ACE_Cache_Object *> -#pragma instantiate ACE_Hash_Bucket_DLCStack_Iterator<ACE_Strdup_String, \ - ACE_Cache_Object *> -#pragma instantiate ACE_Hash_Bucket_Manager<ACE_Strdup_String, \ - ACE_Cache_Object *, \ - ACE_String_Equal_Functor> -#pragma instantiate ACE_Cache_Hash<ACE_Strdup_String, \ - ACE_String_Hash_Functor, \ - ACE_String_Equal_Functor> -#pragma instantiate ACE_Cache_Heap_Item<ACE_Strdup_String, \ +#pragma instantiate JAWS_Hash_Bucket_Item<JAWS_Strdup_String, JAWS_Cache_Object *> +#pragma instantiate JAWS_Hash_Bucket_DLCStack<JAWS_Strdup_String, \ + JAWS_Cache_Object *> +#pragma instantiate JAWS_Hash_Bucket_DLCStack_Iterator<JAWS_Strdup_String, \ + JAWS_Cache_Object *> +#pragma instantiate JAWS_Hash_Bucket_Manager<JAWS_Strdup_String, \ + JAWS_Cache_Object *, \ + JAWS_String_Equal_Functor> +#pragma instantiate JAWS_Cache_Hash<JAWS_Strdup_String, \ + JAWS_String_Hash_Functor, \ + JAWS_String_Equal_Functor> +#pragma instantiate JAWS_Cache_Heap_Item<JAWS_Strdup_String, \ ACE_Referenced_Cache_Object_Factory, \ - ACE_String_Hash_Functor, \ - ACE_String_Equal_Functor> -#pragma instantiate ACE_Cache_Heap<ACE_Strdup_String, \ - ACE_Referenced_Cache_Object_Factory, \ - ACE_String_Hash_Functor, \ - ACE_String_Equal_Functor> -#pragma instantiate ACE_Cache_Manager<ACE_Strdup_String, \ - ACE_Referenced_Cache_Object_Factory, \ - ACE_String_Hash_Functor, \ - ACE_String_Equal_Functor> -#pragma instantiate ACE_Cache_Heap_Item<ACE_Strdup_String, \ - ACE_Counted_Cache_Object_Factory, \ - ACE_String_Hash_Functor, \ - ACE_String_Equal_Functor> -#pragma instantiate ACE_Cache_Heap<ACE_Strdup_String, \ - ACE_Counted_Cache_Object_Factory, \ - ACE_String_Hash_Functor, \ - ACE_String_Equal_Functor> -#pragma instantiate ACE_Cache_Manager<ACE_Strdup_String, \ - ACE_Counted_Cache_Object_Factory, \ - ACE_String_Hash_Functor, \ - ACE_String_Equal_Functor> -#pragma instantiate ACE_Singleton<ACE_Referenced_Cache_Object_Factory, \ + JAWS_String_Hash_Functor, \ + JAWS_String_Equal_Functor> +#pragma instantiate JAWS_Cache_Heap<JAWS_Strdup_String, \ + JAWS_Referenced_Cache_Object_Factory, \ + JAWS_String_Hash_Functor, \ + JAWS_String_Equal_Functor> +#pragma instantiate JAWS_Cache_Manager<JAWS_Strdup_String, \ + JAWS_Referenced_Cache_Object_Factory, \ + JAWS_String_Hash_Functor, \ + JAWS_String_Equal_Functor> +#pragma instantiate JAWS_Cache_Heap_Item<JAWS_Strdup_String, \ + JAWS_Counted_Cache_Object_Factory, \ + JAWS_String_Hash_Functor, \ + JAWS_String_Equal_Functor> +#pragma instantiate JAWS_Cache_Heap<JAWS_Strdup_String, \ + JAWS_Counted_Cache_Object_Factory, \ + JAWS_String_Hash_Functor, \ + JAWS_String_Equal_Functor> +#pragma instantiate JAWS_Cache_Manager<JAWS_Strdup_String, \ + JAWS_Counted_Cache_Object_Factory, \ + JAWS_String_Hash_Functor, \ + JAWS_String_Equal_Functor> +#pragma instantiate ACE_Singleton<JAWS_Referenced_Cache_Object_Factory, \ ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Singleton<ACE_Counted_Cache_Object_Factory, \ +#pragma instantiate ACE_Singleton<JAWS_Counted_Cache_Object_Factory, \ ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Singleton<ACE_String_Referenced_Cache_Manager, \ +#pragma instantiate ACE_Singleton<JAWS_String_Referenced_Cache_Manager, \ ACE_SYNCH_MUTEX> -#pragma instantiate ACE_Singleton<ACE_String_Counted_Cache_Manager, \ +#pragma instantiate ACE_Singleton<JAWS_String_Counted_Cache_Manager, \ ACE_SYNCH_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager.h b/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager.h index bc0d332b94d..723e6729f33 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager.h +++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager.h @@ -1,8 +1,8 @@ /* -*- c++ -*- */ // $Id$ -#ifndef ACE_CACHE_MANAGER_H -#define ACE_CACHE_MANAGER_H +#ifndef JAWS_CACHE_MANAGER_H +#define JAWS_CACHE_MANAGER_H #include "ace/OS.h" #include "ace/ACE.h" @@ -10,38 +10,38 @@ #include "JAWS/Cache_Manager_T.h" -class ACE_String_Hash_Functor +class JAWS_String_Hash_Functor { public: - ACE_String_Hash_Functor (const char *s); + JAWS_String_Hash_Functor (const char *s); operator unsigned long (void) const; private: unsigned long i_; }; -class ACE_String_Equal_Functor +class JAWS_String_Equal_Functor { public: - ACE_String_Equal_Functor (const char *s1, const char *s2); + JAWS_String_Equal_Functor (const char *s1, const char *s2); operator int (void) const; private: int i_; }; -class ACE_Strdup_String +class JAWS_Strdup_String { public: - ACE_Strdup_String (void); - ACE_Strdup_String (const char *s); - ACE_Strdup_String (const ACE_Strdup_String &s); - ~ACE_Strdup_String (void); + JAWS_Strdup_String (void); + JAWS_Strdup_String (const char *s); + JAWS_Strdup_String (const JAWS_Strdup_String &s); + ~JAWS_Strdup_String (void); operator const char * (void) const; void operator = (const char *s); - void operator = (const ACE_Strdup_String &s); + void operator = (const JAWS_Strdup_String &s); private: @@ -50,17 +50,17 @@ private: }; -typedef ACE_Cache_Manager<ACE_Strdup_String, - ACE_Referenced_Cache_Object_Factory, - ACE_String_Hash_Functor, - ACE_String_Equal_Functor> - ACE_String_Referenced_Cache_Manager; +typedef JAWS_Cache_Manager<JAWS_Strdup_String, + JAWS_Referenced_Cache_Object_Factory, + JAWS_String_Hash_Functor, + JAWS_String_Equal_Functor> + JAWS_String_Referenced_Cache_Manager; -typedef ACE_Cache_Manager<ACE_Strdup_String, - ACE_Counted_Cache_Object_Factory, - ACE_String_Hash_Functor, - ACE_String_Equal_Functor> - ACE_String_Counted_Cache_Manager; +typedef JAWS_Cache_Manager<JAWS_Strdup_String, + JAWS_Counted_Cache_Object_Factory, + JAWS_String_Hash_Functor, + JAWS_String_Equal_Functor> + JAWS_String_Counted_Cache_Manager; -#endif /* ACE_CACHE_MANAGER_H */ +#endif /* JAWS_CACHE_MANAGER_H */ diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.cpp b/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.cpp index 9acc3d6bdd3..27f274429bf 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.cpp +++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef ACE_CACHE_MANAGER_T_CPP -#define ACE_CACHE_MANAGER_T_CPP +#ifndef JAWS_CACHE_MANAGER_T_CPP +#define JAWS_CACHE_MANAGER_T_CPP #include "JAWS/Cache_Manager_T.h" #include "JAWS/Cache_Hash_T.h" @@ -11,9 +11,9 @@ class Cache_Manager; #include <iostream.h> template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> -ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> -::ACE_Cache_Manager (ACE_Allocator *alloc, - ACE_Cache_Object_Factory *cof, +JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> +::JAWS_Cache_Manager (ACE_Allocator *alloc, + JAWS_Cache_Object_Factory *cof, size_t hashsize, size_t maxsize, size_t maxobjsize, @@ -80,9 +80,9 @@ ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int -ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> +JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> ::open (ACE_Allocator *alloc, - ACE_Cache_Object_Factory *cof, + JAWS_Cache_Object_Factory *cof, size_t hashsize, size_t maxsize, size_t maxobjsize, @@ -150,13 +150,13 @@ ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> } template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> -ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>::~ACE_Cache_Manager (void) +JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>::~JAWS_Cache_Manager (void) { this->close (); } template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int -ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>::close (void) +JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>::close (void) { while (this->waterlevel_ > 0) this->FLUSH_i (); @@ -177,8 +177,8 @@ ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>::close (void) } template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int -ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> -::GET_i (const KEY &key, ACE_Cache_Object *&object) +JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> +::GET_i (const KEY &key, JAWS_Cache_Object *&object) { int result = this->hash_->find (key, object); @@ -191,8 +191,8 @@ ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> } template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int -ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> -::PUT_i (const KEY &key, const void *data, size_t size, ACE_Cache_Object *&obj) +JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> +::PUT_i (const KEY &key, const void *data, size_t size, JAWS_Cache_Object *&obj) { int result = 0; @@ -216,7 +216,7 @@ ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> obj->internal (new KEY (key)); KEY old_key; - ACE_Cache_Object *old_obj; + JAWS_Cache_Object *old_obj; result = this->hash_->rebind (key, obj, old_key, old_obj); if (result == -1) @@ -257,10 +257,10 @@ ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> } template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int -ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> +JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> ::FLUSH_i (const KEY &key) { - ACE_Cache_Object *temp_object; + JAWS_Cache_Object *temp_object; #ifdef ENTERA_VERBOSE_TRACE cerr << "*** flush key unbinding: " << key << endl; @@ -281,11 +281,11 @@ ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> } template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int -ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> +JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> ::FLUSH_i (void) { KEY temp_key; - ACE_Cache_Object *temp_object; + JAWS_Cache_Object *temp_object; int result = this->heap_->remove (temp_key, temp_object); if (result == 0) @@ -310,8 +310,8 @@ ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> } template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int -ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> -::DROP_i (ACE_Cache_Object *&obj) +JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> +::DROP_i (JAWS_Cache_Object *&obj) { int result = 0; @@ -330,8 +330,8 @@ ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> } template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int -ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> -::GET (const KEY &key, ACE_Cache_Object *&object) +JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> +::GET (const KEY &key, JAWS_Cache_Object *&object) { ACE_Read_Guard<ACE_SYNCH_RW_MUTEX> g (this->lock_); @@ -339,8 +339,8 @@ ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> } template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int -ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> -::PUT (const KEY &key, const void *data, size_t size, ACE_Cache_Object *&obj) +JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> +::PUT (const KEY &key, const void *data, size_t size, JAWS_Cache_Object *&obj) { ACE_Write_Guard<ACE_SYNCH_RW_MUTEX> g (this->lock_); @@ -348,8 +348,8 @@ ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> } template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int -ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> -::MAKE (const void *data, size_t size, ACE_Cache_Object *&obj) +JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> +::MAKE (const void *data, size_t size, JAWS_Cache_Object *&obj) { // verify object is within cacheable range if (size/1024 > this->maxobjsize_) @@ -415,8 +415,8 @@ ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> } template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int -ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> -::TAKE (ACE_Cache_Object *const &obj) +JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> +::TAKE (JAWS_Cache_Object *const &obj) { if (obj == 0) return -1; @@ -425,8 +425,8 @@ ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> } template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int -ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> -::DROP (ACE_Cache_Object *&obj) +JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> +::DROP (JAWS_Cache_Object *&obj) { if (obj == 0) return -1; @@ -489,7 +489,7 @@ ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> } template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int -ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> +JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> ::FLUSH (void) { ACE_Write_Guard<ACE_SYNCH_RW_MUTEX> g (this->lock_); @@ -499,8 +499,8 @@ ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> template <class KEY, class DATA, class CACHE_MANAGER> -ACE_Cache_Proxy<KEY, DATA, CACHE_MANAGER> -::ACE_Cache_Proxy (const KEY &key, Cache_Manager *manager) +JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER> +::JAWS_Cache_Proxy (const KEY &key, Cache_Manager *manager) : object_ (0), manager_ (manager) { @@ -513,8 +513,8 @@ ACE_Cache_Proxy<KEY, DATA, CACHE_MANAGER> } template <class KEY, class DATA, class CACHE_MANAGER> -ACE_Cache_Proxy<KEY, DATA, CACHE_MANAGER> -::ACE_Cache_Proxy (const KEY &key, DATA *data, size_t size, +JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER> +::JAWS_Cache_Proxy (const KEY &key, DATA *data, size_t size, Cache_Manager *manager) : object_ (0), manager_ (manager) @@ -528,7 +528,7 @@ ACE_Cache_Proxy<KEY, DATA, CACHE_MANAGER> } template <class KEY, class DATA, class CACHE_MANAGER> -ACE_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::~ACE_Cache_Proxy (void) +JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::~JAWS_Cache_Proxy (void) { DATA *data = this->data (); this->manager_->DROP (this->object_); @@ -537,22 +537,22 @@ ACE_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::~ACE_Cache_Proxy (void) } template <class KEY, class DATA, class CACHE_MANAGER> DATA * -ACE_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::data (void) const +JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::data (void) const { return this->object_ ? (DATA *) this->object_->data () : 0; } template <class KEY, class DATA, class CACHE_MANAGER> -ACE_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::operator DATA * (void) const +JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::operator DATA * (void) const { return this->data (); } template <class KEY, class DATA, class CACHE_MANAGER> int -ACE_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::close (DATA *) +JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::close (DATA *) { return 0; } -#endif /* ACE_CACHE_MANAGER_T_CPP */ +#endif /* JAWS_CACHE_MANAGER_T_CPP */ diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.h b/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.h index 3d1557f33dc..f3c14de3671 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.h +++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.h @@ -2,36 +2,36 @@ // Hey Emacs! This is a C++ file! // $Id$ -#ifndef ACE_CACHE_MANAGER_T_H -#define ACE_CACHE_MANAGER_T_H +#ifndef JAWS_CACHE_MANAGER_T_H +#define JAWS_CACHE_MANAGER_T_H #include "ace/Singleton.h" #include "ace/Synch.h" #include "JAWS/Cache_Object.h" -template <class KEY, class HASH_FUNC, class EQ_FUNC> class ACE_Cache_Hash; +template <class KEY, class HASH_FUNC, class EQ_FUNC> class JAWS_Cache_Hash; template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> -class ACE_Cache_Heap; +class JAWS_Cache_Heap; template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> -class ACE_Cache_List; +class JAWS_Cache_List; template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> -class ACE_Cache_Manager +class JAWS_Cache_Manager { - friend class ACE_Cache_Hash<KEY, HASH_FUNC, EQ_FUNC>; - friend class ACE_Cache_Heap<KEY, FACTORY, HASH_FUNC, EQ_FUNC>; - friend class ACE_Cache_List<KEY, FACTORY, HASH_FUNC, EQ_FUNC>; + friend class JAWS_Cache_Hash<KEY, HASH_FUNC, EQ_FUNC>; + friend class JAWS_Cache_Heap<KEY, FACTORY, HASH_FUNC, EQ_FUNC>; + friend class JAWS_Cache_List<KEY, FACTORY, HASH_FUNC, EQ_FUNC>; public: typedef ACE_Singleton<FACTORY, ACE_SYNCH_MUTEX> Object_Factory; - typedef ACE_Cache_Hash<KEY, HASH_FUNC, EQ_FUNC> Cache_Hash; - typedef ACE_Cache_List<KEY, FACTORY, HASH_FUNC, EQ_FUNC> Cache_Heap; + typedef JAWS_Cache_Hash<KEY, HASH_FUNC, EQ_FUNC> Cache_Hash; + typedef JAWS_Cache_List<KEY, FACTORY, HASH_FUNC, EQ_FUNC> Cache_Heap; - ACE_Cache_Manager (ACE_Allocator *alloc = 0, - ACE_Cache_Object_Factory *cof = 0, + JAWS_Cache_Manager (ACE_Allocator *alloc = 0, + JAWS_Cache_Object_Factory *cof = 0, size_t hashsize = 2048, // number of hash buckets size_t maxsize = 65535, // max number of in memory @@ -54,7 +54,7 @@ public: ); int open (ACE_Allocator *alloc = 0, - ACE_Cache_Object_Factory *cof = 0, + JAWS_Cache_Object_Factory *cof = 0, size_t hashsize = 1024, // number of hash buckets size_t maxsize = 4096, // max number of in memory @@ -76,28 +76,28 @@ public: // counts ); - ~ACE_Cache_Manager (void); + ~JAWS_Cache_Manager (void); int close (void); // Search Methods - int GET (const KEY &key, ACE_Cache_Object *&cobj); + int GET (const KEY &key, JAWS_Cache_Object *&cobj); // Retrieve the object associated with key from cache. Return 0 on // success, -1 on failure. int PUT (const KEY &key, const void *data, size_t size, - ACE_Cache_Object *&obj); + JAWS_Cache_Object *&obj); // Inserts or replaces object associated with key into cache. // Return 0 on success, -1 on failure. - int MAKE (const void *data, size_t size, ACE_Cache_Object *&cobj); + int MAKE (const void *data, size_t size, JAWS_Cache_Object *&cobj); // Create a cached object, increment reference count. - int TAKE (ACE_Cache_Object *const &cobj); + int TAKE (JAWS_Cache_Object *const &cobj); // Increment reference count. - int DROP (ACE_Cache_Object *&cobj); + int DROP (JAWS_Cache_Object *&cobj); // Decrement reference count on cached object, perhaps delete. // Returns 0 if only decremented, 1 if deleted, -1 if error. @@ -106,12 +106,12 @@ public: protected: - int GET_i (const KEY &key, ACE_Cache_Object *&object); + int GET_i (const KEY &key, JAWS_Cache_Object *&object); // Retrieve the object associated with key from cache. Return 0 on // success, -1 on failure. int PUT_i (const KEY &key, const void *data, size_t size, - ACE_Cache_Object *&object); + JAWS_Cache_Object *&object); // Inserts or replaces object associated with key into cache. // Return 0 on success, -1 on failure. @@ -121,13 +121,13 @@ protected: int FLUSH_i (const KEY &key); // Removes object associated with key from cache. - int DROP_i (ACE_Cache_Object *&cobj); + int DROP_i (JAWS_Cache_Object *&cobj); // Decrement reference count on cached object, perhaps delete. private: ACE_Allocator *allocator_; - ACE_Cache_Object_Factory *factory_; + JAWS_Cache_Object_Factory *factory_; size_t hashsize_; size_t maxsize_; @@ -148,20 +148,20 @@ private: template <class KEY, class DATA, class CACHE_MANAGER> -class ACE_Cache_Proxy +class JAWS_Cache_Proxy { public: typedef CACHE_MANAGER Cache_Manager; typedef ACE_Singleton<Cache_Manager, ACE_SYNCH_MUTEX> Cache_Manager_Singleton; - ACE_Cache_Proxy (const KEY &, Cache_Manager * = 0); + JAWS_Cache_Proxy (const KEY &, Cache_Manager * = 0); // Corresponds to a GET - ACE_Cache_Proxy (const KEY &, DATA *, size_t, Cache_Manager * = 0); + JAWS_Cache_Proxy (const KEY &, DATA *, size_t, Cache_Manager * = 0); // Corresponds to a U/PUT - virtual ~ACE_Cache_Proxy (void); + virtual ~JAWS_Cache_Proxy (void); DATA *data (void) const; operator DATA * (void) const; @@ -170,7 +170,7 @@ public: private: - ACE_Cache_Object *object_; + JAWS_Cache_Object *object_; Cache_Manager *manager_; @@ -182,4 +182,4 @@ private: #include "JAWS/Cache_Manager_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ -#endif /* ACE_CACHE_MANAGER_T_H */ +#endif /* JAWS_CACHE_MANAGER_T_H */ diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Object.cpp b/apps/JAWS/PROTOTYPE/JAWS/Cache_Object.cpp index 846a415b60b..abb582aa9c7 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Object.cpp +++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_Object.cpp @@ -2,7 +2,7 @@ #include "JAWS/Cache_Object.h" -ACE_Cache_Object::ACE_Cache_Object (const void *data, size_t size) +JAWS_Cache_Object::JAWS_Cache_Object (const void *data, size_t size) : internal_ (0), data_ (data), size_ (size) @@ -11,109 +11,109 @@ ACE_Cache_Object::ACE_Cache_Object (const void *data, size_t size) this->new_last_access_ = this->last_access_ = this->first_access_; } -ACE_Cache_Object::~ACE_Cache_Object () +JAWS_Cache_Object::~JAWS_Cache_Object () { this->data_ = 0; this->size_ = 0; } void * -ACE_Cache_Object::internal (void) const +JAWS_Cache_Object::internal (void) const { return this->internal_; } void -ACE_Cache_Object::internal (void *item) +JAWS_Cache_Object::internal (void *item) { this->internal_ = item; } const void * -ACE_Cache_Object::data (void) const +JAWS_Cache_Object::data (void) const { return this->data_; } size_t -ACE_Cache_Object::size (void) const +JAWS_Cache_Object::size (void) const { return this->size_; } unsigned int -ACE_Cache_Object::count (void) const +JAWS_Cache_Object::count (void) const { return this->count_i (); } int -ACE_Cache_Object::acquire (void) +JAWS_Cache_Object::acquire (void) { this->new_last_access_ = ACE_OS::time ((time_t *)0); return this->acquire_i (); } int -ACE_Cache_Object::release (void) +JAWS_Cache_Object::release (void) { this->last_access_ = this->new_last_access_; return this->release_i (); } time_t -ACE_Cache_Object::last_access (void) const +JAWS_Cache_Object::last_access (void) const { return this->last_access_; } time_t -ACE_Cache_Object::first_access (void) const +JAWS_Cache_Object::first_access (void) const { return this->first_access_; } unsigned int -ACE_Cache_Object::priority (void) const +JAWS_Cache_Object::priority (void) const { return this->priority_i (); } void * -ACE_Cache_Object::heap_item (void) const +JAWS_Cache_Object::heap_item (void) const { return this->heap_item_; } void -ACE_Cache_Object::heap_item (void *item) +JAWS_Cache_Object::heap_item (void *item) { this->heap_item_ = item; } -ACE_Referenced_Cache_Object:: -ACE_Referenced_Cache_Object (const void *data, size_t size) - : ACE_Cache_Object (data, size), +JAWS_Referenced_Cache_Object:: +JAWS_Referenced_Cache_Object (const void *data, size_t size) + : JAWS_Cache_Object (data, size), lock_adapter_ (count_) { } -ACE_Referenced_Cache_Object::~ACE_Referenced_Cache_Object (void) +JAWS_Referenced_Cache_Object::~JAWS_Referenced_Cache_Object (void) { } ACE_Lock & -ACE_Referenced_Cache_Object::lock (void) +JAWS_Referenced_Cache_Object::lock (void) { return this->lock_adapter_; } unsigned int -ACE_Referenced_Cache_Object::count_i (void) const +JAWS_Referenced_Cache_Object::count_i (void) const { - ACE_Referenced_Cache_Object *mutable_this - = (ACE_Referenced_Cache_Object *) this; + JAWS_Referenced_Cache_Object *mutable_this + = (JAWS_Referenced_Cache_Object *) this; if (mutable_this->count_.tryacquire_write () == 0) return 0; @@ -122,19 +122,19 @@ ACE_Referenced_Cache_Object::count_i (void) const } int -ACE_Referenced_Cache_Object::acquire_i (void) +JAWS_Referenced_Cache_Object::acquire_i (void) { return this->count_.acquire_read (); } int -ACE_Referenced_Cache_Object::release_i (void) +JAWS_Referenced_Cache_Object::release_i (void) { return this->count_.release (); } unsigned int -ACE_Referenced_Cache_Object::priority_i (void) const +JAWS_Referenced_Cache_Object::priority_i (void) const { unsigned int priority = ~(0U); double delta @@ -148,29 +148,29 @@ ACE_Referenced_Cache_Object::priority_i (void) const -ACE_Counted_Cache_Object:: -ACE_Counted_Cache_Object (const void *data, size_t size) - : ACE_Cache_Object (data, size), +JAWS_Counted_Cache_Object:: +JAWS_Counted_Cache_Object (const void *data, size_t size) + : JAWS_Cache_Object (data, size), count_ (0), new_count_ (0), lock_adapter_ (lock_) { } -ACE_Counted_Cache_Object::~ACE_Counted_Cache_Object (void) +JAWS_Counted_Cache_Object::~JAWS_Counted_Cache_Object (void) { } ACE_Lock & -ACE_Counted_Cache_Object::lock (void) +JAWS_Counted_Cache_Object::lock (void) { return this->lock_adapter_; } unsigned int -ACE_Counted_Cache_Object::count_i (void) const +JAWS_Counted_Cache_Object::count_i (void) const { - ACE_Counted_Cache_Object *mutable_this = (ACE_Counted_Cache_Object *) this; + JAWS_Counted_Cache_Object *mutable_this = (JAWS_Counted_Cache_Object *) this; { ACE_Guard<ACE_SYNCH_MUTEX> g (mutable_this->lock_); @@ -180,7 +180,7 @@ ACE_Counted_Cache_Object::count_i (void) const } int -ACE_Counted_Cache_Object::acquire_i (void) +JAWS_Counted_Cache_Object::acquire_i (void) { ACE_Guard<ACE_SYNCH_MUTEX> g (this->lock_); @@ -189,7 +189,7 @@ ACE_Counted_Cache_Object::acquire_i (void) } int -ACE_Counted_Cache_Object::release_i (void) +JAWS_Counted_Cache_Object::release_i (void) { ACE_Guard<ACE_SYNCH_MUTEX> g (this->lock_); @@ -199,24 +199,24 @@ ACE_Counted_Cache_Object::release_i (void) } unsigned int -ACE_Counted_Cache_Object::priority_i (void) const +JAWS_Counted_Cache_Object::priority_i (void) const { return this->count_i (); } -ACE_Cache_Object_Factory::ACE_Cache_Object_Factory (ACE_Allocator *alloc) +JAWS_Cache_Object_Factory::JAWS_Cache_Object_Factory (ACE_Allocator *alloc) : allocator_ (alloc) { if (this->allocator_ == 0) this->allocator_ = ACE_Allocator::instance (); } -ACE_Cache_Object_Factory::~ACE_Cache_Object_Factory (void) +JAWS_Cache_Object_Factory::~JAWS_Cache_Object_Factory (void) { } int -ACE_Cache_Object_Factory::open (ACE_Allocator *alloc) +JAWS_Cache_Object_Factory::open (ACE_Allocator *alloc) { this->allocator_ = alloc; @@ -226,68 +226,68 @@ ACE_Cache_Object_Factory::open (ACE_Allocator *alloc) return 0; } -ACE_Referenced_Cache_Object_Factory -::ACE_Referenced_Cache_Object_Factory (ACE_Allocator *alloc) - : ACE_Cache_Object_Factory (alloc) +JAWS_Referenced_Cache_Object_Factory +::JAWS_Referenced_Cache_Object_Factory (ACE_Allocator *alloc) + : JAWS_Cache_Object_Factory (alloc) { } -ACE_Referenced_Cache_Object_Factory -::~ACE_Referenced_Cache_Object_Factory (void) +JAWS_Referenced_Cache_Object_Factory +::~JAWS_Referenced_Cache_Object_Factory (void) { } -ACE_Cache_Object * -ACE_Referenced_Cache_Object_Factory::create (const void *data, size_t size) +JAWS_Cache_Object * +JAWS_Referenced_Cache_Object_Factory::create (const void *data, size_t size) { - ACE_Referenced_Cache_Object *obj; + JAWS_Referenced_Cache_Object *obj; - size_t obj_size = sizeof (ACE_Referenced_Cache_Object); + size_t obj_size = sizeof (JAWS_Referenced_Cache_Object); ACE_NEW_MALLOC_RETURN (obj, - (ACE_Referenced_Cache_Object *) + (JAWS_Referenced_Cache_Object *) this->allocator_->malloc (obj_size), - ACE_Referenced_Cache_Object (data, size), 0); + JAWS_Referenced_Cache_Object (data, size), 0); return obj; } void -ACE_Referenced_Cache_Object_Factory::destroy (ACE_Cache_Object *obj) +JAWS_Referenced_Cache_Object_Factory::destroy (JAWS_Cache_Object *obj) { - ACE_Referenced_Cache_Object *rco = (ACE_Referenced_Cache_Object *) obj; - ACE_DES_FREE (rco, this->allocator_->free, ACE_Referenced_Cache_Object); + JAWS_Referenced_Cache_Object *rco = (JAWS_Referenced_Cache_Object *) obj; + ACE_DES_FREE (rco, this->allocator_->free, JAWS_Referenced_Cache_Object); } -ACE_Counted_Cache_Object_Factory -::ACE_Counted_Cache_Object_Factory (ACE_Allocator *alloc) - : ACE_Cache_Object_Factory (alloc) +JAWS_Counted_Cache_Object_Factory +::JAWS_Counted_Cache_Object_Factory (ACE_Allocator *alloc) + : JAWS_Cache_Object_Factory (alloc) { } -ACE_Counted_Cache_Object_Factory -::~ACE_Counted_Cache_Object_Factory (void) +JAWS_Counted_Cache_Object_Factory +::~JAWS_Counted_Cache_Object_Factory (void) { } -ACE_Cache_Object * -ACE_Counted_Cache_Object_Factory::create (const void *data, size_t size) +JAWS_Cache_Object * +JAWS_Counted_Cache_Object_Factory::create (const void *data, size_t size) { - ACE_Counted_Cache_Object *obj; + JAWS_Counted_Cache_Object *obj; - size_t obj_size = sizeof (ACE_Counted_Cache_Object); + size_t obj_size = sizeof (JAWS_Counted_Cache_Object); ACE_NEW_MALLOC_RETURN (obj, - (ACE_Counted_Cache_Object *) + (JAWS_Counted_Cache_Object *) this->allocator_->malloc (obj_size), - ACE_Counted_Cache_Object (data, size), 0); + JAWS_Counted_Cache_Object (data, size), 0); return obj; } void -ACE_Counted_Cache_Object_Factory::destroy (ACE_Cache_Object *obj) +JAWS_Counted_Cache_Object_Factory::destroy (JAWS_Cache_Object *obj) { - ACE_Counted_Cache_Object *cco = (ACE_Counted_Cache_Object *) obj; - ACE_DES_FREE (cco, this->allocator_->free, ACE_Counted_Cache_Object); + JAWS_Counted_Cache_Object *cco = (JAWS_Counted_Cache_Object *) obj; + ACE_DES_FREE (cco, this->allocator_->free, JAWS_Counted_Cache_Object); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Object.h b/apps/JAWS/PROTOTYPE/JAWS/Cache_Object.h index 86267940c78..fbd570b4140 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Object.h +++ b/apps/JAWS/PROTOTYPE/JAWS/Cache_Object.h @@ -2,8 +2,8 @@ // $Id$ -#ifndef ACE_CACHE_OBJECT_H -#define ACE_CACHE_OBJECT_H +#ifndef JAWS_CACHE_OBJECT_H +#define JAWS_CACHE_OBJECT_H #include "ace/OS.h" #include "ace/Synch.h" @@ -11,11 +11,11 @@ // Cache bucket -- use Hash_Bucket to hold cacheable objects. -class ACE_Cache_Object +class JAWS_Cache_Object { public: - ACE_Cache_Object (const void *, size_t); - virtual ~ACE_Cache_Object (void); + JAWS_Cache_Object (const void *, size_t); + virtual ~JAWS_Cache_Object (void); void *internal (void) const; void internal (void *); @@ -60,11 +60,11 @@ private: }; -class ACE_Referenced_Cache_Object : public ACE_Cache_Object +class JAWS_Referenced_Cache_Object : public JAWS_Cache_Object { public: - ACE_Referenced_Cache_Object (const void *, size_t); - virtual ~ACE_Referenced_Cache_Object (void); + JAWS_Referenced_Cache_Object (const void *, size_t); + virtual ~JAWS_Referenced_Cache_Object (void); virtual ACE_Lock & lock (void); @@ -82,11 +82,11 @@ private: }; -class ACE_Counted_Cache_Object : public ACE_Cache_Object +class JAWS_Counted_Cache_Object : public JAWS_Cache_Object { public: - ACE_Counted_Cache_Object (const void *, size_t); - virtual ~ACE_Counted_Cache_Object (void); + JAWS_Counted_Cache_Object (const void *, size_t); + virtual ~JAWS_Counted_Cache_Object (void); virtual ACE_Lock & lock (void); @@ -106,17 +106,17 @@ private: }; -class ACE_Cache_Object_Factory +class JAWS_Cache_Object_Factory { public: - ACE_Cache_Object_Factory (ACE_Allocator *alloc = 0); - virtual ~ACE_Cache_Object_Factory (void); + JAWS_Cache_Object_Factory (ACE_Allocator *alloc = 0); + virtual ~JAWS_Cache_Object_Factory (void); int open (ACE_Allocator *alloc = 0); - virtual ACE_Cache_Object * create (const void *, size_t) = 0; - virtual void destroy (ACE_Cache_Object *) = 0; + virtual JAWS_Cache_Object * create (const void *, size_t) = 0; + virtual void destroy (JAWS_Cache_Object *) = 0; protected: @@ -124,26 +124,26 @@ protected: }; -class ACE_Referenced_Cache_Object_Factory : public ACE_Cache_Object_Factory +class JAWS_Referenced_Cache_Object_Factory : public JAWS_Cache_Object_Factory { public: - ACE_Referenced_Cache_Object_Factory (ACE_Allocator *alloc = 0); - virtual ~ACE_Referenced_Cache_Object_Factory (void); + JAWS_Referenced_Cache_Object_Factory (ACE_Allocator *alloc = 0); + virtual ~JAWS_Referenced_Cache_Object_Factory (void); - virtual ACE_Cache_Object * create (const void *, size_t); - virtual void destroy (ACE_Cache_Object *); + virtual JAWS_Cache_Object * create (const void *, size_t); + virtual void destroy (JAWS_Cache_Object *); }; -class ACE_Counted_Cache_Object_Factory : public ACE_Cache_Object_Factory +class JAWS_Counted_Cache_Object_Factory : public JAWS_Cache_Object_Factory { public: - ACE_Counted_Cache_Object_Factory (ACE_Allocator *alloc = 0); - virtual ~ACE_Counted_Cache_Object_Factory (void); + JAWS_Counted_Cache_Object_Factory (ACE_Allocator *alloc = 0); + virtual ~JAWS_Counted_Cache_Object_Factory (void); - virtual ACE_Cache_Object * create (const void *, size_t); - virtual void destroy (ACE_Cache_Object *); + virtual JAWS_Cache_Object * create (const void *, size_t); + virtual void destroy (JAWS_Cache_Object *); }; -#endif /* UTL_CACHE_OBJECT_H */ +#endif /* JAWS_CACHE_OBJECT_H */ diff --git a/apps/JAWS/PROTOTYPE/JAWS/Hash_Bucket_T.cpp b/apps/JAWS/PROTOTYPE/JAWS/Hash_Bucket_T.cpp index b7c0cb8c93a..f498ce12681 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Hash_Bucket_T.cpp +++ b/apps/JAWS/PROTOTYPE/JAWS/Hash_Bucket_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef ACE_HASH_BUCKET_T_CPP -#define ACE_HASH_BUCKET_T_CPP +#ifndef JAWS_HASH_BUCKET_T_CPP +#define JAWS_HASH_BUCKET_T_CPP #include "JAWS/Hash_Bucket_T.h" @@ -10,10 +10,10 @@ // ----------------- template <class EXT_ID, class INT_ID> -ACE_Hash_Bucket_Item<EXT_ID, INT_ID> -::ACE_Hash_Bucket_Item (const EXT_ID &ext_id, const INT_ID &int_id, - ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *next, - ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *prev) +JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> +::JAWS_Hash_Bucket_Item (const EXT_ID &ext_id, const INT_ID &int_id, + JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *next, + JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *prev) : ext_id_ (ext_id), int_id_ (int_id), next_ (next), @@ -22,16 +22,16 @@ ACE_Hash_Bucket_Item<EXT_ID, INT_ID> } template <class EXT_ID, class INT_ID> -ACE_Hash_Bucket_Item<EXT_ID, INT_ID> -::ACE_Hash_Bucket_Item (ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *next, - ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *prev) +JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> +::JAWS_Hash_Bucket_Item (JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *next, + JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *prev) : next_ (next), prev_ (prev) { } template <class EXT_ID, class INT_ID> -ACE_Hash_Bucket_Item<EXT_ID, INT_ID>::~ACE_Hash_Bucket_Item (void) +JAWS_Hash_Bucket_Item<EXT_ID, INT_ID>::~JAWS_Hash_Bucket_Item (void) { this->next_ = 0; this->prev_ = 0; @@ -43,8 +43,8 @@ ACE_Hash_Bucket_Item<EXT_ID, INT_ID>::~ACE_Hash_Bucket_Item (void) // --------------------- template <class EXT_ID, class INT_ID> -ACE_Hash_Bucket_DLCStack<EXT_ID, INT_ID>:: -ACE_Hash_Bucket_DLCStack (ACE_Allocator *alloc) +JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>:: +JAWS_Hash_Bucket_DLCStack (ACE_Allocator *alloc) : allocator_ (alloc), head_ (0), tail_ (0) @@ -54,29 +54,29 @@ ACE_Hash_Bucket_DLCStack (ACE_Allocator *alloc) } template <class EXT_ID, class INT_ID> -ACE_Hash_Bucket_DLCStack<EXT_ID, INT_ID>:: -~ACE_Hash_Bucket_DLCStack (void) +JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>:: +~JAWS_Hash_Bucket_DLCStack (void) { this->reset (); } template <class EXT_ID, class INT_ID> int -ACE_Hash_Bucket_DLCStack<EXT_ID, INT_ID>:: +JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>:: is_empty (void) const { return this->head_ == 0 && this->tail_ == 0; } -template <class EXT_ID, class INT_ID> ACE_HASH_BUCKET_ITEM * -ACE_Hash_Bucket_DLCStack<EXT_ID, INT_ID>:: +template <class EXT_ID, class INT_ID> JAWS_HASH_BUCKET_ITEM * +JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>:: push (const EXT_ID &ext_id, const INT_ID &int_id) { - size_t malloc_size = sizeof (ACE_HASH_BUCKET_ITEM); - ACE_HASH_BUCKET_ITEM *item; + size_t malloc_size = sizeof (JAWS_HASH_BUCKET_ITEM); + JAWS_HASH_BUCKET_ITEM *item; ACE_NEW_MALLOC_RETURN (item, - (ACE_HASH_BUCKET_ITEM *) + (JAWS_HASH_BUCKET_ITEM *) this->allocator_->malloc (malloc_size), - ACE_HASH_BUCKET_ITEM (ext_id, int_id), 0); + JAWS_HASH_BUCKET_ITEM (ext_id, int_id), 0); if (item != 0) { @@ -100,10 +100,10 @@ push (const EXT_ID &ext_id, const INT_ID &int_id) return item; } -template <class EXT_ID, class INT_ID> ACE_HASH_BUCKET_ITEM * -ACE_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::pop (void) +template <class EXT_ID, class INT_ID> JAWS_HASH_BUCKET_ITEM * +JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::pop (void) { - ACE_HASH_BUCKET_ITEM *item = 0; + JAWS_HASH_BUCKET_ITEM *item = 0; if (! this->is_empty ()) { @@ -126,16 +126,16 @@ ACE_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::pop (void) } template <class EXT_ID, class INT_ID> void -ACE_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::reset (void) +JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::reset (void) { - ACE_HASH_BUCKET_ITEM *item = 0; + JAWS_HASH_BUCKET_ITEM *item = 0; while ((item = this->pop ()) != 0) this->remove (item); } template <class EXT_ID, class INT_ID> int -ACE_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::remove (ACE_HASH_BUCKET_ITEM *item) +JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::remove (JAWS_HASH_BUCKET_ITEM *item) { int result = 0; @@ -163,7 +163,7 @@ ACE_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::remove (ACE_HASH_BUCKET_ITEM *item) if (item->next_ == 0 && item->prev_ == 0) { ACE_DES_FREE_TEMPLATE2 (item, this->allocator_->free, - ACE_Hash_Bucket_Item, EXT_ID, INT_ID); + JAWS_Hash_Bucket_Item, EXT_ID, INT_ID); } else result = -1; @@ -178,8 +178,8 @@ ACE_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::remove (ACE_HASH_BUCKET_ITEM *item) // ------------------------------ template <class EXT_ID, class INT_ID> -ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>:: -ACE_Hash_Bucket_DLCStack_Iterator (const ACE_HASH_BUCKET_DLCSTACK &dlcstack) +JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>:: +JAWS_Hash_Bucket_DLCStack_Iterator (const JAWS_HASH_BUCKET_DLCSTACK &dlcstack) : dlcstack_ (dlcstack), next_ (0), prev_ (0), @@ -188,7 +188,7 @@ ACE_Hash_Bucket_DLCStack_Iterator (const ACE_HASH_BUCKET_DLCSTACK &dlcstack) } template <class EXT_ID, class INT_ID> int -ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::first (void) +JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::first (void) { int result = 0; @@ -204,13 +204,13 @@ ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::first (void) } template <class EXT_ID, class INT_ID> int -ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::last (void) +JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::last (void) { return this->first (); } template <class EXT_ID, class INT_ID> int -ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::advance (void) +JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::advance (void) { int result = 1; @@ -231,7 +231,7 @@ ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::advance (void) } template <class EXT_ID, class INT_ID> int -ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::revert (void) +JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::revert (void) { int result = 1; @@ -252,8 +252,8 @@ ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::revert (void) } template <class EXT_ID, class INT_ID> int -ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>:: -next (ACE_HASH_BUCKET_ITEM *&item) +JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>:: +next (JAWS_HASH_BUCKET_ITEM *&item) { if (this->next_ == 0) this->first (); @@ -263,16 +263,16 @@ next (ACE_HASH_BUCKET_ITEM *&item) } template <class EXT_ID, class INT_ID> int -ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>:: -next (ACE_HASH_BUCKET_ITEM *&item) const +JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>:: +next (JAWS_HASH_BUCKET_ITEM *&item) const { item = this->next_; return ! this->done (); } template <class EXT_ID, class INT_ID> int -ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>:: -prev (ACE_HASH_BUCKET_ITEM *&item) +JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>:: +prev (JAWS_HASH_BUCKET_ITEM *&item) { if (this->prev_ == 0) this->last (); @@ -282,15 +282,15 @@ prev (ACE_HASH_BUCKET_ITEM *&item) } template <class EXT_ID, class INT_ID> int -ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>:: -prev (ACE_HASH_BUCKET_ITEM *&item) const +JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>:: +prev (JAWS_HASH_BUCKET_ITEM *&item) const { item = this->prev_; return ! this->done (); } template <class EXT_ID, class INT_ID> int -ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::done (void) const +JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::done (void) const { return this->done_; } @@ -301,8 +301,8 @@ ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::done (void) const // -------------------- template <class EXT_ID, class INT_ID, class EQ_FUNC> -ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC> -::ACE_Hash_Bucket_Manager (ACE_Allocator *alloc) +JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC> +::JAWS_Hash_Bucket_Manager (ACE_Allocator *alloc) : dlcstack_ (alloc) { if (alloc == 0) @@ -310,7 +310,7 @@ ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC> } template <class EXT_ID, class INT_ID, class EQ_FUNC> int -ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::open (ACE_Allocator *alloc) +JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::open (ACE_Allocator *alloc) { this->dlcstack_.allocator_ = alloc; if (alloc == 0) @@ -320,23 +320,23 @@ ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::open (ACE_Allocator *alloc) } template <class EXT_ID, class INT_ID, class EQ_FUNC> -ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::~ACE_Hash_Bucket_Manager (void) +JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::~JAWS_Hash_Bucket_Manager (void) { } template <class EXT_ID, class INT_ID, class EQ_FUNC> int -ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::close (void) +JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::close (void) { this->dlcstack_.reset (); return 0; } -template <class EXT_ID, class INT_ID, class EQ_FUNC> ACE_HASH_BUCKET_ITEM * -ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC> +template <class EXT_ID, class INT_ID, class EQ_FUNC> JAWS_HASH_BUCKET_ITEM * +JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC> ::find_i (const EXT_ID &ext_id) const { - ACE_HASH_BUCKET_DLCSTACK_ITERATOR iter (this->dlcstack_); - ACE_HASH_BUCKET_ITEM *item = 0; + JAWS_HASH_BUCKET_DLCSTACK_ITERATOR iter (this->dlcstack_); + JAWS_HASH_BUCKET_ITEM *item = 0; if (iter.first ()) while (!iter.done ()) @@ -351,11 +351,11 @@ ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC> } template <class EXT_ID, class INT_ID, class EQ_FUNC> int -ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::find (const EXT_ID &ext_id, +JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::find (const EXT_ID &ext_id, INT_ID &int_id) const { int result = -1; - ACE_HASH_BUCKET_ITEM *item = this->find_i (ext_id); + JAWS_HASH_BUCKET_ITEM *item = this->find_i (ext_id); if (item) { @@ -367,7 +367,7 @@ ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::find (const EXT_ID &ext_id, } template <class EXT_ID, class INT_ID, class EQ_FUNC> int -ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC> +JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC> ::find (const EXT_ID &ext_id) const { INT_ID dummy_id; @@ -375,7 +375,7 @@ ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC> } template <class EXT_ID, class INT_ID, class EQ_FUNC> int -ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::bind (const EXT_ID &ext_id, +JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::bind (const EXT_ID &ext_id, const INT_ID &int_id) { int result = 0; @@ -394,7 +394,7 @@ ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::bind (const EXT_ID &ext_id, } template <class EXT_ID, class INT_ID, class EQ_FUNC> int -ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::trybind (const EXT_ID &ext_id, +JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::trybind (const EXT_ID &ext_id, INT_ID &int_id) { int result = 0; @@ -413,13 +413,13 @@ ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::trybind (const EXT_ID &ext_id, } template <class EXT_ID, class INT_ID, class EQ_FUNC> int -ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::rebind (const EXT_ID &ext_id, +JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::rebind (const EXT_ID &ext_id, const INT_ID &int_id, EXT_ID &old_ext_id, INT_ID &old_int_id) { int result = 0; - ACE_HASH_BUCKET_ITEM *item = this->find_i (ext_id); + JAWS_HASH_BUCKET_ITEM *item = this->find_i (ext_id); if (item) { @@ -436,11 +436,11 @@ ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::rebind (const EXT_ID &ext_id, } template <class EXT_ID, class INT_ID, class EQ_FUNC> int -ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::unbind (const EXT_ID &ext_id, +JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::unbind (const EXT_ID &ext_id, INT_ID &int_id) { int result = -1; - ACE_HASH_BUCKET_ITEM *item = this->find_i (ext_id); + JAWS_HASH_BUCKET_ITEM *item = this->find_i (ext_id); if (item) { @@ -453,10 +453,10 @@ ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::unbind (const EXT_ID &ext_id, } template <class EXT_ID, class INT_ID, class EQ_FUNC> int -ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::unbind (const EXT_ID &ext_id) +JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::unbind (const EXT_ID &ext_id) { INT_ID dummy_id; return this->unbind (ext_id, dummy_id); } -#endif /* ACE_HASH_BUCKET_T_CPP */ +#endif /* JAWS_HASH_BUCKET_T_CPP */ diff --git a/apps/JAWS/PROTOTYPE/JAWS/Hash_Bucket_T.h b/apps/JAWS/PROTOTYPE/JAWS/Hash_Bucket_T.h index d12c11db2e4..9a394a2b42d 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Hash_Bucket_T.h +++ b/apps/JAWS/PROTOTYPE/JAWS/Hash_Bucket_T.h @@ -2,15 +2,15 @@ // Hey Emacs! This is a C++ file! // $Id$ -#ifndef ACE_HASH_BUCKET_T_H -#define ACE_HASH_BUCKET_T_H +#ifndef JAWS_HASH_BUCKET_T_H +#define JAWS_HASH_BUCKET_T_H #include "ace/Containers.h" -#define ACE_HASH_BUCKET_ITEM ACE_Hash_Bucket_Item<EXT_ID, INT_ID> -#define ACE_HASH_BUCKET_DLCSTACK ACE_Hash_Bucket_DLCStack<EXT_ID, INT_ID> -#define ACE_HASH_BUCKET_DLCSTACK_ITERATOR \ - ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID> +#define JAWS_HASH_BUCKET_ITEM JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> +#define JAWS_HASH_BUCKET_DLCSTACK JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID> +#define JAWS_HASH_BUCKET_DLCSTACK_ITERATOR \ + JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID> // Why Hash_Bucket? @@ -22,16 +22,16 @@ // exclusion. template <class EXT_ID, class INT_ID> -class ACE_Hash_Bucket_Item +class JAWS_Hash_Bucket_Item { public: - ACE_Hash_Bucket_Item (const EXT_ID &ext_id, const INT_ID &int_id, - ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *next = 0, - ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *prev = 0); - ACE_Hash_Bucket_Item (ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *next = 0, - ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *prev = 0); + JAWS_Hash_Bucket_Item (const EXT_ID &ext_id, const INT_ID &int_id, + JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *next = 0, + JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *prev = 0); + JAWS_Hash_Bucket_Item (JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *next = 0, + JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *prev = 0); - ~ACE_Hash_Bucket_Item (void); + ~JAWS_Hash_Bucket_Item (void); // Destructor. EXT_ID ext_id_; @@ -40,51 +40,51 @@ public: INT_ID int_id_; // The contents of the entry itself. - ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *next_; + JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *next_; // Pointer to the next item in the bucket of overflow nodes. - ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *prev_; + JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *prev_; // Pointer to the prev item in the bucket of overflow nodes. }; -template <class EXT_ID, class INT_ID> class ACE_Hash_Bucket_DLCStack_Iterator; +template <class EXT_ID, class INT_ID> class JAWS_Hash_Bucket_DLCStack_Iterator; template <class EXT_ID, class INT_ID, class EQ_FUNC> -class ACE_Hash_Bucket_Manager; +class JAWS_Hash_Bucket_Manager; template <class EXT_ID, class INT_ID> -class ACE_Hash_Bucket_DLCStack +class JAWS_Hash_Bucket_DLCStack // Create a doubly linked circular stack to be managed by the // Hash_Bucket_Manager { - friend ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>; + friend JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>; public: - ACE_Hash_Bucket_DLCStack (ACE_Allocator *alloc = 0); - ~ACE_Hash_Bucket_DLCStack (void); + JAWS_Hash_Bucket_DLCStack (ACE_Allocator *alloc = 0); + ~JAWS_Hash_Bucket_DLCStack (void); int is_empty (void) const; // Returns 1 if the container is empty, otherwise returns 0. - ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *push (const EXT_ID &ext_id, + JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *push (const EXT_ID &ext_id, const INT_ID &int_id); // Adds <new_item> to the head of the list. // Returns the new item that was inserted. - ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *pop (void); + JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *pop (void); // Removes and returns the first <item> in the list. Returns // internal node's address on success, 0 if the queue was empty. // This method will *not* free the internal node. void reset (void); - // Reset the <ACE_Hash_Bucket_DLCStack> to be empty. + // Reset the <JAWS_Hash_Bucket_DLCStack> to be empty. // Notice that since no one is interested in the items within, // This operation will delete all items. - int remove (ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *item); + int remove (JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *item); // If item is still part of the CStack, it is removed. // In anycase, if there is no error, item is freed. // Returns 0 if ok, -1 on error. @@ -93,18 +93,18 @@ public: private: - ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *head_; - ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *tail_; + JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *head_; + JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *tail_; }; template <class EXT_ID, class INT_ID> -class ACE_Hash_Bucket_DLCStack_Iterator +class JAWS_Hash_Bucket_DLCStack_Iterator { public: - ACE_Hash_Bucket_DLCStack_Iterator (const ACE_HASH_BUCKET_DLCSTACK &dlcstack); + JAWS_Hash_Bucket_DLCStack_Iterator (const JAWS_HASH_BUCKET_DLCSTACK &dlcstack); int first (void); // Moves to first element in the set, clears done flag. Returns 0 @@ -124,12 +124,12 @@ public: // end up being the last element in the set, 1 otherwise. If revert // takes us to the last element, done is set to true. - int next (ACE_HASH_BUCKET_ITEM *&item); - int next (ACE_HASH_BUCKET_ITEM *&item) const; + int next (JAWS_HASH_BUCKET_ITEM *&item); + int next (JAWS_HASH_BUCKET_ITEM *&item) const; // Pass back the next item. Returns 0 if done is true, 1 otherwise. - int prev (ACE_HASH_BUCKET_ITEM *&item); - int prev (ACE_HASH_BUCKET_ITEM *&item) const; + int prev (JAWS_HASH_BUCKET_ITEM *&item); + int prev (JAWS_HASH_BUCKET_ITEM *&item) const; // Pass back the previous item. Returns 0 if done is true, 1 // otherwise. @@ -139,21 +139,21 @@ public: // element. private: - const ACE_HASH_BUCKET_DLCSTACK &dlcstack_; - ACE_HASH_BUCKET_ITEM *next_; - ACE_HASH_BUCKET_ITEM *prev_; + const JAWS_HASH_BUCKET_DLCSTACK &dlcstack_; + JAWS_HASH_BUCKET_ITEM *next_; + JAWS_HASH_BUCKET_ITEM *prev_; int done_; }; template <class EXT_ID, class INT_ID, class EQ_FUNC> -class ACE_Hash_Bucket_Manager +class JAWS_Hash_Bucket_Manager { public: - ACE_Hash_Bucket_Manager (ACE_Allocator *alloc = 0); + JAWS_Hash_Bucket_Manager (ACE_Allocator *alloc = 0); int open (ACE_Allocator *alloc = 0); - ~ACE_Hash_Bucket_Manager (void); + ~JAWS_Hash_Bucket_Manager (void); int close (void); int find (const EXT_ID &ext_id) const; @@ -175,7 +175,7 @@ public: // then behaves just like <bind>. Otherwise, store the old values // of <ext_id> and <int_id> into the "out" parameters and rebind the // new parameters. This is very useful if you need to have an - // atomic way of updating <ACE_Hash_Map_Entrys> and you also need full + // atomic way of updating <JAWS_Hash_Map_Entrys> and you also need full // control over memory allocation. Returns 0 if a new entry is // bound successfully, returns 1 if an existing entry was rebound, // and returns -1 if failures occur. @@ -188,13 +188,13 @@ public: protected: - ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *find_i (const EXT_ID &ext_id) const; + JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *find_i (const EXT_ID &ext_id) const; // Returns the item associated with ext_id if found in list. // Returns NULL if not found. private: - ACE_Hash_Bucket_DLCStack<EXT_ID, INT_ID> dlcstack_; + JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID> dlcstack_; }; @@ -203,4 +203,4 @@ private: #include "JAWS/Hash_Bucket_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ -#endif /* ACE_HASH_BUCKET_T_H */ +#endif /* JAWS_HASH_BUCKET_T_H */ diff --git a/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.cpp b/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.cpp index c02b7ababff..67710d0f543 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.cpp +++ b/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.cpp @@ -334,14 +334,15 @@ JAWS_Asynch_Handler::open (ACE_HANDLE h, this->handler ()->message_block ()->copy (mb.rd_ptr (), mb.length ()); #endif - ACE_Asynch_Accept::Result fake_result - (*this, JAWS_IO_Asynch_Acceptor_Singleton::instance ()->get_handle (), - h, mb, JAWS_Data_Block::JAWS_DATA_BLOCK_SIZE, - this->ioh_, ACE_INVALID_HANDLE); + ACE_Asynch_Accept_Result_Impl *fake_result + = ACE_Proactor::instance ()->create_asynch_accept_result + (*this, JAWS_IO_Asynch_Acceptor_Singleton::instance ()->get_handle (), + h, mb, JAWS_Data_Block::JAWS_DATA_BLOCK_SIZE, + this->ioh_, ACE_INVALID_HANDLE, 0); this->handler ()->handler_ = this; - fake_result.complete (0, 1, 0); + fake_result->complete (0, 1, 0); } void diff --git a/apps/JAWS/PROTOTYPE/JAWS/Makefile b/apps/JAWS/PROTOTYPE/JAWS/Makefile index fd2632e94f0..a92ca4841ba 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Makefile +++ b/apps/JAWS/PROTOTYPE/JAWS/Makefile @@ -21,12 +21,13 @@ MYFILES = \ Cache_Manager_T \ Cache_Object \ Hash_Bucket_T \ + Pipeline_Handler_T \ + Pipeline \ + Pipeline_Tasks \ Headers \ Parse_Headers \ Waiter \ Reaper \ - Pipeline \ - Pipeline_Tasks \ Data_Block \ Policy \ Concurrency \ @@ -80,38 +81,33 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/Cache_Hash_T.o .obj/Cache_Hash_T.so .shobj/Cache_Hash_T.o .shobj/Cache_Hash_T.so: Cache_Hash_T.cpp ../JAWS/Cache_Hash_T.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - ../JAWS/Cache_Object.h $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Log_Record.i ../JAWS/Cache_Object.h \ + $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ @@ -133,21 +129,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - ../JAWS/Cache_Hash_T.cpp ../JAWS/Hash_Bucket_T.h \ - ../JAWS/Hash_Bucket_T.cpp + $(ACE_ROOT)/ace/Memory_Pool.i ../JAWS/Cache_Hash_T.cpp \ + ../JAWS/Hash_Bucket_T.h ../JAWS/Hash_Bucket_T.cpp .obj/Cache_Heap_T.o .obj/Cache_Heap_T.so .shobj/Cache_Heap_T.o .shobj/Cache_Heap_T.so: Cache_Heap_T.cpp ../JAWS/Cache_Heap_T.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ @@ -163,13 +156,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Free_List.h \ @@ -192,28 +183,23 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - ../JAWS/Cache_Object.h ../JAWS/Cache_Heap_T.cpp \ - ../JAWS/Cache_Manager_T.h \ + $(ACE_ROOT)/ace/Memory_Pool.i ../JAWS/Cache_Object.h \ + ../JAWS/Cache_Heap_T.cpp ../JAWS/Cache_Manager_T.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - ../JAWS/Cache_Manager_T.cpp ../JAWS/Cache_Hash_T.h \ - ../JAWS/Cache_Hash_T.cpp ../JAWS/Hash_Bucket_T.h \ - ../JAWS/Hash_Bucket_T.cpp ../JAWS/Cache_List_T.h \ - ../JAWS/Cache_List_T.cpp + $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/Cache_Manager_T.cpp \ + ../JAWS/Cache_Hash_T.h ../JAWS/Cache_Hash_T.cpp \ + ../JAWS/Hash_Bucket_T.h ../JAWS/Hash_Bucket_T.cpp .obj/Cache_List_T.o .obj/Cache_List_T.so .shobj/Cache_List_T.o .shobj/Cache_List_T.so: Cache_List_T.cpp ../JAWS/Cache_List_T.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ @@ -229,13 +215,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Free_List.h \ @@ -258,30 +242,24 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - ../JAWS/Cache_Object.h ../JAWS/Cache_List_T.cpp \ - ../JAWS/Cache_Manager_T.h \ + $(ACE_ROOT)/ace/Memory_Pool.i ../JAWS/Cache_Object.h \ + ../JAWS/Cache_List_T.cpp ../JAWS/Cache_Manager_T.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - ../JAWS/Cache_Manager_T.cpp ../JAWS/Cache_Hash_T.h \ - ../JAWS/Cache_Hash_T.cpp ../JAWS/Hash_Bucket_T.h \ - ../JAWS/Hash_Bucket_T.cpp ../JAWS/Cache_Heap_T.h \ - ../JAWS/Cache_Heap_T.cpp -.obj/Cache_Manager.o .obj/Cache_Manager.so .shobj/Cache_Manager.o .shobj/Cache_Manager.so: Cache_Manager.cpp \ - $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/Cache_Manager_T.cpp \ + ../JAWS/Cache_Hash_T.h ../JAWS/Cache_Hash_T.cpp \ + ../JAWS/Hash_Bucket_T.h ../JAWS/Hash_Bucket_T.cpp +.obj/Cache_Manager.o .obj/Cache_Manager.so .shobj/Cache_Manager.o .shobj/Cache_Manager.so: Cache_Manager.cpp $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ @@ -292,26 +270,22 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - ../JAWS/Cache_Manager.h ../JAWS/Cache_Manager_T.h \ - $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Synch_T.cpp ../JAWS/Cache_Manager.h \ + ../JAWS/Cache_Manager_T.h $(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 \ - ../JAWS/Cache_Object.h $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp ../JAWS/Cache_Object.h \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ @@ -328,25 +302,21 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - ../JAWS/Cache_Manager_T.cpp ../JAWS/Cache_Hash_T.h \ - ../JAWS/Cache_Hash_T.cpp ../JAWS/Hash_Bucket_T.h \ - ../JAWS/Hash_Bucket_T.cpp ../JAWS/Cache_Heap_T.h \ - ../JAWS/Cache_Heap_T.cpp ../JAWS/Cache_List_T.h \ - ../JAWS/Cache_List_T.cpp + $(ACE_ROOT)/ace/Memory_Pool.i ../JAWS/Cache_Manager_T.cpp \ + ../JAWS/Cache_Hash_T.h ../JAWS/Cache_Hash_T.cpp \ + ../JAWS/Hash_Bucket_T.h ../JAWS/Hash_Bucket_T.cpp \ + ../JAWS/Cache_List_T.h ../JAWS/Cache_List_T.cpp .obj/Cache_Manager_T.o .obj/Cache_Manager_T.so .shobj/Cache_Manager_T.o .shobj/Cache_Manager_T.so: Cache_Manager_T.cpp ../JAWS/Cache_Manager_T.h \ $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ @@ -359,13 +329,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Singleton.i \ @@ -374,9 +342,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - ../JAWS/Cache_Object.h $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp ../JAWS/Cache_Object.h \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ @@ -393,26 +360,21 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - ../JAWS/Cache_Manager_T.cpp ../JAWS/Cache_Hash_T.h \ - ../JAWS/Cache_Hash_T.cpp ../JAWS/Hash_Bucket_T.h \ - ../JAWS/Hash_Bucket_T.cpp ../JAWS/Cache_Heap_T.h \ - ../JAWS/Cache_Heap_T.cpp ../JAWS/Cache_List_T.h \ - ../JAWS/Cache_List_T.cpp + $(ACE_ROOT)/ace/Memory_Pool.i ../JAWS/Cache_Manager_T.cpp \ + ../JAWS/Cache_Hash_T.h ../JAWS/Cache_Hash_T.cpp \ + ../JAWS/Hash_Bucket_T.h ../JAWS/Hash_Bucket_T.cpp .obj/Cache_Object.o .obj/Cache_Object.so .shobj/Cache_Object.o .shobj/Cache_Object.so: Cache_Object.cpp ../JAWS/Cache_Object.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ @@ -423,17 +385,14 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ @@ -457,20 +416,17 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i .obj/Hash_Bucket_T.o .obj/Hash_Bucket_T.so .shobj/Hash_Bucket_T.o .shobj/Hash_Bucket_T.so: Hash_Bucket_T.cpp ../JAWS/Hash_Bucket_T.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/Containers.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ @@ -480,21 +436,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Free_List.h \ @@ -503,8 +456,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Signal.h $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ @@ -512,187 +464,135 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - ../JAWS/Hash_Bucket_T.cpp -.obj/Headers.o .obj/Headers.so .shobj/Headers.o .shobj/Headers.so: Headers.cpp ../JAWS/Headers.h ../JAWS/Export.h \ + $(ACE_ROOT)/ace/Memory_Pool.i ../JAWS/Hash_Bucket_T.cpp +.obj/Pipeline_Handler_T.o .obj/Pipeline_Handler_T.so .shobj/Pipeline_Handler_T.o .shobj/Pipeline_Handler_T.so: Pipeline_Handler_T.cpp \ + ../JAWS/Pipeline_Handler_T.h ../JAWS/Export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Log_Record.i ../JAWS/Pipeline.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(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/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(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/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i -.obj/Parse_Headers.o .obj/Parse_Headers.so .shobj/Parse_Headers.o .shobj/Parse_Headers.so: Parse_Headers.cpp ../JAWS/Parse_Headers.h \ - ../JAWS/Export.h $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Signal.i \ $(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/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Stream.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(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/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ $(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 \ - ../JAWS/Headers.h -.obj/Waiter.o .obj/Waiter.so .shobj/Waiter.o .shobj/Waiter.so: Waiter.cpp $(ACE_ROOT)/ace/Proactor.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Log_Record.i ../JAWS/Waiter.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(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 \ - ../JAWS/Assoc_Array.h ../JAWS/Assoc_Array.cpp ../JAWS/Export.h \ - ../JAWS/IO_Handler.h $(ACE_ROOT)/ace/Asynch_IO.h -.obj/Reaper.o .obj/Reaper.so .shobj/Reaper.o .shobj/Reaper.so: Reaper.cpp ../JAWS/Reaper.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Stream.i \ + $(ACE_ROOT)/ace/Stream.cpp ../JAWS/Pipeline_Handler_T.cpp +.obj/Pipeline.o .obj/Pipeline.so .shobj/Pipeline.o .shobj/Pipeline.so: Pipeline.cpp ../JAWS/Pipeline.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ @@ -705,35 +605,25 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(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/Task.h \ + $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ @@ -741,27 +631,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(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/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -773,8 +651,25 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Stream.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.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/Time_Value.h \ + $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ @@ -795,48 +690,26 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.i \ $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ $(ACE_ROOT)/ace/Module.i \ $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.i \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ - ../JAWS/Export.h ../JAWS/Concurrency.h ../JAWS/IO.h \ - $(ACE_ROOT)/ace/Asynch_IO.h \ - $(ACE_ROOT)/ace/SOCK_Stream.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/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - ../JAWS/IO_Acceptor.h \ - $(ACE_ROOT)/ace/Asynch_Acceptor.h \ - $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.cpp \ - ../JAWS/IO_Handler.h -.obj/Pipeline.o .obj/Pipeline.so .shobj/Pipeline.o .shobj/Pipeline.so: Pipeline.cpp ../JAWS/Pipeline.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/Stream.i \ + $(ACE_ROOT)/ace/Stream.cpp ../JAWS/Export.h \ + ../JAWS/Pipeline_Handler_T.h ../JAWS/Pipeline_Handler_T.cpp +.obj/Pipeline_Tasks.o .obj/Pipeline_Tasks.so .shobj/Pipeline_Tasks.o .shobj/Pipeline_Tasks.so: Pipeline_Tasks.cpp ../JAWS/JAWS.h ../JAWS/IO.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ @@ -845,19 +718,38 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Asynch_IO.h \ + $(ACE_ROOT)/ace/Asynch_IO.i \ + $(ACE_ROOT)/ace/SOCK_Stream.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/IPC_SAP.i $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(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 ../JAWS/Export.h \ + ../JAWS/Pipeline_Tasks.h ../JAWS/Pipeline.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ @@ -869,8 +761,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ @@ -882,11 +773,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Signal.i \ - $(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/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -906,8 +792,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ $(ACE_ROOT)/ace/Message_Queue_T.i \ @@ -938,8 +823,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.i \ $(ACE_ROOT)/ace/Task_T.cpp \ $(ACE_ROOT)/ace/Module.i \ @@ -948,53 +832,88 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Stream_Modules.i \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Stream.i \ - $(ACE_ROOT)/ace/Stream.cpp ../JAWS/Export.h \ - ../JAWS/Pipeline_Handler.h ../JAWS/Pipeline_Handler.cpp -.obj/Pipeline_Tasks.o .obj/Pipeline_Tasks.so .shobj/Pipeline_Tasks.o .shobj/Pipeline_Tasks.so: Pipeline_Tasks.cpp ../JAWS/JAWS.h ../JAWS/IO.h \ - $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Stream.cpp ../JAWS/Pipeline_Handler_T.h \ + ../JAWS/Pipeline_Handler_T.cpp ../JAWS/Data_Block.h \ + ../JAWS/IO_Handler.h ../JAWS/Policy.h ../JAWS/Concurrency.h +.obj/Headers.o .obj/Headers.so .shobj/Headers.o .shobj/Headers.so: Headers.cpp ../JAWS/Headers.h ../JAWS/Export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.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/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/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.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/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Signal.h $(ACE_ROOT)/ace/Signal.i \ + $(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/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i +.obj/Parse_Headers.o .obj/Parse_Headers.so .shobj/Parse_Headers.o .shobj/Parse_Headers.so: Parse_Headers.cpp ../JAWS/Parse_Headers.h \ + ../JAWS/Export.h $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Asynch_IO.h \ - $(ACE_ROOT)/ace/SOCK_Stream.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/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Singleton.i \ @@ -1004,20 +923,69 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ - ../JAWS/Export.h ../JAWS/Pipeline_Tasks.h ../JAWS/Pipeline.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(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/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(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 ../JAWS/Headers.h +.obj/Waiter.o .obj/Waiter.so .shobj/Waiter.o .shobj/Waiter.so: Waiter.cpp $(ACE_ROOT)/ace/Proactor.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Asynch_IO.h \ + $(ACE_ROOT)/ace/Asynch_IO.i \ + $(ACE_ROOT)/ace/Asynch_IO_Impl.h \ + $(ACE_ROOT)/ace/Asynch_IO_Impl.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ @@ -1025,41 +993,124 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Signal.h $(ACE_ROOT)/ace/Signal.i \ + $(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/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Stream.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Timer_List.h \ + $(ACE_ROOT)/ace/Timer_List_T.h \ + $(ACE_ROOT)/ace/Timer_List_T.cpp \ + $(ACE_ROOT)/ace/Timer_Heap.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ + $(ACE_ROOT)/ace/Timer_Wheel.h \ + $(ACE_ROOT)/ace/Timer_Wheel_T.h \ + $(ACE_ROOT)/ace/Timer_Wheel_T.cpp \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i \ + $(ACE_ROOT)/ace/Proactor.i ../JAWS/Waiter.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/Assoc_Array.h \ + ../JAWS/Assoc_Array.cpp ../JAWS/Export.h ../JAWS/IO_Handler.h +.obj/Reaper.o .obj/Reaper.so .shobj/Reaper.o .shobj/Reaper.so: Reaper.cpp ../JAWS/Reaper.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Log_Record.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/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(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/Task.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(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/Signal.h $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Task.i $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ $(ACE_ROOT)/ace/Message_Queue_T.i \ $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ @@ -1080,32 +1131,43 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.i \ $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Module.i \ $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.i \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Stream.i \ - $(ACE_ROOT)/ace/Stream.cpp \ - ../JAWS/Pipeline_Handler.h ../JAWS/Pipeline_Handler.cpp \ - ../JAWS/Data_Block.h ../JAWS/IO_Handler.h ../JAWS/Policy.h \ - ../JAWS/Concurrency.h + $(ACE_ROOT)/ace/Stream_Modules.cpp ../JAWS/Export.h \ + ../JAWS/Concurrency.h ../JAWS/IO.h \ + $(ACE_ROOT)/ace/Asynch_IO.h \ + $(ACE_ROOT)/ace/Asynch_IO.i \ + $(ACE_ROOT)/ace/SOCK_Stream.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/IPC_SAP.i $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i ../JAWS/IO_Acceptor.h \ + $(ACE_ROOT)/ace/Asynch_Acceptor.h \ + $(ACE_ROOT)/ace/Asynch_Acceptor.i \ + $(ACE_ROOT)/ace/Asynch_Acceptor.cpp \ + $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.cpp ../JAWS/IO_Handler.h .obj/Data_Block.o .obj/Data_Block.so .shobj/Data_Block.o .shobj/Data_Block.so: Data_Block.cpp ../JAWS/Data_Block.h \ $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ @@ -1114,21 +1176,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Free_List.h \ @@ -1155,9 +1214,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(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 \ - ../JAWS/Export.h ../JAWS/Pipeline.h \ - $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp ../JAWS/Export.h \ + ../JAWS/Pipeline.h $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ @@ -1176,8 +1234,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Stream.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ $(ACE_ROOT)/ace/Message_Queue_T.i \ @@ -1208,8 +1265,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.i \ $(ACE_ROOT)/ace/Task_T.cpp \ $(ACE_ROOT)/ace/Module.i \ @@ -1218,21 +1274,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Stream_Modules.i \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Stream.i \ - $(ACE_ROOT)/ace/Stream.cpp \ - ../JAWS/Pipeline_Handler.h ../JAWS/Pipeline_Handler.cpp \ - ../JAWS/Policy.h ../JAWS/Concurrency.h \ + $(ACE_ROOT)/ace/Stream.cpp ../JAWS/Pipeline_Handler_T.h \ + ../JAWS/Pipeline_Handler_T.cpp ../JAWS/Policy.h ../JAWS/Concurrency.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/IO.h \ $(ACE_ROOT)/ace/Asynch_IO.h \ + $(ACE_ROOT)/ace/Asynch_IO.i \ $(ACE_ROOT)/ace/SOCK_Stream.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/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/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/IPC_SAP.i $(ACE_ROOT)/ace/SOCK.i \ $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.i \ @@ -1240,17 +1293,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/Policy.o .obj/Policy.so .shobj/Policy.o .shobj/Policy.so: Policy.cpp ../JAWS/Policy.h ../JAWS/Export.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ @@ -1262,13 +1313,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Singleton.i \ @@ -1289,8 +1338,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ @@ -1298,14 +1346,12 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.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/Memory_Pool.i \ $(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 \ @@ -1354,27 +1400,25 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Message_Queue.i \ $(ACE_ROOT)/ace/Task_T.i \ $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Module.i \ $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.i \ $(ACE_ROOT)/ace/Stream_Modules.cpp ../JAWS/IO.h \ $(ACE_ROOT)/ace/Asynch_IO.h \ + $(ACE_ROOT)/ace/Asynch_IO.i \ $(ACE_ROOT)/ace/SOCK_Stream.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/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/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/IPC_SAP.i $(ACE_ROOT)/ace/SOCK.i \ $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.i \ $(ACE_ROOT)/ace/SOCK_Stream.i ../JAWS/IO_Handler.h \ - ../JAWS/IO_Acceptor.h \ - $(ACE_ROOT)/ace/Asynch_Acceptor.h \ + ../JAWS/IO_Acceptor.h $(ACE_ROOT)/ace/Asynch_Acceptor.h \ + $(ACE_ROOT)/ace/Asynch_Acceptor.i \ + $(ACE_ROOT)/ace/Asynch_Acceptor.cpp \ $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/Time_Value.h \ @@ -1382,17 +1426,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.cpp .obj/Concurrency.o .obj/Concurrency.so .shobj/Concurrency.o .shobj/Concurrency.so: Concurrency.cpp ../JAWS/JAWS.h ../JAWS/Concurrency.h \ $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ @@ -1405,13 +1447,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Singleton.i \ @@ -1432,8 +1472,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ @@ -1441,14 +1480,12 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.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/Memory_Pool.i \ $(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 \ @@ -1497,22 +1534,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Message_Queue.i \ $(ACE_ROOT)/ace/Task_T.i \ $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Module.i \ $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.i \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - ../JAWS/Export.h ../JAWS/IO.h \ - $(ACE_ROOT)/ace/Asynch_IO.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp ../JAWS/Export.h \ + ../JAWS/IO.h $(ACE_ROOT)/ace/Asynch_IO.h \ + $(ACE_ROOT)/ace/Asynch_IO.i \ $(ACE_ROOT)/ace/SOCK_Stream.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/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/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/IPC_SAP.i $(ACE_ROOT)/ace/SOCK.i \ $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.i \ @@ -1520,22 +1553,19 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU ../JAWS/Pipeline.h $(ACE_ROOT)/ace/Stream.h \ $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/Stream.i \ - $(ACE_ROOT)/ace/Stream.cpp \ - ../JAWS/Pipeline_Handler.h ../JAWS/Pipeline_Handler.cpp \ - ../JAWS/Pipeline_Tasks.h ../JAWS/Data_Block.h ../JAWS/Policy.h \ - ../JAWS/Waiter.h ../JAWS/Assoc_Array.h ../JAWS/Assoc_Array.cpp \ - ../JAWS/Reaper.h + $(ACE_ROOT)/ace/Stream.cpp ../JAWS/Pipeline_Handler_T.h \ + ../JAWS/Pipeline_Handler_T.cpp ../JAWS/Pipeline_Tasks.h \ + ../JAWS/Data_Block.h ../JAWS/Policy.h ../JAWS/Waiter.h \ + ../JAWS/Assoc_Array.h ../JAWS/Assoc_Array.cpp ../JAWS/Reaper.h .obj/Server.o .obj/Server.so .shobj/Server.o .shobj/Server.so: Server.cpp $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ @@ -1544,24 +1574,20 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Get_Opt.i ../JAWS/Server.h \ - ../JAWS/Export.h ../JAWS/Data_Block.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Get_Opt.i ../JAWS/Server.h ../JAWS/Export.h \ + ../JAWS/Data_Block.h $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Free_List.h \ @@ -1588,8 +1614,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(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 \ - ../JAWS/Pipeline.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp ../JAWS/Pipeline.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ @@ -1609,8 +1634,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Stream.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ $(ACE_ROOT)/ace/Message_Queue_T.i \ @@ -1641,8 +1665,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.i \ $(ACE_ROOT)/ace/Task_T.cpp \ $(ACE_ROOT)/ace/Module.i \ @@ -1651,27 +1674,25 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Stream_Modules.i \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Stream.i \ - $(ACE_ROOT)/ace/Stream.cpp \ - ../JAWS/Pipeline_Handler.h ../JAWS/Pipeline_Handler.cpp \ - ../JAWS/Policy.h ../JAWS/Concurrency.h \ + $(ACE_ROOT)/ace/Stream.cpp ../JAWS/Pipeline_Handler_T.h \ + ../JAWS/Pipeline_Handler_T.cpp ../JAWS/Policy.h ../JAWS/Concurrency.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/IO.h \ $(ACE_ROOT)/ace/Asynch_IO.h \ + $(ACE_ROOT)/ace/Asynch_IO.i \ $(ACE_ROOT)/ace/SOCK_Stream.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/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/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/IPC_SAP.i $(ACE_ROOT)/ace/SOCK.i \ $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.i \ $(ACE_ROOT)/ace/SOCK_Stream.i ../JAWS/IO_Handler.h \ - ../JAWS/IO_Acceptor.h \ - $(ACE_ROOT)/ace/Asynch_Acceptor.h \ + ../JAWS/IO_Acceptor.h $(ACE_ROOT)/ace/Asynch_Acceptor.h \ + $(ACE_ROOT)/ace/Asynch_Acceptor.i \ + $(ACE_ROOT)/ace/Asynch_Acceptor.cpp \ $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ @@ -1679,16 +1700,14 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU ../JAWS/Pipeline_Tasks.h .obj/IO_Acceptor.o .obj/IO_Acceptor.so .shobj/IO_Acceptor.o .shobj/IO_Acceptor.so: IO_Acceptor.cpp ../JAWS/Data_Block.h \ $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ @@ -1697,21 +1716,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Free_List.h \ @@ -1738,9 +1754,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(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 \ - ../JAWS/Export.h ../JAWS/Pipeline.h \ - $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp ../JAWS/Export.h \ + ../JAWS/Pipeline.h $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ @@ -1759,8 +1774,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Stream.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ $(ACE_ROOT)/ace/Message_Queue_T.i \ @@ -1791,8 +1805,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.i \ $(ACE_ROOT)/ace/Task_T.cpp \ $(ACE_ROOT)/ace/Module.i \ @@ -1801,90 +1814,70 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Stream_Modules.i \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Stream.i \ - $(ACE_ROOT)/ace/Stream.cpp \ - ../JAWS/Pipeline_Handler.h ../JAWS/Pipeline_Handler.cpp \ - ../JAWS/IO_Acceptor.h \ + $(ACE_ROOT)/ace/Stream.cpp ../JAWS/Pipeline_Handler_T.h \ + ../JAWS/Pipeline_Handler_T.cpp ../JAWS/IO_Acceptor.h \ $(ACE_ROOT)/ace/Asynch_Acceptor.h \ + $(ACE_ROOT)/ace/Asynch_IO.h \ + $(ACE_ROOT)/ace/Asynch_IO.i \ + $(ACE_ROOT)/ace/Asynch_Acceptor.i \ + $(ACE_ROOT)/ace/Asynch_Acceptor.cpp \ + $(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/LOCK_SOCK_Acceptor.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/SOCK_Stream.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/SOCK_IO.h $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/IPC_SAP.i $(ACE_ROOT)/ace/SOCK.i \ $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.cpp \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/IO.h \ - $(ACE_ROOT)/ace/Asynch_IO.h ../JAWS/IO_Handler.h -.obj/IO_Handler.o .obj/IO_Handler.so .shobj/IO_Handler.o .shobj/IO_Handler.so: IO_Handler.cpp \ - $(ACE_ROOT)/ace/Proactor.h \ + ../JAWS/IO_Handler.h +.obj/IO_Handler.o .obj/IO_Handler.so .shobj/IO_Handler.o .shobj/IO_Handler.so: IO_Handler.cpp $(ACE_ROOT)/ace/Proactor.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Filecache.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Asynch_IO.h \ + $(ACE_ROOT)/ace/Asynch_IO.i \ + $(ACE_ROOT)/ace/Asynch_IO_Impl.h \ + $(ACE_ROOT)/ace/Asynch_IO_Impl.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ @@ -1892,33 +1885,60 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Signal.h $(ACE_ROOT)/ace/Signal.i \ $(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/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Timer_List.h \ + $(ACE_ROOT)/ace/Timer_List_T.h \ + $(ACE_ROOT)/ace/Timer_List_T.cpp \ + $(ACE_ROOT)/ace/Timer_Heap.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ + $(ACE_ROOT)/ace/Timer_Wheel.h \ + $(ACE_ROOT)/ace/Timer_Wheel_T.h \ + $(ACE_ROOT)/ace/Timer_Wheel_T.cpp \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i \ + $(ACE_ROOT)/ace/Proactor.i \ + $(ACE_ROOT)/ace/Filecache.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h ../JAWS/JAWS.h \ - ../JAWS/IO.h $(ACE_ROOT)/ace/Asynch_IO.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ + ../JAWS/IO.h $(ACE_ROOT)/ace/SOCK_Stream.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/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/IPC_SAP.i $(ACE_ROOT)/ace/SOCK.i \ $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.i \ @@ -1928,21 +1948,21 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/Export.h \ ../JAWS/IO_Handler.h ../JAWS/IO_Acceptor.h \ $(ACE_ROOT)/ace/Asynch_Acceptor.h \ - $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.cpp \ - ../JAWS/Data_Block.h \ + $(ACE_ROOT)/ace/Asynch_Acceptor.i \ + $(ACE_ROOT)/ace/Asynch_Acceptor.cpp \ $(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/LOCK_SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.cpp ../JAWS/Data_Block.h \ ../JAWS/Pipeline.h $(ACE_ROOT)/ace/Stream.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ $(ACE_ROOT)/ace/Message_Queue_T.i \ @@ -1951,8 +1971,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ @@ -1963,8 +1981,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.i \ $(ACE_ROOT)/ace/Task_T.cpp \ $(ACE_ROOT)/ace/Module.i \ @@ -1973,21 +1990,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Stream_Modules.i \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Stream.i \ - $(ACE_ROOT)/ace/Stream.cpp \ - ../JAWS/Pipeline_Handler.h ../JAWS/Pipeline_Handler.cpp \ - ../JAWS/Policy.h ../JAWS/Concurrency.h ../JAWS/Waiter.h \ - ../JAWS/Assoc_Array.h ../JAWS/Assoc_Array.cpp + $(ACE_ROOT)/ace/Stream.cpp ../JAWS/Pipeline_Handler_T.h \ + ../JAWS/Pipeline_Handler_T.cpp ../JAWS/Policy.h ../JAWS/Concurrency.h \ + ../JAWS/Waiter.h ../JAWS/Assoc_Array.h ../JAWS/Assoc_Array.cpp .obj/IO.o .obj/IO.so .shobj/IO.o .shobj/IO.so: IO.cpp $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ @@ -1996,21 +2010,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Free_List.h \ @@ -2039,13 +2050,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ $(ACE_ROOT)/ace/SOCK_Stream.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/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/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/IPC_SAP.i $(ACE_ROOT)/ace/SOCK.i \ $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.i \ @@ -2081,8 +2089,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Stream.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ $(ACE_ROOT)/ace/Message_Queue_T.i \ @@ -2103,8 +2110,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.i \ $(ACE_ROOT)/ace/Task_T.cpp \ $(ACE_ROOT)/ace/Module.i \ @@ -2113,15 +2119,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Stream_Modules.i \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Stream.i \ - $(ACE_ROOT)/ace/Stream.cpp \ - ../JAWS/Pipeline_Handler.h ../JAWS/Pipeline_Handler.cpp \ - ../JAWS/Policy.h ../JAWS/Concurrency.h \ + $(ACE_ROOT)/ace/Stream.cpp ../JAWS/Pipeline_Handler_T.h \ + ../JAWS/Pipeline_Handler_T.cpp ../JAWS/Policy.h ../JAWS/Concurrency.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/IO.h \ - $(ACE_ROOT)/ace/Asynch_IO.h ../JAWS/IO_Handler.h \ - ../JAWS/IO_Acceptor.h \ - $(ACE_ROOT)/ace/Asynch_Acceptor.h \ + $(ACE_ROOT)/ace/Asynch_IO.h \ + $(ACE_ROOT)/ace/Asynch_IO.i ../JAWS/IO_Handler.h \ + ../JAWS/IO_Acceptor.h $(ACE_ROOT)/ace/Asynch_Acceptor.h \ + $(ACE_ROOT)/ace/Asynch_Acceptor.i \ + $(ACE_ROOT)/ace/Asynch_Acceptor.cpp \ $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ diff --git a/apps/JAWS/PROTOTYPE/JAWS/Pipeline.cpp b/apps/JAWS/PROTOTYPE/JAWS/Pipeline.cpp index 83aa6397415..e0f298a48ea 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Pipeline.cpp +++ b/apps/JAWS/PROTOTYPE/JAWS/Pipeline.cpp @@ -25,5 +25,3 @@ JAWS_Pipeline::close (u_long) { return 0; } - -#include "JAWS/Pipeline_Handler.cpp" diff --git a/apps/JAWS/PROTOTYPE/JAWS/Pipeline.h b/apps/JAWS/PROTOTYPE/JAWS/Pipeline.h index ff04b4fb61f..03c3c66d104 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Pipeline.h +++ b/apps/JAWS/PROTOTYPE/JAWS/Pipeline.h @@ -36,6 +36,4 @@ public: virtual int close (u_long = 0); }; -#include "JAWS/Pipeline_Handler.h" - #endif /* !defined (JAWS_PIPELINE_H) */ diff --git a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler.cpp b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler_T.cpp index 9d640c287b6..ca2e26b3177 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler.cpp +++ b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler_T.cpp @@ -1,11 +1,11 @@ // $Id$ -#ifndef JAWS_PIPELINE_HANDLER_CPP -#define JAWS_PIPELINE_HANDLER_CPP +#ifndef JAWS_PIPELINE_HANDLER_T_CPP +#define JAWS_PIPELINE_HANDLER_T_CPP -#include "JAWS/Pipeline_Handler.h" +#include "JAWS/Pipeline_Handler_T.h" -ACE_RCSID(JAWS, Pipeline_Handler, "$Id$") +ACE_RCSID(JAWS, Pipeline_Handler_T, "$Id$") template <class TYPE> JAWS_Pipeline_Abstract_Handler<TYPE>::JAWS_Pipeline_Abstract_Handler (void) @@ -28,4 +28,4 @@ JAWS_Pipeline_Abstract_Handler<TYPE>::put (ACE_Message_Block *mb, return status; } -#endif /* !defined (JAWS_PIPELINE_HANDLER_CPP) */ +#endif /* !defined (JAWS_PIPELINE_HANDLER_T_CPP) */ diff --git a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler.h b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler_T.h index 7d95294bf03..4d4d808fee2 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler.h +++ b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler_T.h @@ -1,8 +1,8 @@ /* -*- c++ -*- */ // $Id$ -#ifndef JAWS_PIPELINE_HANDLER_H -#define JAWS_PIPELINE_HANDLER_H +#ifndef JAWS_PIPELINE_HANDLER_T_H +#define JAWS_PIPELINE_HANDLER_T_H #include "JAWS/Export.h" #include "JAWS/Pipeline.h" @@ -26,7 +26,7 @@ public: }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "JAWS/Pipeline_Handler.cpp" +#include "JAWS/Pipeline_Handler_T.cpp" #endif -#endif /* !defined (JAWS_PIPELINE_HANDLER_H) */ +#endif /* !defined (JAWS_PIPELINE_HANDLER_T_H) */ diff --git a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.cpp b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.cpp index e7bd1b2667c..8af617d8979 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.cpp +++ b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.cpp @@ -4,6 +4,7 @@ #include "JAWS/IO.h" #include "JAWS/Pipeline_Tasks.h" +#include "JAWS/Pipeline_Handler_T.h" #include "JAWS/Data_Block.h" #include "JAWS/IO_Handler.h" #include "JAWS/Policy.h" diff --git a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.h b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.h index 4506885b0a2..3bbb5080593 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.h +++ b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.h @@ -12,6 +12,7 @@ #include "JAWS/Export.h" #include "JAWS/Pipeline.h" +#include "JAWS/Pipeline_Handler_T.h" #include "JAWS/Data_Block.h" class JAWS_Export JAWS_Pipeline_Handler diff --git a/apps/JAWS/PROTOTYPE/Makefile b/apps/JAWS/PROTOTYPE/Makefile index 741f7b1aef2..cb6bd8a8cd5 100644 --- a/apps/JAWS/PROTOTYPE/Makefile +++ b/apps/JAWS/PROTOTYPE/Makefile @@ -21,6 +21,7 @@ OBJ = $(addsuffix .o,$(FILES)) LDFLAGS += -L./JAWS LDLIBS = -lHTTPU -lJAWS +CFLAGS += -DJAWS_HAS_THREAD_SAFE_ACCEPT BUILD = $(VBIN) @@ -46,40 +47,41 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/HTTP_10.o .obj/HTTP_10.so .shobj/HTTP_10.o .shobj/HTTP_10.so: HTTP_10.cpp HTTP_10.h \ - $(ACE_ROOT)/ace/RB_Tree.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ +.obj/HTTP_10.o .obj/HTTP_10.so .shobj/HTTP_10.o .shobj/HTTP_10.so: HTTP_10.cpp HTTP_10.h $(ACE_ROOT)/ace/RB_Tree.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ $(ACE_ROOT)/ace/config-sunos5.5.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ $(ACE_ROOT)/ace/RB_Tree.i \ - $(ACE_ROOT)/ace/RB_Tree.cpp \ - JAWS/Pipeline_Tasks.h \ + $(ACE_ROOT)/ace/RB_Tree.cpp JAWS/Pipeline_Tasks.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Singleton.i \ @@ -88,9 +90,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - JAWS/Export.h JAWS/Pipeline.h \ - $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp JAWS/Export.h \ + JAWS/Pipeline.h $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ @@ -101,9 +102,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ @@ -115,8 +114,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -132,9 +129,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IO_Cntl_Msg.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/Time_Value.h \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ $(ACE_ROOT)/ace/Message_Queue_T.i \ @@ -146,7 +145,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ @@ -157,8 +159,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.i \ $(ACE_ROOT)/ace/Task_T.cpp \ $(ACE_ROOT)/ace/Module.i \ @@ -167,44 +168,38 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Stream_Modules.i \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Stream.i \ - $(ACE_ROOT)/ace/Stream.cpp \ - JAWS/Pipeline_Handler.h JAWS/Pipeline_Handler.cpp JAWS/Data_Block.h \ - JAWS/JAWS.h + $(ACE_ROOT)/ace/Stream.cpp JAWS/Pipeline_Handler.h \ + JAWS/Pipeline_Handler.cpp JAWS/Data_Block.h JAWS/JAWS.h .obj/HTTP_10_Request.o .obj/HTTP_10_Request.so .shobj/HTTP_10_Request.o .shobj/HTTP_10_Request.so: HTTP_10_Request.cpp JAWS/JAWS.h HTTP_10_Request.h \ - HTTPU/http_request.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ + HTTPU/http_request.h $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ $(ACE_ROOT)/ace/config-sunos5.5.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Free_List.h \ @@ -229,51 +224,60 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ - JAWS/Parse_Headers.h JAWS/Export.h \ - $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp JAWS/Parse_Headers.h \ + JAWS/Export.h $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp JAWS/Headers.h \ HTTPU/http_export.h HTTPU/http_base.h HTTPU/http_status.h \ HTTPU/http_status.i HTTPU/http_headers.h \ $(ACE_ROOT)/ace/RB_Tree.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ $(ACE_ROOT)/ace/RB_Tree.i \ - $(ACE_ROOT)/ace/RB_Tree.cpp \ - HTTPU/http_headers.i HTTPU/http_base.i HTTPU/parse_http_request.h \ + $(ACE_ROOT)/ace/RB_Tree.cpp HTTPU/http_headers.i \ + HTTPU/http_base.i HTTPU/parse_http_request.h \ HTTPU/parse_http_request.i HTTPU/parse_url.h HTTPU/http_request.i .obj/HTTP_10_Read.o .obj/HTTP_10_Read.so .shobj/HTTP_10_Read.o .shobj/HTTP_10_Read.so: HTTP_10_Read.cpp HTTP_10.h \ - $(ACE_ROOT)/ace/RB_Tree.h \ - $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/RB_Tree.h $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ $(ACE_ROOT)/ace/config-sunos5.5.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ $(ACE_ROOT)/ace/RB_Tree.i \ - $(ACE_ROOT)/ace/RB_Tree.cpp \ - JAWS/Pipeline_Tasks.h \ + $(ACE_ROOT)/ace/RB_Tree.cpp JAWS/Pipeline_Tasks.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Singleton.i \ @@ -282,9 +286,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - JAWS/Export.h JAWS/Pipeline.h \ - $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp JAWS/Export.h \ + JAWS/Pipeline.h $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ @@ -295,9 +298,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ @@ -309,8 +310,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -326,9 +325,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IO_Cntl_Msg.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/Time_Value.h \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ $(ACE_ROOT)/ace/Message_Queue_T.i \ @@ -340,7 +341,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ @@ -351,8 +355,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.i \ $(ACE_ROOT)/ace/Task_T.cpp \ $(ACE_ROOT)/ace/Module.i \ @@ -361,58 +364,55 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Stream_Modules.i \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Stream.i \ - $(ACE_ROOT)/ace/Stream.cpp \ - JAWS/Pipeline_Handler.h JAWS/Pipeline_Handler.cpp JAWS/Data_Block.h \ - JAWS/JAWS.h JAWS/IO.h \ + $(ACE_ROOT)/ace/Stream.cpp JAWS/Pipeline_Handler.h \ + JAWS/Pipeline_Handler.cpp JAWS/Data_Block.h JAWS/JAWS.h JAWS/IO.h \ $(ACE_ROOT)/ace/Asynch_IO.h \ $(ACE_ROOT)/ace/Asynch_IO.i \ $(ACE_ROOT)/ace/SOCK_Stream.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/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/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/IPC_SAP.i $(ACE_ROOT)/ace/SOCK.i \ $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - JAWS/IO_Handler.h JAWS/Policy.h JAWS/Concurrency.h -.obj/HTTP_10_Parse.o .obj/HTTP_10_Parse.so .shobj/HTTP_10_Parse.o .shobj/HTTP_10_Parse.so: HTTP_10_Parse.cpp \ - $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i JAWS/IO_Handler.h \ + JAWS/Policy.h JAWS/Concurrency.h +.obj/HTTP_10_Parse.o .obj/HTTP_10_Parse.so .shobj/HTTP_10_Parse.o .shobj/HTTP_10_Parse.so: HTTP_10_Parse.cpp $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ $(ACE_ROOT)/ace/config-sunos5.5.h \ - $(ACE_ROOT)/ace/config-g++-common.h HTTP_10.h \ - $(ACE_ROOT)/ace/RB_Tree.h \ - $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/RB_Tree.h $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ $(ACE_ROOT)/ace/RB_Tree.i \ - $(ACE_ROOT)/ace/RB_Tree.cpp \ - JAWS/Pipeline_Tasks.h \ + $(ACE_ROOT)/ace/RB_Tree.cpp JAWS/Pipeline_Tasks.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Event_Handler.h \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Singleton.i \ @@ -421,9 +421,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - JAWS/Export.h JAWS/Pipeline.h \ - $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp JAWS/Export.h \ + JAWS/Pipeline.h $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ @@ -434,9 +433,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ @@ -448,8 +445,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -465,9 +460,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IO_Cntl_Msg.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/Time_Value.h \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ $(ACE_ROOT)/ace/Message_Queue_T.i \ @@ -479,7 +476,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ @@ -490,8 +490,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.i \ $(ACE_ROOT)/ace/Task_T.cpp \ $(ACE_ROOT)/ace/Module.i \ @@ -500,75 +499,85 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Stream_Modules.i \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Stream.i \ - $(ACE_ROOT)/ace/Stream.cpp \ - JAWS/Pipeline_Handler.h JAWS/Pipeline_Handler.cpp JAWS/Data_Block.h \ - JAWS/JAWS.h JAWS/IO.h \ + $(ACE_ROOT)/ace/Stream.cpp JAWS/Pipeline_Handler.h \ + JAWS/Pipeline_Handler.cpp JAWS/Data_Block.h JAWS/JAWS.h JAWS/IO.h \ $(ACE_ROOT)/ace/Asynch_IO.h \ $(ACE_ROOT)/ace/Asynch_IO.i \ $(ACE_ROOT)/ace/SOCK_Stream.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/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/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/IPC_SAP.i $(ACE_ROOT)/ace/SOCK.i \ $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - JAWS/IO_Handler.h JAWS/Policy.h JAWS/Concurrency.h HTTP_10_Request.h \ + $(ACE_ROOT)/ace/SOCK_Stream.i JAWS/IO_Handler.h \ + JAWS/Policy.h JAWS/Concurrency.h HTTP_10_Request.h \ HTTPU/http_request.h JAWS/Parse_Headers.h JAWS/Headers.h \ HTTPU/http_export.h HTTPU/http_base.h HTTPU/http_status.h \ HTTPU/http_status.i HTTPU/http_headers.h HTTPU/http_headers.i \ HTTPU/http_base.i HTTPU/parse_http_request.h \ HTTPU/parse_http_request.i HTTPU/parse_url.h HTTPU/http_request.i -.obj/HTTP_10_Write.o .obj/HTTP_10_Write.so .shobj/HTTP_10_Write.o .shobj/HTTP_10_Write.so: HTTP_10_Write.cpp \ - $(ACE_ROOT)/ace/streams.h \ +.obj/HTTP_10_Write.o .obj/HTTP_10_Write.so .shobj/HTTP_10_Write.o .shobj/HTTP_10_Write.so: HTTP_10_Write.cpp $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ $(ACE_ROOT)/ace/config-sunos5.5.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - JAWS/JAWS.h JAWS/IO.h $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Log_Record.i JAWS/JAWS.h JAWS/IO.h \ $(ACE_ROOT)/ace/Asynch_IO.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Asynch_IO.i \ + $(ACE_ROOT)/ace/SOCK_Stream.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/IPC_SAP.i $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ + $(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 JAWS/Export.h \ + JAWS/IO_Handler.h JAWS/Policy.h JAWS/Concurrency.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ @@ -576,22 +585,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(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/Signal.h $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(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 \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ $(ACE_ROOT)/ace/Message_Queue_T.i \ @@ -599,8 +604,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -615,7 +618,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ @@ -628,42 +639,23 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Message_Queue.i \ $(ACE_ROOT)/ace/Task_T.i \ $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.h $(ACE_ROOT)/ace/Module.i \ $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.i \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Asynch_IO.i \ - $(ACE_ROOT)/ace/SOCK_Stream.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/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp JAWS/Export.h \ - JAWS/IO_Handler.h JAWS/Policy.h JAWS/Concurrency.h HTTP_10.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp HTTP_10.h \ $(ACE_ROOT)/ace/RB_Tree.h \ $(ACE_ROOT)/ace/RB_Tree.i \ - $(ACE_ROOT)/ace/RB_Tree.cpp \ - JAWS/Pipeline_Tasks.h JAWS/Pipeline.h \ - $(ACE_ROOT)/ace/Stream.h \ + $(ACE_ROOT)/ace/RB_Tree.cpp JAWS/Pipeline_Tasks.h \ + JAWS/Pipeline.h $(ACE_ROOT)/ace/Stream.h \ $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/Stream.i \ - $(ACE_ROOT)/ace/Stream.cpp \ - JAWS/Pipeline_Handler.h JAWS/Pipeline_Handler.cpp JAWS/Data_Block.h \ - HTTP_10_Request.h HTTPU/http_request.h JAWS/Parse_Headers.h \ - JAWS/Headers.h HTTPU/http_export.h HTTPU/http_base.h \ - HTTPU/http_status.h HTTPU/http_status.i HTTPU/http_headers.h \ - HTTPU/http_headers.i HTTPU/http_base.i HTTPU/parse_http_request.h \ + $(ACE_ROOT)/ace/Stream.cpp JAWS/Pipeline_Handler.h \ + JAWS/Pipeline_Handler.cpp JAWS/Data_Block.h HTTP_10_Request.h \ + HTTPU/http_request.h JAWS/Parse_Headers.h JAWS/Headers.h \ + HTTPU/http_export.h HTTPU/http_base.h HTTPU/http_status.h \ + HTTPU/http_status.i HTTPU/http_headers.h HTTPU/http_headers.i \ + HTTPU/http_base.i HTTPU/parse_http_request.h \ HTTPU/parse_http_request.i HTTPU/parse_url.h HTTPU/http_request.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/apps/JAWS/PROTOTYPE/main.cpp b/apps/JAWS/PROTOTYPE/main.cpp index f129d4b1dfc..d1bd6f46dcb 100644 --- a/apps/JAWS/PROTOTYPE/main.cpp +++ b/apps/JAWS/PROTOTYPE/main.cpp @@ -21,6 +21,10 @@ handler (int) } #endif /* ACE_HAS_SIG_C_FUNC */ +static JAWS_HTTP_10_Read_Task HTTP_Read; +static JAWS_HTTP_10_Parse_Task HTTP_Parse; +static JAWS_HTTP_10_Write_Task HTTP_Write; + int main (int argc, char *argv[]) { @@ -31,9 +35,6 @@ main (int argc, char *argv[]) ACE_OS::signal (SIGUSR2, (ACE_SignalHandler) handler); JAWS_Server server (argc, argv); - JAWS_HTTP_10_Read_Task HTTP_Read; - JAWS_HTTP_10_Parse_Task HTTP_Parse; - JAWS_HTTP_10_Write_Task HTTP_Write; HTTP_Read.next (&HTTP_Parse); HTTP_Parse.next (&HTTP_Write); |