diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-12-13 15:50:57 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-12-13 15:50:57 +0000 |
| commit | 2b5768c8755cccd073e910a604b3152c3497a636 (patch) | |
| tree | e6f486098773e9c7a45eb232b2f40c33cacd70ab /cpp/src/IceGrid/AdapterCache.h | |
| parent | Fixed bug #1611 (diff) | |
| download | ice-2b5768c8755cccd073e910a604b3152c3497a636.tar.bz2 ice-2b5768c8755cccd073e910a604b3152c3497a636.tar.xz ice-2b5768c8755cccd073e910a604b3152c3497a636.zip | |
Fixed timeout issue
Diffstat (limited to 'cpp/src/IceGrid/AdapterCache.h')
| -rw-r--r-- | cpp/src/IceGrid/AdapterCache.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/AdapterCache.h b/cpp/src/IceGrid/AdapterCache.h index 16856f36b35..8aa20ac8298 100644 --- a/cpp/src/IceGrid/AdapterCache.h +++ b/cpp/src/IceGrid/AdapterCache.h @@ -28,13 +28,22 @@ typedef std::vector<ServerEntryPtr> ServerEntrySeq; class AdapterEntry; typedef IceUtil::Handle<AdapterEntry> AdapterEntryPtr; +struct LocatorAdapterInfo +{ + std::string id; + AdapterPrx proxy; + int activationTimeout; + int deactivationTimeout; +}; +typedef std::vector<LocatorAdapterInfo> LocatorAdapterInfoSeq; + class AdapterEntry : virtual public IceUtil::Shared { public: AdapterEntry(AdapterCache&, const std::string&, const std::string&); - virtual std::vector<std::pair<std::string, AdapterPrx> > getProxies(int&, bool&) = 0; + virtual void getLocatorAdapterInfo(LocatorAdapterInfoSeq&, int&, bool&) = 0; virtual float getLeastLoadedNodeLoad(LoadSample) const = 0; virtual AdapterInfoSeq getAdapterInfo() const = 0; @@ -58,12 +67,12 @@ public: ServerAdapterEntry(AdapterCache&, const std::string&, const std::string&, const std::string&, int, const ServerEntryPtr&); - virtual std::vector<std::pair<std::string, AdapterPrx> > getProxies(int&, bool&); + virtual void getLocatorAdapterInfo(LocatorAdapterInfoSeq&, int&, bool&); virtual float getLeastLoadedNodeLoad(LoadSample) const; virtual AdapterInfoSeq getAdapterInfo() const; virtual const std::string& getReplicaGroupId() const { return _replicaGroupId; } - AdapterPrx getProxy(const std::string& = std::string(), bool = true) const; + AdapterPrx getProxy(const std::string&, bool) const; int getPriority() const; private: @@ -80,7 +89,7 @@ public: ReplicaGroupEntry(AdapterCache&, const std::string&, const std::string&, const LoadBalancingPolicyPtr&); - virtual std::vector<std::pair<std::string, AdapterPrx> > getProxies(int&, bool&); + virtual void getLocatorAdapterInfo(LocatorAdapterInfoSeq&, int&, bool&); virtual float getLeastLoadedNodeLoad(LoadSample) const; virtual AdapterInfoSeq getAdapterInfo() const; |