diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-06-15 20:40:16 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-06-15 20:40:16 +0000 |
| commit | cbff57de01637b4e00f6b9ef3d5225c2f2599d8d (patch) | |
| tree | 71dbf433e9d93f88c5803144ba961ab107277a1b | |
| parent | 95b307bd1ccca8faaeea31b07c2fc9994620188a (diff) | |
| download | ATCD-cbff57de01637b4e00f6b9ef3d5225c2f2599d8d.tar.gz | |
Makefile.LoadBalancing
6 files changed, 26 insertions, 20 deletions
diff --git a/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.cpp b/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.cpp index 9533a9cf7e1..3db59e19859 100644 --- a/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.cpp +++ b/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.cpp @@ -1,6 +1,7 @@ // -*- C++ -*- #include "LB_Minimum_Dispersion.h" +#include "LB_ObjectGroup_Map.h" //#include "ReplicaProxy.h" ACE_RCSID (LoadBalancing, diff --git a/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.h b/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.h index 59522d62668..bb22ff7517a 100644 --- a/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.h +++ b/TAO/orbsvcs/orbsvcs/LB_Minimum_Dispersion.h @@ -32,10 +32,11 @@ // the load it is deemed too loaded and the advisory is sent. // Forward declarations -class TAO_LB_ReplicaProxy; +// class TAO_LB_ReplicaProxy; +class TAO_LB_ObjectGroup_Map_Entry; -typedef ACE_Unbounded_Set<TAO_LB_ReplicaProxy *> TAO_LB_ReplicaProxySet; -typedef ACE_Unbounded_Set_Iterator<TAO_LB_ReplicaProxy *> TAO_LB_ReplicaProxySetIterator; +// typedef ACE_Unbounded_Set<TAO_LB_ReplicaProxy *> TAO_LB_ReplicaProxySet; +// typedef ACE_Unbounded_Set_Iterator<TAO_LB_ReplicaProxy *> TAO_LB_ReplicaProxySetIterator; /** * @class TAO_LB_Minimum_Dispersion_Strategy @@ -54,7 +55,8 @@ public: ~TAO_LB_Minimum_Dispersion_Strategy (void); // = The TAO_LB_LoadBalancing_Strategy methods - virtual CORBA::Object_ptr replica (CORBA_Environment &ACE_TRY_ENV) + virtual CORBA::Object_ptr replica (TAO_LB_ObjectGroup_Map_Entry *entry, + CORBA_Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)); // virtual void load_changed (TAO_LB_ReplicaProxy *, @@ -62,12 +64,12 @@ public: private: - /// Set containing the ReplicaProxy servants. - TAO_LB_ReplicaProxySet proxies_; +// /// Set containing the ReplicaProxy servants. +// TAO_LB_ReplicaProxySet proxies_; - /// Lock used to ensure atomic access to state retained by this - /// class. - TAO_SYNCH_MUTEX lock_; +// /// Lock used to ensure atomic access to state retained by this +// /// class. +// TAO_SYNCH_MUTEX lock_; }; diff --git a/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.cpp index 6e798b9f1c3..168246a49ac 100644 --- a/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.cpp +++ b/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.cpp @@ -100,7 +100,7 @@ TAO_LB_ObjectGroupManager::get_object_group_id ( ACE_THROW_SPEC ((CORBA::SystemException, LoadBalancing::ObjectGroupNotFound)) { - ACE_THROW (CORBA::NO_IMPLEMENT (), 0); + ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } LoadBalancing::ObjectGroup_ptr diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.cpp index 9533a9cf7e1..3db59e19859 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.cpp @@ -1,6 +1,7 @@ // -*- C++ -*- #include "LB_Minimum_Dispersion.h" +#include "LB_ObjectGroup_Map.h" //#include "ReplicaProxy.h" ACE_RCSID (LoadBalancing, diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.h index 59522d62668..bb22ff7517a 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Minimum_Dispersion.h @@ -32,10 +32,11 @@ // the load it is deemed too loaded and the advisory is sent. // Forward declarations -class TAO_LB_ReplicaProxy; +// class TAO_LB_ReplicaProxy; +class TAO_LB_ObjectGroup_Map_Entry; -typedef ACE_Unbounded_Set<TAO_LB_ReplicaProxy *> TAO_LB_ReplicaProxySet; -typedef ACE_Unbounded_Set_Iterator<TAO_LB_ReplicaProxy *> TAO_LB_ReplicaProxySetIterator; +// typedef ACE_Unbounded_Set<TAO_LB_ReplicaProxy *> TAO_LB_ReplicaProxySet; +// typedef ACE_Unbounded_Set_Iterator<TAO_LB_ReplicaProxy *> TAO_LB_ReplicaProxySetIterator; /** * @class TAO_LB_Minimum_Dispersion_Strategy @@ -54,7 +55,8 @@ public: ~TAO_LB_Minimum_Dispersion_Strategy (void); // = The TAO_LB_LoadBalancing_Strategy methods - virtual CORBA::Object_ptr replica (CORBA_Environment &ACE_TRY_ENV) + virtual CORBA::Object_ptr replica (TAO_LB_ObjectGroup_Map_Entry *entry, + CORBA_Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)); // virtual void load_changed (TAO_LB_ReplicaProxy *, @@ -62,12 +64,12 @@ public: private: - /// Set containing the ReplicaProxy servants. - TAO_LB_ReplicaProxySet proxies_; +// /// Set containing the ReplicaProxy servants. +// TAO_LB_ReplicaProxySet proxies_; - /// Lock used to ensure atomic access to state retained by this - /// class. - TAO_SYNCH_MUTEX lock_; +// /// Lock used to ensure atomic access to state retained by this +// /// class. +// TAO_SYNCH_MUTEX lock_; }; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.cpp index 6e798b9f1c3..168246a49ac 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.cpp @@ -100,7 +100,7 @@ TAO_LB_ObjectGroupManager::get_object_group_id ( ACE_THROW_SPEC ((CORBA::SystemException, LoadBalancing::ObjectGroupNotFound)) { - ACE_THROW (CORBA::NO_IMPLEMENT (), 0); + ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } LoadBalancing::ObjectGroup_ptr |