diff options
author | Benoit Foucher <benoit@zeroc.com> | 2007-08-30 16:15:46 +0200 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2007-08-30 16:15:46 +0200 |
commit | 90679336bd9c0abddfdcfc037b58a3fbe8299fbf (patch) | |
tree | 578692481f64bf0f1b1d76351b395dfbcf52a708 /cpp/src/IceGrid/RegistryI.h | |
parent | bug 2424: check for null in Java hashCode method (diff) | |
download | ice-90679336bd9c0abddfdcfc037b58a3fbe8299fbf.tar.bz2 ice-90679336bd9c0abddfdcfc037b58a3fbe8299fbf.tar.xz ice-90679336bd9c0abddfdcfc037b58a3fbe8299fbf.zip |
Squashed commit of the following:
commit a61fce80c95ed97d9716648c2083c8581326e950
Author: Benoit Foucher <benoit@zeroc.com>
Date: Thu Aug 30 15:33:54 2007 +0200
Added optimization to not wakeup too often
commit d44134e724e43aeb1db8693a37a5b611f295948c
Author: Benoit Foucher <benoit@zeroc.com>
Date: Thu Aug 30 11:34:22 2007 +0200
Changed the connection monitor to use the timer.
commit 915f0669599a457f46974c3a108205d5c3c666ba
Author: Benoit Foucher <benoit@zeroc.com>
Date: Wed Aug 29 16:18:59 2007 +0200
Fixed IceGrid and casino demo to use IceUtil::Timer
Diffstat (limited to 'cpp/src/IceGrid/RegistryI.h')
-rw-r--r-- | cpp/src/IceGrid/RegistryI.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/RegistryI.h b/cpp/src/IceGrid/RegistryI.h index 152944dc19c..9e77d63f59a 100644 --- a/cpp/src/IceGrid/RegistryI.h +++ b/cpp/src/IceGrid/RegistryI.h @@ -10,6 +10,7 @@ #ifndef ICE_GRID_REGISTRYI_H #define ICE_GRID_REGISTRYI_H +#include <IceUtil/Timer.h> #include <IceGrid/Registry.h> #include <IceGrid/Query.h> #include <IceGrid/Locator.h> @@ -34,9 +35,6 @@ typedef IceUtil::Handle<TraceLevels> TraceLevelsPtr; class ReapThread; typedef IceUtil::Handle<ReapThread> ReapThreadPtr; -class WaitQueue; -typedef IceUtil::Handle<WaitQueue> WaitQueuePtr; - class SessionServantLocatorI; typedef IceUtil::Handle<SessionServantLocatorI> SessionServantLocatorIPtr; @@ -105,7 +103,7 @@ private: bool _master; std::string _replicaName; ReapThreadPtr _reaper; - WaitQueuePtr _waitQueue; + IceUtil::TimerPtr _timer; SessionServantLocatorIPtr _sessionServantLocator; int _sessionTimeout; ReplicaSessionManager _session; |