summaryrefslogtreecommitdiff
path: root/ACE/apps/JAWS3
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-09-28 18:53:06 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-09-28 18:53:06 +0000
commit7037f07a783a475bf959d44ab963dc72744d7486 (patch)
tree9bf6608ee32ca5ad9e3ba323d28ccdddbe5818d4 /ACE/apps/JAWS3
parentb033bc373795d238973ecd67e1543caa87c31420 (diff)
downloadATCD-7037f07a783a475bf959d44ab963dc72744d7486.tar.gz
Tue Sep 28 18:48:58 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* apps/JAWS3/jaws3-todo: Removed, todo for years now
Diffstat (limited to 'ACE/apps/JAWS3')
-rw-r--r--ACE/apps/JAWS3/jaws3-todo/FILE_Cache.h52
-rw-r--r--ACE/apps/JAWS3/jaws3-todo/Map_Manager.h148
-rw-r--r--ACE/apps/JAWS3/jaws3-todo/Map_Manager_T.cpp398
-rw-r--r--ACE/apps/JAWS3/jaws3-todo/Map_Manager_T.h392
-rw-r--r--ACE/apps/JAWS3/jaws3-todo/Reactive_Socket.cpp83
-rw-r--r--ACE/apps/JAWS3/jaws3-todo/Reactive_Socket.h88
-rw-r--r--ACE/apps/JAWS3/jaws3-todo/Reactive_Socket_Helpers.cpp81
-rw-r--r--ACE/apps/JAWS3/jaws3-todo/Reactive_Socket_Helpers.h86
-rw-r--r--ACE/apps/JAWS3/jaws3-todo/Socket.cpp82
-rw-r--r--ACE/apps/JAWS3/jaws3-todo/Socket.h143
10 files changed, 0 insertions, 1553 deletions
diff --git a/ACE/apps/JAWS3/jaws3-todo/FILE_Cache.h b/ACE/apps/JAWS3/jaws3-todo/FILE_Cache.h
deleted file mode 100644
index e81d5d57ecd..00000000000
--- a/ACE/apps/JAWS3/jaws3-todo/FILE_Cache.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- c++ -*- */
-// $Id$
-
-#ifndef JAWS_FILE_CACHE_H
-#define JAWS_FILE_CACHE_H
-
-class JAWS_FILE_Cache;
-
-typedef const char * KEY;
-typedef JAWS_FILE * VALUE;
-typedef int ATTR;
-typedef ACE_Pair <VALUE, ATTR> CACHE_VALUE;
-typedef ACE_Equal_To<KEY> EQ_FUNC;
-typedef ACE_Hash<KEY> HASH_FUNC;
-
-#define JAWS_KEY_PAIR KEY, CACHE_VALUE
-#define JAWS_MAP_FUNCS HASH_FUNC, EQ_FUNC
-#define JAWS_NULL_SYNCH ACE_SYNCH_NULL_MUTEX
-#define JAWS_MAP_MANAGER_T_ARGS \
- JAWS_KEY_PAIR, JAWS_MAP_FUNCS, JAWS_NULL_SYNCH
-
-typedef ACE_Hash_Map_Manager_Ex<JAWS_MAP_MANAGER_T_ARGS>
- JAWS_FILE_HASH_MAP_MANAGER;
-typedef ACE_Hash_Map_Iterator_Ex<JAWS_MAP_MANAGER_T_ARGS>
- JAWS_FILE_HASH_MAP_ITERATOR;
-typedef ACE_Hash_Map_Reverse_Iterator_Ex<JAWS_MAP_MANAGER_T_ARGS>
- JAWS_FILE_HASH_MAP_REVERSE_ITERATOR;
-
-typedef ACE_Map_Manager<JAWS_KEY_PAIR, JAWS_NULL_SYNCH>
- JAWS_FILE_MAP_MANAGER;
-typedef ACE_Map_Iterator<JAWS_KEY_PAIR, JAWS_NULL_SYNCH>
- JAWS_FILE_MAP_ITERATOR;
-typedef ACE_Map_Reverse_Iterator<JAWS_KEY_PAIR, JAWS_NULL_SYNCH>
- JAWS_FILE_MAP_REVERSE_ITERATOR;
-
-// Need a specialization to decrement a reference count.
-typedef ACE_Cleanup_Strategy<JAWS_KEY_PAIR, JAWS_FILE_HASH_MAP_MANAGER>
- JAWS_FILE_HASH_MAP_CLEANUP;
-
-// Need a specialization to decrement a reference count.
-typedef ACE_Cleanup_Strategy<JAWS_KEY_PAIR, JAWS_FILE_MAP_MANAGER>
- JAWS_FILE_MAP_CLEANUP;
-
-
-
-
-class JAWS_Export JAWS_FILE_Cache
-{
-public:
-};
-
-#endif /* JAWS_FILE_CACHE_H */
diff --git a/ACE/apps/JAWS3/jaws3-todo/Map_Manager.h b/ACE/apps/JAWS3/jaws3-todo/Map_Manager.h
deleted file mode 100644
index 7452ddb21e8..00000000000
--- a/ACE/apps/JAWS3/jaws3-todo/Map_Manager.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- c++ -*- */
-// $Id$
-
-#ifndef JAWS_CACHE_MAP_MANAGER_H
-#define JAWS_CACHE_MAP_MANAGER_H
-
-template <class EXT_ID>
-class JAWS_Cache_Map_Entry
-{
-public:
-
- JAWS_Cache_Map_Entry ( const EXT_ID &ext_id
- , ACE_Message_Block *&int_id
- , JAWS_Cache_Map_Entry<EXT_ID, INT_ID> *next = 0
- , JAWS_Cache_Map_Entry<EXT_ID, INT_ID> *prev = 0
- );
-
- JAWS_Cache_Map_Entry ( JAWS_Cache_Map_Entry<EXT_ID, INT_ID> *next
- , JAWS_Cache_Map_Entry<EXT_ID, INT_ID> *prev
- );
-
-private:
-
- ~JAWS_Cache_Map_Entry (void) {}
-
-public:
-
- EXT_ID ext_id_;
- ACE_Message_Block *int_id_;
-
- time_t last_update_;
- int ref_count_;
-
- JAWS_Cache_Map_Entry<EXT_ID, INT_ID> *next_;
- JAWS_Cache_Map_Entry<EXT_ID, INT_ID> *prev_;
-
-};
-
-
-template <class EXT_ID, class EQ_FUNC, class ACE_LOCK>
-class JAWS_Map_Manager
-{
-public:
-
- JAWS_Map_Manager (ACE_Allocator *alloc = 0);
- JAWS_Map_Manager (size_t size, ACE_Allocator *alloc = 0);
-
- int open ( size_t size = ACE_DEFAULT_MAP_SIZE
- , ACE_Allocator *alloc = 0);
-
- int close (void);
-
- ~JAWS_Map_Manager (void);
-
- int bind ( const EXT_ID &key
- , const void * const &data
- , size_t size
- , JAWS_Cache_Map_Entry<EXT_ID> *&entry
- );
-
- int rebind ( const EXT_ID &key
- , const void * const &data
- , size_t size
- , JAWS_Cache_Map_Entry<EXT_ID> *&entry
- );
-
- int find (const EXT_ID &key, JAWS_Cache_Map_Entry<EXT_ID> *&entry);
-
- int unbind (JAWS_Cache_Map_Entry<EXT_ID> *entry);
-
- ACE_Message_Block * make_message_block ( const void * const &data
- , size_t size);
-
- ACE_LOCK lock_;
-
- JAWS_Cache_Map_Entry<EXT_ID> *head_;
- JAWS_Cache_Map_Entry<EXT_ID> *tail_;
-
- ACE_Allocator *allocator_;
-
-};
-
-template <class EXT_ID, class ACE_LOCK>
-class JAWS_Cache_Replacement
-{
-public:
-
- JAWS_Cache_Replacement (ACE_Allocator *alloc = 0);
- JAWS_Cache_Replacement (size_t max_entries, ACE_Allocator *alloc = 0);
-
- virtual int open ( size_t max_entries = ACE_DEFAULT_MAP_SIZE
- , ACE_Allocator *alloc = 0);
-
- virtual int close (void);
-
- virtual ~JAWS_Cache_Replacement (void);
-
- virtual int insert (JAWS_Cache_Map_Entry<EXT_ID> *entry) = 0;
- virtual int update (JAWS_Cache_Map_Entry<EXT_ID> *entry) = 0;
- virtual int remove (JAWS_Cache_Map_Entry<EXT_ID> *entry) = 0;
- virtual int expire (JAWS_Cache_Map_Entry<EXT_ID> *&entry) = 0;
-
- JAWS_Cache_Map_Entry<EXT_ID> *table_;
-
- ACE_Allocator *allocator_;
- ACE_LOCK lock_;
-
-};
-
-template <class EXT_ID, class ACE_LOCK>
-class JAWS_LRU_Cache_Replacement
- : public JAWS_Cache_Replacement<EXT_ID, ACE_LOCK>
-{
-public:
-
- JAWS_LRU_Cache_Replacement (ACE_Allocator *alloc = 0);
- JAWS_LRU_Cache_Replacement (size_t max_entries, ACE_Allocator *alloc = 0);
-
- int open ( size_t max_entries = ACE_DEFAULT_MAP_SIZE
- , ACE_Allocator *alloc = 0);
-
- int close (void);
-
- ~JAWS_LRU_Cache_Replacement (void);
-
- int insert (JAWS_Cache_Map_Entry<EXT_ID> *entry);
- int update (JAWS_Cache_Map_Entry<EXT_ID> *entry);
- int remove (JAWS_Cache_Map_Entry<EXT_ID> *entry);
- int expire (JAWS_Cache_Map_Entry<EXT_ID> *&entry);
-
- int head_;
- int tail_;
-
- JAWS_LRU_Cache_Replacement_Info *info_;
-
-};
-
-
-template <class EXT_ID, class INT_ID, class HASH_FUNC, class EQ_FUNC, class ACE_LOCK>
-class JAWS_Cache_Map_Manager
-{
-public:
-
-
- JAWS_Map_Manager<EXT_ID, INT_ID, EQ_FUNC, ACE_
-};
-
-#endif /* JAWS_CACHE_MAP_MANAGER_H */
diff --git a/ACE/apps/JAWS3/jaws3-todo/Map_Manager_T.cpp b/ACE/apps/JAWS3/jaws3-todo/Map_Manager_T.cpp
deleted file mode 100644
index c2b8d78145b..00000000000
--- a/ACE/apps/JAWS3/jaws3-todo/Map_Manager_T.cpp
+++ /dev/null
@@ -1,398 +0,0 @@
-/* -*- c++ -*- */
-// $Id$
-
-#ifndef JAWS_CACHE_MAP_MANAGER_T_CPP
-#define JAWS_CACHE_MAP_MANAGER_T_CPP
-
-#include "jaws3/Map_Manager_T.h"
-
-template <class EXT_ID>
-JAWS_Cache_Map_Entry<EXT_ID>
-::JAWS_Cache_Map_Entry ( const EXT_ID &ext_id
- , ACE_Message_Block *&int_id
- , JAWS_Cache_Map_Entry<EXT_ID, INT_ID> *next
- , JAWS_Cache_Map_Entry<EXT_ID, INT_ID> *prev
- )
- : ext_id_ (ext_id)
- , int_id_ (int_id)
- , ref_count_ (1)
- , next_ (next)
- , prev_ (prev)
- , replacement_index_ (-1)
-{
-}
-
-template <class EXT_ID>
-JAWS_Cache_Map_Entry<EXT_ID>
-::JAWS_Cache_Map_Entry ( JAWS_Cache_Map_Entry<EXT_ID, INT_ID> *next
- , JAWS_Cache_Map_Entry<EXT_ID, INT_ID> *prev
- )
- : next_ (next)
- , prev_ (prev)
-{
-}
-
-
-template <class EXT_ID, class EQ_FUNC, class ACE_LOCK>
-class JAWS_Map_Manager
-{
-public:
-
- JAWS_Map_Manager (ACE_Allocator *alloc = 0);
- JAWS_Map_Manager (size_t size, ACE_Allocator *alloc = 0);
-
- //FUZZ: disable check_for_lack_ACE_OS
- int open ( size_t size = ACE_DEFAULT_MAP_SIZE,
- ACE_Allocator *alloc = 0);
-
- int close (void);
-
- ~JAWS_Map_Manager (void);
-
- int bind ( const EXT_ID &key
- , const void * const &data
- , size_t size
- , JAWS_Cache_Map_Entry<EXT_ID> *&entry
- );
- //FUZZ: enable check_for_lack_ACE_OS
-
- int rebind ( const EXT_ID &key
- , const void * const &data
- , size_t size
- , JAWS_Cache_Map_Entry<EXT_ID> *&entry
- );
-
- int find (const EXT_ID &key, JAWS_Cache_Map_Entry<EXT_ID> *&entry);
-
- int unbind (JAWS_Cache_Map_Entry<EXT_ID> *entry);
-
- ACE_Message_Block * make_message_block ( const void * const &data
- , size_t size);
-
- ACE_LOCK lock_;
-
- JAWS_Cache_Map_Entry<EXT_ID> *head_;
- JAWS_Cache_Map_Entry<EXT_ID> *tail_;
-
- ACE_Allocator *allocator_;
-
-};
-
-#define JAWS_CACHE_REPLACEMENT_TEMPLATE \
- template <class EXT_ID, class ACE_LOCK> \
- JAWS_Cache_Replacement<EXT_ID, ACE_LOCK>
-
-#define JAWS_LRU_CACHE_REPLACEMENT_TEMPLATE \
- template <class EXT_ID, class ACE_LOCK> \
- JAWS_Cache_Replacement<EXT_ID, ACE_LOCK>
-
-#define JAWS_LFU_CACHE_REPLACEMENT_TEMPLATE \
- template <class EXT_ID, class ACE_LOCK> \
- JAWS_Cache_Replacement<EXT_ID, ACE_LOCK>
-
-#define JAWS_FIFO_CACHE_REPLACEMENT_TEMPLATE \
- template <class EXT_ID, class ACE_LOCK> \
- JAWS_Cache_Replacement<EXT_ID, ACE_LOCK>
-
-JAWS_CACHE_REPLACEMENT_TEMPLATE::JAWS_Cache_Replacement (ACE_Allocator *alloc)
-{
- this->open (ACE_DEFAULT_MAP_SIZE, alloc);
-}
-
-JAWS_Cache_Replacement::
-JAWS_Cache_Replacement (size_t max_entries, ACE_Allocator *alloc)
-{
- this->open (max_entries, alloc);
-}
-
-int
-JAWS_CACHE_REPLACEMENT_TEMPLATE::open ( size_t max_entries
- , ACE_Allocator *alloc
- )
-{
- this->max_entries_ = max_entries;
- this->allocator_ = alloc;
-
- size_t bytes = max_entries * sizeof (JAWS_Cache_Map_Entry<EXT_ID> *);
- void *ptr;
-
- ACE_ALLOCATOR_RETURN (ptr, this->allocator_->malloc (bytes), -1);
-}
-
-int
-JAWS_CACHE_REPLACEMENT_TEMPLATE::close (void)
-{
-}
-
- virtual ~JAWS_Cache_Replacement (void);
-
- virtual int insert (JAWS_Cache_Map_Entry<EXT_ID> *entry) = 0;
- virtual int update (JAWS_Cache_Map_Entry<EXT_ID> *entry) = 0;
- virtual int remove (JAWS_Cache_Map_Entry<EXT_ID> *entry) = 0;
- virtual JAWS_Cache_Map_Entry<EXT_ID> * expire (void) = 0;
-
- JAWS_Cache_Map_Entry<EXT_ID> **table_;
- size_t max_entries_;
-
- ACE_Allocator *allocator_;
- ACE_LOCK lock_;
-
-};
-
-template <class EXT_ID, class ACE_LOCK>
-class JAWS_LRU_Cache_Replacement
- : public JAWS_Cache_Replacement<EXT_ID, ACE_LOCK>
-{
-public:
-
- JAWS_LRU_Cache_Replacement (ACE_Allocator *alloc = 0);
- JAWS_LRU_Cache_Replacement (size_t max_entries, ACE_Allocator *alloc = 0);
-
- //FUZZ: disable check_for_lack_ACE_OS
- int open ( size_t max_entries = ACE_DEFAULT_MAP_SIZE,
- ACE_Allocator *alloc = 0);
-
- int close (void);
- //FUZZ: enable check_for_lack_ACE_OS
-
- ~JAWS_LRU_Cache_Replacement (void);
-
- int insert (JAWS_Cache_Map_Entry<EXT_ID> *entry);
- int update (JAWS_Cache_Map_Entry<EXT_ID> *entry);
- int remove (JAWS_Cache_Map_Entry<EXT_ID> *entry);
- JAWS_Cache_Map_Entry<EXT_ID> * expire (void);
-
-protected:
-
- void insert_i (JAWS_Cache_Map_Entry<EXT_ID> *entry)
- {
- if (this->tail_ == -1)
- this->tail_ = 0;
-
- this->table_[this->tail_] = entry;
- this->next_[this->tail_] = this->tail_+1;
- this->prev_[this->tail_+1] = this->tail_;
- this->next_[this->tail_+1] = -1;
-
- if (this->head_ == -1)
- this->head_ = 0;
-
- this->count_++;
- }
-
- void update_i (int i)
- {
- if (i == this->tail_)
- return;
-
- JAWS_Cache_Map_Entry<EXT_ID> *entry = this->table_[i];
- this->remove_i (i);
- this->insert_i (entry);
- }
-
- void remove_i (int i)
- {
- if (this->count_ == 0 || i >= this->count_)
- return;
-
- --this->count_;
- if (i == this->tail_)
- this->tail_ = this->prev_[i];
- if (i == this->head_)
- this->head_ = this->next_[i];
-
- if (i < this->count_)
- {
- this->swap_i (i, this->count_);
- i = this->count_;
- }
-
- int p_i = this->prev_[i];
- int n_i = this->next_[i];
- this->next_[p_i] = n_i;
- this->prev_[n_i] = p_i;
-
- if (this->count_ == 0)
- this->head_ = -1;
- }
-
- void swap_i (int i, int j)
- {
- int p_i, p_j, n_i, n_j;
-
- p_i = this->prev_[i];
- n_i = this->next_[i];
- p_j = this->prev_[j];
- n_j = this->next_[j];
-
- this->next_[p_i] = j;
- this->prev_[n_i] = j;
- this->next_[p_j] = i;
- this->prev_[n_j] = i;
-
- JAWS_Cache_Map_Entry<EXT_ID> *entry = this->table_[i];
- this->table_[i] = this->table_[j];
- this->table_[j] = entry;
-
- this->table_[i]->replacement_index_ = i;
- this->table_[j]->replacement_index_ = j;
-
- if (this->head_ == i || this->head_ == j)
- this->head_ = (this->head_ == i) ? j : i;
-
- if (this->tail_ == i || this->tail_ == j)
- this->tail_ = (this->tail_ == i) ? j : i;
- }
-
-private:
-
- int count_;
-
- int head_;
- int tail_;
-
- int *next_;
- int *prev_;
-
-};
-
-template <class EXT_ID, class ACE_LOCK>
-class JAWS_LFU_Cache_Replacement
- : public JAWS_Cache_Replacement<EXT_ID, ACE_LOCK>
-{
-public:
-
- JAWS_LFU_Cache_Replacement (ACE_Allocator *alloc = 0);
- JAWS_LFU_Cache_Replacement (size_t max_entries, ACE_Allocator *alloc = 0);
-
- //FUZZ: disable check_for_lack_ACE_OS
- int open ( size_t max_entries = ACE_DEFAULT_MAP_SIZE,
- ACE_Allocator *alloc = 0);
-
- int close (void);
- //FUZZ: enable check_for_lack_ACE_OS
-
- ~JAWS_LFU_Cache_Replacement (void);
-
- int insert (JAWS_Cache_Map_Entry<EXT_ID> *entry);
- int update (JAWS_Cache_Map_Entry<EXT_ID> *entry);
- int remove (JAWS_Cache_Map_Entry<EXT_ID> *entry);
- JAWS_Cache_Map_Entry<EXT_ID> * expire (void);
-
-protected:
-
- int sift_up (int i)
- {
- JAWS_Cache_Map_Entry<EXT_ID> *entry = this->table_[i];
-
- while (i > 0)
- {
- int p = this->parent (i);
-
- if (entry->ref_count_ >= this->table_[p]->ref_count_)
- break;
-
- this->table_[i] = this->table_[p];
- this->table_[i]->replacement_index_ = i;
-
- i = p;
- }
-
- this->table_[i] = entry;
- this->table_[i]->replacement_index_ = i;
-
- return i;
- }
-
- int sift_down (int i)
- {
- JAWS_Cache_Map_Entry<EXT_ID> *entry = this->table_[i];
-
- while (this->left (i) < this->count_)
- {
- int l, r;
-
- l = this->left (i);
- r = this->right (i);
-
- if (r >= this->count_
- || this->table_[l]->ref_count_ <= this->table_[r]->ref_count_)
- r = l;
-
- if (entry->ref_count_ <= this->table_[r]->ref_count_)
- break;
-
- this->table_[i] = this->table_[r];
- this->table_[i]->replacement_index_ = i;
-
- i = r;
- }
-
- this->table_[i] = entry;
- this->table_[i]->replacement_index_ = i;
-
- return i;
- }
-
- int sift (int i)
- {
- int i_sifted;
-
- i_sifted = this->sift_up (i);
- if (i_sifted == i)
- i_sifted = this->sift_down (i);
-
- return i_sifted;
- }
-
- int parent (int i) { return --i/2; }
- int left (int i) { return 2*i+1; }
- int right (int i) { return 2*i+2; }
-
-private:
-
- int count_;
-
-};
-
-template <class EXT_ID, class ACE_LOCK>
-class JAWS_FIFO_Cache_Replacement
- : public JAWS_Cache_Replacement<EXT_ID, ACE_LOCK>
-{
-public:
-
- JAWS_FIFO_Cache_Replacement (ACE_Allocator *alloc = 0);
- JAWS_FIFO_Cache_Replacement (size_t max_entries, ACE_Allocator *alloc = 0);
-
- //FUZZ: disable check_for_lack_ACE_OS
- int open ( size_t max_entries = ACE_DEFAULT_MAP_SIZE,
- ACE_Allocator *alloc = 0);
-
- int close (void);
- //FUZZ: enable check_for_lack_ACE_OS
-
- ~JAWS_FIFO_Cache_Replacement (void);
-
- int insert (JAWS_Cache_Map_Entry<EXT_ID> *entry);
- int update (JAWS_Cache_Map_Entry<EXT_ID> *entry);
- int remove (JAWS_Cache_Map_Entry<EXT_ID> *entry);
- JAWS_Cache_Map_Entry<EXT_ID> * expire (void);
-
- int head_;
- int tail_;
-
- JAWS_FIFO_Cache_Replacement_Info *info_;
-
-};
-
-
-template <class EXT_ID, class INT_ID, class HASH_FUNC, class EQ_FUNC, class ACE_LOCK>
-class JAWS_Cache_Map_Manager
-{
-public:
-
-
- JAWS_Map_Manager<EXT_ID, INT_ID, EQ_FUNC, ACE_
-};
-
-#endif /* JAWS_CACHE_MAP_MANAGER_T_CPP */
diff --git a/ACE/apps/JAWS3/jaws3-todo/Map_Manager_T.h b/ACE/apps/JAWS3/jaws3-todo/Map_Manager_T.h
deleted file mode 100644
index f9ba8c03ba2..00000000000
--- a/ACE/apps/JAWS3/jaws3-todo/Map_Manager_T.h
+++ /dev/null
@@ -1,392 +0,0 @@
-/* -*- c++ -*- */
-// $Id$
-
-#ifndef JAWS_CACHE_MAP_MANAGER_T_H
-#define JAWS_CACHE_MAP_MANAGER_T_H
-
-#include "jaws3/Map_Manager.h"
-
-template <class EXT_ID>
-class JAWS_Cache_Map_Entry
-{
-public:
-
- JAWS_Cache_Map_Entry ( const EXT_ID &ext_id
- , ACE_Message_Block *&int_id
- , JAWS_Cache_Map_Entry<EXT_ID, INT_ID> *next = 0
- , JAWS_Cache_Map_Entry<EXT_ID, INT_ID> *prev = 0
- );
-
- JAWS_Cache_Map_Entry ( JAWS_Cache_Map_Entry<EXT_ID, INT_ID> *next
- , JAWS_Cache_Map_Entry<EXT_ID, INT_ID> *prev
- );
-
-private:
-
- ~JAWS_Cache_Map_Entry (void) {}
-
-public:
-
- EXT_ID ext_id_;
- ACE_Message_Block *int_id_;
-
- time_t last_update_;
- int ref_count_;
-
- JAWS_Cache_Map_Entry<EXT_ID, INT_ID> *next_;
- JAWS_Cache_Map_Entry<EXT_ID, INT_ID> *prev_;
-
- int replacement_index_;
-
-};
-
-
-template <class EXT_ID, class EQ_FUNC, class ACE_LOCK>
-class JAWS_Map_Manager
-{
-public:
-
- JAWS_Map_Manager (ACE_Allocator *alloc = 0);
- JAWS_Map_Manager (size_t size, ACE_Allocator *alloc = 0);
-
- int open ( size_t size = ACE_DEFAULT_MAP_SIZE
- , ACE_Allocator *alloc = 0);
-
- int close (void);
-
- ~JAWS_Map_Manager (void);
-
- int bind ( const EXT_ID &key
- , const void * const &data
- , size_t size
- , JAWS_Cache_Map_Entry<EXT_ID> *&entry
- );
-
- int rebind ( const EXT_ID &key
- , const void * const &data
- , size_t size
- , JAWS_Cache_Map_Entry<EXT_ID> *&entry
- );
-
- int find (const EXT_ID &key, JAWS_Cache_Map_Entry<EXT_ID> *&entry);
-
- int unbind (JAWS_Cache_Map_Entry<EXT_ID> *entry);
-
- ACE_Message_Block * make_message_block ( const void * const &data
- , size_t size);
-
- ACE_LOCK lock_;
-
- JAWS_Cache_Map_Entry<EXT_ID> *head_;
- JAWS_Cache_Map_Entry<EXT_ID> *tail_;
-
- ACE_Allocator *allocator_;
-
-};
-
-template <class EXT_ID, class ACE_LOCK>
-class JAWS_Cache_Replacement
-{
-public:
-
- JAWS_Cache_Replacement (ACE_Allocator *alloc = 0);
- JAWS_Cache_Replacement (size_t max_entries, ACE_Allocator *alloc = 0);
-
- virtual int open ( size_t max_entries = ACE_DEFAULT_MAP_SIZE
- , ACE_Allocator *alloc = 0);
-
- virtual int close (void);
-
- virtual ~JAWS_Cache_Replacement (void);
-
- virtual int insert (JAWS_Cache_Map_Entry<EXT_ID> *entry) = 0;
- virtual int update (JAWS_Cache_Map_Entry<EXT_ID> *entry) = 0;
- virtual int remove (JAWS_Cache_Map_Entry<EXT_ID> *entry) = 0;
- virtual JAWS_Cache_Map_Entry<EXT_ID> * expire (void) = 0;
-
- JAWS_Cache_Map_Entry<EXT_ID> **table_;
-
- ACE_Allocator *allocator_;
- ACE_LOCK lock_;
-
-};
-
-template <class EXT_ID, class ACE_LOCK>
-class JAWS_LRU_Cache_Replacement
- : public JAWS_Cache_Replacement<EXT_ID, ACE_LOCK>
-{
-public:
-
- JAWS_LRU_Cache_Replacement (ACE_Allocator *alloc = 0);
- JAWS_LRU_Cache_Replacement (size_t max_entries, ACE_Allocator *alloc = 0);
-
- int open ( size_t max_entries = ACE_DEFAULT_MAP_SIZE
- , ACE_Allocator *alloc = 0);
-
- int close (void);
-
- ~JAWS_LRU_Cache_Replacement (void);
-
- int insert (JAWS_Cache_Map_Entry<EXT_ID> *entry);
- int update (JAWS_Cache_Map_Entry<EXT_ID> *entry);
- int remove (JAWS_Cache_Map_Entry<EXT_ID> *entry);
- JAWS_Cache_Map_Entry<EXT_ID> * expire (void);
-
-protected:
-
- void insert_i (JAWS_Cache_Map_Entry<EXT_ID> *entry)
- {
- if (this->tail_ == -1)
- this->tail_ = 0;
-
- this->table_[this->tail_] = entry;
- this->next_[this->tail_] = this->tail_+1;
- this->prev_[this->tail_+1] = this->tail_;
- this->next_[this->tail_+1] = -1;
-
- if (this->head_ == -1)
- this->head_ = 0;
-
- this->count_++;
- }
-
- void update_i (int i)
- {
- if (i == this->tail_)
- return;
-
- JAWS_Cache_Map_Entry<EXT_ID> *entry = this->table_[i];
- this->remove_i (i);
- this->insert_i (entry);
- }
-
- void remove_i (int i)
- {
- if (this->count_ == 0 || i >= this->count_)
- return;
-
- --this->count_;
- if (i == this->tail_)
- this->tail_ = this->prev_[i];
- if (i == this->head_)
- this->head_ = this->next_[i];
-
- if (i < this->count_)
- {
- this->swap_i (i, this->count_);
- i = this->count_;
- }
-
- int p_i = this->prev_[i];
- int n_i = this->next_[i];
- this->next_[p_i] = n_i;
- this->prev_[n_i] = p_i;
-
- if (this->count_ == 0)
- this->head_ = -1;
- }
-
- void swap_i (int i, int j)
- {
- int p_i, p_j, n_i, n_j;
-
- p_i = this->prev_[i];
- n_i = this->next_[i];
- p_j = this->prev_[j];
- n_j = this->next_[j];
-
- this->next_[p_i] = j;
- this->prev_[n_i] = j;
- this->next_[p_j] = i;
- this->prev_[n_j] = i;
-
- JAWS_Cache_Map_Entry<EXT_ID> *entry = this->table_[i];
- this->table_[i] = this->table_[j];
- this->table_[j] = entry;
-
- this->table_[i]->replacement_index_ = i;
- this->table_[j]->replacement_index_ = j;
-
- if (this->head_ == i || this->head_ == j)
- this->head_ = (this->head_ == i) ? j : i;
-
- if (this->tail_ == i || this->tail_ == j)
- this->tail_ = (this->tail_ == i) ? j : i;
- }
-
-private:
-
- int count_;
-
- int head_;
- int tail_;
-
- int *next_;
- int *prev_;
-
-};
-
-template <class EXT_ID, class ACE_LOCK>
-class JAWS_LFU_Cache_Replacement
- : public JAWS_Cache_Replacement<EXT_ID, ACE_LOCK>
-{
-public:
-
- JAWS_LFU_Cache_Replacement (ACE_Allocator *alloc = 0);
- JAWS_LFU_Cache_Replacement (size_t max_entries, ACE_Allocator *alloc = 0);
-
- int open ( size_t max_entries = ACE_DEFAULT_MAP_SIZE
- , ACE_Allocator *alloc = 0);
-
- int close (void);
-
- ~JAWS_LFU_Cache_Replacement (void);
-
- int insert (JAWS_Cache_Map_Entry<EXT_ID> *entry);
- int update (JAWS_Cache_Map_Entry<EXT_ID> *entry);
- int remove (JAWS_Cache_Map_Entry<EXT_ID> *entry);
- JAWS_Cache_Map_Entry<EXT_ID> * expire (void);
-
-protected:
-
- int sift_up (int i)
- {
- JAWS_Cache_Map_Entry<EXT_ID> *entry = this->table_[i];
-
- while (i > 0)
- {
- int p = this->parent (i);
-
- if (entry->ref_count_ >= this->table_[p]->ref_count_)
- break;
-
- this->table_[i] = this->table_[p];
- this->table_[i]->replacement_index_ = i;
-
- i = p;
- }
-
- this->table_[i] = entry;
- this->table_[i]->replacement_index_ = i;
-
- return i;
- }
-
- int sift_down (int i)
- {
- JAWS_Cache_Map_Entry<EXT_ID> *entry = this->table_[i];
-
- while (this->left (i) < this->count_)
- {
- int l, r;
-
- l = this->left (i);
- r = this->right (i);
-
- if (r >= this->count_
- || this->table_[l]->ref_count_ <= this->table_[r]->ref_count_)
- r = l;
-
- if (entry->ref_count_ <= this->table_[r]->ref_count_)
- break;
-
- this->table_[i] = this->table_[r];
- this->table_[i]->replacement_index_ = i;
-
- i = r;
- }
-
- this->table_[i] = entry;
- this->table_[i]->replacement_index_ = i;
-
- return i;
- }
-
- int sift (int i)
- {
- int i_sifted;
-
- i_sifted = this->sift_up (i);
- if (i_sifted == i)
- i_sifted = this->sift_down (i);
-
- return i_sifted;
- }
-
- int parent (int i) { return --i/2; }
- int left (int i) { return 2*i+1; }
- int right (int i) { return 2*i+2; }
-
-private:
-
- int count_;
-
-};
-
-template <class EXT_ID, class ACE_LOCK>
-class JAWS_FIFO_Cache_Replacement
- : public JAWS_Cache_Replacement<EXT_ID, ACE_LOCK>
-{
-public:
-
- JAWS_FIFO_Cache_Replacement (ACE_Allocator *alloc = 0);
- JAWS_FIFO_Cache_Replacement (size_t max_entries, ACE_Allocator *alloc = 0);
-
- int open ( size_t max_entries = ACE_DEFAULT_MAP_SIZE
- , ACE_Allocator *alloc = 0);
-
- int close (void);
-
- ~JAWS_FIFO_Cache_Replacement (void);
-
- int insert (JAWS_Cache_Map_Entry<EXT_ID> *entry);
- int update (JAWS_Cache_Map_Entry<EXT_ID> *entry);
- int remove (JAWS_Cache_Map_Entry<EXT_ID> *entry);
- JAWS_Cache_Map_Entry<EXT_ID> * expire (void);
-
- int head_;
- int tail_;
-
- JAWS_FIFO_Cache_Replacement_Info *info_;
-
-};
-
-template <class EXT_ID, class ACE_LOCK>
-class JAWS_RANDOM_Cache_Replacement
- : public JAWS_Cache_Replacement<EXT_ID, ACE_LOCK>
-{
-public:
-
- JAWS_RANDOM_Cache_Replacement (ACE_Allocator *alloc = 0);
- JAWS_RANDOM_Cache_Replacement (size_t max_entries, ACE_Allocator *alloc = 0);
-
- int open ( size_t max_entries = ACE_DEFAULT_MAP_SIZE
- , ACE_Allocator *alloc = 0);
-
- int close (void);
-
- ~JAWS_RANDOM_Cache_Replacement (void);
-
- int insert (JAWS_Cache_Map_Entry<EXT_ID> *entry);
- int update (JAWS_Cache_Map_Entry<EXT_ID> *entry);
- int remove (JAWS_Cache_Map_Entry<EXT_ID> *entry);
- JAWS_Cache_Map_Entry<EXT_ID> * expire (void);
-
- int head_;
- int tail_;
-
- JAWS_RANDOM_Cache_Replacement_Info *info_;
-
-};
-
-
-template <class EXT_ID, class INT_ID, class HASH_FUNC, class EQ_FUNC, class ACE_LOCK>
-class JAWS_Cache_Map_Manager
-{
-public:
-
-
- JAWS_Map_Manager<EXT_ID, INT_ID, EQ_FUNC, ACE_
-};
-
-#endif /* JAWS_CACHE_MAP_MANAGER_T_H */
diff --git a/ACE/apps/JAWS3/jaws3-todo/Reactive_Socket.cpp b/ACE/apps/JAWS3/jaws3-todo/Reactive_Socket.cpp
deleted file mode 100644
index a445a2a3535..00000000000
--- a/ACE/apps/JAWS3/jaws3-todo/Reactive_Socket.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-// $Id$
-
-#include "ace/Addr.h"
-#include "ace/Acceptor.h"
-#include "ace/Singleton.h"
-#include "ace/SOCK_Stream.h"
-#include "ace/SOCK_Acceptor.h"
-
-#define JAWS_BUILD_DLL
-
-#include "jaws3/Socket.h"
-#include "jaws3/Reactive_Socket.h"
-
-
-class JAWS_Socket_EC_SH_Adapter;
-
-typedef ACE_Oneshot_Acceptor<JAWS_Socket_EC_SH_Adapter, ACE_SOCK_ACCEPTOR>
- JAWS_Socket_Oneshot_Acceptor;
-
-
-void
-JAWS_Reactive_Socket::accept ( const ACE_Addr &local_sap
- , ACE_SOCK_Stream &new_stream
- , JAWS_Event_Completer *completer
- , void *act
- )
-{
-}
-
-
-void
-JAWS_Reactive_Socket::connect ( const ACE_Addr &remote_sap
- , ACE_SOCK_Stream &new_stream
- , JAWS_Event_Completer *completer
- , void *act
- )
-{
-}
-
-
-void
-JAWS_Reactive_Socket::connect ( const ACE_Addr &remote_sap
- , ACE_SOCK_Stream &new_stream
- , const ACE_Addr &local_sap
- , JAWS_Event_Completer *completer
- , void *act
- )
-{
-}
-
-
-void
-JAWS_Reactive_Socket::accept ( const ACE_Addr &local_sap
- , ACE_SOCK_Stream &new_stream
- , JAWS_Event_Completer *completer
- , const ACE_Time_Value &timeout
- , void *act
- )
-{
-}
-
-
-void
-JAWS_Reactive_Socket::connect ( const ACE_Addr &remote_sap
- , ACE_SOCK_Stream &new_stream
- , JAWS_Event_Completer *completer
- , const ACE_Time_Value &timeout
- , void *act
- )
-{
-}
-
-
-void
-JAWS_Reactive_Socket::connect ( const ACE_Addr &remote_sap
- , ACE_SOCK_Stream &new_stream
- , const ACE_Addr &local_sap
- , JAWS_Event_Completer *completer
- , const ACE_Time_Value &timeout
- , void *act
- )
-{
-}
diff --git a/ACE/apps/JAWS3/jaws3-todo/Reactive_Socket.h b/ACE/apps/JAWS3/jaws3-todo/Reactive_Socket.h
deleted file mode 100644
index bc40c6844ca..00000000000
--- a/ACE/apps/JAWS3/jaws3-todo/Reactive_Socket.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- c++ -*- */
-// $Id$
-
-#ifndef JAWS_REACTIVE_SOCKET_H
-#define JAWS_REACTIVE_SOCKET_H
-
-#include "ace/Addr.h"
-#include "ace/Synch.h"
-#include "ace/Acceptor.h"
-#include "ace/Singleton.h"
-#include "ace/SOCK_Stream.h"
-#include "ace/SOCK_Acceptor.h"
-
-#include "jaws3/Export.h"
-#include "jaws3/Socket.h"
-
-class JAWS_Reactive_Socket;
-
-class JAWS_Export JAWS_Reactive_Socket : public JAWS_Socket_Impl
-{
-public:
-
- static JAWS_Reactive_Socket * instance (void)
- {
- return ACE_Singleton<JAWS_Reactive_Socket, ACE_SYNCH_MUTEX>::instance ();
- }
-
- void accept ( const ACE_Addr &local_sap
- , ACE_SOCK_Stream &new_stream
- , JAWS_Event_Completer *completer
- , void *act = 0
- );
- // The address to new_stream is passed back as the data member of
- // the JAWS_Event_Result that is returned to the completer.
-
- void connect ( const ACE_Addr &remote_sap
- , ACE_SOCK_Stream &new_stream
- , JAWS_Event_Completer *completer
- , void *act = 0
- );
- // The address to new_stream 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.
-
- void connect ( const ACE_Addr &remote_sap
- , ACE_SOCK_Stream &new_stream
- , const ACE_Addr &local_sap
- , JAWS_Event_Completer *completer
- , void *act = 0
- );
- // The address to new_stream is passed back as the data member of
- // the JAWS_Event_Result that is returned to the completer.
- // Use the specified local access point.
-
- void accept ( const ACE_Addr &local_sap
- , ACE_SOCK_Stream &new_stream
- , JAWS_Event_Completer *completer
- , const ACE_Time_Value &timeout
- , void *act = 0
- );
- // The address to new_stream is passed back as the data member of
- // the JAWS_Event_Result that is returned to the completer.
-
- void connect ( const ACE_Addr &remote_sap
- , ACE_SOCK_Stream &new_stream
- , JAWS_Event_Completer *completer
- , const ACE_Time_Value &timeout
- , void *act = 0
- );
- // The address to new_stream 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.
-
- void connect ( const ACE_Addr &remote_sap
- , ACE_SOCK_Stream &new_stream
- , const ACE_Addr &local_sap
- , JAWS_Event_Completer *completer
- , const ACE_Time_Value &timeout
- , void *act = 0
- );
- // The address to new_stream is passed back as the data member of
- // the JAWS_Event_Result that is returned to the completer.
- // Use the specified local access point.
-
-};
-
-
-#endif /* JAWS_REACTIVE_SOCKET_H */
diff --git a/ACE/apps/JAWS3/jaws3-todo/Reactive_Socket_Helpers.cpp b/ACE/apps/JAWS3/jaws3-todo/Reactive_Socket_Helpers.cpp
deleted file mode 100644
index 5379f169134..00000000000
--- a/ACE/apps/JAWS3/jaws3-todo/Reactive_Socket_Helpers.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- c++ -*- */
-// $Id$
-
-#include "ace/Addr.h"
-#include "ace/Synch.h"
-#include "ace/Acceptor.h"
-#include "ace/Singleton.h"
-#include "ace/SOCK_Stream.h"
-#include "ace/SOCK_Acceptor.h"
-
-#include "jaws3/Reactive_Socket_Helpers.h"
-
-JAWS_Socket_EC_SH_Adapter
-::JAWS_Socket_EC_SH_Adapter ( ACE_SOCK_Stream *stream
- , JAWS_Event_Completer *completer
- , void *act
- , JAWS_EC_CALLBACK callback
- , JAWS_Event_Result::JE_REASON ok_reason
- , JAWS_Event_Result::JE_REASON timeout_reason
- , JAWS_Event_Result::JE_REASON error_reason
- )
- : stream_ (stream)
- , completer_ (completer)
- , act_ (act)
- , callback_ (callback)
- , ok_reason_ (ok_reason)
- , timeout_reason_ (timeout_reason)
- , error_reason_ (error_reason)
-{
-}
-
-
-int
-JAWS_Socket_EC_SH_Adapter::open (void *)
-{
- JAWS_Event_Result result ( 0
- , JAWS_Event_Result::JE_OK
- , this->ok_reason_
- , 0
- , this->stream_);
-
- *this->stream_ = this->peer ();
- this->set_handle (ACE_INVALID_HANDLE);
- (this->completer_->*callback_) (result, this->act_);
-
- return -1;
-}
-
-
-JAWS_Socket_Accept_EC_SH_Adapter
-::JAWS_Socket_Accept_EC_SH_Adapter ( ACE_SOCK_Stream *stream
- , JAWS_Event_Completer *completer
- , void *act
- )
- : JAWS_Socket_EC_SH_Adapter ( stream
- , completer
- , act
- , & JAWS_Event_Completer::accept_complete
- , JAWS_Event_Result::JE_ACCEPT_OK
- , JAWS_Event_Result::JE_ACCEPT_TIMEOUT
- , JAWS_Event_Result::JE_ACCEPT_FAIL
- )
-{
-}
-
-
-JAWS_Socket_Connect_EC_SH_Adapter::
-JAWS_Socket_Connect_EC_SH_Adapter ( ACE_SOCK_Stream *stream
- , JAWS_Event_Completer *completer
- , void *act
- )
- : JAWS_Socket_EC_SH_Adapter ( stream
- , completer
- , act
- , & JAWS_Event_Completer::connect_complete
- , JAWS_Event_Result::JE_CONNECT_OK
- , JAWS_Event_Result::JE_CONNECT_TIMEOUT
- , JAWS_Event_Result::JE_CONNECT_FAIL
- )
-{
-}
diff --git a/ACE/apps/JAWS3/jaws3-todo/Reactive_Socket_Helpers.h b/ACE/apps/JAWS3/jaws3-todo/Reactive_Socket_Helpers.h
deleted file mode 100644
index 93d6b47de5c..00000000000
--- a/ACE/apps/JAWS3/jaws3-todo/Reactive_Socket_Helpers.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- c++ -*- */
-// $Id$
-
-#ifndef JAWS_REACTIVE_SOCKET_HELPERS
-#define JAWS_REACTIVE_SOCKET_HELPERS
-
-#include "ace/Addr.h"
-#include "ace/Synch.h"
-#include "ace/Acceptor.h"
-#include "ace/Singleton.h"
-#include "ace/SOCK_Stream.h"
-#include "ace/SOCK_Acceptor.h"
-
-#include "jaws3/Event_Completer.h"
-#include "jaws3/Event_Result.h"
-
-
-typedef void (JAWS_Event_Completer:: *JAWS_EC_CALLBACK)
- (const JAWS_Event_Result &, void *act);
-
-
-class JAWS_Socket_EC_SH_Adapter
- : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-{
-
- friend class JAWS_Socket_Accept_EC_SH_Adapter;
- friend class JAWS_Socket_Connect_EC_SH_Adapter;
-
-public:
-
- JAWS_Socket_EC_SH_Adapter ( ACE_SOCK_Stream *stream
- , JAWS_Event_Completer *completer
- , void *act
- , JAWS_EC_CALLBACK callback
- , JAWS_Event_Result::JE_REASON ok_reason
- , JAWS_Event_Result::JE_REASON timeout_reason
- , JAWS_Event_Result::JE_REASON error_reason
- );
-
- int open (void *);
- // Callback from Acceptor/Connector when accept()/connect() completes.
-
-private:
-
- ACE_SOCK_Stream *stream_;
-
- JAWS_Event_Completer *completer_;
- void *act_;
-
- JAWS_EC_CALLBACK callback_;
- JAWS_Event_Result::JE_REASON ok_reason_;
- JAWS_Event_Result::JE_REASON timeout_reason_;
- JAWS_Event_Result::JE_REASON error_reason_;
-
-};
-
-
-class JAWS_Socket_Accept_EC_SH_Adapter : public JAWS_Socket_EC_SH_Adapter
-{
-public:
-
- JAWS_Socket_Accept_EC_SH_Adapter ( ACE_SOCK_Stream *stream
- , JAWS_Event_Completer *completer
- , void *act
- );
-
-};
-
-
-class JAWS_Socket_Connect_EC_SH_Adapter : public JAWS_Socket_EC_SH_Adapter
-{
-public:
-
- JAWS_Socket_Connect_EC_SH_Adapter ( ACE_SOCK_Stream *stream
- , JAWS_Event_Completer *completer
- , void *act
- );
-
-private:
-
- JAWS_Event_Completer *completer_;
- void *act_;
-
-};
-
-#endif /* JAWS_REACTIVE_SOCKET_HELPERS */
diff --git a/ACE/apps/JAWS3/jaws3-todo/Socket.cpp b/ACE/apps/JAWS3/jaws3-todo/Socket.cpp
deleted file mode 100644
index 26bb9a137e1..00000000000
--- a/ACE/apps/JAWS3/jaws3-todo/Socket.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-// $Id$
-
-#define JAWS_BUILD_DLL
-#include "jaws3/Socket.h"
-
-
-JAWS_Socket::JAWS_Socket (JAWS_Socket_Impl *impl = 0)
- : impl_ (impl)
-{
-}
-
-void
-JAWS_Socket::accept ( const ACE_Addr &local_sap
- , ACE_SOCK_Stream &new_stream
- , JAWS_Event_Completer *completer
- , void *act
- )
-{
- this->impl_->accept (local_sap, new_stream, completer, act);
-}
-
-void
-JAWS_Socket::connect ( const ACE_Addr &remote_sap
- , ACE_SOCK_Stream &new_stream
- , JAWS_Event_Completer *completer
- , void *act = 0
- )
-{
- this->impl_->connect (remote_sap, new_stream, completer, act);
-}
-
-void
-JAWS_Socket::connect ( const ACE_Addr &remote_sap
- , ACE_SOCK_Stream &new_stream
- , const ACE_Addr &local_sap
- , JAWS_Event_Completer *completer
- , void *act = 0
- )
-{
- this->impl_->connect (remote_sap, new_stream, local_sap, completer, act);
-}
-
-void
-JAWS_Socket::accept ( const ACE_Addr &local_sap
- , ACE_SOCK_Stream &new_stream
- , JAWS_Event_Completer *completer
- , const ACE_Time_Value &timeout
- , void *act = 0
- )
-{
- this->impl_->accept (local_sap, new_stream, completer, timeout, act);
-}
-
-void
-JAWS_Socket::connect ( const ACE_Addr &remote_sap
- , ACE_SOCK_Stream &new_stream
- , JAWS_Event_Completer *completer
- , const ACE_Time_Value &timeout
- , void *act = 0
- )
-{
- this->impl_->connect (remote_sap, new_stream, completer, timeout, act);
-}
-
-void
-JAWS_Socket::connect ( const ACE_Addr &remote_sap
- , ACE_SOCK_Stream &new_stream
- , const ACE_Addr &local_sap
- , JAWS_Event_Completer *completer
- , const ACE_Time_Value &timeout
- , void *act = 0
- )
-{
- this->impl_->connect ( remote_sap
- , new_stream
- , local_sap
- , completer
- , timeout
- , act
- );
-}
-
diff --git a/ACE/apps/JAWS3/jaws3-todo/Socket.h b/ACE/apps/JAWS3/jaws3-todo/Socket.h
deleted file mode 100644
index 841517730bf..00000000000
--- a/ACE/apps/JAWS3/jaws3-todo/Socket.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/* -*- c++ -*- */
-// $Id$
-
-#ifndef JAWS_SOCKET_H
-#define JAWS_SOCKET_H
-
-#include "ace/Addr.h"
-#include "ace/Synch.h"
-#include "ace/Singleton.h"
-#include "ace/SOCK_Stream.h"
-
-#include "jaws3/Export.h"
-#include "jaws3/Event_Completer.h"
-
-class JAWS_Socket;
-class JAWS_Socket_Impl;
-
-class JAWS_Export JAWS_Socket_Impl
-{
-public:
-
- virtual ~JAWS_Socket_Impl (void) {}
-
- virtual void accept ( const ACE_Addr &local_sap
- , ACE_SOCK_Stream &new_stream
- , JAWS_Event_Completer *completer
- , void *act = 0
- ) = 0;
- // The address to new_stream 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_Stream &new_stream
- , JAWS_Event_Completer *completer
- , void *act = 0
- ) = 0;
- // The address to new_stream 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_Stream &new_stream
- , const ACE_Addr &local_sap
- , JAWS_Event_Completer *completer
- , void *act = 0
- ) = 0;
- // The address to new_stream 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_Stream &new_stream
- , JAWS_Event_Completer *completer
- , const ACE_Time_Value &timeout
- , void *act = 0
- ) = 0;
- // The address to new_stream 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_Stream &new_stream
- , JAWS_Event_Completer *completer
- , const ACE_Time_Value &timeout
- , void *act = 0
- ) = 0;
- // The address to new_stream 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_Stream &new_stream
- , const ACE_Addr &local_sap
- , JAWS_Event_Completer *completer
- , const ACE_Time_Value &timeout
- , void *act = 0
- ) = 0;
- // The address to new_stream 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_Socket
-{
-public:
-
- JAWS_Socket (JAWS_Socket_Impl *impl = 0);
-
- static JAWS_Socket * instance (void)
- {
- return ACE_Singleton<JAWS_Socket, ACE_SYNCH_MUTEX>::instance ();
- }
-
- void accept ( const ACE_Addr &local_sap
- , ACE_SOCK_Stream &new_stream
- , JAWS_Event_Completer *completer
- , void *act = 0
- );
-
- void connect ( const ACE_Addr &remote_sap
- , ACE_SOCK_Stream &new_stream
- , JAWS_Event_Completer *completer
- , void *act = 0
- );
-
- void connect ( const ACE_Addr &remote_sap
- , ACE_SOCK_Stream &new_stream
- , const ACE_Addr &local_sap
- , JAWS_Event_Completer *completer
- , void *act = 0
- );
-
- void accept ( const ACE_Addr &local_sap
- , ACE_SOCK_Stream &new_stream
- , JAWS_Event_Completer *completer
- , const ACE_Time_Value &timeout
- , void *act = 0
- );
-
- void connect ( const ACE_Addr &remote_sap
- , ACE_SOCK_Stream &new_stream
- , JAWS_Event_Completer *completer
- , const ACE_Time_Value &timeout
- , void *act = 0
- );
-
- void connect ( const ACE_Addr &remote_sap
- , ACE_SOCK_Stream &new_stream
- , const ACE_Addr &local_sap
- , JAWS_Event_Completer *completer
- , const ACE_Time_Value &timeout
- , void *act = 0
- );
-
-private:
-
- JAWS_Socket_Impl *impl_;
-
-};
-
-
-#endif /* JAWS_SOCKET_H */