From 9c2ec3049a5634f1c916d792e81fc80edb669ea8 Mon Sep 17 00:00:00 2001 From: nobody Date: Sat, 31 Jul 2004 16:14:11 +0000 Subject: This commit was manufactured by cvs2svn to create tag 'TAO-1_4_2'. --- apps/JAWS3/jaws3/Asynch_IO.cpp | 308 ---------------- apps/JAWS3/jaws3/Asynch_IO.h | 71 ---- apps/JAWS3/jaws3/Asynch_IO_Helpers.h | 55 --- apps/JAWS3/jaws3/Cached_Allocator_T.cpp | 140 ------- apps/JAWS3/jaws3/Cached_Allocator_T.h | 107 ------ apps/JAWS3/jaws3/Concurrency.cpp | 104 ------ apps/JAWS3/jaws3/Concurrency.h | 74 ---- apps/JAWS3/jaws3/Concurrency_T.cpp | 47 --- apps/JAWS3/jaws3/Concurrency_T.h | 50 --- apps/JAWS3/jaws3/Config_File.cpp | 308 ---------------- apps/JAWS3/jaws3/Config_File.h | 73 ---- apps/JAWS3/jaws3/Datagram.cpp | 86 ----- apps/JAWS3/jaws3/Datagram.h | 139 ------- apps/JAWS3/jaws3/Event_Completer.cpp | 51 --- apps/JAWS3/jaws3/Event_Completer.h | 41 --- apps/JAWS3/jaws3/Event_Dispatcher.cpp | 52 --- apps/JAWS3/jaws3/Event_Dispatcher.h | 52 --- apps/JAWS3/jaws3/Event_Result.h | 103 ------ apps/JAWS3/jaws3/Export.h | 48 --- apps/JAWS3/jaws3/FILE.cpp | 88 ----- apps/JAWS3/jaws3/FILE.h | 49 --- apps/JAWS3/jaws3/IO.cpp | 112 ------ apps/JAWS3/jaws3/IO.h | 140 ------- apps/JAWS3/jaws3/Options.cpp | 25 -- apps/JAWS3/jaws3/Options.h | 41 --- apps/JAWS3/jaws3/Protocol_Handler.cpp | 65 ---- apps/JAWS3/jaws3/Protocol_Handler.h | 81 ----- apps/JAWS3/jaws3/Reactive_IO.cpp | 601 ------------------------------- apps/JAWS3/jaws3/Reactive_IO.h | 71 ---- apps/JAWS3/jaws3/Reactive_IO_Helpers.h | 305 ---------------- apps/JAWS3/jaws3/Signal_Task.cpp | 83 ----- apps/JAWS3/jaws3/Signal_Task.h | 33 -- apps/JAWS3/jaws3/Symbol_Table.cpp | 12 - apps/JAWS3/jaws3/Symbol_Table.h | 53 --- apps/JAWS3/jaws3/Synch_IO.cpp | 265 -------------- apps/JAWS3/jaws3/Synch_IO.h | 66 ---- apps/JAWS3/jaws3/THYBRID_Concurrency.cpp | 130 ------- apps/JAWS3/jaws3/THYBRID_Concurrency.h | 37 -- apps/JAWS3/jaws3/TPOOL_Concurrency.cpp | 80 ---- apps/JAWS3/jaws3/TPOOL_Concurrency.h | 32 -- apps/JAWS3/jaws3/TPR_Concurrency.cpp | 89 ----- apps/JAWS3/jaws3/TPR_Concurrency.h | 35 -- apps/JAWS3/jaws3/Task_Timer.cpp | 104 ------ apps/JAWS3/jaws3/Task_Timer.h | 56 --- apps/JAWS3/jaws3/Templates.cpp | 100 ----- apps/JAWS3/jaws3/Timer.cpp | 53 --- apps/JAWS3/jaws3/Timer.h | 94 ----- apps/JAWS3/jaws3/Timer_Helpers.cpp | 40 -- apps/JAWS3/jaws3/Timer_Helpers.h | 44 --- apps/JAWS3/jaws3/jaws.conf | 15 - apps/JAWS3/jaws3/jaws3.mpc | 78 ---- apps/JAWS3/jaws3/main.cpp | 33 -- 52 files changed, 5019 deletions(-) delete mode 100644 apps/JAWS3/jaws3/Asynch_IO.cpp delete mode 100644 apps/JAWS3/jaws3/Asynch_IO.h delete mode 100644 apps/JAWS3/jaws3/Asynch_IO_Helpers.h delete mode 100644 apps/JAWS3/jaws3/Cached_Allocator_T.cpp delete mode 100644 apps/JAWS3/jaws3/Cached_Allocator_T.h delete mode 100644 apps/JAWS3/jaws3/Concurrency.cpp delete mode 100644 apps/JAWS3/jaws3/Concurrency.h delete mode 100644 apps/JAWS3/jaws3/Concurrency_T.cpp delete mode 100644 apps/JAWS3/jaws3/Concurrency_T.h delete mode 100644 apps/JAWS3/jaws3/Config_File.cpp delete mode 100644 apps/JAWS3/jaws3/Config_File.h delete mode 100644 apps/JAWS3/jaws3/Datagram.cpp delete mode 100644 apps/JAWS3/jaws3/Datagram.h delete mode 100644 apps/JAWS3/jaws3/Event_Completer.cpp delete mode 100644 apps/JAWS3/jaws3/Event_Completer.h delete mode 100644 apps/JAWS3/jaws3/Event_Dispatcher.cpp delete mode 100644 apps/JAWS3/jaws3/Event_Dispatcher.h delete mode 100644 apps/JAWS3/jaws3/Event_Result.h delete mode 100644 apps/JAWS3/jaws3/Export.h delete mode 100644 apps/JAWS3/jaws3/FILE.cpp delete mode 100644 apps/JAWS3/jaws3/FILE.h delete mode 100644 apps/JAWS3/jaws3/IO.cpp delete mode 100644 apps/JAWS3/jaws3/IO.h delete mode 100644 apps/JAWS3/jaws3/Options.cpp delete mode 100644 apps/JAWS3/jaws3/Options.h delete mode 100644 apps/JAWS3/jaws3/Protocol_Handler.cpp delete mode 100644 apps/JAWS3/jaws3/Protocol_Handler.h delete mode 100644 apps/JAWS3/jaws3/Reactive_IO.cpp delete mode 100644 apps/JAWS3/jaws3/Reactive_IO.h delete mode 100644 apps/JAWS3/jaws3/Reactive_IO_Helpers.h delete mode 100644 apps/JAWS3/jaws3/Signal_Task.cpp delete mode 100644 apps/JAWS3/jaws3/Signal_Task.h delete mode 100644 apps/JAWS3/jaws3/Symbol_Table.cpp delete mode 100644 apps/JAWS3/jaws3/Symbol_Table.h delete mode 100644 apps/JAWS3/jaws3/Synch_IO.cpp delete mode 100644 apps/JAWS3/jaws3/Synch_IO.h delete mode 100644 apps/JAWS3/jaws3/THYBRID_Concurrency.cpp delete mode 100644 apps/JAWS3/jaws3/THYBRID_Concurrency.h delete mode 100644 apps/JAWS3/jaws3/TPOOL_Concurrency.cpp delete mode 100644 apps/JAWS3/jaws3/TPOOL_Concurrency.h delete mode 100644 apps/JAWS3/jaws3/TPR_Concurrency.cpp delete mode 100644 apps/JAWS3/jaws3/TPR_Concurrency.h delete mode 100644 apps/JAWS3/jaws3/Task_Timer.cpp delete mode 100644 apps/JAWS3/jaws3/Task_Timer.h delete mode 100644 apps/JAWS3/jaws3/Templates.cpp delete mode 100644 apps/JAWS3/jaws3/Timer.cpp delete mode 100644 apps/JAWS3/jaws3/Timer.h delete mode 100644 apps/JAWS3/jaws3/Timer_Helpers.cpp delete mode 100644 apps/JAWS3/jaws3/Timer_Helpers.h delete mode 100644 apps/JAWS3/jaws3/jaws.conf delete mode 100644 apps/JAWS3/jaws3/jaws3.mpc delete mode 100644 apps/JAWS3/jaws3/main.cpp (limited to 'apps/JAWS3/jaws3') diff --git a/apps/JAWS3/jaws3/Asynch_IO.cpp b/apps/JAWS3/jaws3/Asynch_IO.cpp deleted file mode 100644 index 811c3d88a6f..00000000000 --- a/apps/JAWS3/jaws3/Asynch_IO.cpp +++ /dev/null @@ -1,308 +0,0 @@ -// $Id$ - -#ifndef JAWS_BUILD_DLL -#define JAWS_BUILD_DLL -#endif /*JAWS_BUILD_DLL*/ - -#include "ace/config-lite.h" - -#include "jaws3/IO.h" -#include "jaws3/Asynch_IO.h" -#include "jaws3/Event_Completer.h" -#include "jaws3/Event_Result.h" - -#if defined (ACE_HAS_AIO_CALLS) || defined (ACE_WIN32) - -#include "jaws3/Asynch_IO_Helpers.h" - -void -JAWS_Asynch_IO::send ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , void *act - ) -{ - JAWS_EC_AH_Adapter *jecaha; - jecaha = JAWS_EC_AH_Adapter::make (completer); - - ACE_Asynch_Write_Stream asynch_write_stream; - - if (jecaha == 0 - || asynch_write_stream.open (*jecaha, handle) == -1 - || asynch_write_stream.write (*mb, mb->length (), act) == -1) - { - delete jecaha; - JAWS_Event_Result io_result ( 0 - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_SEND_FAIL - ); - - if (completer) - completer->output_complete (io_result, act); - } -} - - -void -JAWS_Asynch_IO::recv ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , void *act - ) -{ - JAWS_EC_AH_Adapter *jecaha; - jecaha = JAWS_EC_AH_Adapter::make (completer); - - ACE_Asynch_Read_Stream asynch_read_stream; - - if (jecaha == 0 - || asynch_read_stream.open (*jecaha, handle) == -1 - || asynch_read_stream.read (*mb, mb->space (), act) == -1) - { - delete jecaha; - JAWS_Event_Result io_result ( 0 - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_RECV_FAIL - ); - - if (completer) - completer->output_complete (io_result, act); - } -} - - -void -JAWS_Asynch_IO::transmit ( ACE_HANDLE handle - , ACE_HANDLE source - , JAWS_Event_Completer *completer - , void *act - , ACE_Message_Block *header - , ACE_Message_Block *trailer - ) -{ - JAWS_EC_AH_Adapter *jecaha; - jecaha = JAWS_EC_AH_Adapter::make (completer); - - ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer = 0; - header_and_trailer = - new ACE_Asynch_Transmit_File::Header_And_Trailer ( header - , header->length () - , trailer - , trailer->length () - ); - - ACE_Asynch_Transmit_File asynch_transmit_file; - - if (source == ACE_INVALID_HANDLE - || jecaha == 0 - || header_and_trailer == 0 - || asynch_transmit_file.open (*jecaha, handle) == -1 - || asynch_transmit_file.transmit_file ( source - , header_and_trailer - , 0 - , 0 - , 0 - , 0 - , 0 - , act - ) == -1) - { - delete jecaha; - delete header_and_trailer; - JAWS_Event_Result io_result ( 0 - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_TRANSMIT_FAIL - ); - - if (completer) - completer->output_complete (io_result, act); - } -} - - - -JAWS_EC_AH_Adapter * -JAWS_EC_AH_Adapter::make (JAWS_Event_Completer *completer) -{ - return new JAWS_EC_AH_Adapter (completer); -} - -void -JAWS_EC_AH_Adapter -::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result) -{ - JAWS_Event_Result io_result; - - io_result = this->make_io_result ( result - , JAWS_Event_Result::JE_RECV_OK - , JAWS_Event_Result::JE_RECV_FAIL - ); - // More useful diagnostics not implemented yet. - - void *act = ACE_const_cast (void *, result.act ()); - - this->completer_->input_complete (io_result, act); - delete this; -} - -void -JAWS_EC_AH_Adapter -::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result) -{ - JAWS_Event_Result io_result; - - io_result = this->make_io_result ( result - , JAWS_Event_Result::JE_SEND_OK - , JAWS_Event_Result::JE_SEND_FAIL - ); - // More useful diagnostics not implemented yet. - - void *act = ACE_const_cast (void *, result.act ()); - - this->completer_->output_complete (io_result, act); - delete this; -} - -void -JAWS_EC_AH_Adapter -::handle_transmit_file (const ACE_Asynch_Transmit_File::Result &result) -{ - JAWS_Event_Result io_result; - - io_result = this->make_io_result ( result - , JAWS_Event_Result::JE_TRANSMIT_OK - , JAWS_Event_Result::JE_TRANSMIT_FAIL - ); - // More useful diagnostics not implemented yet. - // Watch out for files not opened in overlapped IO mode. - - void *act = ACE_const_cast (void *, result.act ()); - - this->completer_->output_complete (io_result, act); - delete this; -} - -JAWS_Event_Result -JAWS_EC_AH_Adapter -::make_io_result ( const ACE_Asynch_Result &result - , JAWS_Event_Result::JE_REASON reason_ok - , JAWS_Event_Result::JE_REASON reason_fail - ) -{ - size_t bytes = result.bytes_transferred (); - - JAWS_Event_Result::JE_STATUS status; - JAWS_Event_Result::JE_REASON reason; - - if (result.success ()) - { - status = JAWS_Event_Result::JE_OK; - reason = reason_ok; - } - else - { - status = JAWS_Event_Result::JE_ERROR; - reason = reason_fail; - } - - JAWS_Event_Result io_result (bytes, status, reason); - - return io_result; -} - -#else /* EMULATE AIO WITH REACTOR */ - -#include "jaws3/Reactive_IO.h" - -void -JAWS_Asynch_IO::send ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , void *act - ) -{ - JAWS_Reactive_IO::instance ()->send (handle, mb, completer, act); -} - - -void -JAWS_Asynch_IO::recv ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , void *act - ) -{ - JAWS_Reactive_IO::instance ()->recv (handle, mb, completer, act); -} - - -void -JAWS_Asynch_IO::transmit ( ACE_HANDLE handle - , ACE_HANDLE source - , JAWS_Event_Completer *completer - , void *act - , ACE_Message_Block *header - , ACE_Message_Block *trailer - ) -{ - JAWS_Reactive_IO::instance ()->transmit ( handle - , source - , completer - , act - , header - , trailer - ); -} - -#endif /* defined (ACE_HAS_AIO_CALLS) || defined (ACE_WIN32) */ - -// For now, we will simulate timed Asynch IO with timed Reactive IO. -// In the future, we will implement the timed Asynch IO with timers -// and Asynch IO cancelation. - -#include "jaws3/Reactive_IO.h" - -void -JAWS_Asynch_IO::send ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act - ) -{ - JAWS_Reactive_IO::instance ()->send (handle, mb, completer, tv, act); -} - - -void -JAWS_Asynch_IO::recv ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act - ) -{ - JAWS_Reactive_IO::instance ()->recv (handle, mb, completer, tv, act); -} - - -void -JAWS_Asynch_IO::transmit ( ACE_HANDLE handle - , ACE_HANDLE source - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act - , ACE_Message_Block *header - , ACE_Message_Block *trailer - ) -{ - JAWS_Reactive_IO::instance ()->transmit ( handle - , source - , completer - , tv - , act - , header - , trailer - ); -} - diff --git a/apps/JAWS3/jaws3/Asynch_IO.h b/apps/JAWS3/jaws3/Asynch_IO.h deleted file mode 100644 index b62a0e4b285..00000000000 --- a/apps/JAWS3/jaws3/Asynch_IO.h +++ /dev/null @@ -1,71 +0,0 @@ -/* -*- c++ -*- */ -// $Id$ - -#ifndef JAWS_ASYNCH_IO_H -#define JAWS_ASYNCH_IO_H - -#include "ace/OS.h" -#include "ace/Asynch_IO.h" -#include "ace/Singleton.h" - -#include "jaws3/Export.h" -#include "jaws3/IO.h" -#include "jaws3/Event_Result.h" - -class JAWS_Asynch_IO; - -class JAWS_Export JAWS_Asynch_IO : public JAWS_IO_Impl -{ -public: - - static JAWS_Asynch_IO * instance (void) - { - return ACE_Singleton::instance (); - } - - void send ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , void *act = 0 - ); - - void recv ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , void *act = 0 - ); - - void transmit ( ACE_HANDLE handle - , ACE_HANDLE source - , JAWS_Event_Completer *completer - , void *act = 0 - , ACE_Message_Block *header = 0 - , ACE_Message_Block *trailer = 0 - ); - - void send ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act = 0 - ); - - void recv ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act = 0 - ); - - void transmit ( ACE_HANDLE handle - , ACE_HANDLE source - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act = 0 - , ACE_Message_Block *header = 0 - , ACE_Message_Block *trailer = 0 - ); - -}; - -#endif /* JAWS_ASYNCH_IO_H */ diff --git a/apps/JAWS3/jaws3/Asynch_IO_Helpers.h b/apps/JAWS3/jaws3/Asynch_IO_Helpers.h deleted file mode 100644 index 473b5cbc842..00000000000 --- a/apps/JAWS3/jaws3/Asynch_IO_Helpers.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- c++ -*- */ -// $Id$ - -#ifndef JAWS_ASYNCH_IO_HELPERS_H -#define JAWS_ASYNCH_IO_HELPERS_H - -#include "ace/OS.h" -#include "ace/Asynch_IO.h" -#include "ace/Singleton.h" - -#include "jaws3/IO.h" -#include "jaws3/Event_Result.h" -#include "jaws3/Event_Completer.h" - -class JAWS_Asynch_IO; - -class JAWS_EC_AH_Adapter : public ACE_Handler -// = TITLE -// A JAWS_Event_Completer - ACE_Handler adapter. -// -// = DESCRIPTION -// This class will be conditionally #included by jaws3/Asynch_IO.cpp -// if the given platform supports POSIX or WIN32 asynch IO. -{ -public: - - static JAWS_EC_AH_Adapter * make (JAWS_Event_Completer *); - - void handle_read_stream (const ACE_Asynch_Read_Stream::Result &result); - - void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result); - - void handle_transmit_file (const ACE_Asynch_Transmit_File::Result &result); - -private: - - JAWS_EC_AH_Adapter (JAWS_Event_Completer *completer) - : completer_ (completer) - { - } - -protected: - - JAWS_Event_Result make_io_result ( const ACE_Asynch_Result &result - , JAWS_Event_Result::JE_REASON reason_ok - , JAWS_Event_Result::JE_REASON reason_fail - ); - -private: - - JAWS_Event_Completer *completer_; - -}; - -#endif /* JAWS_ASYNCH_IO_HELPERS_H */ diff --git a/apps/JAWS3/jaws3/Cached_Allocator_T.cpp b/apps/JAWS3/jaws3/Cached_Allocator_T.cpp deleted file mode 100644 index 8b4e8e5db58..00000000000 --- a/apps/JAWS3/jaws3/Cached_Allocator_T.cpp +++ /dev/null @@ -1,140 +0,0 @@ -// $Id$ - -#ifndef JAWS_CACHED_ALLOCATOR_T_CPP -#define JAWS_CACHED_ALLOCATOR_T_CPP - -#include "jaws3/Cached_Allocator_T.h" - -template char * -JAWS_Cached_Allocator::get_next_pool (char *pool) -{ - char *next = 0; - char *next_indirect = pool + (this->pool_size_); - memcpy (&next, next_indirect, sizeof (char *)); - return next; -} - -template void -JAWS_Cached_Allocator::set_next_pool (char *pool, char *next_pool) -{ - char *next_indirect = pool + (this->pool_size_); - memcpy (next_indirect, &next_pool, sizeof (char *)); -} - -template void -JAWS_Cached_Allocator::extend_pool (void) -{ - char *new_pool = 0; - ACE_NEW (new_pool, char[this->pool_size_ + sizeof (char *)]); - - for (size_t c = 0; c < (this->pool_size_ / sizeof (T)); c++) - { - void* placement = new_pool + c * sizeof(T); - this->free_list_.add (new (placement) ACE_Cached_Mem_Pool_Node); - this->set_next_pool (new_pool, 0); - } - - if (this->pool_head_ == 0) - this->pool_head_ = this->pool_tail_ = new_pool; - else - this->set_next_pool (this->pool_tail_, new_pool); - - this->pool_tail_ = new_pool; -} - -template -JAWS_Cached_Allocator::JAWS_Cached_Allocator (size_t n_chunks) - : pool_size_ (n_chunks * sizeof (T)) - , pool_head_ (0) - , pool_tail_ (0) - , free_list_ (ACE_PURE_FREE_LIST) -{ - this->extend_pool (); -} - -template -JAWS_Cached_Allocator::~JAWS_Cached_Allocator (void) -{ - char *curr = this->pool_head_; - - while (curr) - { - char *next = this->get_next_pool (curr); - delete [] curr; - curr = next; - } -} - -template void * -JAWS_Cached_Allocator::malloc (size_t nbytes) -{ - if (nbytes > sizeof (T)) - return NULL; - - ACE_Cached_Mem_Pool_Node *node = 0; - node = this->free_list_.remove (); - - if (node == 0) - { - this->extend_pool (); - node = this->free_list_.remove (); - // ASSERT node != 0 - } - - // addr() call is really not absolutely necessary because of the way - // ACE_Cached_Mem_Pool_Node's internal structure arranged. - return node->addr (); -} - -template void -JAWS_Cached_Allocator::free (void *ptr) -{ - this->free_list_.add ((ACE_Cached_Mem_Pool_Node *) ptr); -} - - -template JAWS_Cached_Allocator * -JAWS_TSS_Cached_Allocator::ts_allocator (void) -{ - JAWS_Cached_Allocator *ts_obj = 0; - - ts_obj = this->ts_allocator_.ts_object (); - - // Don't need double-check locking since this value is - // obtained from a thread specific context. - if (ts_obj == 0) - { - ACE_NEW_RETURN (ts_obj, - JAWS_CACHED_ALLOCATOR(T) (this->n_chunks_), - 0); - this->ts_allocator_.ts_object (ts_obj); - } - - return ts_obj; -} - -template -JAWS_TSS_Cached_Allocator::JAWS_TSS_Cached_Allocator (size_t n_chunks) - : n_chunks_ (n_chunks) -{ -} - -template -JAWS_TSS_Cached_Allocator::~JAWS_TSS_Cached_Allocator (void) -{ -} - -template void * -JAWS_TSS_Cached_Allocator::malloc (size_t nbytes) -{ - return this->ts_allocator ()->malloc (nbytes); -} - -template void -JAWS_TSS_Cached_Allocator::free (void *ptr) -{ - this->ts_allocator ()->free (ptr); -} - - -#endif /* JAWS_CACHED_ALLOCATOR_T_CPP */ diff --git a/apps/JAWS3/jaws3/Cached_Allocator_T.h b/apps/JAWS3/jaws3/Cached_Allocator_T.h deleted file mode 100644 index 589d5710e47..00000000000 --- a/apps/JAWS3/jaws3/Cached_Allocator_T.h +++ /dev/null @@ -1,107 +0,0 @@ -/* -*- c++ -*- */ -// $Id$ - -#ifndef JAWS_CACHED_ALLOCATOR_T_H -#define JAWS_CACHED_ALLOCATOR_T_H - -#include "ace/ACE.h" -#include "ace/Synch.h" -#include "ace/Malloc.h" -#include "ace/Free_List.h" - -#define JAWS_DEFAULT_ALLOCATOR_CHUNKS 10 -#define JAWS_CACHED_ALLOCATOR(T) \ - JAWS_Cached_Allocator< T, ACE_SYNCH_NULL_MUTEX > - -template -class JAWS_Cached_Allocator : public ACE_New_Allocator -// = TITLE -// Create a cached memory pool with chunks each with -// sizeof () size. -// -// = DESCRIPTION -// This class enables caching of dynamically allocated, -// fixed-sized classes. -{ -public: - - JAWS_Cached_Allocator (size_t n_chunks = JAWS_DEFAULT_ALLOCATOR_CHUNKS); - - ~JAWS_Cached_Allocator (void); - - void* malloc (size_t); - // get a chunk of memory from free store. - - void free (void *); - // return a chunk of memory back to free store. - -protected: - - char * get_next_pool (char *pool); - - void set_next_pool (char *pool, char *next_pool); - - void extend_pool (void); - -private: - - size_t pool_size_; - - char *pool_head_; - // Head of memory pool. - - char *pool_tail_; - // Tail of memory pool. - - ACE_Locked_Free_List, ACE_LOCK> free_list_; - // Maintain a cached memory free list. - -}; - - - -template -class JAWS_TSS_Cached_Allocator : public ACE_New_Allocator -// = TITLE -// Create a thread specific cached memory pool with -// chunks each with sizeof () size. -// -// = DESCRIPTION -// This class enables caching of dynamically allocated, -// fixed-sized classes. -{ -public: - - JAWS_TSS_Cached_Allocator (size_t n_chunks = JAWS_DEFAULT_ALLOCATOR_CHUNKS); - - ~JAWS_TSS_Cached_Allocator (void); - - void * malloc (size_t); - // get a chunk of memory from free store. - - void free (void *); - // return a chunk of memory back to free store. - -protected: - - JAWS_Cached_Allocator * ts_allocator (void); - -private: - - size_t n_chunks_; - - ACE_TSS_TYPE (JAWS_CACHED_ALLOCATOR(T)) ts_allocator_; - -}; - - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "jaws3/Cached_Allocator_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Cached_Allocator_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - - -#endif /* JAWS_CACHED_ALLOCATOR_T_H */ diff --git a/apps/JAWS3/jaws3/Concurrency.cpp b/apps/JAWS3/jaws3/Concurrency.cpp deleted file mode 100644 index 3844950c25d..00000000000 --- a/apps/JAWS3/jaws3/Concurrency.cpp +++ /dev/null @@ -1,104 +0,0 @@ -// $Id$ - -#include "ace/Message_Block.h" -#include "ace/Singleton.h" -#include "ace/Synch_Traits.h" -#include "ace/Null_Mutex.h" - -#ifndef JAWS_BUILD_DLL -#define JAWS_BUILD_DLL -#endif - -#include "jaws3/Concurrency.h" -#include "jaws3/TPOOL_Concurrency.h" -#include "jaws3/TPR_Concurrency.h" -#include "jaws3/THYBRID_Concurrency.h" -#include "jaws3/Options.h" - - -typedef ACE_Singleton - JAWS_Empty_Message_Block; - - -int -JAWS_Concurrency_Impl::svc (void) -{ - JAWS_Protocol_Handler *ph; - - while (this->getq (ph) != -1) - { - if (ph == 0) - continue; - - if (ph->service () == -1) - { - // TODO: Do I really want to call close here, or - // let the protocol handler close itself? - ph->dismiss (); - continue; - } - } - - return 0; -} - - -JAWS_Concurrency_Bridge -::JAWS_Concurrency_Bridge (JAWS_Concurrency_Impl *impl) - : impl_ (impl) -{ - if (this->impl_ == 0) - { - const char *concurrency; - concurrency = JAWS_Options::instance ()->getenv ("JAWS_CONCURRENCY"); - if (concurrency == 0) - concurrency = JAWS_DEFAULT_CONCURRENCY; - - if (ACE_OS::strcasecmp (concurrency, "TPR") == 0) - this->impl_ = JAWS_TPR_Concurrency::instance (); - else if (ACE_OS::strcasecmp (concurrency, "TPOOL") == 0) - this->impl_ = JAWS_TPOOL_Concurrency::instance (); - else if (ACE_OS::strcasecmp (concurrency, "THYBRID") == 0) - this->impl_ = JAWS_THYBRID_Concurrency::instance (); - else - this->impl_ = JAWS_THYBRID_Concurrency::instance (); - // Since synchronous IO is the default IO, need an aggressive - // default concurrency mechanism. - } -} - - -int -JAWS_Concurrency_Bridge -::putq (JAWS_Protocol_Handler *ph) -{ - return this->impl_->putq (ph); -} - - -int -JAWS_Concurrency_Bridge -::getq (JAWS_Protocol_Handler *&ph) -{ - return this->impl_->getq (ph); -} - - -void -JAWS_Concurrency_Bridge::shutdown (void) -{ - ACE_Message_Block *empty_mb = JAWS_Empty_Message_Block::instance (); - JAWS_CONCURRENCY_TASK *task; - - task = JAWS_THYBRID_Concurrency::instance (); - task->putq (empty_mb); - task->wait (); - - task = JAWS_TPOOL_Concurrency::instance (); - task->putq (empty_mb); - task->wait (); - - task = JAWS_TPR_Concurrency::instance (); - task->putq (empty_mb); - task->wait (); -} diff --git a/apps/JAWS3/jaws3/Concurrency.h b/apps/JAWS3/jaws3/Concurrency.h deleted file mode 100644 index 237e274a120..00000000000 --- a/apps/JAWS3/jaws3/Concurrency.h +++ /dev/null @@ -1,74 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -#ifndef JAWS_CONCURRENCY_H -#define JAWS_CONCURRENCY_H - -#include "ace/Task.h" -#include "ace/Singleton.h" -#include "ace/Synch_Traits.h" - -#include "jaws3/Export.h" -#include "jaws3/Protocol_Handler.h" - - -typedef ACE_Task JAWS_CONCURRENCY_TASK; - -class JAWS_Export JAWS_Concurrency_Impl : public JAWS_CONCURRENCY_TASK -{ -public: - - virtual ~JAWS_Concurrency_Impl (void) {}; - - virtual int putq (JAWS_Protocol_Handler *ph) = 0; - - virtual int getq (JAWS_Protocol_Handler *&ph) = 0; - - int svc (void); - -}; - - -// Include the templates here. -#include "jaws3/Concurrency_T.h" - - -ACE_TEMPLATE_SPECIALIZATION -class JAWS_Export JAWS_Concurrency_Bridge -{ -public: - - JAWS_Concurrency_Bridge (JAWS_Concurrency_Impl *impl = 0); - - int putq (JAWS_Protocol_Handler *ph); - int getq (JAWS_Protocol_Handler *&ph); - - void shutdown (void); - -protected: - - JAWS_Concurrency_Impl *impl_; - -}; - - -#ifndef JAWS_CONCURRENCY_CONCRETE_IMPL -#define JAWS_CONCURRENCY_CONCRETE_IMPL JAWS_Concurrency_Impl -#endif /* JAWS_CONCURRENCY_CONCRETE_IMPL */ - - -class JAWS_Export JAWS_Concurrency - : public JAWS_Concurrency_Bridge -{ -public: - - static JAWS_Concurrency * instance (void) - { - return ACE_Singleton::instance (); - } - -}; - - -#endif /* JAWS_CONCURRENCY_H */ diff --git a/apps/JAWS3/jaws3/Concurrency_T.cpp b/apps/JAWS3/jaws3/Concurrency_T.cpp deleted file mode 100644 index ea86da1c989..00000000000 --- a/apps/JAWS3/jaws3/Concurrency_T.cpp +++ /dev/null @@ -1,47 +0,0 @@ -// $Id$ - -#include "ace/Message_Block.h" -#include "ace/Singleton.h" -#include "ace/Synch_Traits.h" -#include "ace/Null_Mutex.h" - -#include "jaws3/Concurrency_T.h" - -typedef ACE_Singleton - JAWS_Empty_Message_Block; - - -template -JAWS_Concurrency_Bridge -::JAWS_Concurrency_Bridge (CONCURRENCY_IMPL *impl) - : impl_ (impl) -{ - if (this->impl_ == 0) - this->impl_ = CONCURRENCY_IMPL::instance (); -} - - -template int -JAWS_Concurrency_Bridge::putq (JAWS_Protocol_Handler *ph) -{ - return this->impl_->putq (ph); -} - - -template int -JAWS_Concurrency_Bridge::getq (JAWS_Protocol_Handler *&ph) -{ - return this->impl_->getq (ph); -} - - -template void -JAWS_Concurrency_Bridge::shutdown (void) -{ - ACE_Message_Block *empty_mb = JAWS_Empty_Message_Block::instance (); - JAWS_CONCURRENCY_TASK *task; - - task = this->impl_; - task->putq (empty_mb); - task->wait (); -} diff --git a/apps/JAWS3/jaws3/Concurrency_T.h b/apps/JAWS3/jaws3/Concurrency_T.h deleted file mode 100644 index 788129d74cf..00000000000 --- a/apps/JAWS3/jaws3/Concurrency_T.h +++ /dev/null @@ -1,50 +0,0 @@ -/* -*- c++ -*- */ -// $Id$ - -#ifndef JAWS_CONCURRENCY_T_H -#define JAWS_CONCURRENCY_T_H - -// This gets me the ACE #defines without having to #include "ace/OS.h". -#include "ace/OS.h" - -class JAWS_Protocol_Handler; - -template -class JAWS_Concurrency_Bridge -// = TITLE -// The Concurrency Bridge uses the Concrete Bridge pattern. -// -// = DESCRIPTION -// The Concurrency Bridge class plays the role of Abstraction -// in the Bridge pattern. If the CONCURRENCY_IMPL is the -// base class JAWS_Concurrency_Impl, then it plays the classic -// role. If the CONCURRENCY_IMPL is one of the Concrete -// Implementors, then its role is more that of an Adapter, -// which is like Bridge, but without the polymorphism overhead. -// -{ -public: - - JAWS_Concurrency_Bridge (CONCURRENCY_IMPL *impl = 0); - - int putq (JAWS_Protocol_Handler *ph); - int getq (JAWS_Protocol_Handler *&ph); - - void shutdown (void); - -protected: - - CONCURRENCY_IMPL *impl_; - -}; - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "jaws3/Concurrency_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Concurrency_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - - -#endif /* JAWS_CONCURRENCY_T_H */ diff --git a/apps/JAWS3/jaws3/Config_File.cpp b/apps/JAWS3/jaws3/Config_File.cpp deleted file mode 100644 index 5793aa60dc5..00000000000 --- a/apps/JAWS3/jaws3/Config_File.cpp +++ /dev/null @@ -1,308 +0,0 @@ -// $Id$ - -#include "ace/OS_NS_stdlib.h" -#include "ace/OS_NS_string.h" -#include "ace/FILE_Connector.h" -#include "ace/Message_Block.h" -#include "ace/Singleton.h" -#include "ace/Unbounded_Queue.h" - -#ifndef JAWS_BUILD_DLL -#define JAWS_BUILD_DLL -#endif - -#include "jaws3/Config_File.h" -#include "jaws3/Symbol_Table.h" - -// = Helper class to manage "constant" strings. - -class JAWS_strings -{ -public: - - ~JAWS_strings (void) - { - void *p; - while (this->queue_.dequeue_head (p) != -1) - ACE_OS::free (p); - } - - const ACE_TCHAR * duplicate (const ACE_TCHAR *s) - { - void **x; - const ACE_TCHAR *d = 0; - ACE_Unbounded_Queue_Iterator iter (this->queue_); - - while (iter.next (x)) - { - d = (const ACE_TCHAR *) *x; - if (ACE_OS::strcmp (d, s) == 0) - break; - d = 0; - iter.advance (); - } - - if (d == 0) - { - d = ACE_OS::strdup (s); - this->queue_.enqueue_tail ((void *) d); - } - - return d; - } - -private: - - ACE_Unbounded_Queue queue_; - -}; - - -// = Underlying implementation class. - - -class JAWS_Config_File_Impl -{ -public: - - JAWS_Config_File_Impl (const ACE_TCHAR *config_file); - ~JAWS_Config_File_Impl (void); - int find (const ACE_TCHAR *key, const ACE_TCHAR *&value); - - void parse_file (void); - void reset (void); - void dump (void); - - enum { JAWS_CONFIG_FILE_SYMBOL_TABLE_SIZE = 211 }; - -private: - - ACE_FILE_Addr faddr_; - JAWS_strings *strings_; - JAWS_Symbol_Table *symbols_; - -}; - -JAWS_Config_File_Impl::JAWS_Config_File_Impl (const ACE_TCHAR *config_file) - : faddr_ (config_file) - , strings_ (0) - , symbols_ (0) -{ - this->strings_ = new JAWS_strings; - this->symbols_ = new JAWS_Symbol_Table (JAWS_CONFIG_FILE_SYMBOL_TABLE_SIZE); - this->parse_file (); -} - -JAWS_Config_File_Impl::~JAWS_Config_File_Impl (void) -{ - delete this->symbols_; - this->symbols_ = 0; - delete this->strings_; - this->strings_ = 0; -} - -int -JAWS_Config_File_Impl::find (const ACE_TCHAR *key, const ACE_TCHAR *&value) -{ - return this->symbols_->find (key, value); -} - -void -JAWS_Config_File_Impl::parse_file (void) -{ - ACE_FILE_Connector fconnector; - ACE_FILE_IO fio; - - if (fconnector.connect ( fio - , this->faddr_ - , 0 - , ACE_Addr::sap_any - , 0 - , O_RDONLY - ) == -1) - return; - - ACE_Message_Block buffer (8192); - ACE_Message_Block line (4096); - ssize_t count = 0; - const ACE_TCHAR *sym_name; - const ACE_TCHAR *sym_value; - int last_line_was_read = 0; - ACE_TCHAR *end_of_current_line = 0; - ACE_TCHAR *p = 0; - - while (last_line_was_read - || (count = fio.recv (buffer.wr_ptr (), buffer.space () - 2)) >= 0) - { - end_of_current_line = 0; - - // Make sure input is newline terminated if it is the last line, - // and always null terminated. - if (! last_line_was_read) - { - if (count > 0) - { - buffer.wr_ptr (count); - // Scan forward for at least one newline character - p = buffer.rd_ptr (); - while (p != buffer.wr_ptr ()) - { - if (*p == '\n') - break; - p++; - } - - if (p == buffer.wr_ptr ()) - continue; - - end_of_current_line = p; - } - else - { - if (buffer.wr_ptr ()[-1] != '\n') - { - buffer.wr_ptr ()[0] = '\n'; - buffer.wr_ptr (1); - } - - last_line_was_read = 1; - } - - buffer.wr_ptr ()[0] = '\0'; - } - - if (end_of_current_line == 0) - { - end_of_current_line = buffer.rd_ptr (); - while (*end_of_current_line != '\n') - end_of_current_line++; - } - - // If buffer is not pointing to a continuation line, or there is - // no more input, then can commit the scanned configuration - // line. - if (line.length () != 0 - && ((last_line_was_read && buffer.length () == 0) - || (buffer.rd_ptr ()[0] != ' ' - && buffer.rd_ptr ()[0] != '\t'))) - { - ACE_TCHAR *name = 0; - ACE_TCHAR *value = 0; - - name = line.rd_ptr (); - for (p = name; *p != '\0'; p++) - { - if (*p == '=') - { - line.rd_ptr (p+1); - while (p != name && (p[-1] == ' ' || p[-1] == '\t')) - p--; - *p = '\0'; - } - } - - if (*name) - { - value = line.rd_ptr (); - while (*value == ' ' || *value == '\t') - value++; - p = line.wr_ptr (); - while (p != value && (p[-1] == ' ' || p[-1] == '\t')) - p--; - *p = '\0'; - - sym_name = this->strings_->duplicate (name); - sym_value = this->strings_->duplicate (value); - this->symbols_->rebind (sym_name, sym_value); - } - - line.reset (); - } - - // If we are done, we are done! - if (last_line_was_read && buffer.length () == 0) - break; - - // If the buffer is pointing at a comment line, ignore it. - if (buffer.rd_ptr ()[0] == '#' - || buffer.rd_ptr ()[0] == '\n' - || (buffer.rd_ptr ()[0] == '\r' && buffer.rd_ptr ()[1] == '\n')) - { - buffer.rd_ptr (end_of_current_line + 1); - buffer.crunch (); - continue; - } - - // Whatever is left is either the start of a name-value-pair or a - // continuation of one. - line.copy (buffer.rd_ptr (), - end_of_current_line - buffer.rd_ptr ()); - p = line.wr_ptr (); - while (p != line.rd_ptr () && (p[-1] == ' ' || p[-1] == '\t')) - p--; - line.wr_ptr (p); - line.wr_ptr ()[0] = '\0'; - buffer.rd_ptr (end_of_current_line + 1); - buffer.crunch (); - } - - fio.close (); -} - -void -JAWS_Config_File_Impl::reset (void) -{ - delete this->symbols_; - delete this->strings_; - this->strings_ = new JAWS_strings; - this->symbols_ = new JAWS_Symbol_Table (JAWS_CONFIG_FILE_SYMBOL_TABLE_SIZE); - this->parse_file (); -} - -void -JAWS_Config_File_Impl::dump (void) -{ - JAWS_SYMBOL_TABLE_ITERATOR iter (*this->symbols_); - JAWS_SYMBOL_TABLE_ENTRY *entry; - - while (iter.next (entry)) - { - ACE_DEBUG ((LM_DEBUG, "[%D|%t] %s=%s\n", - entry->ext_id_, - entry->int_id_)); - iter.advance (); - } -} - -JAWS_Config_File::JAWS_Config_File (const ACE_TCHAR *config_file, - const ACE_TCHAR *config_dir) -{ - ACE_TCHAR filename[MAXPATHLEN]; - ACE_OS::strcpy (filename, config_dir); - ACE_OS::strcat (filename, config_file); - - this->impl_ = new JAWS_Config_File_Impl (filename); -} - -int -JAWS_Config_File::find (const ACE_TCHAR *key, const ACE_TCHAR *&value) -{ - return this->impl_->find (key, value); -} - -void -JAWS_Config_File::reset (void) -{ - this->impl_->reset (); -} - -void -JAWS_Config_File::dump (void) -{ - this->impl_->dump (); -} - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/apps/JAWS3/jaws3/Config_File.h b/apps/JAWS3/jaws3/Config_File.h deleted file mode 100644 index aab87c502ca..00000000000 --- a/apps/JAWS3/jaws3/Config_File.h +++ /dev/null @@ -1,73 +0,0 @@ -/* -*- c++ -*- */ -// $Id$ - -#ifndef JAWS_CONFIG_FILE_H -#define JAWS_CONFIG_FILE_H - -#include "jaws3/Export.h" - -class JAWS_Config_File; -class JAWS_Config_File_Impl; - -class JAWS_Export JAWS_Config_File -// = TITLE -// A simple configuration file manager. -// -// = DESCRIPTION -// Reads in a configuration file. The syntax of the configuration -// file is: -// = BEGIN -// := -// -// := [] -// -// := -// | -// -// := '=' -// -// := -// -// := [] [] -// -// := [] -// -// := [] -// -// := [] -// -// := '#' -// -// := [] -// = END -// No is to exceed 4094 characters. -{ -public: - - // = Initialization - - JAWS_Config_File (const ACE_TCHAR *config_file, - const ACE_TCHAR *config_dir = "./"); - // Parse the specified in the . - - // = Searching - - int find (const ACE_TCHAR *key, const ACE_TCHAR *&value); - // Find the associated with . - -public: - - void reset (void); - // Re-read the configuration file. - - void dump (void); - // Dump the values of all configuration variables. - -private: - - JAWS_Config_File_Impl *impl_; - // Opaque implementation. - -}; - -#endif /* JAWS_CONFIG_FILE_H */ diff --git a/apps/JAWS3/jaws3/Datagram.cpp b/apps/JAWS3/jaws3/Datagram.cpp deleted file mode 100644 index 3849e7afd1d..00000000000 --- a/apps/JAWS3/jaws3/Datagram.cpp +++ /dev/null @@ -1,86 +0,0 @@ -// $Id$ - - -#ifndef JAWS_BUILD_DLL -#define JAWS_BUILD_DLL -#endif /*JAWS_BUILD_DLL*/ - -#include "jaws3/Datagram.h" - - -JAWS_Datagram::JAWS_Datagram (JAWS_Datagram_Impl *impl) - : impl_ (impl) -{ -} - -void -JAWS_Datagram::accept ( const ACE_Addr &local_sap - , ACE_SOCK_Dgram &new_dgram - , JAWS_Event_Completer *completer - , void *act - ) -{ - this->impl_->accept (local_sap, new_dgram, completer, act); -} - -void -JAWS_Datagram::connect ( const ACE_Addr &remote_sap - , ACE_SOCK_Dgram &new_dgram - , JAWS_Event_Completer *completer - , void *act - ) -{ - this->impl_->connect (remote_sap, new_dgram, completer, act); -} - -void -JAWS_Datagram::connect ( const ACE_Addr &remote_sap - , ACE_SOCK_Dgram &new_dgram - , const ACE_Addr &local_sap - , JAWS_Event_Completer *completer - , void *act - ) -{ - this->impl_->connect (remote_sap, new_dgram, local_sap, completer, act); -} - -void -JAWS_Datagram::accept ( const ACE_Addr &local_sap - , ACE_SOCK_Dgram &new_dgram - , JAWS_Event_Completer *completer - , const ACE_Time_Value &timeout - , void *act - ) -{ - this->impl_->accept (local_sap, new_dgram, completer, timeout, act); -} - -void -JAWS_Datagram::connect ( const ACE_Addr &remote_sap - , ACE_SOCK_Dgram &new_dgram - , JAWS_Event_Completer *completer - , const ACE_Time_Value &timeout - , void *act - ) -{ - this->impl_->connect (remote_sap, new_dgram, completer, timeout, act); -} - -void -JAWS_Datagram::connect ( const ACE_Addr &remote_sap - , ACE_SOCK_Dgram &new_dgram - , const ACE_Addr &local_sap - , JAWS_Event_Completer *completer - , const ACE_Time_Value &timeout - , void *act - ) -{ - this->impl_->connect ( remote_sap - , new_dgram - , local_sap - , completer - , timeout - , act - ); -} - diff --git a/apps/JAWS3/jaws3/Datagram.h b/apps/JAWS3/jaws3/Datagram.h deleted file mode 100644 index 370088892de..00000000000 --- a/apps/JAWS3/jaws3/Datagram.h +++ /dev/null @@ -1,139 +0,0 @@ -/* -*- c++ -*- */ -// $Id$ - -#ifndef JAWS_DATAGRAM_H -#define JAWS_DATAGRAM_H - -#include "ace/Addr.h" -#include "ace/Synch.h" -#include "ace/Singleton.h" -#include "ace/SOCK_Dgram.h" - -#include "jaws3/Export.h" -#include "jaws3/Event_Completer.h" - -class JAWS_Export JAWS_Datagram_Impl -{ -public: - - virtual ~JAWS_Datagram_Impl (void) {} - - virtual void accept ( const ACE_Addr &local_sap - , ACE_SOCK_Dgram &new_dgram - , JAWS_Event_Completer *completer - , void *act = 0 - ) = 0; - // The address to new_dgram is passed back as the data member of - // the JAWS_Event_Result that is returned to the completer. - - virtual void connect ( const ACE_Addr &remote_sap - , ACE_SOCK_Dgram &new_dgram - , JAWS_Event_Completer *completer - , void *act = 0 - ) = 0; - // The address to new_dgram is passed back as the data member of - // the JAWS_Event_Result that is returned to the completer. - // ADDR_ANY is assumed for the local access point. - - virtual void connect ( const ACE_Addr &remote_sap - , ACE_SOCK_Dgram &new_dgram - , const ACE_Addr &local_sap - , JAWS_Event_Completer *completer - , void *act = 0 - ) = 0; - // The address to new_dgram is passed back as the data member of - // the JAWS_Event_Result that is returned to the completer. - // Use the specified local access point. - - virtual void accept ( const ACE_Addr &local_sap - , ACE_SOCK_Dgram &new_dgram - , JAWS_Event_Completer *completer - , const ACE_Time_Value &timeout - , void *act = 0 - ) = 0; - // The address to new_dgram is passed back as the data member of - // the JAWS_Event_Result that is returned to the completer. - - virtual void connect ( const ACE_Addr &remote_sap - , ACE_SOCK_Dgram &new_dgram - , JAWS_Event_Completer *completer - , const ACE_Time_Value &timeout - , void *act = 0 - ) = 0; - // The address to new_dgram is passed back as the data member of - // the JAWS_Event_Result that is returned to the completer. - // ADDR_ANY is assumed for the local access point. - - virtual void connect ( const ACE_Addr &remote_sap - , ACE_SOCK_Dgram &new_dgram - , const ACE_Addr &local_sap - , JAWS_Event_Completer *completer - , const ACE_Time_Value &timeout - , void *act = 0 - ) = 0; - // The address to new_dgram is passed back as the data member of - // the JAWS_Event_Result that is returned to the completer. - // Use the specified local access point. - -}; - - -class JAWS_Export JAWS_Datagram -{ -public: - - JAWS_Datagram (JAWS_Datagram_Impl *impl = 0); - - static JAWS_Datagram * instance (void) - { - return ACE_Singleton::instance (); - } - - void accept ( const ACE_Addr &local_sap - , ACE_SOCK_Dgram &new_dgram - , JAWS_Event_Completer *completer - , void *act = 0 - ); - - void connect ( const ACE_Addr &remote_sap - , ACE_SOCK_Dgram &new_dgram - , JAWS_Event_Completer *completer - , void *act = 0 - ); - - void connect ( const ACE_Addr &remote_sap - , ACE_SOCK_Dgram &new_dgram - , const ACE_Addr &local_sap - , JAWS_Event_Completer *completer - , void *act = 0 - ); - - void accept ( const ACE_Addr &local_sap - , ACE_SOCK_Dgram &new_dgram - , JAWS_Event_Completer *completer - , const ACE_Time_Value &timeout - , void *act = 0 - ); - - void connect ( const ACE_Addr &remote_sap - , ACE_SOCK_Dgram &new_dgram - , JAWS_Event_Completer *completer - , const ACE_Time_Value &timeout - , void *act = 0 - ); - - void connect ( const ACE_Addr &remote_sap - , ACE_SOCK_Dgram &new_dgram - , const ACE_Addr &local_sap - , JAWS_Event_Completer *completer - , const ACE_Time_Value &timeout - , void *act = 0 - ); - -private: - - JAWS_Datagram_Impl *impl_; - -}; - -#endif /* JAWS_DATAGRAM_H */ diff --git a/apps/JAWS3/jaws3/Event_Completer.cpp b/apps/JAWS3/jaws3/Event_Completer.cpp deleted file mode 100644 index fe8fa81d647..00000000000 --- a/apps/JAWS3/jaws3/Event_Completer.cpp +++ /dev/null @@ -1,51 +0,0 @@ -// $Id$ - -#ifndef JAWS_BUILD_DLL -#define JAWS_BUILD_DLL -#endif - -#include "jaws3/Event_Completer.h" - -// Default do nothing completers. - -void -JAWS_Event_Completer::default_complete (const JAWS_Event_Result &, void *) -{ -} - -void -JAWS_Event_Completer::accept_complete (const JAWS_Event_Result &r, void *d) -{ - this->default_complete (r, d); -} - -void -JAWS_Event_Completer::connect_complete (const JAWS_Event_Result &r, void *d) -{ - this->default_complete (r, d); -} - -void -JAWS_Event_Completer::input_complete (const JAWS_Event_Result &r, void *d) -{ - this->default_complete (r, d); -} - -void -JAWS_Event_Completer::output_complete (const JAWS_Event_Result &r, void *d) -{ - this->default_complete (r, d); -} - -void -JAWS_Event_Completer::timer_complete (const JAWS_Event_Result &r, void *d) -{ - this->default_complete (r, d); -} - -void -JAWS_Event_Completer::lambda_complete (const JAWS_Event_Result &r, void *d) -{ - this->default_complete (r, d); -} - diff --git a/apps/JAWS3/jaws3/Event_Completer.h b/apps/JAWS3/jaws3/Event_Completer.h deleted file mode 100644 index f2265851b4c..00000000000 --- a/apps/JAWS3/jaws3/Event_Completer.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- c++ -*- */ -// $Id$ - -#ifndef JAWS_EVENT_COMPLETER_H -#define JAWS_EVENT_COMPLETER_H - -#include "jaws3/Export.h" -#include "jaws3/Event_Result.h" - -class JAWS_Event_Completer; - -class JAWS_Export JAWS_Event_Completer -// = TITLE -// Event completion callback class. -{ -public: - - virtual void accept_complete (const JAWS_Event_Result &r, void *act = 0); - // The callback entry point when input has been read. - - virtual void connect_complete (const JAWS_Event_Result &r, void *act = 0); - // The callback entry point when input has been read. - - virtual void input_complete (const JAWS_Event_Result &r, void *act = 0); - // The callback entry point when input has been read. - - virtual void output_complete (const JAWS_Event_Result &r, void *act = 0); - // The callback entry point when output has been completely written. - - virtual void timer_complete (const JAWS_Event_Result &r, void *act = 0); - // The callback entry point when timer has expired. - - virtual void lambda_complete (const JAWS_Event_Result &r, void *act = 0); - // The callback entry point when a lambda event completes. - - virtual void default_complete (const JAWS_Event_Result &r, void *act = 0); - // The defaul callback entry point when an event completes. - -}; - -#endif /* JAWS_EVENT_COMPLETER_H */ diff --git a/apps/JAWS3/jaws3/Event_Dispatcher.cpp b/apps/JAWS3/jaws3/Event_Dispatcher.cpp deleted file mode 100644 index 6b498e23125..00000000000 --- a/apps/JAWS3/jaws3/Event_Dispatcher.cpp +++ /dev/null @@ -1,52 +0,0 @@ -// $Id$ - -#include "ace/Log_Msg.h" -#include "ace/Thread.h" -#include "ace/Reactor.h" -#include "ace/Proactor.h" -#include "ace/POSIX_Proactor.h" - -#ifndef JAWS_BUILD_DLL -#define JAWS_BUILD_DLL -#endif /*JAWS_BUILD_DLL*/ - -#include "jaws3/Event_Dispatcher.h" - -static ACE_THR_FUNC_RETURN -JAWS_Event_Dispatcher_Proactor_Event_Loop (void *) -{ - ACE_Proactor::run_event_loop (); - return 0; -} - - -void -JAWS_Event_Dispatcher::end_event_loop (void) -{ - ACE_Reactor::end_event_loop (); -} - - -void -JAWS_Event_Dispatcher::run_event_loop (void) -{ - // First, initiate the proactor thread - - int result; - result = ACE_Thread::spawn ( JAWS_Event_Dispatcher_Proactor_Event_Loop - , 0 - , THR_BOUND - ); - if (result < 0) - { - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Thread::spawn")); - return; - } - - // Now, enter the reactor's event loop. - ACE_Reactor::run_event_loop (); - - // End the proactor's event loop if reactor was interrupted. - ACE_Proactor::end_event_loop (); -} - diff --git a/apps/JAWS3/jaws3/Event_Dispatcher.h b/apps/JAWS3/jaws3/Event_Dispatcher.h deleted file mode 100644 index 65a82e56e03..00000000000 --- a/apps/JAWS3/jaws3/Event_Dispatcher.h +++ /dev/null @@ -1,52 +0,0 @@ -/* -*- c++ -*- */ -// $Id$ - -#ifndef JAWS_EVENT_DISPATCHER_H -#define JAWS_EVENT_DISPATCHER_H - -#include "ace/OS.h" -#include "ace/Reactor.h" -#include "ace/Select_Reactor.h" - -#include "jaws3/Export.h" - -// We are using the Reactor in a single threaded manner, -// so if we are using the Select Reactor, get rid of the -// big reactor lock. - -typedef ACE_Select_Reactor_Token_T - ACE_Select_Reactor_Noop_Token; - -typedef ACE_Select_Reactor_T - ACE_Select_NULL_LOCK_Reactor; - -#if !defined (ACE_WIN32) \ - || !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0) \ - || defined (ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL) \ - || defined (ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL) - -#define ACE_REACTOR_INSTANCE_INIT \ - do { \ - ACE_Select_NULL_LOCK_Reactor *select_reactor; \ - select_reactor = new ACE_Select_NULL_LOCK_Reactor; \ - ACE_Reactor::instance (new ACE_Reactor (select_reactor, 1), 1); \ - } while (0) - -#else - -#define ACE_REACTOR_INSTANCE_INIT ACE_Reactor::instance () - -#endif /* ACE_WIN32 */ - -class JAWS_Event_Dispatcher; - -class JAWS_Export JAWS_Event_Dispatcher -{ -public: - - static void end_event_loop (void); - static void run_event_loop (void); - -}; - -#endif /* JAWS_EVENT_DISPATCHER_H */ diff --git a/apps/JAWS3/jaws3/Event_Result.h b/apps/JAWS3/jaws3/Event_Result.h deleted file mode 100644 index 3cc83de4b5e..00000000000 --- a/apps/JAWS3/jaws3/Event_Result.h +++ /dev/null @@ -1,103 +0,0 @@ -/* -*- c++ -*- */ -// $Id$ - -#ifndef JAWS_EVENT_RESULT_H -#define JAWS_EVENT_RESULT_H - -#include "ace/OS.h" - -#include "jaws3/Export.h" - -class JAWS_Event_Result; - -class JAWS_Export JAWS_Event_Result -{ -public: - - enum JE_STATUS - { JE_IDLE - , JE_OK - , JE_PENDING - , JE_CANCEL - , JE_ERROR - }; - - enum JE_REASON - { JE_NO_REASON - , JE_ACCEPT_OK - , JE_ACCEPT_PENDING - , JE_ACCEPT_TIMEOUT - , JE_ACCEPT_FAIL - , JE_CONNECT_OK - , JE_CONNECT_PENDING - , JE_CONNECT_TIMEOUT - , JE_CONNECT_FAIL - , JE_SEND_OK - , JE_SEND_PENDING - , JE_SEND_BLOCKED - , JE_SEND_SHORT - , JE_SEND_TIMEOUT - , JE_SEND_FAIL - , JE_RECV_OK - , JE_RECV_PENDING - , JE_RECV_BLOCKED - , JE_RECV_SHORT - , JE_RECV_TIMEOUT - , JE_RECV_FAIL - , JE_TRANSMIT_OK - , JE_TRANSMIT_PENDING - , JE_TRANSMIT_BLOCKED - , JE_TRANSMIT_SHORT - , JE_TRANSMIT_TIMEOUT - , JE_TRANSMIT_FAIL - , JE_TIMER_OK - , JE_TIMER_CANCEL - , JE_TIMER_PENDING - , JE_TIMER_FAIL - , JE_LAMBDA_OK - , JE_LAMBDA_CANCEL - , JE_LAMBDA_PENDING - , JE_LAMBDA_SHORT - , JE_LAMBDA_TIMEOUT - , JE_LAMBDA_FAIL - }; - - JAWS_Event_Result ( size_t bytes = 0 - , JE_STATUS status = JE_IDLE - , JE_REASON reason = JE_NO_REASON - , int error_number = -1 - , void * data = 0 - ) - : bytes_ (bytes) - , status_ (status) - , reason_ (reason) - , error_number_ (error_number) - , data_ (data) - { - if (this->error_number_ == -1) - this->error_number_ = errno; - } - - size_t bytes (void) const { return this->bytes_; } - - int status (void) const { return this->status_; } - int reason (void) const { return this->reason_; } - - int error_number (void) const { return (errno = this->error_number_); } - - void * data (void) const { return this->data_; } - -private: - - size_t bytes_; - - JE_STATUS status_; - JE_REASON reason_; - - int error_number_; - - void *data_; - -}; - -#endif /* JAWS_EVENT_RESULT_H */ diff --git a/apps/JAWS3/jaws3/Export.h b/apps/JAWS3/jaws3/Export.h deleted file mode 100644 index 8af831df529..00000000000 --- a/apps/JAWS3/jaws3/Export.h +++ /dev/null @@ -1,48 +0,0 @@ -// $Id$ - -// Definition for Win32 Export directives. -// This file is generated automatically by -// ${TAO_ROOT}/TAO_IDL/GenExportH.BAT -// ------------------------------ -#ifndef JAWS_EXPORT_H -#define JAWS_EXPORT_H - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (ACE_AS_STATIC_LIBS) -# if !defined (JAWS_HAS_DLL) -# define JAWS_HAS_DLL 0 -# endif /* ! ACE_HAS_DLL */ -#else -# if !defined (JAWS_HAS_DLL) -# define JAWS_HAS_DLL 1 -# endif /* ! ACE_HAS_DLL */ -#endif /* ACE_AS_STATIC_LIB */ - -#if defined (JAWS_HAS_DLL) -# if (JAWS_HAS_DLL == 1) -# if defined (JAWS_BUILD_DLL) -# define JAWS_Export ACE_Proper_Export_Flag -# define JAWS_SINGLETON_DECLARATION(T) \ - ACE_EXPORT_SINGLETON_DECLARATION (T) -# else -# define JAWS_Export ACE_Proper_Import_Flag -# define JAWS_SINGLETON_DECLARATION(T) \ - ACE_IMPORT_SINGLETON_DECLARATION (T) -# endif /* JAWS_BUILD_DLL */ -# else -# define JAWS_Export -# define JAWS_SINGLETON_DECLARATION(T) -# endif /* ! JAWS_HAS_DLL == 1 */ -#else -# define JAWS_Export -# define JAWS_SINGLETON_DECLARATION(T) -#endif /* JAWS_HAS_DLL */ - -#endif /* JAWS_EXPORT_H */ - // End of auto generated file. - diff --git a/apps/JAWS3/jaws3/FILE.cpp b/apps/JAWS3/jaws3/FILE.cpp deleted file mode 100644 index 2f465b21a55..00000000000 --- a/apps/JAWS3/jaws3/FILE.cpp +++ /dev/null @@ -1,88 +0,0 @@ -// $Id$ - -#include "ace/config-all.h" -#include "ace/Guard_T.h" -#include "ace/Synch_Traits.h" -#include "ace/Thread_Mutex.h" - -#ifndef JAWS_BUILD_DLL -#define JAWS_BUILD_DLL -#endif - -#include "jaws3/FILE.h" - - -JAWS_FILE::JAWS_FILE (void) - : map_ (0) - , can_map_ (0) -{ -} - -JAWS_FILE::~JAWS_FILE (void) -{ - delete this->map_; - this->map_ = 0; -} - -ACE_Mem_Map * -JAWS_FILE::mem_map (int length, - int prot, - int share, - void *addr, - off_t offset, - LPSECURITY_ATTRIBUTES sa) const -{ - if (this->can_map_ == 0) - return 0; - - JAWS_FILE *mutable_this = (JAWS_FILE *) this; - return mutable_this->mem_map (length, prot, share, addr, offset, sa); -} - -ACE_Mem_Map * -JAWS_FILE::mem_map (int length, - int prot, - int share, - void *addr, - off_t offset, - LPSECURITY_ATTRIBUTES sa) -{ - if (this->can_map_ == 0) - return 0; - - if (this->map_ == 0) - { - ACE_Guard g (this->lock_); - - if (this->map_ == 0) - { - this->map_ = new ACE_Mem_Map; - if (this->map_ != 0) - { - int r = this->map_->map (this->get_handle (), - length, prot, share, addr, offset, sa); - if (r < 0) - { - delete this->map_; - this->map_ = 0; - } - } - } - } - - return this->map_; - -} - - -ACE_Mem_Map * -JAWS_FILE::map (void) const -{ - return this->map_; -} - -void -JAWS_FILE::can_map (int flag) -{ - this->can_map_ = (flag != 0); -} diff --git a/apps/JAWS3/jaws3/FILE.h b/apps/JAWS3/jaws3/FILE.h deleted file mode 100644 index 8e8623234e2..00000000000 --- a/apps/JAWS3/jaws3/FILE.h +++ /dev/null @@ -1,49 +0,0 @@ -// $Id$ - -/* -*- c++ -*- */ - -#ifndef JAWS_FILE_H -#define JAWS_FILE_H - -#include "ace/FILE_IO.h" -#include "ace/Mem_Map.h" - -#include "jaws3/Export.h" - -class JAWS_Export JAWS_FILE : public ACE_FILE_IO -// -// Like ACE_FILE_IO, but support for ACE_Mem_Map; -{ -public: - - JAWS_FILE (void); - - ~JAWS_FILE (void); - - ACE_Mem_Map *mem_map (int length = -1, - int prot = PROT_RDWR, - int share = ACE_MAP_PRIVATE, - void *addr = 0, - off_t offset = 0, - LPSECURITY_ATTRIBUTES sa = 0); - ACE_Mem_Map *mem_map (int length = -1, - int prot = PROT_RDWR, - int share = ACE_MAP_PRIVATE, - void *addr = 0, - off_t offset = 0, - LPSECURITY_ATTRIBUTES sa = 0) const; - - ACE_Mem_Map *map (void) const; - - void can_map (int); - -private: - - ACE_SYNCH_MUTEX lock_; - ACE_Mem_Map *map_; - - int can_map_; - -}; - -#endif /* JAWS_FILE_H */ diff --git a/apps/JAWS3/jaws3/IO.cpp b/apps/JAWS3/jaws3/IO.cpp deleted file mode 100644 index 6a4090f8481..00000000000 --- a/apps/JAWS3/jaws3/IO.cpp +++ /dev/null @@ -1,112 +0,0 @@ -// $Id$ - -#ifndef JAWS_BUILD_DLL -#define JAWS_BUILD_DLL -#endif /*JAWS_BUILD_DLL*/ - -#include "jaws3/IO.h" -#include "jaws3/Asynch_IO.h" -#include "jaws3/Synch_IO.h" -#include "jaws3/Reactive_IO.h" -#include "jaws3/Options.h" - -JAWS_IO::JAWS_IO (JAWS_IO_Impl *impl) - : impl_ (impl) -{ - // Use synchronous IO by default. It is the most efficient - // in terms of calls needed, but provides the least amount - // of support for concurrency. - - if (this->impl_ == 0) - { - const char *io_type = JAWS_Options::instance ()->getenv ("JAWS_IO"); - if (io_type == 0) - io_type = JAWS_DEFAULT_IO; - - if (ACE_OS::strcasecmp (io_type, "SYNCH") == 0) - this->impl_ = JAWS_Synch_IO::instance (); - else if (ACE_OS::strcasecmp (io_type, "ASYNCH") == 0) - this->impl_ = JAWS_Asynch_IO::instance (); - else if (ACE_OS::strcasecmp (io_type, "REACTIVE") == 0) - this->impl_ = JAWS_Reactive_IO::instance (); - else - this->impl_ = JAWS_Synch_IO::instance (); - } -} - -JAWS_IO::~JAWS_IO (void) -{ -} - - -void -JAWS_IO::send ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , void *act - ) -{ - this->impl_->send (handle, mb, completer, act); -} - - -void -JAWS_IO::recv ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , void *act - ) -{ - this->impl_->recv (handle, mb, completer, act); -} - - -void -JAWS_IO::transmit ( ACE_HANDLE handle - , ACE_HANDLE source - , JAWS_Event_Completer *completer - , void *act - , ACE_Message_Block *header - , ACE_Message_Block *trailer - ) -{ - this->impl_->transmit (handle, source, completer, act, header, trailer); -} - - -void -JAWS_IO::send ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act - ) -{ - this->impl_->send (handle, mb, completer, tv, act); -} - - -void -JAWS_IO::recv ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act - ) -{ - this->impl_->recv (handle, mb, completer, tv, act); -} - - -void -JAWS_IO::transmit ( ACE_HANDLE handle - , ACE_HANDLE source - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act - , ACE_Message_Block *header - , ACE_Message_Block *trailer - ) -{ - this->impl_->transmit (handle, source, completer, tv, act, header, trailer); -} diff --git a/apps/JAWS3/jaws3/IO.h b/apps/JAWS3/jaws3/IO.h deleted file mode 100644 index a910a4fb029..00000000000 --- a/apps/JAWS3/jaws3/IO.h +++ /dev/null @@ -1,140 +0,0 @@ -/* -*- c++ -*- */ -// $Id$ - -#ifndef JAWS_IO_H -#define JAWS_IO_H - -#include "ace/Message_Block.h" -#include "ace/Singleton.h" -#include "ace/Synch_Traits.h" - -#include "jaws3/Export.h" - - -class JAWS_IO; -class JAWS_Event_Completer; - - -class JAWS_Export JAWS_IO_Impl -// = TITLE -// IO inteface for the implementation classes on the RHS of the -// Bridge Pattern. -{ -public: - - virtual ~JAWS_IO_Impl (void) {} - - // = Regular IO methods. - - virtual void send ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , void *act = 0 - ) = 0; - - virtual void recv ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , void *act = 0 - ) = 0; - - virtual void transmit ( ACE_HANDLE handle - , ACE_HANDLE source - , JAWS_Event_Completer *completer - , void *act = 0 - , ACE_Message_Block *header = 0 - , ACE_Message_Block *trailer = 0 - ) = 0; - - // = Timed IO methods. - - virtual void send ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act = 0 - ) = 0; - - virtual void recv ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act = 0 - ) = 0; - - virtual void transmit ( ACE_HANDLE handle - , ACE_HANDLE source - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act = 0 - , ACE_Message_Block *header = 0 - , ACE_Message_Block *trailer = 0 - ) = 0; - -}; - - -class JAWS_Export JAWS_IO -{ -public: - - JAWS_IO (JAWS_IO_Impl *impl = 0); - - ~JAWS_IO (void); - - static JAWS_IO * instance (void) - { - return ACE_Singleton::instance (); - } - - void send ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , void *act = 0 - ); - - void recv ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , void *act = 0 - ); - - void transmit ( ACE_HANDLE handle - , ACE_HANDLE source - , JAWS_Event_Completer *completer - , void *act = 0 - , ACE_Message_Block *header = 0 - , ACE_Message_Block *trailer = 0 - ); - - void send ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act = 0 - ); - - void recv ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act = 0 - ); - - void transmit ( ACE_HANDLE handle - , ACE_HANDLE source - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act = 0 - , ACE_Message_Block *header = 0 - , ACE_Message_Block *trailer = 0 - ); - - -private: - - JAWS_IO_Impl *impl_; - -}; - -#endif /* JAWS_IO_H */ diff --git a/apps/JAWS3/jaws3/Options.cpp b/apps/JAWS3/jaws3/Options.cpp deleted file mode 100644 index 19c7a40406e..00000000000 --- a/apps/JAWS3/jaws3/Options.cpp +++ /dev/null @@ -1,25 +0,0 @@ -// $Id$ - -#include "ace/OS_NS_stdlib.h" - -#ifndef JAWS_BUILD_DLL -#define JAWS_BUILD_DLL -#endif /*JAWS_BUILD_DLL*/ - -#include "jaws3/Options.h" - -JAWS_Options::JAWS_Options (void) -{ - this->cf_ = new JAWS_Config_File ("jaws.conf"); -} - -const char * -JAWS_Options::getenv (const char *key) -{ - const char *value = 0; - if (this->cf_ == 0 || this->cf_->find (key, value) < 0) - value = ACE_OS::getenv (key); - - return value; -} - diff --git a/apps/JAWS3/jaws3/Options.h b/apps/JAWS3/jaws3/Options.h deleted file mode 100644 index b767cc5438c..00000000000 --- a/apps/JAWS3/jaws3/Options.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- c++ -*- */ -// $Id$ - -#ifndef JAWS_OPTIONS_H -#define JAWS_OPTIONS_H - -#include "ace/OS.h" -#include "ace/Singleton.h" -#include "ace/Synch.h" - -#include "jaws3/Export.h" -#include "jaws3/Config_File.h" - -#define JAWS_DEFAULT_MIN_THYBRID_THREADS "1" -#define JAWS_DEFAULT_MAX_THYBRID_THREADS "-1" -#define JAWS_DEFAULT_TPOOL_THREADS "5" -#define JAWS_DEFAULT_IO "SYNCH" -#define JAWS_DEFAULT_CONCURRENCY "TPR" - -class JAWS_Options; - -class JAWS_Export JAWS_Options -{ -public: - - JAWS_Options (void); - - const char *getenv (const char *key); - - static JAWS_Options * instance (void) - { - return ACE_Singleton::instance (); - } - -private: - - JAWS_Config_File *cf_; - -}; - -#endif /* JAWS_OPTIONS_H */ diff --git a/apps/JAWS3/jaws3/Protocol_Handler.cpp b/apps/JAWS3/jaws3/Protocol_Handler.cpp deleted file mode 100644 index 4b2122b46d0..00000000000 --- a/apps/JAWS3/jaws3/Protocol_Handler.cpp +++ /dev/null @@ -1,65 +0,0 @@ -// $Id$ - -#ifndef JAWS_BUILD_DLL -#define JAWS_BUILD_DLL -#endif - -#include "jaws3/Protocol_Handler.h" -#include "jaws3/Concurrency.h" - -JAWS_Protocol_State::~JAWS_Protocol_State (void) -{ -} - - -JAWS_Protocol_Handler::JAWS_Protocol_Handler ( JAWS_Protocol_State *state - , void *data - ) - : state_ (state) - , data_ (data) - , mb_ (& this->db_) -{ - this->db_.base ((char *) this, 0 /* an infinite queue */); -} - - -JAWS_Protocol_Handler::~JAWS_Protocol_Handler (void) -{ - this->mb_.replace_data_block (0); -} - - -int -JAWS_Protocol_Handler::service (void) -{ - if (this->state_ == 0) - return -1; - - return this->state_->service (this, this->data_); -} - - -void -JAWS_Protocol_Handler::event_complete ( const JAWS_Event_Result &result - , void *act - ) -{ - // This call is done in the context of the dispatching - // thread (e.g., by the Reactor thread, or by one of the - // threads in the Proactor, or by the invoker of the IO - // if the IO is synchronous). - - this->state_ = this->state_->transition (result, this->data_, act); - - // At this point, we need to cue this Handler back into - // the concurrency mechanism. This probably means the - // Message Queue of some Concurrency Task. - - JAWS_Concurrency::instance ()->putq (this); - - // Doing it this way is less efficient than calling into - // the service() method of the next state directly from - // here, but it gains the flexibility of a more modular - // concurrency mechanism. -} - diff --git a/apps/JAWS3/jaws3/Protocol_Handler.h b/apps/JAWS3/jaws3/Protocol_Handler.h deleted file mode 100644 index 5452d4e0247..00000000000 --- a/apps/JAWS3/jaws3/Protocol_Handler.h +++ /dev/null @@ -1,81 +0,0 @@ -// $Id$ -#ifndef JAWS_PROTOCOL_HANDLER_H -#define JAWS_PROTOCOL_HANDLER_H - -#include "ace/Message_Block.h" - -#include "jaws3/Export.h" -#include "jaws3/Event_Completer.h" - - -class JAWS_Export JAWS_Protocol_State -{ - - friend class JAWS_Protocol_Handler; - -public: - - virtual ~JAWS_Protocol_State (void); - -protected: - - virtual int service (JAWS_Event_Completer *, void *data) = 0; - - virtual JAWS_Protocol_State * transition ( const JAWS_Event_Result & - , void *data - , void *act - ) = 0; - -}; - - -class JAWS_Protocol_Handler - : public JAWS_Event_Completer -// = TITLE -// Abstraction that interacts with concurrency dispatching. -{ - - friend class JAWS_TPOOL_Concurrency; - friend class JAWS_TPR_Concurrency; - friend class JAWS_THYBRID_Concurrency; - -public: - - JAWS_Protocol_Handler (JAWS_Protocol_State *state = 0, void *data = 0); - - virtual int service (void); - - virtual void dismiss (void) - { - delete this; - } - -protected: - - virtual ~JAWS_Protocol_Handler (void); - // Try to guarantee this class will be created dynamically. - -protected: - - void event_complete (const JAWS_Event_Result &result, void *act); - // The event completion routine that triggers the transition - // to the next Protocol State. - - void default_complete (const JAWS_Event_Result &result, void *act) - { - this->event_complete (result, act); - } - -private: - - JAWS_Protocol_State *state_; - - void *data_; - - ACE_Data_Block db_; - ACE_Message_Block mb_; - -}; - - -#endif /* JAWS_PROTOCOL_HANDLER_H */ diff --git a/apps/JAWS3/jaws3/Reactive_IO.cpp b/apps/JAWS3/jaws3/Reactive_IO.cpp deleted file mode 100644 index 6917832124e..00000000000 --- a/apps/JAWS3/jaws3/Reactive_IO.cpp +++ /dev/null @@ -1,601 +0,0 @@ -// $Id$ - -#include "ace/ACE.h" -#include "ace/OS.h" -#include "ace/Reactor.h" - -#ifndef JAWS_BUILD_DLL -#define JAWS_BUILD_DLL -#endif - -#include "jaws3/IO.h" -#include "jaws3/Reactive_IO.h" -#include "jaws3/Reactive_IO_Helpers.h" -#include "jaws3/Event_Completer.h" - -void -JAWS_Reactive_IO::send ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act - ) -{ - if (mb->length () == 0) - { - JAWS_Event_Result io_result ( 0 - , JAWS_Event_Result::JE_OK - , JAWS_Event_Result::JE_SEND_OK - ); - if (completer) - completer->output_complete (io_result, act); - - return; - } - - JAWS_IO_Reactive_Send *rs; - rs = JAWS_IO_Reactive_Send::make (handle, mb, completer, tv, act); - - if (rs == 0) - { - JAWS_Event_Result io_result ( 0 - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_SEND_FAIL - ); - if (completer) - completer->output_complete (io_result, act); - - return; - } - - rs->open (); -} - -void -JAWS_Reactive_IO::send ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , void *act - ) -{ - this->send (handle, mb, completer, ACE_Time_Value::zero, act); -} - - -void -JAWS_Reactive_IO::recv ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act - ) -{ - - JAWS_IO_Reactive_Recv *rr; - rr = JAWS_IO_Reactive_Recv::make (handle, mb, completer, tv, act); - - if (rr == 0) - { - JAWS_Event_Result io_result ( 0 - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_RECV_FAIL - ); - if (completer) - completer->output_complete (io_result, act); - - return; - } - - rr->open (); -} - - -void -JAWS_Reactive_IO::recv ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , void *act - ) -{ - this->recv (handle, mb, completer, ACE_Time_Value::zero, act); -} - - -void -JAWS_Reactive_IO::transmit ( ACE_HANDLE handle - , ACE_HANDLE source - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act - , ACE_Message_Block *header - , ACE_Message_Block *trailer - ) -{ - JAWS_IO_Reactive_Transmit *rt; - rt = JAWS_IO_Reactive_Transmit::make ( handle - , source - , completer - , tv - , header - , trailer - , act - ); - - if (rt == 0) - { - JAWS_Event_Result io_result ( 0 - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_TRANSMIT_FAIL - ); - if (completer) - completer->output_complete (io_result, act); - - return; - } - - rt->open (); -} - - -void -JAWS_Reactive_IO::transmit ( ACE_HANDLE handle - , ACE_HANDLE source - , JAWS_Event_Completer *completer - , void *act - , ACE_Message_Block *header - , ACE_Message_Block *trailer - ) -{ - this->transmit ( handle - , source - , completer - , ACE_Time_Value::zero - , act - , header - , trailer - ); -} - - -void -JAWS_IO_Reactive_Handler::open (void) -{ - int result = ACE_Reactor::instance ()->notify (this); - - if (result < 0) - this->close (result); -} - -void -JAWS_IO_Reactive_Handler::close (int result) -{ - if (result < 0) - { - if (ACE_BIT_ENABLED (this->mask_, ACE_Event_Handler::WRITE_MASK)) - { - JAWS_Event_Result io_result ( 0 - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_SEND_FAIL - ); - this->io_result_ = io_result; - } - else if (ACE_BIT_ENABLED (this->mask_, ACE_Event_Handler::READ_MASK)) - { - JAWS_Event_Result io_result ( 0 - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_RECV_FAIL - ); - this->io_result_ = io_result; - } - - this->handle_close (this->handle_, this->mask_); - } -} - -int -JAWS_IO_Reactive_Handler::handle_timeout (const ACE_Time_Value &, const void *) -{ - if (this->was_active_) - { - this->was_active_ = 0; - - this->timer_id_ = - ACE_Reactor::instance ()->schedule_timer (this, 0, this->tv_); - - return 0; - } - - ACE_Reactor::instance () - ->remove_handler ( this - , ACE_Event_Handler::RWE_MASK|ACE_Event_Handler::DONT_CALL - ); - - this->timer_id_ = -1; - - if (ACE_BIT_ENABLED (this->mask_, ACE_Event_Handler::WRITE_MASK)) - { - JAWS_Event_Result io_result ( 0 - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_SEND_TIMEOUT - , ETIME - ); - this->io_result_ = io_result; - } - else if (ACE_BIT_ENABLED (this->mask_, ACE_Event_Handler::READ_MASK)) - { - JAWS_Event_Result io_result ( 0 - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_RECV_TIMEOUT - , ETIME - ); - this->io_result_ = io_result; - } - - return -1; -} - -int -JAWS_IO_Reactive_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask) -{ - if (this->completer_) - { - if (ACE_BIT_ENABLED (this->mask_, ACE_Event_Handler::WRITE_MASK)) - this->completer_->output_complete (this->io_result_, this->act_); - else if (ACE_BIT_ENABLED (this->mask_, ACE_Event_Handler::READ_MASK)) - this->completer_->input_complete (this->io_result_, this->act_); - } - - ACE_Reactor::instance () - ->remove_handler ( this - , ACE_Event_Handler::RWE_MASK|ACE_Event_Handler::DONT_CALL - ); - - delete this; - return 0; -} - -int -JAWS_IO_Reactive_Handler::handle_exception (ACE_HANDLE handle) -{ - if (handle == ACE_INVALID_HANDLE) - { - // We are being called back from a notify call. - // This is our cue to register ourselves with the Reactor. - - int result; - result = - ACE_Reactor::instance () - ->register_handler (this, this->mask_|ACE_Event_Handler::EXCEPT_MASK); - - if (result < 0) - this->close (result); - - return 0; - } - - // back to our regularly scheduled except mask handling. - - if (ACE_BIT_ENABLED (this->mask_, ACE_Event_Handler::WRITE_MASK)) - { - JAWS_Event_Result io_result ( this->bytes_ - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_SEND_SHORT - ); - this->io_result_ = io_result; - } - else if (ACE_BIT_ENABLED (this->mask_, ACE_Event_Handler::READ_MASK)) - { - JAWS_Event_Result io_result ( this->bytes_ - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_RECV_SHORT - ); - this->io_result_ = io_result; - } - - return -1; -} - - -int -JAWS_IO_Reactive_Send::handle_output (ACE_HANDLE handle) -{ - this->was_active_ = 1; - - ssize_t count = ACE::send ( handle - , this->mb_->rd_ptr () - , this->mb_->length () - ); - - if (count <= 0 && this->bytes_ == 0) - { - JAWS_Event_Result io_result ( 0 - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_SEND_FAIL - ); - this->io_result_ = io_result; - } - else if (count <= 0 && this->bytes_ > 0) - { - JAWS_Event_Result io_result ( this->bytes_ - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_SEND_SHORT - ); - this->io_result_ = io_result; - } - else - { - if (count > 0) - this->mb_->rd_ptr (count); - - this->bytes_ += count; - - JAWS_Event_Result io_result ( this->bytes_ - , JAWS_Event_Result::JE_OK - , JAWS_Event_Result::JE_SEND_OK - ); - this->io_result_ = io_result; - } - - if (count <= 0 || this->mb_->length () == 0) - return -1; - - // Not done yet, so stay registered. - return 0; -} - - -int -JAWS_IO_Reactive_Recv::handle_input (ACE_HANDLE handle) -{ - ssize_t count = ACE::recv ( handle - , this->mb_->wr_ptr () - , this->mb_->space () - ); - - if (count < 0) - { - JAWS_Event_Result io_result ( 0 - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_RECV_FAIL - ); - this->io_result_ = io_result; - } - else - { - if (count > 0) - this->mb_->wr_ptr (count); - - JAWS_Event_Result io_result ( count - , JAWS_Event_Result::JE_OK - , JAWS_Event_Result::JE_RECV_OK - ); - this->io_result_ = io_result; - } - - return -1; -} - - -int -JAWS_IO_Reactive_Transmit::handle_output (ACE_HANDLE handle) -{ - this->was_active_ = 1; - - if (this->header_ && this->header_->length () > 0) - return this->handle_output_header (handle); - else - this->header_ = 0; - - if (this->source_ != ACE_INVALID_HANDLE) - return this->handle_output_source (handle); - - if (this->trailer_ && this->trailer_->length () > 0) - return this->handle_output_trailer (handle); - else - this->trailer_ = 0; - - JAWS_Event_Result io_result ( this->bytes_ - , JAWS_Event_Result::JE_OK - , JAWS_Event_Result::JE_TRANSMIT_OK - ); - this->io_result_ = io_result; - - return -1; -} - -int -JAWS_IO_Reactive_Transmit::handle_output_header (ACE_HANDLE handle) -{ - return this->handle_output_mb (handle, this->header_); -} - -int -JAWS_IO_Reactive_Transmit::handle_output_source (ACE_HANDLE handle) -{ - ACE_Message_Block *mb = this->source_buf_; - - // Try to read data into the mb if data is still available. - if (mb->space () && this->source_ != ACE_INVALID_HANDLE) - { - ssize_t count; - count = ACE_OS::read (this->source_, mb->wr_ptr (), mb->space ()); - - if (count < 0) - { - this->source_ = ACE_INVALID_HANDLE; - this->source_buf_ = 0; - - if (this->bytes_ == 0) - { - JAWS_Event_Result io_result ( 0 - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_TRANSMIT_FAIL - ); - this->io_result_ = io_result; - } - else if (this->bytes_ > 0) - { - JAWS_Event_Result io_result ( this->bytes_ - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_TRANSMIT_SHORT - ); - this->io_result_ = io_result; - } - - return -1; - } - else if (count == 0) - this->source_ = ACE_INVALID_HANDLE; - else - mb->wr_ptr (count); - } - - int result = 0; - - if (mb->length () > 0) - result = this->handle_output_mb (handle, mb); - - if (result < 0) - { - this->source_ = ACE_INVALID_HANDLE; - this->source_buf_ = 0; - } - else if (mb == 0 && this->source_ == ACE_INVALID_HANDLE) - this->source_buf_ = 0; - else - this->source_buf_->crunch (); - - return result; -} - -int -JAWS_IO_Reactive_Transmit::handle_output_trailer (ACE_HANDLE handle) -{ - int result = this->handle_output_mb (handle, this->trailer_); - - if (result == 0 && this->trailer_ == 0) - { - JAWS_Event_Result io_result ( this->bytes_ - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_TRANSMIT_SHORT - ); - this->io_result_ = io_result; - return -1; - } - - return result; -} - -int -JAWS_IO_Reactive_Transmit::handle_output_mb ( ACE_HANDLE handle - , ACE_Message_Block *&mb - ) -{ - ssize_t count = ACE::send (handle, mb->rd_ptr (), mb->length ()); - - if (count <= 0 && this->bytes_ == 0) - { - JAWS_Event_Result io_result ( 0 - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_TRANSMIT_FAIL - ); - this->io_result_ = io_result; - } - else if (count <= 0 && this->bytes_ > 0) - { - JAWS_Event_Result io_result ( this->bytes_ - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_TRANSMIT_SHORT - ); - this->io_result_ = io_result; - } - else - { - mb->rd_ptr (count); - this->bytes_ += count; - } - - if (count <= 0) - return -1; - - if (mb->length () == 0) - mb = 0; - - return 0; -} - -void -JAWS_IO_Reactive_Transmit::close (int result) -{ - if (result < 0) - { - JAWS_Event_Result io_result ( 0 - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_TRANSMIT_FAIL - ); - this->io_result_ = io_result; - - this->handle_close (this->handle_, this->mask_); - } -} - -int -JAWS_IO_Reactive_Transmit::handle_timeout (const ACE_Time_Value &, const void *) -{ - if (this->was_active_) - { - this->was_active_ = 0; - - this->timer_id_ = - ACE_Reactor::instance ()->schedule_timer (this, 0, this->tv_); - - return 0; - } - - ACE_Reactor::instance () - ->remove_handler ( this - , ACE_Event_Handler::RWE_MASK|ACE_Event_Handler::DONT_CALL - ); - - this->timer_id_ = -1; - - JAWS_Event_Result io_result ( 0 - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_TRANSMIT_TIMEOUT - , ETIME - ); - - this->io_result_ = io_result; - - return -1; -} - -int -JAWS_IO_Reactive_Transmit::handle_exception (ACE_HANDLE handle) -{ - if (handle == ACE_INVALID_HANDLE) - { - // We are being called back from a notify call. - // This is our cue to register ourselves with the Reactor. - - int result; - result = - ACE_Reactor::instance () - ->register_handler (this, this->mask_|ACE_Event_Handler::EXCEPT_MASK); - - if (result < 0) - this->close (result); - - return 0; - } - - // back to our regularly scheduled except mask handling. - - JAWS_Event_Result io_result ( this->bytes_ - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_TRANSMIT_SHORT - ); - this->io_result_ = io_result; - - return -1; -} diff --git a/apps/JAWS3/jaws3/Reactive_IO.h b/apps/JAWS3/jaws3/Reactive_IO.h deleted file mode 100644 index 9bbb8dbffdf..00000000000 --- a/apps/JAWS3/jaws3/Reactive_IO.h +++ /dev/null @@ -1,71 +0,0 @@ -/* -*- c++ -*- */ -// $Id$ - -#ifndef JAWS_REACTIVE_IO_H -#define JAWS_REACTIVE_IO_H - -#include "ace/OS.h" -#include "ace/Message_Block.h" -#include "ace/Singleton.h" - -#include "jaws3/Export.h" -#include "jaws3/IO.h" -#include "jaws3/Event_Result.h" - -class JAWS_Reactive_IO; - -class JAWS_Export JAWS_Reactive_IO : public JAWS_IO_Impl -{ -public: - - static JAWS_Reactive_IO * instance (void) - { - return ACE_Singleton::instance (); - } - - void send ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , void *act = 0 - ); - - void recv ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , void *act = 0 - ); - - void transmit ( ACE_HANDLE handle - , ACE_HANDLE source - , JAWS_Event_Completer *completer - , void *act = 0 - , ACE_Message_Block *header = 0 - , ACE_Message_Block *trailer = 0 - ); - - void send ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act = 0 - ); - - void recv ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act = 0 - ); - - void transmit ( ACE_HANDLE handle - , ACE_HANDLE source - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act = 0 - , ACE_Message_Block *header = 0 - , ACE_Message_Block *trailer = 0 - ); - -}; - -#endif /* JAWS_REACTIVE_IO_H */ diff --git a/apps/JAWS3/jaws3/Reactive_IO_Helpers.h b/apps/JAWS3/jaws3/Reactive_IO_Helpers.h deleted file mode 100644 index 96a7bfc4114..00000000000 --- a/apps/JAWS3/jaws3/Reactive_IO_Helpers.h +++ /dev/null @@ -1,305 +0,0 @@ -/* -*- c++ -*- */ -// $Id$ - -#ifndef JAWS_REACTIVE_IO_HELPERS_H -#define JAWS_REACTIVE_IO_HELPERS_H - -#include "ace/OS.h" -#include "ace/Message_Block.h" -#include "ace/Singleton.h" - -#include "jaws3/Export.h" -#include "jaws3/IO.h" -#include "jaws3/Event_Result.h" -#include "jaws3/Event_Completer.h" - -class JAWS_Reactive_IO; - -class JAWS_IO_Reactive_Handler : public ACE_Event_Handler -{ - - friend class JAWS_IO_Reactive_Send; - friend class JAWS_IO_Reactive_Recv; - friend class JAWS_IO_Reactive_Transmit; - -public: - - virtual void open (void); - - int handle_timeout (const ACE_Time_Value &, const void *); - - int handle_close (ACE_HANDLE, ACE_Reactor_Mask); - - int handle_exception (ACE_HANDLE); - - ACE_HANDLE get_handle (void) const { return this->handle_; } - - void set_handle (ACE_HANDLE handle) { this->handle_ = handle; } - -protected: - - virtual void close (int result); - -private: - - JAWS_IO_Reactive_Handler ( ACE_HANDLE handle - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act - , ACE_Reactor_Mask mask - ) - : bytes_ (0) - , handle_ (handle) - , completer_ (completer) - , tv_ (tv) - , act_ (act) - , mask_ (mask) - , timer_id_ (-1) - , was_active_ (0) - { - if (ACE_Time_Value::zero < this->tv_) - this->timer_id_ = - ACE_Reactor::instance ()->schedule_timer (this, 0, this->tv_); - } - - ~JAWS_IO_Reactive_Handler (void) - { - if (this->timer_id_ != -1) - ACE_Reactor::instance ()->cancel_timer (this->timer_id_); - } - -private: - - JAWS_Event_Result io_result_; - - size_t bytes_; - ACE_HANDLE handle_; - JAWS_Event_Completer *completer_; - ACE_Time_Value tv_; - void *act_; - - ACE_Reactor_Mask mask_; - long timer_id_; - - int was_active_; - -}; - - -class JAWS_IO_Reactive_Send : public JAWS_IO_Reactive_Handler -{ - - friend class JAWS_Reactive_IO; - -public: - - int handle_output (ACE_HANDLE handle); - - static JAWS_IO_Reactive_Send * make ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , void *act - ) - { - return new JAWS_IO_Reactive_Send ( handle - , mb - , completer - , ACE_Time_Value::zero - , act - , ACE_Event_Handler::WRITE_MASK - ); - } - - static JAWS_IO_Reactive_Send * make ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act - ) - { - return new JAWS_IO_Reactive_Send ( handle - , mb - , completer - , tv - , act - , ACE_Event_Handler::WRITE_MASK - ); - } - -private: - - JAWS_IO_Reactive_Send ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act - , ACE_Reactor_Mask mask - ) - : JAWS_IO_Reactive_Handler (handle, completer, tv, act, mask) - , mb_ (mb) - { - } - -private: - - ACE_Message_Block *mb_; - -}; - - -class JAWS_IO_Reactive_Recv : public JAWS_IO_Reactive_Handler -{ - - friend class JAWS_Reactive_IO; - -public: - - int handle_input (ACE_HANDLE handle); - - static JAWS_IO_Reactive_Recv * make ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , void *act - ) - { - return new JAWS_IO_Reactive_Recv ( handle - , mb - , completer - , ACE_Time_Value::zero - , act - , ACE_Event_Handler::READ_MASK - ); - } - - static JAWS_IO_Reactive_Recv * make ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act - ) - { - return new JAWS_IO_Reactive_Recv ( handle - , mb - , completer - , tv - , act - , ACE_Event_Handler::READ_MASK - ); - } - -private: - - JAWS_IO_Reactive_Recv ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act - , ACE_Reactor_Mask mask - ) - : JAWS_IO_Reactive_Handler (handle, completer, tv, act, mask) - , mb_ (mb) - { - } - -private: - - ACE_Message_Block *mb_; - -}; - - -class JAWS_IO_Reactive_Transmit : public JAWS_IO_Reactive_Handler -{ - - friend class JAWS_Reactive_IO; - -public: - - int handle_timeout (const ACE_Time_Value &, const void *); - - int handle_output (ACE_HANDLE handle); - - int handle_exception (ACE_HANDLE handle); - - static JAWS_IO_Reactive_Transmit * make ( ACE_HANDLE handle - , ACE_HANDLE source - , JAWS_Event_Completer *completer - , ACE_Message_Block *header - , ACE_Message_Block *trailer - , void *act - ) - { - return new JAWS_IO_Reactive_Transmit ( handle - , source - , completer - , ACE_Time_Value::zero - , header - , trailer - , act - , ACE_Event_Handler::WRITE_MASK - ); - } - - static JAWS_IO_Reactive_Transmit * make ( ACE_HANDLE handle - , ACE_HANDLE source - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , ACE_Message_Block *header - , ACE_Message_Block *trailer - , void *act - ) - { - return new JAWS_IO_Reactive_Transmit ( handle - , source - , completer - , tv - , header - , trailer - , act - , ACE_Event_Handler::WRITE_MASK - ); - } - -protected: - - void close (int result); - - int handle_output_header (ACE_HANDLE handle); - - int handle_output_source (ACE_HANDLE handle); - - int handle_output_trailer (ACE_HANDLE handle); - - int handle_output_mb (ACE_HANDLE handle, ACE_Message_Block *&mb); - -private: - - JAWS_IO_Reactive_Transmit ( ACE_HANDLE handle - , ACE_HANDLE source - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , ACE_Message_Block *header - , ACE_Message_Block *trailer - , void *act - , ACE_Reactor_Mask mask - ) - : JAWS_IO_Reactive_Handler (handle, completer, tv, act, mask) - , source_ (source) - , source_mb_ (8 * 1024) - , source_buf_ (& this->source_mb_) - , header_ (header) - , trailer_ (trailer) - { - } - -private: - - ACE_HANDLE source_; - ACE_Message_Block source_mb_; - ACE_Message_Block *source_buf_; - ACE_Message_Block *header_; - ACE_Message_Block *trailer_; - -}; - -#endif /* JAWS_REACTIVE_IO_HELPERS_H */ diff --git a/apps/JAWS3/jaws3/Signal_Task.cpp b/apps/JAWS3/jaws3/Signal_Task.cpp deleted file mode 100644 index 24c79eec032..00000000000 --- a/apps/JAWS3/jaws3/Signal_Task.cpp +++ /dev/null @@ -1,83 +0,0 @@ -// $Id$ - -#include "ace/OS_NS_signal.h" -#include "ace/OS_NS_Thread.h" -#include "ace/Thread.h" - -#ifndef JAWS_BUILD_DLL -#define JAWS_BUILD_DLL -#endif - -#include "jaws3/Signal_Task.h" -#include "jaws3/Event_Dispatcher.h" -#include "jaws3/THYBRID_Concurrency.h" -#include "jaws3/TPOOL_Concurrency.h" -#include "jaws3/TPR_Concurrency.h" - - -ACE_THR_FUNC_RETURN -JAWS_Signal_Task_function (void *) -{ - int done = 0; - - while (! done) - { - int signo = ACE_OS::sigwait (JAWS_Signal_Task::instance ()->sigset ()); - - switch (signo) - { - case SIGINT: - case SIGTERM: - - JAWS_Concurrency::instance ()->shutdown (); - JAWS_Event_Dispatcher::end_event_loop (); - - done = 1; - - break; -# if !defined (ACE_WIN32) - case SIGHUP: - // In the future, re-read jaws.conf and svc.conf, - // and then reset the JAWS singletons. - // For now, just ignore it. - break; - - case SIGPIPE: -#endif // !defined (ACE_WIN32) - default: - break; - - } - - } - - return 0; -} - - -JAWS_Signal_Task::JAWS_Signal_Task (void) -{ - // Set our signal mask. - this->sigset_.empty_set (); - - this->sigset_.sig_add (SIGINT); - this->sigset_.sig_add (SIGTERM); - this->sigset_.sig_add (SIGPIPE); - -#if 0 - this->sigset_.fill_set (); -#endif - - ACE_OS::sigprocmask (SIG_BLOCK, this->sigset_, 0); - - int result; - result = ACE_Thread::spawn ( JAWS_Signal_Task_function - , 0 - , THR_BOUND - ); - if (result < 0) - { - ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Thread::spawn")); - return; - } -} diff --git a/apps/JAWS3/jaws3/Signal_Task.h b/apps/JAWS3/jaws3/Signal_Task.h deleted file mode 100644 index f66c9fb9e56..00000000000 --- a/apps/JAWS3/jaws3/Signal_Task.h +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -// $Id$ - -#ifndef JAWS_SIGNAL_TASK_H -#define JAWS_SIGNAL_TASK_H - -#include "ace/OS.h" -#include "ace/Synch.h" -#include "ace/Signal.h" -#include "ace/Singleton.h" - -#include "jaws3/Export.h" - -class JAWS_Export JAWS_Signal_Task -{ -public: - - JAWS_Signal_Task (void); - - static JAWS_Signal_Task * instance (void) - { - return ACE_Singleton::instance (); - } - - ACE_Sig_Set & sigset (void) { return this->sigset_; } - -private: - - ACE_Sig_Set sigset_; - -}; - -#endif /* JAWS_SIGNAL_TASK_H */ diff --git a/apps/JAWS3/jaws3/Symbol_Table.cpp b/apps/JAWS3/jaws3/Symbol_Table.cpp deleted file mode 100644 index 94e35254cb7..00000000000 --- a/apps/JAWS3/jaws3/Symbol_Table.cpp +++ /dev/null @@ -1,12 +0,0 @@ -// $Id$ - -#ifndef JAWS_BUILD_DLL -#define JAWS_BUILD_DLL -#endif - -#include "jaws3/Symbol_Table.h" - -JAWS_Symbol_Table::JAWS_Symbol_Table (size_t size) - : JAWS_SYMBOL_TABLE_BASE (size) -{ -} diff --git a/apps/JAWS3/jaws3/Symbol_Table.h b/apps/JAWS3/jaws3/Symbol_Table.h deleted file mode 100644 index dfd856205e3..00000000000 --- a/apps/JAWS3/jaws3/Symbol_Table.h +++ /dev/null @@ -1,53 +0,0 @@ -/* -*- c++ -*- */ -// $Id$ - -#ifndef JAWS_SYMBOL_TABLE_H -#define JAWS_SYMBOL_TABLE_H - -#include "ace/Hash_Map_Manager.h" -#include "ace/Synch.h" - -#include "jaws3/Export.h" - -#define JAWS_SYMBOL_TABLE_ENTRY \ - ACE_Hash_Map_Entry - -#define JAWS_SYMBOL_TABLE_BASE \ - ACE_Hash_Map_Manager_Ex, ACE_Equal_To, \ - ACE_SYNCH_NULL_MUTEX> - -#define JAWS_SYMBOL_TABLE_ITERATOR_BASE \ - ACE_Hash_Map_Iterator_Base_Ex, \ - ACE_Equal_To, \ - ACE_SYNCH_NULL_MUTEX> - -#define JAWS_SYMBOL_TABLE_ITERATOR \ - ACE_Hash_Map_Iterator_Ex, ACE_Equal_To, \ - ACE_SYNCH_NULL_MUTEX> - -#define JAWS_SYMBOL_TABLE_REVERSE_ITERATOR \ - ACE_Hash_Map_Reverse_Iterator_Ex, \ - ACE_Equal_To, \ - ACE_SYNCH_NULL_MUTEX> - -class JAWS_Symbol_Table; - -class JAWS_Export JAWS_Symbol_Table : public JAWS_SYMBOL_TABLE_BASE - -// = TITLE -// A class the associates a string with another string. -{ -public: - - // = Initialization methods - - JAWS_Symbol_Table (size_t size = 211); - // Hash table should be a prime. - -}; - -#endif /* JAWS_SYMBOL_TABLE_H */ diff --git a/apps/JAWS3/jaws3/Synch_IO.cpp b/apps/JAWS3/jaws3/Synch_IO.cpp deleted file mode 100644 index 69b0d92fd95..00000000000 --- a/apps/JAWS3/jaws3/Synch_IO.cpp +++ /dev/null @@ -1,265 +0,0 @@ -// $Id$ - -#include "ace/ACE.h" - -#ifndef JAWS_BUILD_DLL -#define JAWS_BUILD_DLL -#endif - -#include "jaws3/IO.h" -#include "jaws3/Synch_IO.h" -#include "jaws3/Event_Completer.h" - -static JAWS_Event_Result -JAWS_synch_send ( ACE_HANDLE handle - , ACE_Message_Block *mb - , const ACE_Time_Value *tv = 0 - ) -{ - JAWS_Event_Result io_result; - - ssize_t result = ACE::send_n (handle, mb->rd_ptr (), mb->length (), tv); - if (result < 0) - { - if (errno == ETIME) - { - JAWS_Event_Result tmp_io_result ( 0 - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_SEND_TIMEOUT - ); - io_result = tmp_io_result; - } - else - { - JAWS_Event_Result tmp_io_result ( 0 - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_SEND_FAIL - ); - io_result = tmp_io_result; - } - } - else if ((size_t) result < mb->length ()) - { - if (result > 0) - mb->rd_ptr (result); - - JAWS_Event_Result tmp_io_result ( result - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_SEND_SHORT - ); - io_result = tmp_io_result; - } - else - { - if (result > 0) - mb->rd_ptr (result); - - JAWS_Event_Result tmp_io_result ( result - , JAWS_Event_Result::JE_OK - , JAWS_Event_Result::JE_SEND_OK - ); - io_result = tmp_io_result; - } - - return io_result; -} - -void -JAWS_Synch_IO::send ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act - ) -{ - JAWS_Event_Result io_result; - const ACE_Time_Value *tvp = 0; - - if (ACE_Time_Value::zero < tv) - tvp = &tv; - - io_result = JAWS_synch_send (handle, mb, tvp); - - if (completer) - completer->output_complete (io_result, act); -} - - -void -JAWS_Synch_IO::send ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , void *act - ) -{ - this->send (handle, mb, completer, ACE_Time_Value::zero, act); -} - - -void -JAWS_Synch_IO::recv ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act - ) -{ - JAWS_Event_Result io_result; - const ACE_Time_Value *tvp = 0; - - if (ACE_Time_Value::zero < tv) - tvp = &tv; - - ssize_t result = ACE::recv (handle, mb->wr_ptr (), mb->space (), tvp); - if (result < 0) - { - JAWS_Event_Result tmp_io_result ( 0 - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_RECV_FAIL - ); - io_result = tmp_io_result; - } - else - { - if (result > 0) - mb->wr_ptr (result); - - JAWS_Event_Result tmp_io_result ( result - , JAWS_Event_Result::JE_OK - , JAWS_Event_Result::JE_RECV_OK - ); - io_result = tmp_io_result; - } - - if (completer) - completer->input_complete (io_result, act); -} - - -void -JAWS_Synch_IO::recv ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , void *act - ) -{ - this->recv (handle, mb, completer, ACE_Time_Value::zero, act); -} - - -void -JAWS_Synch_IO::transmit ( ACE_HANDLE handle - , ACE_HANDLE source - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act - , ACE_Message_Block *header - , ACE_Message_Block *trailer - ) -{ - JAWS_Event_Result io_result; - const ACE_Time_Value *tvp = 0; - - if (ACE_Time_Value::zero < tv) - tvp = &tv; - - size_t bytes = 0; - - if (header) - { - io_result = JAWS_synch_send (handle, header, tvp); - bytes += io_result.bytes (); - if (io_result.status () != JAWS_Event_Result::JE_OK) - { - if (completer) - completer->input_complete (io_result, act); - - return; - } - } - - ACE_Message_Block buf (8 * 1024); - ssize_t len = 0; - while ((len = ACE::recv (source, buf.wr_ptr (), buf.space (), tvp)) >= 0) - { - if (len == 0) - break; - - buf.wr_ptr (len); - io_result = JAWS_synch_send (handle, & buf); - bytes += io_result.bytes (); - if (io_result.status () != JAWS_Event_Result::JE_OK) - { - JAWS_Event_Result tmp_io_result ( bytes - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_SEND_SHORT - ); - - if (completer) - completer->input_complete (tmp_io_result, act); - - return; - } - - buf.crunch (); - } - - if (trailer) - { - io_result = JAWS_synch_send (handle, trailer, tvp); - bytes += io_result.bytes (); - if (io_result.status () != JAWS_Event_Result::JE_OK) - { - JAWS_Event_Result tmp_io_result ( bytes - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_SEND_SHORT - ); - - if (completer) - completer->input_complete (tmp_io_result, act); - - return; - } - } - - if (len == 0) - { - JAWS_Event_Result tmp_io_result ( bytes - , JAWS_Event_Result::JE_OK - , JAWS_Event_Result::JE_SEND_OK - ); - io_result = tmp_io_result; - } - else - { - JAWS_Event_Result tmp_io_result ( bytes - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_SEND_SHORT - ); - io_result = tmp_io_result; - } - - if (completer) - completer->input_complete (io_result, act); -} - - -void -JAWS_Synch_IO::transmit ( ACE_HANDLE handle - , ACE_HANDLE source - , JAWS_Event_Completer *completer - , void *act - , ACE_Message_Block *header - , ACE_Message_Block *trailer - ) -{ - this->transmit ( handle - , source - , completer - , ACE_Time_Value::zero - , act - , header - , trailer - ); -} - diff --git a/apps/JAWS3/jaws3/Synch_IO.h b/apps/JAWS3/jaws3/Synch_IO.h deleted file mode 100644 index f74d78ce04d..00000000000 --- a/apps/JAWS3/jaws3/Synch_IO.h +++ /dev/null @@ -1,66 +0,0 @@ -/* -*- c++ -*- */ -// $Id$ - -#ifndef JAWS_SYNCH_IO_H -#define JAWS_SYNCH_IO_H - -#include "ace/OS.h" -#include "ace/Singleton.h" - -#include "jaws3/IO.h" - -class JAWS_Export JAWS_Synch_IO : public JAWS_IO_Impl -{ -public: - - static JAWS_Synch_IO * instance (void) - { - return ACE_Singleton::instance (); - } - - void send ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , void *act = 0 - ); - - void recv ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , void *act = 0 - ); - - void transmit ( ACE_HANDLE handle - , ACE_HANDLE source - , JAWS_Event_Completer *completer - , void *act = 0 - , ACE_Message_Block *header = 0 - , ACE_Message_Block *trailer = 0 - ); - - void send ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act = 0 - ); - - void recv ( ACE_HANDLE handle - , ACE_Message_Block *mb - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act = 0 - ); - - void transmit ( ACE_HANDLE handle - , ACE_HANDLE source - , JAWS_Event_Completer *completer - , const ACE_Time_Value &tv - , void *act = 0 - , ACE_Message_Block *header = 0 - , ACE_Message_Block *trailer = 0 - ); - -}; - -#endif /* JAWS_SYNCH_IO_H */ diff --git a/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp b/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp deleted file mode 100644 index 83c3da28bc7..00000000000 --- a/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp +++ /dev/null @@ -1,130 +0,0 @@ -// $Id$ - -#include "ace/OS_NS_stdlib.h" -#include "ace/Message_Block.h" - -#ifndef JAWS_BUILD_DLL -#define JAWS_BUILD_DLL -#endif - -#include "jaws3/Concurrency.h" -#include "jaws3/THYBRID_Concurrency.h" -#include "jaws3/Protocol_Handler.h" -#include "jaws3/Options.h" - - -JAWS_THYBRID_Concurrency::JAWS_THYBRID_Concurrency (void) - : getting_ (0) - , min_number_of_threads_ (1) - , max_number_of_threads_ (-1) - , shutdown_task_ (0) - , error_ (0) -{ - const char *value; - - value = JAWS_Options::instance ()->getenv ("JAWS_MIN_THYBRID_THREADS"); - if (value != 0) - this->min_number_of_threads_ = ACE_OS::atoi (value); - else - this->min_number_of_threads_ = - ACE_OS::atoi (JAWS_DEFAULT_MIN_THYBRID_THREADS); - - if (this->min_number_of_threads_ <= 0) - this->min_number_of_threads_ = 1; - - value = JAWS_Options::instance ()->getenv ("JAWS_MAX_THYBRID_THREADS"); - if (value != 0) - this->max_number_of_threads_ = ACE_OS::atoi (value); - else - this->max_number_of_threads_ = - ACE_OS::atoi (JAWS_DEFAULT_MAX_THYBRID_THREADS); - - if (this->max_number_of_threads_ <= 0) - this->max_number_of_threads_ = -1; - else if (this->max_number_of_threads_ < this->min_number_of_threads_) - this->max_number_of_threads_ = this->min_number_of_threads_; - - int r; - r = this->activate (THR_BOUND | THR_JOINABLE, this->min_number_of_threads_); - if (r < 0) - { - this->shutdown_task_ = 1; - this->error_ = 1; - } -} - -int -JAWS_THYBRID_Concurrency::putq (JAWS_Protocol_Handler *ph) -{ - if (this->error_) - return -1; - - JAWS_CONCURRENCY_TASK *task = this; - int result = task->putq (& ph->mb_); - - if (result != -1) - { - if (this->getting_ < this->min_number_of_threads_ - && (this->max_number_of_threads_ < 0 - || this->thr_count () < (size_t) this->max_number_of_threads_)) - { - int r; - r = this->activate ( THR_BOUND | THR_JOINABLE - , 1 // number of threads - , 1 // force active - ); - if (r < 0) - { - // ACE_ERROR - return -1; - } - } - } - - return result; -} - -int -JAWS_THYBRID_Concurrency::getq (JAWS_Protocol_Handler *&ph) -{ - ph = 0; - - JAWS_CONCURRENCY_TASK *task = this; - - if (this->shutdown_task_ && task->msg_queue ()->message_count () == 0) - return -1; - - int getting = ++(this->getting_); - - if (getting > this->min_number_of_threads_) - { - if (task->msg_queue ()->message_count () == 0) - { - --(this->getting_); - return -1; - } - } - - ACE_Message_Block *mb = 0; - int result = task->getq (mb); - - if (result != -1) - { - ph = (JAWS_Protocol_Handler *) mb->base (); - - if (ph == 0) - { - // Shutdown this task; - this->shutdown_task_ = 1; - if (this->getting_ > 1) - { - task->putq (mb); - result = -1; - } - - } - } - - --(this->getting_); - return result; -} diff --git a/apps/JAWS3/jaws3/THYBRID_Concurrency.h b/apps/JAWS3/jaws3/THYBRID_Concurrency.h deleted file mode 100644 index c75fbb1cb1f..00000000000 --- a/apps/JAWS3/jaws3/THYBRID_Concurrency.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -// $Id$ - -#ifndef JAWS_THYBRID_CONCURRENCY_H -#define JAWS_THYBRID_CONCURRENCY_H - -#include "ace/Atomic_Op.h" - -#include "jaws3/Concurrency.h" - -class JAWS_Export JAWS_THYBRID_Concurrency : public JAWS_Concurrency_Impl -{ -public: - - JAWS_THYBRID_Concurrency (void); - - int putq (JAWS_Protocol_Handler *ph); - - int getq (JAWS_Protocol_Handler *&ph); - - static JAWS_THYBRID_Concurrency * instance (void) - { - return ACE_Singleton - ::instance (); - } - -private: - - ACE_Atomic_Op getting_; - int min_number_of_threads_; - int max_number_of_threads_; - int shutdown_task_; - int error_; - -}; - -#endif /* JAWS_THYBRID_CONCURRENCY_H */ diff --git a/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp b/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp deleted file mode 100644 index 4f91c5f34c8..00000000000 --- a/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp +++ /dev/null @@ -1,80 +0,0 @@ -// $Id$ - -#include "ace/OS_NS_stdlib.h" -#include "ace/Message_Block.h" - -#ifndef JAWS_BUILD_DLL -#define JAWS_BUILD_DLL -#endif - -#include "jaws3/TPOOL_Concurrency.h" -#include "jaws3/Protocol_Handler.h" -#include "jaws3/Options.h" - -JAWS_TPOOL_Concurrency::JAWS_TPOOL_Concurrency (void) - : number_of_threads_ (5) - , shutdown_task_ (0) - , error_ (0) -{ - const char *value = JAWS_Options::instance ()->getenv ("JAWS_TPOOL_THREADS"); - if (value != 0) - this->number_of_threads_ = ACE_OS::atoi (value); - else - this->number_of_threads_ = ACE_OS::atoi (JAWS_DEFAULT_TPOOL_THREADS); - - if (this->number_of_threads_ <= 0) - this->number_of_threads_ = 5; - - int r; - r = this->activate ( THR_BOUND | THR_JOINABLE, this->number_of_threads_); - - if (r < 0) - { - // ACE_ERROR - this->error_ = 1; - this->shutdown_task_ = 1; - } -} - -int -JAWS_TPOOL_Concurrency::putq (JAWS_Protocol_Handler *ph) -{ - if (this->error_) - return -1; - - JAWS_CONCURRENCY_TASK *task = this; - return task->putq (& ph->mb_); -} - -int -JAWS_TPOOL_Concurrency::getq (JAWS_Protocol_Handler *&ph) -{ - ph = 0; - - JAWS_CONCURRENCY_TASK *task = this; - - if (this->shutdown_task_ && task->msg_queue ()->message_count () == 0) - return -1; - - ACE_Message_Block *mb = 0; - - int result = task->getq (mb); - - if (result != -1) - { - ph = (JAWS_Protocol_Handler *) mb->base (); - - if (ph == 0) - { - // Shutdown this task; - this->shutdown_task_ = 1; - if (this->number_of_threads_ && this->number_of_threads_-- > 1) - { - task->putq (mb); - result = -1; - } - } - } - - return result; -} diff --git a/apps/JAWS3/jaws3/TPOOL_Concurrency.h b/apps/JAWS3/jaws3/TPOOL_Concurrency.h deleted file mode 100644 index b9617b2fde3..00000000000 --- a/apps/JAWS3/jaws3/TPOOL_Concurrency.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- c++ -*- */ -// $Id$ - -#ifndef JAWS_TPOOL_CONCURRENCY_H -#define JAWS_TPOOL_CONCURRENCY_H - -#include "jaws3/Concurrency.h" - -class JAWS_Export JAWS_TPOOL_Concurrency : public JAWS_Concurrency_Impl -{ -public: - - JAWS_TPOOL_Concurrency (void); - - int putq (JAWS_Protocol_Handler *ph); - - int getq (JAWS_Protocol_Handler *&ph); - - static JAWS_TPOOL_Concurrency * instance (void) - { - return ACE_Singleton::instance (); - } - -private: - - int number_of_threads_; - int shutdown_task_; - int error_; - -}; - -#endif /* JAWS_TPOOL_CONCURRENCY_H */ diff --git a/apps/JAWS3/jaws3/TPR_Concurrency.cpp b/apps/JAWS3/jaws3/TPR_Concurrency.cpp deleted file mode 100644 index 6e15def5cb8..00000000000 --- a/apps/JAWS3/jaws3/TPR_Concurrency.cpp +++ /dev/null @@ -1,89 +0,0 @@ -// $Id$ - -#include "ace/Message_Block.h" - -#ifndef JAWS_BUILD_DLL -#define JAWS_BUILD_DLL -#endif - -#include "jaws3/Concurrency.h" -#include "jaws3/TPR_Concurrency.h" -#include "jaws3/Protocol_Handler.h" -#include "jaws3/Options.h" - - -JAWS_TPR_Concurrency::JAWS_TPR_Concurrency (void) - : getting_ (0) - , shutdown_task_ (0) - , error_ (0) -{ - int r; - r = this->activate (THR_BOUND | THR_JOINABLE); - if (r < 0) - { - this->error_ = 1; - this->shutdown_task_ = 1; - } -} - -int -JAWS_TPR_Concurrency::putq (JAWS_Protocol_Handler *ph) -{ - if (this->error_) - return -1; - - JAWS_CONCURRENCY_TASK *task = this; - int result = task->putq (& ph->mb_); - - if (result != -1) - { - int r; - r = this->activate ( THR_BOUND | THR_JOINABLE - , 1 // number of threads - , 1 // force active - ); - if (r < 0) - { - // ACE_ERROR - return -1; - } - } - - return result; -} - -int -JAWS_TPR_Concurrency::getq (JAWS_Protocol_Handler *&ph) -{ - ph = 0; - - JAWS_CONCURRENCY_TASK *task = this; - - if (this->shutdown_task_ && task->msg_queue ()->message_count () == 0) - return -1; - - int getting = ++(this->getting_); - - if (getting > 1 && task->msg_queue ()->message_count () == 0) - { - --(this->getting_); - return -1; - } - - ACE_Message_Block *mb = 0; - int result = task->getq (mb); - - if (result != -1) - { - ph = (JAWS_Protocol_Handler *) mb->base (); - - if (ph == 0) - { - // Shutdown this task; - this->shutdown_task_ = 1; - } - } - - --(this->getting_); - return result; -} diff --git a/apps/JAWS3/jaws3/TPR_Concurrency.h b/apps/JAWS3/jaws3/TPR_Concurrency.h deleted file mode 100644 index 9feff7da706..00000000000 --- a/apps/JAWS3/jaws3/TPR_Concurrency.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -*- c++ -*- */ -// $Id$ - -#ifndef JAWS_TPR_CONCURRENCY_H -#define JAWS_TPR_CONCURRENCY_H - -#include "ace/Atomic_Op.h" - -#include "jaws3/Concurrency.h" - -class JAWS_Export JAWS_TPR_Concurrency : public JAWS_Concurrency_Impl -{ -public: - - JAWS_TPR_Concurrency (void); - - int putq (JAWS_Protocol_Handler *ph); - - int getq (JAWS_Protocol_Handler *&ph); - - static JAWS_TPR_Concurrency * instance (void) - { - return ACE_Singleton::instance (); - } - -private: - - ACE_Atomic_Op getting_; - int min_number_of_threads_; - int shutdown_task_; - int error_; - -}; - -#endif /* JAWS_TPR_CONCURRENCY_H */ diff --git a/apps/JAWS3/jaws3/Task_Timer.cpp b/apps/JAWS3/jaws3/Task_Timer.cpp deleted file mode 100644 index c3775020193..00000000000 --- a/apps/JAWS3/jaws3/Task_Timer.cpp +++ /dev/null @@ -1,104 +0,0 @@ -// $Id$ - -#ifndef JAWS_BUILD_DLL -#define JAWS_BUILD_DLL -#endif - -#include "jaws3/Task_Timer.h" -#include "jaws3/Timer_Helpers.h" - - -JAWS_Task_Timer::JAWS_Task_Timer (void) -{ - this->timer_queue_.activate (); -} - - -void -JAWS_Task_Timer::schedule_timer ( long *timer_id - , const ACE_Time_Value &delta - , JAWS_Event_Completer *completer - , void *act - ) -{ - JAWS_Timer_EH *eh = new JAWS_Timer_EH (completer, act); - if (eh == 0 - || (*timer_id = - this->timer_queue_.schedule ( eh - , 0 - , delta + ACE_OS::gettimeofday ())) - == -1) - { - JAWS_Event_Result timer_result ( 0 - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_TIMER_FAIL - ); - - if (completer) - completer->timer_complete (timer_result, act); - - delete eh; - } -} - - -void -JAWS_Task_Timer::schedule_absolute_timer ( long *timer_id - , const ACE_Time_Value &tv - , JAWS_Event_Completer *completer - , void *act - ) -{ - JAWS_Timer_EH *eh = new JAWS_Timer_EH (completer, act); - if (eh == 0 - || (*timer_id = this->timer_queue_.schedule (eh, 0, tv)) == -1) - { - JAWS_Event_Result timer_result ( 0 - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_TIMER_FAIL - ); - - if (completer) - completer->timer_complete (timer_result, act); - - delete eh; - } -} - - -void -JAWS_Task_Timer::schedule_interval_timer ( long *timer_id - , const ACE_Time_Value &interval - , JAWS_Event_Completer *completer - , void *act - ) -{ - JAWS_Timer_EH *eh = new JAWS_Timer_EH (completer, act); - if (eh == 0 - || (*timer_id = - this->timer_queue_.schedule ( eh - , 0 - , interval + ACE_OS::gettimeofday () - , interval - )) - == -1) - { - JAWS_Event_Result timer_result ( 0 - , JAWS_Event_Result::JE_ERROR - , JAWS_Event_Result::JE_TIMER_FAIL - ); - - if (completer) - completer->timer_complete (timer_result, act); - - delete eh; - } -} - - -void -JAWS_Task_Timer::cancel_timer (long timer_id) -{ - this->timer_queue_.cancel (timer_id); -} - diff --git a/apps/JAWS3/jaws3/Task_Timer.h b/apps/JAWS3/jaws3/Task_Timer.h deleted file mode 100644 index a31781a922a..00000000000 --- a/apps/JAWS3/jaws3/Task_Timer.h +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- c++ -*- */ -// $Id$ - -#ifndef JAWS_TASK_TIMER_H -#define JAWS_TASK_TIMER_H - -#include "ace/Singleton.h" -#include "ace/Timer_Wheel.h" -#include "ace/Timer_Queue_Adapters.h" - -#include "jaws3/Export.h" -#include "jaws3/Timer.h" - -class JAWS_Task_Timer; - -class JAWS_Export JAWS_Task_Timer : public JAWS_Timer_Impl -{ -public: - - JAWS_Task_Timer (void); - - static JAWS_Timer_Impl * instance (void) - { - return ACE_Singleton::instance (); - } - - void schedule_timer ( long *timer_id - , const ACE_Time_Value &delta - , JAWS_Event_Completer *completer - , void *act = 0 - ); - - void schedule_absolute_timer ( long *timer_id - , const ACE_Time_Value &tv - , JAWS_Event_Completer *completer - , void *act = 0 - ); - - void schedule_interval_timer ( long *timer_id - , const ACE_Time_Value &interval - , JAWS_Event_Completer *completer - , void *act = 0 - ); - - void cancel_timer (long timer_id); - // NOTE: Cancelling the timer causes handle_close to be called, but - // not handle_timeout (of couse, I mean in the ACE_Event_Handler that - // is being used as the timer helper). - -private: - - ACE_Thread_Timer_Queue_Adapter timer_queue_; - -}; - -#endif /* JAWS_TASK_TIMER_H */ diff --git a/apps/JAWS3/jaws3/Templates.cpp b/apps/JAWS3/jaws3/Templates.cpp deleted file mode 100644 index 32bd4642109..00000000000 --- a/apps/JAWS3/jaws3/Templates.cpp +++ /dev/null @@ -1,100 +0,0 @@ -// $Id$ - -#include "ace/Reactor.h" -#include "ace/Select_Reactor.h" -#include "ace/Svc_Handler.h" -#include "ace/SOCK_Stream.h" -#include "ace/LSOCK_Stream.h" - -#ifndef JAWS_BUILD_DLL -#define JAWS_BUILD_DLL -#endif - -#include "jaws3/Asynch_IO.h" -#include "jaws3/Concurrency.h" -#include "jaws3/Export.h" -#include "jaws3/IO.h" -#include "jaws3/Event_Dispatcher.h" -#include "jaws3/Event_Completer.h" -#include "jaws3/Options.h" -#include "jaws3/Protocol_Handler.h" -#include "jaws3/Reactive_IO.h" -#include "jaws3/Signal_Task.h" -#include "jaws3/Symbol_Table.h" -#include "jaws3/Synch_IO.h" -#include "jaws3/TPOOL_Concurrency.h" -#include "jaws3/TPR_Concurrency.h" -#include "jaws3/THYBRID_Concurrency.h" -#include "jaws3/Timer.h" -#include "jaws3/Task_Timer.h" - -#define ACE_EHHTU_RW \ - ACE_Event_Handler_Handle_Timeout_Upcall -#define ACE_EHHTU_R \ - ACE_Event_Handler_Handle_Timeout_Upcall - -#define ACE_WHEEL_TEMPLATE_ARGS_RW \ - ACE_Event_Handler *, ACE_EHHTU_RW, ACE_SYNCH_RW_MUTEX -#define ACE_WHEEL_TEMPLATE_ARGS_R \ - ACE_Event_Handler *, ACE_EHHTU_R, ACE_SYNCH_RECURSIVE_MUTEX - -#define ACE_TWT_RW \ - ACE_Timer_Wheel_T -#define ACE_TWT_R \ - ACE_Timer_Wheel_T -#define ACE_TWIT_RW \ - ACE_Timer_Wheel_Iterator_T -#define ACE_TWIT_R \ - ACE_Timer_Wheel_Iterator_T -#define ACE_TQT_RW \ - ACE_Timer_Queue_T -#define ACE_TQT_R \ - ACE_Timer_Queue_T -#define ACE_TQIT_RW \ - ACE_Timer_Queue_Iterator_T -#define ACE_TQIT_R \ - ACE_Timer_Queue_Iterator_T - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Svc_Handler; -template class ACE_Svc_Handler; -template class ACE_Atomic_Op; -template class ACE_Atomic_Op_Ex; -template class ACE_Node; -template class ACE_Unbounded_Queue; -template class ACE_Unbounded_Queue_Iterator; -template class ACE_Singleton; -template class ACE_Singleton; -template class ACE_Singleton; -template class ACE_Singleton; -template class ACE_Singleton; -template class ACE_Singleton; -template class ACE_Singleton; -template class ACE_Singleton; -template class ACE_Singleton; -template class ACE_Select_Reactor_Token_T; -template class ACE_Select_Reactor_T; -template class ACE_Lock_Adapter; -template class ACE_EHHTU_RW; -template class ACE_EHHTU_R; -template class ACE_TWT_RW; -template class ACE_TWT_R; -template class ACE_TWIT_RW; -template class ACE_TWIT_R; -template class ACE_TQT_RW; -template class ACE_TQT_R; -template class ACE_TQIT_RW; -template class ACE_TQIT_R; -template class ACE_Thread_Timer_Queue_Adapter< ACE_TWT_RW >; -template class ACE_Thread_Timer_Queue_Adapter< ACE_TWT_R >; -template class ACE_Singleton; -template class ACE_Singleton; -template class ACE_Singleton; -template class ACE_Singleton; -template class JAWS_SYMBOL_TABLE_ENTRY; -template class JAWS_SYMBOL_TABLE_BASE; -template class JAWS_SYMBOL_TABLE_ITERATOR_BASE; -template class JAWS_SYMBOL_TABLE_ITERATOR; -template class JAWS_SYMBOL_TABLE_REVERSE_ITERATOR; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/apps/JAWS3/jaws3/Timer.cpp b/apps/JAWS3/jaws3/Timer.cpp deleted file mode 100644 index 33773520ddc..00000000000 --- a/apps/JAWS3/jaws3/Timer.cpp +++ /dev/null @@ -1,53 +0,0 @@ -// $Id$ - -#ifndef JAWS_BUILD_DLL -#define JAWS_BUILD_DLL -#endif - -#include "jaws3/Timer.h" -#include "jaws3/Task_Timer.h" - -JAWS_Timer::JAWS_Timer (JAWS_Timer_Impl *impl) - : impl_ (impl) -{ - // TODO: Change this to use JAWS_Options after we have more than - // one way of handling timers. - if (this->impl_ == 0) - this->impl_ = JAWS_Task_Timer::instance (); -} - -void -JAWS_Timer::schedule_timer ( long *timer_id - , const ACE_Time_Value &delta - , JAWS_Event_Completer *completer - , void *act - ) -{ - this->impl_->schedule_timer (timer_id, delta, completer, act); -} - -void -JAWS_Timer::schedule_absolute_timer ( long *timer_id - , const ACE_Time_Value &tv - , JAWS_Event_Completer *completer - , void *act - ) -{ - this->impl_->schedule_absolute_timer (timer_id, tv, completer, act); -} - -void -JAWS_Timer::schedule_interval_timer ( long *timer_id - , const ACE_Time_Value &interval - , JAWS_Event_Completer *completer - , void *act - ) -{ - this->impl_->schedule_interval_timer (timer_id, interval, completer, act); -} - -void -JAWS_Timer::cancel_timer (long timer_id) -{ - this->impl_->cancel_timer (timer_id); -} diff --git a/apps/JAWS3/jaws3/Timer.h b/apps/JAWS3/jaws3/Timer.h deleted file mode 100644 index d2468344307..00000000000 --- a/apps/JAWS3/jaws3/Timer.h +++ /dev/null @@ -1,94 +0,0 @@ -/* -*- c++ -*- */ -// $Id$ - -#ifndef JAWS_TIMER_H -#define JAWS_TIMER_H - -#include "ace/Singleton.h" -#include "ace/Timer_Wheel.h" -#include "ace/Timer_Queue_Adapters.h" - -#include "jaws3/Export.h" -#include "jaws3/Event_Completer.h" - -class JAWS_Timer; -class JAWS_Timer_Impl; - -class JAWS_Export JAWS_Timer_Impl -// = TITLE -// Implementation base class for Timers that corresponds to the -// RHS of the Bridge pattern. -{ -public: - - virtual ~JAWS_Timer_Impl (void) {} - - virtual void schedule_timer ( long *timer_id - , const ACE_Time_Value &delta - , JAWS_Event_Completer *completer - , void *act = 0 - ) = 0; - // Schedule a timer to expire at now+delta. - - virtual void schedule_absolute_timer ( long *timer_id - , const ACE_Time_Value &tv - , JAWS_Event_Completer *completer - , void *act = 0 - ) = 0; - // Schedule a timer to expire at tv. - - virtual void schedule_interval_timer ( long *timer_id - , const ACE_Time_Value &interval - , JAWS_Event_Completer *completer - , void *act = 0 - ) = 0; - // Schedule a timer to expire at now+interval, and every interval following. - - virtual void cancel_timer (long timer_id) = 0; - // Cancel a timer. - -}; - - -class JAWS_Export JAWS_Timer -// = TITLE -// Abstraction base class for Timers that corresponds to the LHS of the -// Bridge pattern. -{ -public: - - JAWS_Timer (JAWS_Timer_Impl *impl = 0); - - static JAWS_Timer * instance (void) - { - return ACE_Singleton::instance (); - } - - void schedule_timer ( long *timer_id - , const ACE_Time_Value &delta - , JAWS_Event_Completer *completer - , void *act = 0 - ); - - void schedule_absolute_timer ( long *timer_id - , const ACE_Time_Value &tv - , JAWS_Event_Completer *completer - , void *act = 0 - ); - - void schedule_interval_timer ( long *timer_id - , const ACE_Time_Value &interval - , JAWS_Event_Completer *completer - , void *act = 0 - ); - - void cancel_timer (long timer_id); - -private: - - JAWS_Timer_Impl *impl_; - -}; - - -#endif /* JAWS_TIMER_H */ diff --git a/apps/JAWS3/jaws3/Timer_Helpers.cpp b/apps/JAWS3/jaws3/Timer_Helpers.cpp deleted file mode 100644 index 1b7d4b60c41..00000000000 --- a/apps/JAWS3/jaws3/Timer_Helpers.cpp +++ /dev/null @@ -1,40 +0,0 @@ -// $Id$ - -#ifndef JAWS_BUILD_DLL -#define JAWS_BUILD_DLL -#endif - -#include "jaws3/Timer_Helpers.h" - -int -JAWS_Timer_EH::handle_timeout (const ACE_Time_Value &, const void *) -{ - JAWS_Event_Result timer_result ( 0 - , JAWS_Event_Result::JE_OK - , JAWS_Event_Result::JE_TIMER_OK - ); - - if (this->completer_) - this->completer_->timer_complete (timer_result, this->act_); - - if (this->interval_) - return 0; - - this->expired_ = 1; - return -1; -} - -int -JAWS_Timer_EH::handle_close (ACE_HANDLE, ACE_Reactor_Mask) -{ - JAWS_Event_Result timer_result ( 0 - , JAWS_Event_Result::JE_CANCEL - , JAWS_Event_Result::JE_TIMER_CANCEL - ); - - if (! this->expired_ && this->completer_) - this->completer_->timer_complete (timer_result, this->act_); - - return 0; -} - diff --git a/apps/JAWS3/jaws3/Timer_Helpers.h b/apps/JAWS3/jaws3/Timer_Helpers.h deleted file mode 100644 index 9ce8434975f..00000000000 --- a/apps/JAWS3/jaws3/Timer_Helpers.h +++ /dev/null @@ -1,44 +0,0 @@ -/* -*- c+ -*- */ -// $Id$ - -#ifndef JAWS_TIMER_HELPERS_H -#define JAWS_TIMER_HELPERS_H - -#include "ace/Singleton.h" -#include "ace/Event_Handler.h" - -#include "jaws3/Timer.h" -#include "jaws3/Event_Completer.h" -#include "jaws3/Event_Result.h" - -class JAWS_Timer_EH : public ACE_Event_Handler -{ -public: - - JAWS_Timer_EH ( JAWS_Event_Completer *completer - , void *act = 0 - , int interval = 0 - ) - : completer_ (completer) - , act_ (act) - , interval_ (interval) - , expired_ (0) - { - } - - int handle_timeout (const ACE_Time_Value &tv, const void *act); - // Called when timer expires. - - int handle_close (ACE_HANDLE h, ACE_Reactor_Mask m); - // Called directly when timer is canceled. - -private: - - JAWS_Event_Completer *completer_; - void *act_; - const int interval_; - int expired_; - -}; - -#endif /* JAWS_TIMER_HELPERS_H */ diff --git a/apps/JAWS3/jaws3/jaws.conf b/apps/JAWS3/jaws3/jaws.conf deleted file mode 100644 index 4f029ef4a44..00000000000 --- a/apps/JAWS3/jaws3/jaws.conf +++ /dev/null @@ -1,15 +0,0 @@ -# See jaws3/Options.h for default values -# - -#JAWS_IO = SYNCH -# SYNCH, ASYNCH, or REACTIVE - -#JAWS_CONCURRENCY = TPOOL -# TPOOL, TPR, or THYBRID - -#JAWS_MIN_THYBRID_THREADS = 1 - -#JAWS_MAX_THYBRID_THREADS = -1 -# -1 means no upper bound - -#JAWS_TPOOL_THREADS = 20 diff --git a/apps/JAWS3/jaws3/jaws3.mpc b/apps/JAWS3/jaws3/jaws3.mpc deleted file mode 100644 index 5d1be0bfcd0..00000000000 --- a/apps/JAWS3/jaws3/jaws3.mpc +++ /dev/null @@ -1,78 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project(JAWS3) : acelib { - sharedname = JAWS3 - dynamicflags = JAWS_BUILD_DLL - includes += .. - Source_Files { - Asynch_IO.cpp - Concurrency.cpp - Config_File.cpp - Datagram.cpp - Event_Completer.cpp - Event_Dispatcher.cpp - FILE.cpp - IO.cpp - Options.cpp - Protocol_Handler.cpp - Reactive_IO.cpp - Signal_Task.cpp - Symbol_Table.cpp - Synch_IO.cpp - THYBRID_Concurrency.cpp - TPOOL_Concurrency.cpp - TPR_Concurrency.cpp - Task_Timer.cpp - Templates.cpp - Timer.cpp - Timer_Helpers.cpp - } - - Template_Files{ - Cached_Allocator_T.cpp - Concurrency_T.cpp - } - - Header_Files{ - Asynch_IO.h - Asynch_IO_Helpers.h - Cached_Allocator_T.h - Concurrency.h - Concurrency_T.h - Config_File.h - Datagram.h - Event_Completer.h - Event_Dispatcher.h - Event_Result.h - Export.h - FILE.h - IO.h - Options.h - Protocol_Handler.h - Reactive_IO.h - Reactive_IO_Helpers.h - Signal_Task.h - Symbol_Table.h - Synch_IO.h - Task_Timer.h - THYBRID_Concurrency.h - Timer.h - Timer_Helpers.h - TPOOL_Concurrency.h - TPR_Concurrency.h - } - - Inline_Files{ - } -} - -project(JAWS3_server) : aceexe { - includes += .. - exename = main - after += JAWS3 - libs += JAWS3 - Source_Files { - main.cpp - } -} diff --git a/apps/JAWS3/jaws3/main.cpp b/apps/JAWS3/jaws3/main.cpp deleted file mode 100644 index 4b5705abc2f..00000000000 --- a/apps/JAWS3/jaws3/main.cpp +++ /dev/null @@ -1,33 +0,0 @@ -// $Id$ -#include "ace/Log_Msg.h" -#include "ace/Reactor.h" -#include "ace/Select_Reactor.h" -#include "ace/Service_Config.h" -#include "ace/Thread_Manager.h" - -#include "jaws3/Event_Dispatcher.h" -#include "jaws3/Signal_Task.h" - -int -main (int argc, ACE_TCHAR *argv[]) -{ - ACE_REACTOR_INSTANCE_INIT; - - JAWS_Signal_Task::instance (); - - if (ACE_Service_Config::open (argc, argv) == -1 - && errno != ENOENT) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("open")), - 1); - - // Run forever, performing the configured services until we - // shutdown. - - JAWS_Event_Dispatcher::run_event_loop (); - - ACE_Thread_Manager::instance ()->wait (); - - return 0; -} -- cgit v1.2.1