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/NodeI.cpp | |
| 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/NodeI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/NodeI.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp index 2db15a6052f..1c0f3d5f1f9 100644 --- a/cpp/src/IceGrid/NodeI.cpp +++ b/cpp/src/IceGrid/NodeI.cpp @@ -7,6 +7,7 @@ // // ********************************************************************** +#include <IceUtil/Timer.h> #include <Ice/Ice.h> #include <IcePatch2/Util.h> #include <IcePatch2/ClientUtil.h> @@ -15,7 +16,6 @@ #include <IceGrid/ServerI.h> #include <IceGrid/ServerAdapterI.h> #include <IceGrid/Util.h> -#include <IceGrid/WaitQueue.h> #include <IceGrid/TraceLevels.h> #include <IceGrid/NodeSessionManager.h> @@ -192,7 +192,7 @@ private: NodeI::NodeI(const Ice::ObjectAdapterPtr& adapter, NodeSessionManager& sessions, const ActivatorPtr& activator, - const WaitQueuePtr& waitQueue, + const IceUtil::TimerPtr& timer, const TraceLevelsPtr& traceLevels, const NodePrx& proxy, const string& name, @@ -201,7 +201,7 @@ NodeI::NodeI(const Ice::ObjectAdapterPtr& adapter, _adapter(adapter), _sessions(sessions), _activator(activator), - _waitQueue(waitQueue), + _timer(timer), _traceLevels(traceLevels), _name(name), _proxy(proxy), @@ -702,10 +702,10 @@ NodeI::getActivator() const return _activator; } -WaitQueuePtr -NodeI::getWaitQueue() const +IceUtil::TimerPtr +NodeI::getTimer() const { - return _waitQueue; + return _timer; } TraceLevelsPtr |