diff options
| author | Bernard Normier <bernard@zeroc.com> | 2003-07-18 19:47:14 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2003-07-18 19:47:14 +0000 |
| commit | 3c02842b6143c6ce9297feecd7c9497312c76da8 (patch) | |
| tree | 478210bed985772e2957ee0a65b9cd3f5f390234 | |
| parent | use lazy initialization of communicator for each request (diff) | |
| download | ice-3c02842b6143c6ce9297feecd7c9497312c76da8.tar.bz2 ice-3c02842b6143c6ce9297feecd7c9497312c76da8.tar.xz ice-3c02842b6143c6ce9297feecd7c9497312c76da8.zip | |
Major Freeze update
167 files changed, 8082 insertions, 9645 deletions
diff --git a/cpp/CHANGES b/cpp/CHANGES index bb788e62251..461fc589ecb 100644 --- a/cpp/CHANGES +++ b/cpp/CHANGES @@ -1,6 +1,144 @@ Changes since version 1.1.0 --------------------------- +- Major Freeze update: + - Removed the lowest Freeze layer. You should use instead Berkeley DB + directly. + + - For Freeze Maps and Evictors, the underlying Berkeley DB environment + is now always transactional. New configurations variables: + - Freeze.<envName>.DbHome provides the path to the DB home, + and defaults to <envName>. + - Freeze.<envName>.DbRecoverFatal triggers "fatal recovery" when + set to a value other than 0 (defaults to 0). + - Freeze.<envName>.DbPrivate when set to a value other than 0 tells + Berkeley DB to use process private memory instead of shared + memory. Defaults to 1. Set it to 0 when you want to run db_stat + (or another Berkeley DB utility) on a running environment. + - Freeze.<envName>.DbCheckpointPeriod: each Berkeley DB + environment created by Freeze has an associated thread that + checkpoints this environment every DbCheckpointPeriod minutes. + Defaults to 3 minutes. + - Freeze.<envName>.PeriodicCheckpointMinSize defines the minimum + size in kbytes for the periodic checkpoint (see above). This + value is passed to Berkeley DB's checkpoint function. Defaults + to 0 (no minimum). + - Freeze.<envName>.OldLogsAutoDelete: when set to a value other + than 0, old transactional logs no longer in use are deleted + after each periodic checkpoint. Defaults to 1. + Such a Freeze-created Berkeley DB environment is created and opened + when the first Freeze Map or Evictor using it is created, and is + closed when the last Freeze Map or Evictor using it is closed. + + - Freeze Map update: + Freeze Maps are now opened/created directly using their constructor + C++: DBMap(const Ice::CommunicatorPtr& communicator, + const std::string& envName, + const std::string& dbName, + bool createDb = true); + Java: public + Map(Ice.Communicator communicator, + String envName, + String dbName, + boolean createDb); + + In Java, it is necessary to call close() on the Map if you want + to close the underlying Berkeley DB database (and indirectly + environment) before the Map is finalized. + + As a consequence of using a transactional Berkeley DB environment, + all Map writes are now transactional: + - non-iterator writes use DB_AUTO_COMMIT + - writable iterators (non-const C++ iterators, Java Iterators) have + an associated transaction that is committed when the iterator is + closed. + + Freeze Maps support concurrent access: several threads can use (read + and write) the same Map concurrently without any application level + locking: the locking is handled by Berkeley DB. However iterators are + not thread safe: concurrent access to a given iterator (which is very + unusual) needs to be synchronized by the application. + Concurrent reads and writes to the same Map can generate deadlocks, + even with a single writer. Berkeley DB detects such deadlocks and + "kills" one locker (iterator or transaction) to resolve it. For + non-iterator access, Freeze handles such exception and retries + transparently. When using iterators, a DBDeadlockException is raised + to the application, which is responsible to close the affected + iterator(s) and retry. + Serialized access or concurrent reads never produce deadlocks. + + In Java, iterators are no longer closed as a side effect of other + write operations. Doing so would require adding synchronization to + all Java iterator methods. + Currently, Java Freeze Map iterators are closed either through the + proprietary close() method, or when hasNext() returns false (or + next() throws NoSuchElementException, which is equivalent). This + latter behavior may be removed soon. + + In C++, the copy constructor and assignment operator of Freeze + Map iterators duplicate the source iterator. When the source + iterator is non-const, the duplicate iterator will use the same + transaction. This transaction is committed only when its last + associated iterator is closed (i.e. destroyed or assigned end()). + + - Freeze Evictor update: + Freeze Maps are now opened/created directly using a static + createEvictor function/method: + C++: Freeze::EvictorPtr + Freeze::createEvictor(const Ice::CommunicatorPtr& communicator, + const std::string& envName, + const std::string& dbName, + bool createDb = true); + Java (in class Freeze.Util): + public static Evictor + createEvictor(Ice.Communicator communicator, + String envName, + String dbName, + boolean createDb); + + The persistence strategies have been removed. + Ice objects are now saved by a background thread, controlled by the + following configuration variables. + - Freeze.Evictor.<envName>.<dbName>.SaveSizeTrigger: as soon as + SaveSizeTrigger objects have been created, modified or destroyed, + the background wakes up to save them. When set to a negative value, + there is no size trigger. Defaults to 10. + - Freeze.Evictor.<envName>.<dbName>.SavePeriod: the saving thread + wakes up every SavePeriod ms and saves any created, modified or + destroyed object. When set to 0, there is no periodic wake up. + Defaults to 1 minute (60,000 ms). + + The application can also request an immediate save by calling + saveNow() on the evictor object. Also, creating a Freeze Evictor + Iterator triggers an immediate save. + + When saving an object, the background saving thread locks this + object. In Java, it locks the object itself; in C++, the object is + expected to implement IceUtil::AbstractMutex. Naturally the + application must use the same synchronization to access the + persistent state of the object. + + The configuration variable Freeze.Evictor.NoSyncAllowed can be + set to a value other than 0 to allow C++ objects that do not + implement IceUtil::AbstractMutex to be saved For such objects, no + synchronization is performed: it is recommended to only use this + feature with explict saves (SaveSizeTrigger set to -1 and + SavePeriod set to 0). NoSyncAllowed defaults to 0. + + - Freeze and XMLTransform now require Berkeley DB 4.1. They no + longer compile with older Berkeley DB releases. + + With Visual C++, you need to use the same project directory settings + when building Berkeley DB and Ice. In particular if you build Ice + with STLPort, you need to build Berkeley DB with the same STLPort. + +- Added new C++ AbstractMutex class, and helper templates + (AbstractMutexI, AbstractMutexReadI, AbstractMutexWriteI) to easily + implement AbstractMutex using Mutex, RecMutex, Monitor or RWRecMutex. + +- Fixed a bug in the implementation of StaticMutex on Windows, which + could result in a crash at exit. + - Added Ice.UDP.RcvSize and Ice.UDP.SndSize properties. These properties control the size of the UDP receive and send buffers as well as controlling the maximum size of a datagram invocation. If a datagram exceeds the @@ -44,11 +182,6 @@ Changes since version 1.1.0 function, to insert or replace an element, like the old insert. This corresponds to the behavior of Berkeley DB's DB->put(). -- Added saveObject() operation on Evictor, and savedObject() operation - on PersistenceStrategy. saveObject() saves a persistent object - immediately. Once an operation has called saveObject(), the object - is considered "clean": other updates by the same operation can only - be reliably saved by another call to saveObject(). - Added a test to the Slice parser to complain if an operation on a local interface or class has an exception specification. diff --git a/cpp/all.dsw b/cpp/all.dsw index f7f9ea4af6a..bab487b35fe 100644 --- a/cpp/all.dsw +++ b/cpp/all.dsw @@ -363,9 +363,6 @@ Package=<5> Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name Freeze
- End Project Dependency
- Begin Project Dependency
Project_Dep_Name Ice
End Project Dependency
Begin Project Dependency
@@ -384,9 +381,6 @@ Package=<5> Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name Freeze
- End Project Dependency
- Begin Project Dependency
Project_Dep_Name Ice
End Project Dependency
Begin Project Dependency
@@ -612,9 +606,6 @@ Package=<4> Project_Dep_Name IceStormS
End Project Dependency
Begin Project Dependency
- Project_Dep_Name cursor
- End Project Dependency
- Begin Project Dependency
Project_Dep_Name dbmap
End Project Dependency
Begin Project Dependency
@@ -1056,27 +1047,6 @@ Package=<4> ###############################################################################
-Project: "cursor"=.\test\Freeze\cursor\cursor.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name Freeze
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name Ice
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name IceUtil
- End Project Dependency
-}}}
-
-###############################################################################
-
Project: "dbmap"=.\test\Freeze\dbmap\dbmap.dsp - Package Owner=<4>
Package=<5>
diff --git a/cpp/allTests.py b/cpp/allTests.py index 3254b7c2c06..84a8292187b 100755 --- a/cpp/allTests.py +++ b/cpp/allTests.py @@ -50,14 +50,13 @@ tests = [ \ "IceSSL/certificateVerifier", \ "IceSSL/certificateVerification", \ "IceXML/encoding", \ - "Freeze/cursor", \ "Freeze/dbmap", \ "Freeze/complex", \ "Freeze/evictor", \ "IceStorm/single", \ "IceStorm/federation", \ "IceStorm/federation2", \ - "XMLTransform/transform", \ + "XMLTransform/transform", \ ] # diff --git a/cpp/config/IcePackAdmin.py b/cpp/config/IcePackAdmin.py index 5ffd367b010..551bfdbe598 100644 --- a/cpp/config/IcePackAdmin.py +++ b/cpp/config/IcePackAdmin.py @@ -14,6 +14,7 @@ # ********************************************************************** import sys, os, TestUtil +import time for toplevel in [".", "..", "../..", "../../..", "../../../.."]: toplevel = os.path.normpath(toplevel) @@ -44,6 +45,10 @@ def startIcePackRegistry(port, testdir): r' --IcePack.Registry.Admin.Endpoints=default' + \ r' --IcePack.Registry.Data=' + dataDir + \ r' --IcePack.Registry.DynamicRegistration' + \ + r' --IcePack.Registry.Trace.ServerRegistry=0' + \ + r' --IcePack.Registry.Trace.AdapterRegistry=0' + \ + r' --IcePack.Registry.Trace.ObjectRegistry=0' + \ + r' --IcePack.Registry.Trace.NodeRegistry=0' + \ r' --Ice.ProgramName=icepackregistry' icePackPipe = os.popen(command) @@ -53,7 +58,6 @@ def startIcePackRegistry(port, testdir): TestUtil.getAdapterReady(icePackPipe) TestUtil.getAdapterReady(icePackPipe) print "ok" - return icePackPipe def startIcePackNode(testdir): diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index 68cfaa87c79..8273157831b 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -183,10 +183,10 @@ endif ifneq ($(DB_HOME),) DB_FLAGS = -I$(DB_HOME)/include - DB_LIBS = -L$(DB_HOME)/$(libsubdir) -ldb + DB_LIBS = -L$(DB_HOME)/$(libsubdir) -ldb_cxx else DB_FLAGS = - DB_LIBS = -ldb + DB_LIBS = -ldb_cxx endif ifneq ($(XERCESC_HOME),) diff --git a/cpp/config/Make.rules.SunOS b/cpp/config/Make.rules.SunOS index 2e384c0d0fa..d2d95e1d4c0 100644 --- a/cpp/config/Make.rules.SunOS +++ b/cpp/config/Make.rules.SunOS @@ -47,8 +47,14 @@ else endif endif +# +# -features=tmplife is needed to destroy temporary objects immediately +# (as specified by ISO C++) instead of at the end of the current block. +# This is very useful to avoid deadlocks when using Freeze DBMap +# iterators. +# -CXXFLAGS = -KPIC -mt +p $(CXXSCOPEFLAGS) $(CXXWARNFLAGS) $(CXXARCHFLAGS) +CXXFLAGS = -KPIC -mt +p -features=tmplife $(CXXSCOPEFLAGS) $(CXXWARNFLAGS) $(CXXARCHFLAGS) ifeq ($(OPTIMIZE),yes) diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py index d5fdc368de0..3fccc2ea3a6 100644 --- a/cpp/config/TestUtil.py +++ b/cpp/config/TestUtil.py @@ -186,7 +186,7 @@ else: defaultHost = "" commonServerOptions = " --Ice.PrintProcessId --Ice.PrintAdapterReady --Ice.ThreadPool.Server.Size=3" + \ - " --Ice.Warn.Connections --Ice.ServerIdleTime=30" + " --Ice.Warn.Connections " clientOptions = clientProtocol + defaultHost serverOptions = serverProtocol + defaultHost + commonServerOptions diff --git a/cpp/demo/Freeze/bench/.depend b/cpp/demo/Freeze/bench/.depend index 5a55f36e6a2..082e3818111 100644 --- a/cpp/demo/Freeze/bench/.depend +++ b/cpp/demo/Freeze/bench/.depend @@ -1,4 +1,4 @@ -Client.o: Client.cpp ../../../include/Freeze/Application.h ../../../include/Ice/Application.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Freeze/DBF.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Strategy.h ../../../include/Freeze/Map.h BenchTypes.h Test.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h -BenchTypes.o: BenchTypes.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h BenchTypes.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h Test.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h +Client.o: Client.cpp ../../../include/Ice/Application.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h BenchTypes.h ../../../include/Freeze/Map.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h Test.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h +BenchTypes.o: BenchTypes.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h BenchTypes.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h Test.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h Test.o: Test.cpp Test.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/LocalException.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Stream.h Test.cpp: Test.ice diff --git a/cpp/demo/Freeze/bench/Client.cpp b/cpp/demo/Freeze/bench/Client.cpp index 2824058a2f1..b654d2dcb86 100644 --- a/cpp/demo/Freeze/bench/Client.cpp +++ b/cpp/demo/Freeze/bench/Client.cpp @@ -12,7 +12,7 @@ // // ********************************************************************** -#include <Freeze/Application.h> +#include <Ice/Application.h> #include <BenchTypes.h> #include <cstdlib> @@ -140,39 +140,38 @@ private: int _current; }; -class TestApp : public Freeze::Application +class TestApp : public Ice::Application { public: TestApp(const string&); - virtual int runFreeze(int, char*[], const Freeze::DBEnvironmentPtr&); + virtual int run(int, char*[]); private: - void IntIntMapTest(const Freeze::DBEnvironmentPtr&); + void IntIntMapTest(); void generatedRead(IntIntMap&, int, const GeneratorPtr&); - void Struct1Struct2MapTest(const Freeze::DBEnvironmentPtr&); - void Struct1Class1MapTest(const Freeze::DBEnvironmentPtr&); - void Struct1ObjectMapTest(const Freeze::DBEnvironmentPtr&); - void IntIntMapReadTest(const Freeze::DBEnvironmentPtr&); + void Struct1Struct2MapTest(); + void Struct1Class1MapTest(); + void Struct1ObjectMapTest(); + void IntIntMapReadTest(); + const string _envName; StopWatch _watch; int _repetitions; }; -TestApp::TestApp(const string& dbEnvName) : - Freeze::Application(dbEnvName), +TestApp::TestApp(const string& envName) : + _envName(envName), _repetitions(10000) { } void -TestApp::IntIntMapTest(const Freeze::DBEnvironmentPtr& dbEnv) +TestApp::IntIntMapTest() { - Freeze::DBPtr db = dbEnv->openDB("IntIntMap", true); - - IntIntMap m(db); + IntIntMap m(communicator(), _envName, "IntIntMap"); // // Populate the database. @@ -218,8 +217,6 @@ TestApp::IntIntMapTest(const Freeze::DBEnvironmentPtr& dbEnv) cout << "\ttime for " << _repetitions << " removes: " << total << "ms" << endl; cout << "\ttime per remove: " << perRecord << "ms" << endl; - - db->close(); } void @@ -242,11 +239,9 @@ TestApp::generatedRead(IntIntMap& m, int reads , const GeneratorPtr& gen) } void -TestApp::IntIntMapReadTest(const Freeze::DBEnvironmentPtr& dbEnv) +TestApp::IntIntMapReadTest() { - Freeze::DBPtr db = dbEnv->openDB("IntIntMap", true); - - IntIntMap m(db); + IntIntMap m(communicator(), _envName, "IntIntMap"); // // Populate the database. @@ -295,15 +290,12 @@ TestApp::IntIntMapReadTest(const Freeze::DBEnvironmentPtr& dbEnv) cout << "\ttime per remove: " << perRecord << "ms" << endl; */ - db->close(); } void -TestApp::Struct1Struct2MapTest(const Freeze::DBEnvironmentPtr& dbEnv) +TestApp::Struct1Struct2MapTest() { - Freeze::DBPtr db = dbEnv->openDB("Struct1Struct2", true); - - Struct1Struct2Map m(db); + Struct1Struct2Map m(communicator(), _envName, "Struct1Struct2"); // // Populate the database. @@ -359,15 +351,11 @@ TestApp::Struct1Struct2MapTest(const Freeze::DBEnvironmentPtr& dbEnv) cout << "\ttime for " << _repetitions << " removes: " << total << "ms" << endl; cout << "\ttime per remove: " << perRecord << "ms" << endl; - - db->close(); } void -TestApp::Struct1Class1MapTest(const Freeze::DBEnvironmentPtr& dbEnv) +TestApp::Struct1Class1MapTest() { - Freeze::DBPtr db = dbEnv->openDB("Struct1Class1", true); - - Struct1Class1Map m(db); + Struct1Class1Map m(communicator(), _envName, "Struct1Class1"); // // Populate the database. @@ -423,16 +411,12 @@ TestApp::Struct1Class1MapTest(const Freeze::DBEnvironmentPtr& dbEnv) cout << "\ttime for " << _repetitions << " removes: " << total << "ms" << endl; cout << "\ttime per remove: " << perRecord << "ms" << endl; - - db->close(); } void -TestApp::Struct1ObjectMapTest(const Freeze::DBEnvironmentPtr& dbEnv) +TestApp::Struct1ObjectMapTest() { - Freeze::DBPtr db = dbEnv->openDB("Struct1Object", true); - - Struct1ObjectMap m(db); + Struct1ObjectMap m(communicator(), _envName, "Struct1Object"); // // Populate the database. @@ -515,7 +499,6 @@ TestApp::Struct1ObjectMapTest(const Freeze::DBEnvironmentPtr& dbEnv) cout << "\ttime for " << _repetitions << " removes: " << total << "ms" << endl; cout << "\ttime per remove: " << perRecord << "ms" << endl; - db->close(); } class MyFactory : public Ice::ObjectFactory @@ -551,25 +534,25 @@ public: typedef IceUtil::Handle<MyFactory> MyFactoryPtr; int -TestApp::runFreeze(int argc, char* argv[], const Freeze::DBEnvironmentPtr& dbEnv) +TestApp::run(int argc, char* argv[]) { cout <<"IntIntMap" << endl; - IntIntMapTest(dbEnv); + IntIntMapTest(); cout <<"Struct1Struct2Map" << endl; - Struct1Struct2MapTest(dbEnv); + Struct1Struct2MapTest(); cout <<"Struct1Class1Map" << endl; - Struct1Class1MapTest(dbEnv); + Struct1Class1MapTest(); MyFactoryPtr factory = new MyFactory(); - factory->install(dbEnv->getCommunicator()); + factory->install(communicator()); cout <<"Struct1ObjectMap" << endl; - Struct1ObjectMapTest(dbEnv); + Struct1ObjectMapTest(); cout <<"IntIntMap (read test)" << endl; - IntIntMapReadTest(dbEnv); + IntIntMapReadTest(); return EXIT_SUCCESS; } diff --git a/cpp/demo/Freeze/library/.depend b/cpp/demo/Freeze/library/.depend index 065859db187..ea391c7af1c 100644 --- a/cpp/demo/Freeze/library/.depend +++ b/cpp/demo/Freeze/library/.depend @@ -4,16 +4,16 @@ Scanner.o: Scanner.cpp ../../../include/IceUtil/Config.h ../../../include/Ice/Ic Parser.o: Parser.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h Parser.h Library.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h RunParser.o: RunParser.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h Parser.h Library.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h Client.o: Client.cpp ../../../include/Ice/Application.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h Parser.h Library.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h -LibraryI.o: LibraryI.cpp ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DBF.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Strategy.h ../../../include/Freeze/Map.h LibraryI.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Thread.h Library.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h LibraryTypes.h -LibraryTypes.o: LibraryTypes.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h LibraryTypes.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h Library.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h -BookFactory.o: BookFactory.cpp BookFactory.h LibraryI.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Handle.h Library.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/ObjectFactory.h LibraryTypes.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h -Server.o: Server.cpp ../../../include/Freeze/Application.h ../../../include/Ice/Application.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Freeze/DBF.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Strategy.h ../../../include/Freeze/Map.h BookFactory.h LibraryI.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Thread.h Library.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h LibraryTypes.h +LibraryI.o: LibraryI.cpp ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/DBException.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Map.h ../../../include/Freeze/DB.h LibraryI.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Thread.h Library.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h LibraryTypes.h ../../../include/IceUtil/AbstractMutex.h +LibraryTypes.o: LibraryTypes.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h LibraryTypes.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h Library.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h +BookFactory.o: BookFactory.cpp BookFactory.h LibraryI.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Handle.h ../../../include/Freeze/Evictor.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/StreamF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Freeze/DBException.h ../../../include/Freeze/ObjectRecord.h Library.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/ObjectFactory.h LibraryTypes.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/IceUtil/AbstractMutex.h +Server.o: Server.cpp ../../../include/Ice/Application.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h BookFactory.h LibraryI.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Thread.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/DBException.h ../../../include/Freeze/ObjectRecord.h Library.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h LibraryTypes.h ../../../include/Freeze/Map.h ../../../include/Freeze/DB.h ../../../include/IceUtil/AbstractMutex.h ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Freeze/EvictorF.h Grammar.o: Grammar.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h Parser.h Library.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h Scanner.o: Scanner.cpp ../../../include/IceUtil/Config.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h Parser.h Library.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h Grammar.h Parser.o: Parser.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h Parser.h Library.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h RunParser.o: RunParser.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h Parser.h Library.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h -LibraryI.o: LibraryI.cpp ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DBF.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Strategy.h ../../../include/Freeze/Map.h LibraryI.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Thread.h Library.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h LibraryTypes.h -LibraryTypes.o: LibraryTypes.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h LibraryTypes.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h Library.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h -BookFactory.o: BookFactory.cpp BookFactory.h LibraryI.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Handle.h Library.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/ObjectFactory.h LibraryTypes.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h -Collocated.o: Collocated.cpp ../../../include/Freeze/Application.h ../../../include/Ice/Application.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Freeze/DBF.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Strategy.h ../../../include/Freeze/Map.h BookFactory.h LibraryI.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Thread.h Library.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h LibraryTypes.h Parser.h +LibraryI.o: LibraryI.cpp ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/DBException.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Map.h ../../../include/Freeze/DB.h LibraryI.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Thread.h Library.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h LibraryTypes.h ../../../include/IceUtil/AbstractMutex.h +LibraryTypes.o: LibraryTypes.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h LibraryTypes.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h Library.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h +BookFactory.o: BookFactory.cpp BookFactory.h LibraryI.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Handle.h ../../../include/Freeze/Evictor.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/StreamF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Freeze/DBException.h ../../../include/Freeze/ObjectRecord.h Library.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/ObjectFactory.h LibraryTypes.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/IceUtil/AbstractMutex.h +Collocated.o: Collocated.cpp ../../../include/Ice/Application.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h BookFactory.h LibraryI.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Thread.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/DBException.h ../../../include/Freeze/ObjectRecord.h Library.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h LibraryTypes.h ../../../include/Freeze/Map.h ../../../include/Freeze/DB.h ../../../include/IceUtil/AbstractMutex.h Parser.h ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Freeze/EvictorF.h Library.cpp: Library.ice diff --git a/cpp/demo/Freeze/library/Collocated.cpp b/cpp/demo/Freeze/library/Collocated.cpp index c2065b9d420..86319dac05c 100644 --- a/cpp/demo/Freeze/library/Collocated.cpp +++ b/cpp/demo/Freeze/library/Collocated.cpp @@ -12,24 +12,28 @@ // // ********************************************************************** -#include <Freeze/Application.h> +#include <Ice/Application.h> #include <BookFactory.h> #include <Parser.h> +#include <Freeze/Freeze.h> using namespace std; using namespace Ice; using namespace Freeze; -class LibraryCollocated : public Freeze::Application +class LibraryCollocated : public Ice::Application { public: - LibraryCollocated(const string& dbEnvName) : - Freeze::Application(dbEnvName) + LibraryCollocated(const string& envName) : + _envName(envName) { } - virtual int runFreeze(int argc, char* argv[], const DBEnvironmentPtr&); + virtual int run(int argc, char* argv[]); + +private: + const string _envName; }; int @@ -40,27 +44,16 @@ main(int argc, char* argv[]) } int -LibraryCollocated::runFreeze(int argc, char* argv[], const DBEnvironmentPtr& dbEnv) +LibraryCollocated::run(int argc, char* argv[]) { PropertiesPtr properties = communicator()->getProperties(); string value; - DBPtr dbBooks = dbEnv->openDB("books", true); - DBPtr dbAuthors = dbEnv->openDB("authors", true); - // // Create an Evictor for books. - // - PersistenceStrategyPtr strategy; - if(properties->getPropertyAsInt("Library.IdleStrategy") > 0) - { - strategy = dbBooks->createIdleStrategy(); - } - else - { - strategy = dbBooks->createEvictionStrategy(); - } - Freeze::EvictorPtr evictor = dbBooks->createEvictor(strategy); + // + Freeze::EvictorPtr evictor = Freeze::createEvictor(communicator(), _envName, "books"); + Int evictorSize = properties->getPropertyAsInt("Library.EvictorSize"); if(evictorSize > 0) { @@ -76,7 +69,7 @@ LibraryCollocated::runFreeze(int argc, char* argv[], const DBEnvironmentPtr& dbE // // Create the library, and add it to the Object Adapter. // - LibraryIPtr library = new LibraryI(dbAuthors, evictor); + LibraryIPtr library = new LibraryI(communicator(), _envName, "authors", evictor); adapter->add(library, stringToIdentity("library")); // diff --git a/cpp/demo/Freeze/library/LibraryI.cpp b/cpp/demo/Freeze/library/LibraryI.cpp index faf92f55324..4a3715237c9 100644 --- a/cpp/demo/Freeze/library/LibraryI.cpp +++ b/cpp/demo/Freeze/library/LibraryI.cpp @@ -157,9 +157,11 @@ private: Ice::ObjectAdapterPtr _adapter; }; -LibraryI::LibraryI(const Freeze::DBPtr& db, const Freeze::EvictorPtr& evictor) : +LibraryI::LibraryI(const Ice::CommunicatorPtr& communicator, + const string& envName, const string& dbName, + const Freeze::EvictorPtr& evictor) : _evictor(evictor), - _authors(db) + _authors(communicator, envName, dbName) { } diff --git a/cpp/demo/Freeze/library/LibraryI.h b/cpp/demo/Freeze/library/LibraryI.h index f551279d498..8e49f5d6f93 100644 --- a/cpp/demo/Freeze/library/LibraryI.h +++ b/cpp/demo/Freeze/library/LibraryI.h @@ -16,15 +16,18 @@ #define LIBRARY_I_H #include <IceUtil/RWRecMutex.h> - +#include <Freeze/Evictor.h> #include <Library.h> #include <LibraryTypes.h> +#include <IceUtil/AbstractMutex.h> class LibraryI : public Library, public IceUtil::RWRecMutex { public: - LibraryI(const Freeze::DBPtr&, const Freeze::EvictorPtr&); + LibraryI(const Ice::CommunicatorPtr& communicator, + const std::string& envName, const std::string& dbName, + const Freeze::EvictorPtr& evictor); virtual ~LibraryI(); virtual ::BookPrx createBook(const ::BookDescription&, const Ice::Current&); @@ -48,7 +51,7 @@ private: typedef IceUtil::Handle<LibraryI> LibraryIPtr; -class BookI : public Book, public IceUtil::RWRecMutex +class BookI : public Book, public IceUtil::AbstractMutexReadI<IceUtil::RWRecMutex> { public: diff --git a/cpp/demo/Freeze/library/Server.cpp b/cpp/demo/Freeze/library/Server.cpp index 1d905a47e04..b828c4e4454 100644 --- a/cpp/demo/Freeze/library/Server.cpp +++ b/cpp/demo/Freeze/library/Server.cpp @@ -12,23 +12,28 @@ // // ********************************************************************** -#include <Freeze/Application.h> +#include <Ice/Application.h> #include <BookFactory.h> +#include <Freeze/Freeze.h> using namespace std; using namespace Ice; using namespace Freeze; -class LibraryServer : public Freeze::Application +class LibraryServer : public Ice::Application { public: - LibraryServer(const string& dbEnvName) : - Freeze::Application(dbEnvName) + LibraryServer(const string& envName) : + _envName(envName) { } - virtual int runFreeze(int argc, char* argv[], const DBEnvironmentPtr&); + virtual int run(int argc, char* argv[]); + +private: + + const string _envName; }; int @@ -39,26 +44,15 @@ main(int argc, char* argv[]) } int -LibraryServer::runFreeze(int argc, char* argv[], const DBEnvironmentPtr& dbEnv) +LibraryServer::run(int argc, char* argv[]) { PropertiesPtr properties = communicator()->getProperties(); - - DBPtr dbBooks = dbEnv->openDB("books", true); - DBPtr dbAuthors = dbEnv->openDB("authors", true); - + // // Create an Evictor for books. // - PersistenceStrategyPtr strategy; - if(properties->getPropertyAsInt("Library.IdleStrategy") > 0) - { - strategy = dbBooks->createIdleStrategy(); - } - else - { - strategy = dbBooks->createEvictionStrategy(); - } - Freeze::EvictorPtr evictor = dbBooks->createEvictor(strategy); + Freeze::EvictorPtr evictor = Freeze::createEvictor(communicator(), _envName, "books"); + Int evictorSize = properties->getPropertyAsInt("Library.EvictorSize"); if(evictorSize > 0) { @@ -74,7 +68,7 @@ LibraryServer::runFreeze(int argc, char* argv[], const DBEnvironmentPtr& dbEnv) // // Create the library, and add it to the Object Adapter. // - LibraryIPtr library = new LibraryI(dbAuthors, evictor); + LibraryIPtr library = new LibraryI(communicator(), _envName, "authors", evictor); adapter->add(library, stringToIdentity("library")); // diff --git a/cpp/demo/Freeze/phonebook/.depend b/cpp/demo/Freeze/phonebook/.depend index a793dd3ae99..3f52670d8c0 100644 --- a/cpp/demo/Freeze/phonebook/.depend +++ b/cpp/demo/Freeze/phonebook/.depend @@ -4,16 +4,16 @@ Scanner.o: Scanner.cpp ../../../include/IceUtil/Config.h ../../../include/Ice/Ic Parser.o: Parser.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h Parser.h PhoneBook.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h RunParser.o: RunParser.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h Parser.h PhoneBook.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h Client.o: Client.cpp ../../../include/Ice/Application.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h Parser.h PhoneBook.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h -PhoneBookI.o: PhoneBookI.cpp PhoneBookI.h ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Base64.h ../../../include/IceUtil/InputUtil.h ../../../include/IceUtil/OutputUtil.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Freeze/DBF.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Strategy.h ../../../include/Freeze/Map.h PhoneBook.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h NameIdentitiesDict.h -NameIdentitiesDict.o: NameIdentitiesDict.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h NameIdentitiesDict.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h PhoneBook.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h -ContactFactory.o: ContactFactory.cpp ContactFactory.h PhoneBookI.h ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Base64.h ../../../include/IceUtil/InputUtil.h ../../../include/IceUtil/OutputUtil.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Freeze/DBF.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Strategy.h ../../../include/Freeze/Map.h PhoneBook.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h NameIdentitiesDict.h -Server.o: Server.cpp ../../../include/Freeze/Application.h ../../../include/Ice/Application.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Freeze/DBF.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Strategy.h ../../../include/Freeze/Map.h ContactFactory.h PhoneBookI.h ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Base64.h ../../../include/IceUtil/InputUtil.h ../../../include/IceUtil/OutputUtil.h PhoneBook.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h NameIdentitiesDict.h +PhoneBookI.o: PhoneBookI.cpp PhoneBookI.h ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/AbstractMutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Base64.h ../../../include/IceUtil/InputUtil.h ../../../include/IceUtil/OutputUtil.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/DBException.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Map.h ../../../include/Freeze/DB.h PhoneBook.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h NameIdentitiesDict.h +NameIdentitiesDict.o: NameIdentitiesDict.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h NameIdentitiesDict.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h PhoneBook.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h +ContactFactory.o: ContactFactory.cpp ContactFactory.h PhoneBookI.h ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/AbstractMutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Base64.h ../../../include/IceUtil/InputUtil.h ../../../include/IceUtil/OutputUtil.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/DBException.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Map.h ../../../include/Freeze/DB.h PhoneBook.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h NameIdentitiesDict.h +Server.o: Server.cpp ../../../include/Ice/Application.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ContactFactory.h PhoneBookI.h ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/AbstractMutex.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Base64.h ../../../include/IceUtil/InputUtil.h ../../../include/IceUtil/OutputUtil.h ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/DBException.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Map.h ../../../include/Freeze/DB.h PhoneBook.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h NameIdentitiesDict.h Grammar.o: Grammar.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h Parser.h PhoneBook.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h Scanner.o: Scanner.cpp ../../../include/IceUtil/Config.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h Parser.h PhoneBook.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h Grammar.h Parser.o: Parser.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h Parser.h PhoneBook.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h RunParser.o: RunParser.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h Parser.h PhoneBook.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h -PhoneBookI.o: PhoneBookI.cpp PhoneBookI.h ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Base64.h ../../../include/IceUtil/InputUtil.h ../../../include/IceUtil/OutputUtil.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Freeze/DBF.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Strategy.h ../../../include/Freeze/Map.h PhoneBook.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h NameIdentitiesDict.h -NameIdentitiesDict.o: NameIdentitiesDict.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h NameIdentitiesDict.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h PhoneBook.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h -ContactFactory.o: ContactFactory.cpp ContactFactory.h PhoneBookI.h ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Base64.h ../../../include/IceUtil/InputUtil.h ../../../include/IceUtil/OutputUtil.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Freeze/DBF.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Strategy.h ../../../include/Freeze/Map.h PhoneBook.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h NameIdentitiesDict.h -Collocated.o: Collocated.cpp ../../../include/Freeze/Application.h ../../../include/Ice/Application.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Freeze/DBF.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Strategy.h ../../../include/Freeze/Map.h ContactFactory.h PhoneBookI.h ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Base64.h ../../../include/IceUtil/InputUtil.h ../../../include/IceUtil/OutputUtil.h PhoneBook.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h NameIdentitiesDict.h Parser.h +PhoneBookI.o: PhoneBookI.cpp PhoneBookI.h ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/AbstractMutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Base64.h ../../../include/IceUtil/InputUtil.h ../../../include/IceUtil/OutputUtil.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/DBException.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Map.h ../../../include/Freeze/DB.h PhoneBook.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h NameIdentitiesDict.h +NameIdentitiesDict.o: NameIdentitiesDict.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h NameIdentitiesDict.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h PhoneBook.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h +ContactFactory.o: ContactFactory.cpp ContactFactory.h PhoneBookI.h ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/AbstractMutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Base64.h ../../../include/IceUtil/InputUtil.h ../../../include/IceUtil/OutputUtil.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/DBException.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Map.h ../../../include/Freeze/DB.h PhoneBook.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h NameIdentitiesDict.h +Collocated.o: Collocated.cpp ../../../include/Ice/Application.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ContactFactory.h PhoneBookI.h ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/AbstractMutex.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Base64.h ../../../include/IceUtil/InputUtil.h ../../../include/IceUtil/OutputUtil.h ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/DBException.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Map.h ../../../include/Freeze/DB.h PhoneBook.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h NameIdentitiesDict.h Parser.h PhoneBook.cpp: PhoneBook.ice ../../../slice/Ice/Identity.ice diff --git a/cpp/demo/Freeze/phonebook/Collocated.cpp b/cpp/demo/Freeze/phonebook/Collocated.cpp index 6e0a26a1dfd..2fc4da0e356 100644 --- a/cpp/demo/Freeze/phonebook/Collocated.cpp +++ b/cpp/demo/Freeze/phonebook/Collocated.cpp @@ -12,7 +12,7 @@ // // ********************************************************************** -#include <Freeze/Application.h> +#include <Ice/Application.h> #include <ContactFactory.h> #include <Parser.h> @@ -20,16 +20,19 @@ using namespace std; using namespace Ice; using namespace Freeze; -class PhoneBookCollocated : public Freeze::Application +class PhoneBookCollocated : public Ice::Application { public: - PhoneBookCollocated(const string& dbEnvName) : - Freeze::Application(dbEnvName) + PhoneBookCollocated(const string& envName) : + _envName(envName) { } - virtual int runFreeze(int argc, char* argv[], const DBEnvironmentPtr&); + virtual int run(int argc, char* argv[]); + +private: + const string _envName; }; int @@ -40,27 +43,16 @@ main(int argc, char* argv[]) } int -PhoneBookCollocated::runFreeze(int argc, char* argv[], const DBEnvironmentPtr& dbEnv) +PhoneBookCollocated::run(int argc, char* argv[]) { PropertiesPtr properties = communicator()->getProperties(); string value; - - DBPtr dbPhoneBook = dbEnv->openDB("phonebook", true); - DBPtr dbContacts = dbEnv->openDB("contacts", true); - + // // Create an Evictor for contacts. // - PersistenceStrategyPtr strategy; - if(properties->getPropertyAsInt("PhoneBook.IdleStrategy") > 0) - { - strategy = dbContacts->createIdleStrategy(); - } - else - { - strategy = dbContacts->createEvictionStrategy(); - } - Freeze::EvictorPtr evictor = dbContacts->createEvictor(strategy); + Freeze::EvictorPtr evictor = Freeze::createEvictor(communicator(), _envName, "contacts"); + Int evictorSize = properties->getPropertyAsInt("PhoneBook.EvictorSize"); if(evictorSize > 0) { @@ -76,7 +68,9 @@ PhoneBookCollocated::runFreeze(int argc, char* argv[], const DBEnvironmentPtr& d // // Create the phonebook, and add it to the Object Adapter. // - PhoneBookIPtr phoneBook = new PhoneBookI(dbPhoneBook, evictor); + PhoneBookIPtr phoneBook = new PhoneBookI(communicator(), + _envName, "phonebook", + evictor); adapter->add(phoneBook, stringToIdentity("phonebook")); // diff --git a/cpp/demo/Freeze/phonebook/PhoneBookI.cpp b/cpp/demo/Freeze/phonebook/PhoneBookI.cpp index 3c99a30c748..8b1b4c73faa 100644 --- a/cpp/demo/Freeze/phonebook/PhoneBookI.cpp +++ b/cpp/demo/Freeze/phonebook/PhoneBookI.cpp @@ -148,10 +148,11 @@ ContactI::destroy(const Ice::Current&) } } -PhoneBookI::PhoneBookI(const DBPtr& db, const Freeze::EvictorPtr& evictor) : - _db(db), +PhoneBookI::PhoneBookI(const Ice::CommunicatorPtr& communicator, + const std::string& envName, const std::string& dbName, + const Freeze::EvictorPtr& evictor) : _evictor(evictor), - _nameIdentitiesDict(db) + _nameIdentitiesDict(communicator, envName, dbName) { } @@ -349,20 +350,22 @@ PhoneBookI::getNewIdentity() Ice::Long n; Identities ids; - NameIdentitiesDict::iterator p = _nameIdentitiesDict.find("ID"); - if(p == _nameIdentitiesDict.end()) { - n = 0; - } - else - { - ids = p->second; - assert(ids.size() == 1); - - string::size_type sz; - bool rc = IceUtil::stringToInt64(ids.front().name, n, sz); - assert(rc); - n += 1; + NameIdentitiesDict::iterator p = _nameIdentitiesDict.find("ID"); + if(p == _nameIdentitiesDict.end()) + { + n = 0; + } + else + { + ids = p->second; + assert(ids.size() == 1); + + string::size_type sz; + bool rc = IceUtil::stringToInt64(ids.front().name, n, sz); + assert(rc); + n += 1; + } } char s[20]; diff --git a/cpp/demo/Freeze/phonebook/PhoneBookI.h b/cpp/demo/Freeze/phonebook/PhoneBookI.h index 68875dcce71..3ebc830bb85 100644 --- a/cpp/demo/Freeze/phonebook/PhoneBookI.h +++ b/cpp/demo/Freeze/phonebook/PhoneBookI.h @@ -27,7 +27,8 @@ typedef IceUtil::Handle<PhoneBookI> PhoneBookIPtr; class ContactI; typedef IceUtil::Handle<ContactI> ContactIPtr; -class ContactI : public Contact, public IceUtil::RWRecMutex +class ContactI : public Contact, + public IceUtil::AbstractMutexReadI<IceUtil::RWRecMutex> { public: @@ -58,7 +59,9 @@ class PhoneBookI : public PhoneBook, public IceUtil::RWRecMutex { public: - PhoneBookI(const Freeze::DBPtr&, const Freeze::EvictorPtr&); + PhoneBookI(const Ice::CommunicatorPtr& communicator, + const std::string& envName, const std::string& dbName, + const Freeze::EvictorPtr& evictor); virtual ContactPrx createContact(const Ice::Current&); virtual Contacts findContacts(const std::string&, const Ice::Current&) const; @@ -73,7 +76,6 @@ private: void removeI(const Ice::Identity&, const std::string&); - Freeze::DBPtr _db; Freeze::EvictorPtr _evictor; NameIdentitiesDict _nameIdentitiesDict; }; diff --git a/cpp/demo/Freeze/phonebook/Server.cpp b/cpp/demo/Freeze/phonebook/Server.cpp index 1b2e5d4dfec..70ad2d3abb3 100644 --- a/cpp/demo/Freeze/phonebook/Server.cpp +++ b/cpp/demo/Freeze/phonebook/Server.cpp @@ -12,23 +12,26 @@ // // ********************************************************************** -#include <Freeze/Application.h> +#include <Ice/Application.h> #include <ContactFactory.h> using namespace std; using namespace Ice; using namespace Freeze; -class PhoneBookServer : public Freeze::Application +class PhoneBookServer : public Ice::Application { public: - PhoneBookServer(const string& dbEnvName) : - Freeze::Application(dbEnvName) + PhoneBookServer(const string& envName) : + _envName(envName) { } - virtual int runFreeze(int argc, char* argv[], const DBEnvironmentPtr&); + virtual int run(int argc, char* argv[]); + +private: + const string _envName; }; int @@ -39,26 +42,15 @@ main(int argc, char* argv[]) } int -PhoneBookServer::runFreeze(int argc, char* argv[], const DBEnvironmentPtr& dbEnv) +PhoneBookServer::run(int argc, char* argv[]) { PropertiesPtr properties = communicator()->getProperties(); - DBPtr dbPhoneBook = dbEnv->openDB("phonebook", true); - DBPtr dbContacts = dbEnv->openDB("contacts", true); - // // Create an Evictor for contacts. // - PersistenceStrategyPtr strategy; - if(properties->getPropertyAsInt("PhoneBook.IdleStrategy") > 0) - { - strategy = dbContacts->createIdleStrategy(); - } - else - { - strategy = dbContacts->createEvictionStrategy(); - } - Freeze::EvictorPtr evictor = dbContacts->createEvictor(strategy); + Freeze::EvictorPtr evictor = Freeze::createEvictor(communicator(), _envName, "contacts"); + Int evictorSize = properties->getPropertyAsInt("PhoneBook.EvictorSize"); if(evictorSize > 0) { @@ -74,7 +66,8 @@ PhoneBookServer::runFreeze(int argc, char* argv[], const DBEnvironmentPtr& dbEnv // // Create the phonebook, and add it to the Object Adapter. // - PhoneBookIPtr phoneBook = new PhoneBookI(dbPhoneBook, evictor); + PhoneBookIPtr phoneBook = new PhoneBookI(communicator(), + _envName, "phonebook", evictor); adapter->add(phoneBook, stringToIdentity("phonebook")); // diff --git a/cpp/demo/Freeze/phonebook/config b/cpp/demo/Freeze/phonebook/config index bec25d3df84..572801ed958 100644 --- a/cpp/demo/Freeze/phonebook/config +++ b/cpp/demo/Freeze/phonebook/config @@ -2,8 +2,8 @@ Ice.Warn.Connections=1 #Ice.Trace.Network=3 #Ice.Trace.Protocol=1 -#Freeze.Trace.DB=1 -#Freeze.Trace.Evictor=2 +Freeze.Trace.DB=1 +Freeze.Trace.Evictor=2 PhoneBook.Endpoints=default -p 10000 PhoneBook.Proxy=phonebook:default -p 10000 diff --git a/cpp/demo/IceBox/hello/.depend b/cpp/demo/IceBox/hello/.depend index e3188d4ebae..6fe220b760b 100644 --- a/cpp/demo/IceBox/hello/.depend +++ b/cpp/demo/IceBox/hello/.depend @@ -1,5 +1,5 @@ Hello.o: Hello.cpp Hello.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/Stream.h Client.o: Client.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h Hello.h HelloI.o: HelloI.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h HelloI.h Hello.h -HelloServiceI.o: HelloServiceI.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h HelloServiceI.h ../../../include/IceBox/IceBox.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h HelloI.h Hello.h +HelloServiceI.o: HelloServiceI.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h HelloServiceI.h ../../../include/IceBox/IceBox.h HelloI.h Hello.h Hello.cpp: Hello.ice diff --git a/cpp/demo/IcePack/hello/.depend b/cpp/demo/IcePack/hello/.depend index ae765874dc4..4863589e456 100644 --- a/cpp/demo/IcePack/hello/.depend +++ b/cpp/demo/IcePack/hello/.depend @@ -1,7 +1,7 @@ Hello.o: Hello.cpp Hello.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/LocalException.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Stream.h Client.o: Client.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/IcePack/Query.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h ../../../include/IcePack/Exception.h Hello.h -HelloI.o: HelloI.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/IcePack/Admin.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h ../../../include/IceBox/IceBox.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h ../../../include/IcePack/Exception.h HelloI.h Hello.h -HelloServiceI.o: HelloServiceI.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h HelloServiceI.h ../../../include/IceBox/IceBox.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h HelloI.h Hello.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h -HelloI.o: HelloI.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/IcePack/Admin.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h ../../../include/IceBox/IceBox.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h ../../../include/IcePack/Exception.h HelloI.h Hello.h +HelloI.o: HelloI.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/IcePack/Admin.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h ../../../include/IceBox/IceBox.h ../../../include/IcePack/Exception.h HelloI.h Hello.h +HelloServiceI.o: HelloServiceI.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h HelloServiceI.h ../../../include/IceBox/IceBox.h HelloI.h Hello.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h +HelloI.o: HelloI.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/IcePack/Admin.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h ../../../include/IceBox/IceBox.h ../../../include/IcePack/Exception.h HelloI.h Hello.h Server.o: Server.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h HelloI.h Hello.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h Hello.cpp: Hello.ice diff --git a/cpp/include/Freeze/Application.h b/cpp/include/Freeze/Application.h deleted file mode 100644 index 279ccf1ad92..00000000000 --- a/cpp/include/Freeze/Application.h +++ /dev/null @@ -1,42 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003 -// ZeroC, Inc. -// Billerica, MA, USA -// -// All Rights Reserved. -// -// Ice is free software; you can redistribute it and/or modify it under -// the terms of the GNU General Public License version 2 as published by -// the Free Software Foundation. -// -// ********************************************************************** - -#ifndef FREEZE_APPLICATION_H -#define FREEZE_APPLICATION_H - -#include <Ice/Application.h> -#include <Freeze/Freeze.h> - -namespace Freeze -{ - -class FREEZE_API Application : public Ice::Application -{ -public: - - Application(const std::string&); - virtual ~Application(); - - virtual int runFreeze(int, char*[], const DBEnvironmentPtr&) = 0; - -private: - - virtual int run(int, char*[]); - - const std::string _dbEnvName; -}; - -} - -#endif diff --git a/cpp/include/Freeze/Freeze.h b/cpp/include/Freeze/Freeze.h index 86f1fcc87c4..317df6014fd 100644 --- a/cpp/include/Freeze/Freeze.h +++ b/cpp/include/Freeze/Freeze.h @@ -16,9 +16,7 @@ #define FREEZE_FREEZE_H #include <Freeze/Initialize.h> -#include <Freeze/DB.h> #include <Freeze/Evictor.h> -#include <Freeze/Strategy.h> #include <Freeze/Map.h> #endif diff --git a/cpp/include/Freeze/Initialize.h b/cpp/include/Freeze/Initialize.h index 8fefce833ce..e9d1ae9a2b4 100644 --- a/cpp/include/Freeze/Initialize.h +++ b/cpp/include/Freeze/Initialize.h @@ -16,13 +16,25 @@ #define FREEZE_INITIALIZE_H #include <Ice/Ice.h> -#include <Freeze/DBF.h> +#include <Freeze/EvictorF.h> + +// +// Berkeley DB's DbEnv +// +class DbEnv; namespace Freeze { -FREEZE_API DBEnvironmentPtr initialize(const ::Ice::CommunicatorPtr&, const std::string&); -FREEZE_API DBEnvironmentPtr initializeWithTxn(const ::Ice::CommunicatorPtr&, const std::string&); +FREEZE_API EvictorPtr createEvictor(const Ice::CommunicatorPtr& communicator, + const std::string& envName, + const std::string& dbName, + bool createDb = true); + +FREEZE_API EvictorPtr createEvictor(const Ice::CommunicatorPtr& communicator, + DbEnv& dbEnv, + const std::string& dbName, + bool createDb = true); } diff --git a/cpp/include/Freeze/Map.h b/cpp/include/Freeze/Map.h index 70e206e2af0..8e48f0e966c 100644 --- a/cpp/include/Freeze/Map.h +++ b/cpp/include/Freeze/Map.h @@ -16,13 +16,107 @@ #define FREEZE_MAP_H #include <Ice/Ice.h> +#include <iterator> #include <Freeze/DB.h> +#include <Freeze/DBException.h> -#include <iterator> +// +// Berkeley DB's DbEnv +// +class DbEnv; namespace Freeze { +class DBIteratorHelper; + +class FREEZE_API DBMapHelper +{ +public: + + static DBMapHelper* + create(const Ice::CommunicatorPtr& communicator, + const std::string& envName, + const std::string& dbName, + bool createDb); + + static DBMapHelper* + create(const Ice::CommunicatorPtr& communicator, + DbEnv& dbEnv, + const std::string& dbName, + bool createDb); + + virtual ~DBMapHelper() = 0; + + virtual DBIteratorHelper* + find(const Key&, bool) const = 0; + + virtual void + put(const Key&, const Value&) = 0; + + virtual size_t + erase(const Key&) = 0; + + virtual size_t + count(const Key&) const = 0; + + virtual void + clear() = 0; + + virtual void + destroy() = 0; + + virtual size_t + size() const = 0; + + const Ice::CommunicatorPtr& + getCommunicator() const + { + return _communicator; + } + +protected: + + DBMapHelper(const Ice::CommunicatorPtr&); + + Ice::CommunicatorPtr _communicator; +}; + + +class FREEZE_API DBIteratorHelper +{ +public: + + static DBIteratorHelper* + create(const DBMapHelper& m, bool readOnly); + + virtual + ~DBIteratorHelper() = 0; + + virtual DBIteratorHelper* + clone() const = 0; + + virtual void + get(const Key*&, const Value*&) const = 0; + + virtual void + set(const Value&) = 0; + + virtual void + erase() = 0; + + virtual bool + next() const = 0; + + virtual bool + equals(const DBIteratorHelper&) const = 0; + + virtual const Ice::CommunicatorPtr& + getCommunicator() const = 0; +}; + + + // // Forward declaration // @@ -63,8 +157,15 @@ public: typedef value_type& reference; - DBIterator(const DBPtr& db, const DBCursorPtr& cursor) : - _db(db), _cursor(cursor), _refValid(false) + DBIterator(DBMapHelper& mapHelper) : + _helper(DBIteratorHelper::create(mapHelper, false)), + _refValid(false) + { + } + + DBIterator(DBIteratorHelper* helper) : + _helper(helper), + _refValid(false) { } @@ -76,65 +177,45 @@ public: DBIterator(const DBIterator& rhs) : _refValid(false) { - if(rhs._cursor) + if(rhs._helper.get() != 0) { - _cursor = rhs._cursor->clone(); + _helper.reset(rhs._helper->clone()); } - - _db = rhs._db; } DBIterator& operator=(const DBIterator& rhs) { - if(_cursor) - { - _cursor->close(); - } - - if(rhs._cursor) + if(this != &rhs) { - _cursor = rhs._cursor->clone(); + if(rhs._helper.get() != 0) + { + _helper.reset(rhs._helper->clone()); + } + else + { + _helper.reset(); + } + + _refValid = false; } - _db = rhs._db; - _refValid = false; - return *this; } ~DBIterator() { - if(_cursor) - { - _cursor->close(); - } } bool operator==(const DBIterator& rhs) const { - if(_db && _db == rhs._db && _cursor && rhs._cursor) + if(_helper.get() != 0 && rhs._helper.get() != 0) { - Freeze::Key k1, k2; - Freeze::Value v; - try - { - _cursor->curr(k1, v); - rhs._cursor->curr(k2, v); - return k1 == k2; - } - catch(const DBNotFoundException&) - { - return false; - } + return _helper->equals(*rhs._helper.get()); + } + else + { + return _helper.get() == rhs._helper.get(); } - else if(!_db && !rhs._db) - { - return true; - } - else - { - return false; - } } bool operator!=(const DBIterator& rhs) const @@ -190,9 +271,11 @@ public: // void set(const mapped_type& value) { - Freeze::Value v; - ValueCodec::write(value, v, _db->getCommunicator()); - _cursor->set(v); + assert(_helper.get()); + + Value v; + ValueCodec::write(value, v, _helper->getCommunicator()); + _helper->set(v); _refValid = false; } @@ -200,37 +283,37 @@ private: void incr() { - assert(_cursor && _db); - if(!_cursor->next()) + assert(_helper.get() != 0); + if(!_helper->next()) { // // The iterator has been moved past the end, and is now // invalid. // - _cursor->close(); - _cursor = 0; - _db = 0; + _helper.reset(); } _refValid = false; } void getCurrentValue(key_type& key, mapped_type& value) const { - Freeze::Key k; - Freeze::Value v; - - _cursor->curr(k, v); + assert(_helper.get() != 0); - Ice::CommunicatorPtr communicator = _db->getCommunicator(); - KeyCodec::read(key, k, communicator); - ValueCodec::read(value, v, communicator); + const Key* k = 0; + const Value* v = 0; + _helper->get(k, v); + assert(k != 0); + assert(v != 0); + + const Ice::CommunicatorPtr& communicator = _helper->getCommunicator(); + KeyCodec::read(key, *k, communicator); + ValueCodec::read(value, *v, communicator); } friend class ConstDBIterator<key_type, mapped_type, KeyCodec, ValueCodec>; friend class DBMap<key_type, mapped_type, KeyCodec, ValueCodec>; - DBPtr _db; - DBCursorPtr _cursor; + std::auto_ptr<DBIteratorHelper> _helper; // // Cached last return value. This is so that operator->() can @@ -263,10 +346,18 @@ public: typedef value_type& reference; - ConstDBIterator(const DBPtr& db, const DBCursorPtr& cursor) : - _db(db), _cursor(cursor), _refValid(false) + ConstDBIterator(DBMapHelper& mapHelper) : + _helper(DBIteratorHelper::create(mapHelper, true)), + _refValid(false) + { + } + + ConstDBIterator(DBIteratorHelper* helper) : + _helper(helper), + _refValid(false) { } + ConstDBIterator() : _refValid(false) { @@ -275,12 +366,10 @@ public: ConstDBIterator(const ConstDBIterator& rhs) : _refValid(false) { - if(rhs._cursor) + if(rhs._helper.get() != 0) { - _cursor = rhs._cursor->clone(); + _helper.reset(rhs._helper->clone()); } - - _db = rhs._db; } // @@ -290,29 +379,28 @@ public: ConstDBIterator(const DBIterator<key_type, mapped_type, KeyCodec, ValueCodec>& rhs) : _refValid(false) { - if(rhs._cursor) + if(rhs._helper.get() != 0) { - _cursor = rhs._cursor->clone(); + _helper.reset(rhs._helper->clone()); } - - _db = rhs._db; } ConstDBIterator& operator=(const ConstDBIterator& rhs) { - if(_cursor) + if(this != &rhs) { - _cursor->close(); - } - - if(rhs._cursor) - { - _cursor = rhs._cursor->clone(); + if(rhs._helper.get() != 0) + { + _helper.reset(rhs._helper->clone()); + } + else + { + _helper.reset(); + } + + _refValid = false; } - _db = rhs._db; - _refValid = false; - return *this; } @@ -321,17 +409,15 @@ public: // ConstDBIterator& operator=(const DBIterator<key_type, mapped_type, KeyCodec, ValueCodec>& rhs) { - if(_cursor) + if(rhs._helper.get() != 0) { - _cursor->close(); + _helper.reset(rhs._helper->clone()); } - - if(rhs._cursor) + else { - _cursor = rhs._cursor->clone(); + _helper.reset(); } - _db = rhs._db; _refValid = false; return *this; @@ -339,37 +425,18 @@ public: ~ConstDBIterator() { - if(_cursor) - { - _cursor->close(); - } } bool operator==(const ConstDBIterator& rhs) { - if(_db && _db == rhs._db && _cursor && rhs._cursor) + if(_helper.get() != 0 && rhs._helper.get() != 0) { - Freeze::Key k1, k2; - Freeze::Value v; - try - { - _cursor->curr(k1, v); - rhs._cursor->curr(k2, v); - return k1 == k2; - } - catch(const DBNotFoundException&) - { - return false; - } + return _helper->equals(*rhs._helper); + } + else + { + return _helper.get() == rhs._helper.get(); } - else if(!_db && !rhs._db) - { - return true; - } - else - { - return false; - } } bool operator!=(const ConstDBIterator& rhs) @@ -424,36 +491,36 @@ private: void incr() { - assert(_cursor); - if(!_cursor->next()) + assert(_helper.get() != 0); + if(!_helper->next()) { // // The iterator has been moved past the end, and is now // invalid. // - _cursor->close(); - _cursor = 0; - _db = 0; + _helper.reset(); } _refValid = false; } void getCurrentValue(key_type& key, mapped_type& value) const { - Freeze::Key k; - Freeze::Value v; - - _cursor->curr(k, v); + assert(_helper.get() != 0); + + const Key* k = 0; + const Value* v = 0; + _helper->get(k, v); + assert(k != 0); + assert(v != 0); - Ice::CommunicatorPtr communicator = _db->getCommunicator(); - KeyCodec::read(key, k, communicator); - ValueCodec::read(value, v, communicator); + const Ice::CommunicatorPtr& communicator = _helper->getCommunicator(); + KeyCodec::read(key, *k, communicator); + ValueCodec::read(value, *v, communicator); } friend class DBMap<key_type, mapped_type, KeyCodec, ValueCodec>; - DBPtr _db; - DBCursorPtr _cursor; + std::auto_ptr<DBIteratorHelper> _helper; // // Cached last return value. This is so that operator->() can @@ -513,14 +580,44 @@ public: // // Constructors // - DBMap(const DBPtr& db) : - _db(db) + DBMap(const Ice::CommunicatorPtr& communicator, + const std::string& envName, + const std::string& dbName, + bool createDb = true) : + _helper(DBMapHelper::create(communicator, envName, dbName, createDb)) + { + } + + DBMap(const Ice::CommunicatorPtr& communicator, + DbEnv& dbEnv, + const std::string& dbName, + bool createDb = true) : + _helper(DBMapHelper::create(communicator, dbEnv, dbName, createDb)) { } - template <class _InputIterator> - DBMap(const DBPtr& db, _InputIterator first, _InputIterator last) : - _db(db) + template <class _InputDBIterator> + DBMap(const Ice::CommunicatorPtr& communicator, + const std::string& envName, + const std::string& dbName, + bool createDb, + _InputDBIterator first, _InputDBIterator last) : + _helper(new DBMapHelper(communicator, envName, dbName, createDb)) + { + while(first != last) + { + put(*first); + ++first; + } + } + + template <class _InputDBIterator> + DBMap(const Ice::CommunicatorPtr& communicator, + DbEnv& dbEnv, + const std::string& dbName, + bool createDb, + _InputDBIterator first, _InputDBIterator last) : + _helper(new DBMapHelper(communicator, dbEnv, dbName, createDb)) { while(first != last) { @@ -549,7 +646,9 @@ public: // transaction. // if(count() != rhs.count()) + { return false; + } for(const_iterator p = rhs.begin() ; p != rhs.end() ; ++p) { @@ -573,16 +672,16 @@ public: void swap(DBMap& rhs) { - DBPtr tmp = _db; - _db = rhs._db; - rhs._db = tmp; + DBMapHelper* tmp = _helper.release(); + _helper.reset(rhs._helper.release()); + rhs._helper.reset(tmp); } iterator begin() { try { - return iterator(_db, _db->getCursor()); + return iterator(DBIteratorHelper::create(*_helper.get(), false)); } catch(const DBNotFoundException&) { @@ -593,7 +692,7 @@ public: { try { - return const_iterator(_db, _db->getCursor()); + return const_iterator(DBIteratorHelper::create(*_helper.get(), true)); } catch(const DBNotFoundException&) { @@ -618,7 +717,7 @@ public: size_type size() const { - return (size_type)_db->getNumberOfRecords(); + return _helper->size(); } size_type max_size() const @@ -651,72 +750,50 @@ public: // // position is ignored. // - Ice::CommunicatorPtr communicator = _db->getCommunicator(); + const Ice::CommunicatorPtr& communicator = _helper->getCommunicator(); - DBCursorPtr cursor; - bool alreadyThere; - - Freeze::Key k; + Key k; KeyCodec::write(key.first, k, communicator); - try - { - cursor = _db->getCursorAtKey(k); - alreadyThere = true; - } - catch(const DBNotFoundException&) - { - alreadyThere = false; - } + iterator r = iterator(_helper->find(k, false)); - if(!alreadyThere) + if(r == end()) { - Freeze::Value v; + Value v; ValueCodec::write(key.second, v, communicator); - _db->put(k, v); - cursor = _db->getCursorAtKey(k); + _helper->put(k, v); + r = iterator(_helper->find(k, false)); } - return iterator(_db, cursor); + return r; } std::pair<iterator, bool> insert(const value_type& key) { - Ice::CommunicatorPtr communicator = _db->getCommunicator(); + const Ice::CommunicatorPtr& communicator = _helper->getCommunicator(); - Freeze::Key k; + Key k; KeyCodec::write(key.first, k, communicator); - DBCursorPtr cursor; - bool inserted; + iterator r = iterator(_helper->find(k, false)); + bool inserted = false; - try - { - // - // Does the value exist already? - // - cursor = _db->getCursorAtKey(k); - inserted = false; - } - catch(const DBNotFoundException&) + if(r == end()) { + Value v; + ValueCodec::write(key.second, v, communicator); + + _helper->put(k, v); inserted = true; + r = iterator(_helper->find(k, false)); } - if(inserted) - { - Freeze::Value v; - ValueCodec::write(key.second, v, communicator); - - _db->put(k, v); - cursor = _db->getCursorAtKey(k); - } - return std::pair<iterator, bool>(iterator(_db, cursor), inserted); + return std::pair<iterator, bool>(r, inserted); } - template <typename InputIterator> - void insert(InputIterator first, InputIterator last) + template <typename InputDBIterator> + void insert(InputDBIterator first, InputDBIterator last) { while(first != last) { @@ -728,20 +805,20 @@ public: void put(const value_type& key) { // - // insert or replace (like DB->put) + // insert or replace // - Ice::CommunicatorPtr communicator = _db->getCommunicator(); + const Ice::CommunicatorPtr& communicator = _helper->getCommunicator(); - Freeze::Key k; - Freeze::Value v; + Key k; + Value v; KeyCodec::write(key.first, k, communicator); ValueCodec::write(key.second, v, communicator); - _db->put(k, v); + _helper->put(k, v); } - template <typename InputIterator> - void put(InputIterator first, InputIterator last) + template <typename InputDBIterator> + void put(InputDBIterator first, InputDBIterator last) { while(first != last) { @@ -752,88 +829,64 @@ public: void erase(iterator position) { - position._cursor->del(); + assert(position._helper.get() != 0); + position._helper->erase(); } size_type erase(const key_type& key) { - Freeze::Key k; - KeyCodec::write(key, k, _db->getCommunicator()); - - try - { - _db->del(k); - } - catch(const DBNotFoundException&) - { - return 0; - } + Key k; + KeyCodec::write(key, k, _helper->getCommunicator()); - return 1; + return _helper->erase(k); } void erase(iterator first, iterator last) { while(first != last) { - first._cursor->del(); + first._helper->erase(); ++first; } } void clear() { - _db->clear(); + _helper->clear(); } + + // + // destroy is not in STL + // + void destroy() + { + _helper->destroy(); + } + iterator find(const key_type& key) { - Freeze::Key k; - KeyCodec::write(key, k, _db->getCommunicator()); + Key k; + KeyCodec::write(key, k, _helper->getCommunicator()); - try - { - DBCursorPtr cursor = _db->getCursorAtKey(k); - return iterator(_db, cursor); - } - catch(const DBNotFoundException&) - { - // - // The record doesn't exist, return the end() iterator. - // - } - return end(); + return iterator(_helper->find(k, false)); } const_iterator find(const key_type& key) const { - Freeze::Key k; - KeyCodec::write(key, k, _db->getCommunicator()); + Key k; + KeyCodec::write(key, k, _helper->getCommunicator()); - try - { - DBCursorPtr cursor = _db->getCursorAtKey(k); - return const_iterator(_db, cursor); - } - catch(const DBNotFoundException&) - { - // - // The record doesn't exist, return the end() iterator. - // - } - return end(); + return const_iterator(_helper->find(k, true)); } size_type count(const key_type& key) const { - if(find(key) != end()) - { - return 1; - } - else - { - return 0; - } + Key k; + KeyCodec::write(key, k, _helper->getCommunicator()); + + return _helper->count(k); + } std::pair<iterator, iterator> equal_range(const key_type& key) @@ -850,7 +903,7 @@ public: private: - DBPtr _db; + std::auto_ptr<DBMapHelper> _helper; }; } diff --git a/cpp/include/IceUtil/AbstractMutex.h b/cpp/include/IceUtil/AbstractMutex.h new file mode 100644 index 00000000000..9d54a33c713 --- /dev/null +++ b/cpp/include/IceUtil/AbstractMutex.h @@ -0,0 +1,120 @@ +// ********************************************************************** +// +// Copyright (c) 2003 +// ZeroC, Inc. +// Billerica, MA, USA +// +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. +// +// ********************************************************************** + +#ifndef ICE_UTIL_ABSTRACT_MUTEX_H +#define ICE_UTIL_ABSTRACT_MUTEX_H + +#include <IceUtil/Config.h> +#include <IceUtil/Lock.h> + +namespace IceUtil +{ + +class AbstractMutex +{ +public: + + typedef LockT<AbstractMutex> Lock; + typedef TryLockT<AbstractMutex> TryLock; + + virtual void lock() const = 0; + virtual void unlock() const = 0; + virtual bool tryLock() const = 0; +}; + +template <typename T> +class AbstractMutexI : public AbstractMutex, public T +{ +public: + + typedef LockT<AbstractMutexI> Lock; + typedef TryLockT<AbstractMutexI> TryLock; + + virtual void lock() const + { + T::lock(); + } + + virtual void unlock() const + { + T::unlock(); + } + + virtual bool tryLock() const + { + return T::tryLock(); + } + + virtual ~AbstractMutexI() + {} +}; + +template <typename T> +class AbstractMutexReadI : public AbstractMutex, public T +{ +public: + + typedef LockT<AbstractMutexReadI> Lock; + typedef TryLockT<AbstractMutexReadI> TryLock; + + virtual void lock() const + { + readLock(); + } + + virtual void unlock() const + { + T::unlock(); + } + + virtual bool tryLock() const + { + return T::tryReadLock(); + } + + virtual ~AbstractMutexReadI() + {} +}; + +template <typename T> +class AbstractMutexWriteI : public AbstractMutex, public T +{ +public: + + typedef LockT<AbstractMutexWriteI> Lock; + typedef TryLockT<AbstractMutexWriteI> TryLock; + + virtual void lock() const + { + writeLock(); + } + + virtual void unlock() const + { + T::unlock(); + } + + virtual bool tryLock() const + { + return T::tryWriteLock(); + } + + virtual ~AbstractMutexWriteI() + {} +}; + + +} + +#endif diff --git a/cpp/include/IceUtil/IceUtil.h b/cpp/include/IceUtil/IceUtil.h index fca3c6c6b1e..786d7a49bdc 100644 --- a/cpp/include/IceUtil/IceUtil.h +++ b/cpp/include/IceUtil/IceUtil.h @@ -23,6 +23,7 @@ #include <IceUtil/Shared.h> #include <IceUtil/Unicode.h> #include <IceUtil/UUID.h> +#include <IceUtil/AbstractMutex.h> #include <IceUtil/Mutex.h> #include <IceUtil/RecMutex.h> #include <IceUtil/RWRecMutex.h> diff --git a/cpp/include/IceUtil/StaticMutex.h b/cpp/include/IceUtil/StaticMutex.h index df16e103195..c36a6c72a0c 100644 --- a/cpp/include/IceUtil/StaticMutex.h +++ b/cpp/include/IceUtil/StaticMutex.h @@ -60,8 +60,8 @@ public: #ifdef _WIN32 - mutable bool _mutexInitialized; - mutable CRITICAL_SECTION _mutex; + mutable bool _mutexInitialized; + mutable CRITICAL_SECTION* _mutex; #else mutable pthread_mutex_t _mutex; #endif @@ -128,12 +128,12 @@ StaticMutex::lock() const { initialize(); } - EnterCriticalSection(&_mutex); + EnterCriticalSection(_mutex); // // If necessary this can be removed and replaced with a _count // member (like the UNIX implementation of RecStaticMutex). // - assert(_mutex.RecursionCount == 1); + assert(_mutex->RecursionCount == 1); } inline bool @@ -143,13 +143,13 @@ StaticMutex::tryLock() const { initialize(); } - if(!TryEnterCriticalSection(&_mutex)) + if(!TryEnterCriticalSection(_mutex)) { return false; } - if(_mutex.RecursionCount > 1) + if(_mutex->RecursionCount > 1) { - LeaveCriticalSection(&_mutex); + LeaveCriticalSection(_mutex); return false; } return true; @@ -159,15 +159,15 @@ inline void StaticMutex::unlock() const { assert(_mutexInitialized); - assert(_mutex.RecursionCount == 1); - LeaveCriticalSection(&_mutex); + assert(_mutex->RecursionCount == 1); + LeaveCriticalSection(_mutex); } inline void StaticMutex::unlock(LockState& state) const { assert(_mutexInitialized); - LeaveCriticalSection(&_mutex); + LeaveCriticalSection(_mutex); } inline void @@ -177,7 +177,7 @@ StaticMutex::lock(LockState&) const { initialize(); } - EnterCriticalSection(&_mutex); + EnterCriticalSection(_mutex); } #else diff --git a/cpp/include/XMLTransform/XMLTransform.h b/cpp/include/XMLTransform/XMLTransform.h index 8c79b291aa2..f3a5ef581d6 100644 --- a/cpp/include/XMLTransform/XMLTransform.h +++ b/cpp/include/XMLTransform/XMLTransform.h @@ -15,14 +15,19 @@ #ifndef XML_TRANSFORM_H #define XML_TRANSFORM_H -#include <Freeze/DB.h> #include <IceUtil/OutputUtil.h> - #include <Ice/Xerces.h> #include <xercesc/dom/DOM.hpp> #include <map> +// +// Forward declarations for Berkeley DB +// +class DbEnv; +class Db; + + #ifndef XML_TRANSFORM_API # ifdef XML_TRANSFORM_API_EXPORTS # define XML_TRANSFORM_API ICE_DECLSPEC_EXPORT @@ -225,7 +230,7 @@ class XML_TRANSFORM_API DBTransformer { public: - DBTransformer(const Freeze::DBEnvironmentPtr&, const Freeze::DBPtr&, const Ice::StringSeq&, const Ice::StringSeq&, + DBTransformer(DbEnv&, Db&, const Ice::StringSeq&, const Ice::StringSeq&, const Ice::StringSeq&, const Ice::StringSeq&, bool); ~DBTransformer(); @@ -246,8 +251,8 @@ private: void transform(ICE_XERCES_NS DOMDocument*, ICE_XERCES_NS DOMDocument*); - Freeze::DBEnvironmentPtr _dbEnv; - Freeze::DBPtr _db; + DbEnv& _dbEnv; + Db& _db; Ice::StringSeq _loadOld; Ice::StringSeq _loadNew; Ice::StringSeq _pathOld; diff --git a/cpp/slice/Freeze/DB.ice b/cpp/slice/Freeze/DB.ice index e25fa4a9b86..199efde93aa 100644 --- a/cpp/slice/Freeze/DB.ice +++ b/cpp/slice/Freeze/DB.ice @@ -15,12 +15,6 @@ #ifndef FREEZE_DB_ICE #define FREEZE_DB_ICE -#include <Ice/CommunicatorF.ice> -#include <Freeze/DBException.ice> -#include <Freeze/DBF.ice> -#include <Freeze/EvictorF.ice> -#include <Freeze/StrategyF.ice> - /** * * &Freeze; provides automatic persistence for &Ice; @@ -35,157 +29,6 @@ module Freeze /** * - * A database environment. Multiple databases can be created from a - * single database environment. The database environment also offers - * operations to create transactions. - * - * @see DBTransaction - * @see DB - * - **/ -local interface DBEnvironment -{ - /** - * - * Get the name of the database environment. - * - * @return The name of this database environment. - * - **/ - string getName(); - - /** - * - * Get the communicator for this database environment. - * - * @return The communicator for this database environment. - * - **/ - Ice::Communicator getCommunicator(); - - /** - * - * Open and return a database object. If the database does not - * exist and the [create] flag is false a DBNotFoundException is - * raised. If the database has been opened before, the previously - * returned database object is returned again. - * - * @param name The database name. - * - * @param create Flag that determines whether the database is - * created if it does not exist. - * - * @return The database object. - * - * @throws DBException Raised if a database failure occurred. - * - * @throws DBNotFoundException Raised if a database does not exist - * and the [create] flag is false. - * - * @see DB - * @see DB::close - * - **/ - DB openDB(string name, bool create); - - /** - * - * Open and return a database object within the context of a - * transaction. If the database does not exist and the [create] - * flag is false a [DBNotFoundException] is raised. If the - * database has been opened before, the previously returned - * database object is returned again. - * - * @param txn The transaction context. - * - * @param name The database name. - * - * @param create Flag that determines whether the database is - * created if it does not exist. - * - * @return The database object. - * - * @throws DBException Raised if a database failure occurred. - * - * @throws DBNotFoundException Raised if a database does not exist - * and the [create] flag is false. - * - * @see DB - * @see DB::close - * - **/ - DB openDBWithTxn(DBTransaction txn, string name, bool create); - - /** - * - * Start a new transaction in this database environment, and - * return the transaction object. - * - * @return The transaction object. - * - * @throws DBException Raised if a database failure occurred. - * - * @see DBTransaction - * - **/ - DBTransaction startTransaction(); - - /** - * - * Close the database environment and destroy this database - * environment object. This operation also calls [close] on all - * databases that have been opened with this database environment - * object. Subsequent calls to [close] have no effect. - * - * @throws DBException Raised if a database failure occurred. - * - * @see DB::close - * - **/ - void close(); - - /** - * - * Flush any cached information to the disk. This operation calls - * [sync] on all databases that have been opened with this - * database environment object. - * - * @see DB::sync - * - **/ - void sync(); -}; - -/** - * - * A transaction object. - * - * @see DBEnvironment - * - **/ -local interface DBTransaction -{ - /** - * - * Commit a transaction. - * - * @throws DBException Raised if a database failure occurred. - * - **/ - void commit(); - - /** - * - * Abort a transaction. - * - * @throws DBException Raised if a database failure occurred. - * - **/ - void abort(); -}; - -/** - * * A database key, represented as a sequence of bytes. * **/ @@ -198,557 +41,6 @@ sequence<byte> Key; **/ sequence<byte> Value; -/** - * - * A database cursor provides a way to iterate through all key/value - * pairs in the database. A cursor must be closed before its database - * is closed. - * - * @see DB - * @see DB::getCursor - * @see DB::getCursorForKey - * - **/ -local interface DBCursor -{ - /** - * - * Get the communicator for this cursor. - * - * @return The communicator for this cursor. - * - **/ - Ice::Communicator getCommunicator(); - - /** - * - * Return the element to which the cursor currently refers. - * - * @param k The key of the next element. - * @param v The value of the next element. - * - * @throws DBNotFoundException If there are no further elements in - * the database. - * - * @throws DBDeadlockException Raised if a deadlock occurred. - * - * @throws DBException Raised if any other database failure - * occurred. - * - **/ - void curr(out Key k, out Value v); - - /** - * - * Overwrite the data to which the cursor currently refers. - * - * @param v The value to write into the database. - * - * @throws DBDeadlockException Raised if a deadlock occurred. - * - * @throws DBException Raised if any other database failure - * occurred. - * - **/ - void set(Value v); - - /** - * - * Move the cursor to the next element in the database. - * - * @return false if there is no next element in the database, true - * otherwise. - * - * @throws DBDeadlockException Raised if a deadlock occurred. - * - * @throws DBException Raised if any other database failure - * occurred. - * - **/ - bool next(); - - /** - * - * Move the cursor to the previous element in the database. - * - * @return false if there is no previous element in the database, - * true otherwise. - * - * @throws DBDeadlockException Raised if a deadlock occurred. - * - * @throws DBException Raised if any other database failure - * occurred. - * - **/ - bool prev(); - - /** - * - * Remove the key and the corresponding value from the database at - * the current cursor position. - * - * @throws DBNotFoundException Raised if the current element does - * not exist. - * - * @throws DBDeadlockException Raised if a deadlock occurred. - * - * @throws DBException Raised if any other database failure - * occurred. - * - **/ - void del(); - - /** - * - * Clone the cursor. - * - * @return The cloned cursor. - * - * @throws DBException Raised if a database failure occurred. - * - **/ - DBCursor clone(); - - /** - * - * Close the cursor. Subsequent calls to [close] have no effect. - * - * @throws DBException Raised if a database failure occurred. - * - **/ - void close(); -}; - -/** - * - * A database of key/value pairs. - * - * @see DBEnvironment - * @see DBCursor - * @see Evictor - * - **/ -local interface DB -{ - /** - * - * Get the communicator for this database. - * - * @return The communicator for this database. - * - **/ - Ice::Communicator getCommunicator(); - - /** - * - * Get the name of the database. - * - * @return The name of this database. - * - **/ - string getName(); - - /** - * - * Get the number of key/value pairs in the database. - * - * @return The number of pairs. - * - * @throws DBException Raised if the database has been closed. - * - **/ - long getNumberOfRecords(); - - /** - * - * Create a cursor for this database. - * - * <note><para>Care must be taken to not to close this database, - * or the database environment this database belongs to, before - * the cursor has been properly closed.</para></note> - * - * @return A database cursor. - * - * @throws DBNotFoundException Raised if the database is empty. - * - * @throws DBException Raised if the database has been closed. - * - * @see DBCursor - * @see getCursorAtKey - * - **/ - DBCursor getCursor(); - - /** - * - * Create a cursor for this database. Calling [curr] on the cursor - * returns the key/value pair for the given key. - * - * <note><para>Care must be taken to not to close this database, - * or the database environment this database belongs to, before - * the cursor has been properly closed.</para></note> - * - * @param k The key under which the cursor is opened. - * - * @return A database cursor. - * - * @throws DBNotFoundException If the key was not found in the - * database. - * - * @throws DBDeadlockException Raised if a deadlock occurred. - * - * @throws DBException Raised if any other database failure - * occurred. - * - * @see DBCursor - * @see getCursor - * - **/ - DBCursor getCursorAtKey(Key k); - - /** - * - * Save a value in the database under a given key. - * - * @param k The key under which the value is stored in - * the database. - * - * @param v The value to store. - * - * @throws DBDeadlockException Raised if a deadlock occurred. - * - * @throws DBException Raised if any other database failure - * occurred. - * - * @see get - * @see del - * - **/ - void put(Key k, Value v); - - /** - * - * Determine if a key is contained in the database. - * - * @param k The key to check. - * - * @return true if the key is contained in the database, false otherwise. - * - * @throws DBNotFoundException Raised if the key was not found in - * the database. - * - * @throws DBDeadlockException Raised if a deadlock occurred. - * - * @throws DBException Raised if any other database failure - * occurred. - * - * @see put - * @see del - * - **/ - bool contains(Key k); - - /** - * - * Get a value associated with a key. - * - * @param k The key under which the value is stored in the database. - * - * @return The value associated with the key. - * - * @throws DBNotFoundException Raised if the key was not found in - * the database. - * - * @throws DBDeadlockException Raised if a deadlock occurred. - * - * @throws DBException Raised if any other database failure - * occurred. - * - * @see put - * @see del - * - **/ - Value get(Key k); - - /** - * - * Remove a key and its corresponding value from the database. If - * the key does not exist, this operation does nothing. - * - * @param k The key of the key/value pair to be removed. - * - * @throws DBNotFoundException Raised if the key was not found in - * the database. - * - * @throws DBDeadlockException Raised if a deadlock occurred. - * - * @throws DBException Raised if any other database failure - * occurred. - * - * @see put - * @see get - * - **/ - void del(Key k); - - /** - * - * Create a transactional cursor for this database. The cursor - * operations are transaction-protected. - * - * <note><para>Care must be taken to not to close this database, - * or the database environment this database belongs to, before - * the cursor has been properly closed.</para></note> - * - * <note><para>The cursor must be closed before the transaction is - * committed or aborted.</para></note> - * - * @param txn The transaction context in which the cursor may be - * used. - * - * @return A database cursor. - * - * @throws DBNotFoundException Raised if the database is empty. - * - * @throws DBException Raised if the database has been closed. - * - * @see DBCursor - * @see getCursorAtKeyWithTxn - * - **/ - DBCursor getCursorWithTxn(DBTransaction txn); - - /** - * - * Create a transactional cursor for this database. Calling [curr] - * on the cursor returns the key/value pair for the given - * key. The cursor operations will be transaction protected. - * - * <note><para>Care must be taken to not to close this database, - * or the database environment this database belongs to, before - * the Cursor has been properly closed.</para></note> - * - * <note><para>The cursor must be closed before the transaction is - * commited or aborted.</para></note> - * - * @return A database cursor. - * - * @param txn The transaction context in which the cursor may be - * used. - * - * @param k The key under which the cursor is opened. - * - * @throws DBNotFoundException If the key was not found in the - * database. - * - * @throws DBDeadlockException Raised if a deadlock occurred. - * - * @throws DBException Raised if any other database failure - * occurred. - * - * @see DBCursor - * @see getCursorWithTxn - * - **/ - DBCursor getCursorAtKeyWithTxn(DBTransaction txn, Key k); - - /** - * - * Save a value in the database under a given key within the - * context of a transaction. - * - * @param txn The transaction context. - * - * @param k The key under which the value is stored in - * the database. - * - * @param v The value to store. - * - * @throws DBDeadlockException Raised if a deadlock occurred. - * - * @throws DBException Raised if any other database failure - * occurred. - * - * @see getWithTxn - * @see delWithTxn - * - **/ - void putWithTxn(DBTransaction txn, Key k, Value v); - - /** - * - * Determine if a key is contained in the database within the - * context of a transaction. - * - * @param txn The transaction context. - * - * @param k The key to check. - * - * @return true if the key is contained in the database, false otherwise. - * - * @throws DBNotFoundException Raised if the key was not found in - * the database. - * - * @throws DBDeadlockException Raised if a deadlock occurred. - * - * @throws DBException Raised if any other database failure - * occurred. - * - * @see putWithTxn - * @see delWithTxn - * - **/ - bool containsWithTxn(DBTransaction txn, Key k); - - /** - * - * Get the value associated with a key, within the context of a - * transaction. - * - * @param txn The transaction context. - * - * @param k The key under which the value is stored in the database. - * - * @return The value associated with the key. - * - * @throws DBNotFoundException Raised if the key was not found in - * the database. - * - * @throws DBDeadlockException Raised if a deadlock occurred. - * - * @throws DBException Raised if any other database failure - * occurred. - * - * @see putWithTxn - * @see delWithTxn - * - **/ - Value getWithTxn(DBTransaction txn, Key k); - - /** - * - * Remove a key and its corresponding value from the database - * within the context of a transaction. If the key does not exist, - * this operation does nothing. - * - * @param txn The transaction context. - * - * @param k The key of the key/value pair to be removed. - * - * @throws DBNotFoundException Raised if the key was not found in - * the database. - * - * @throws DBDeadlockException Raised if a deadlock occurred. - * - * @throws DBException Raised if any other database failure - * occurred. - * - * @see putWithTxn - * @see getWithTxn - * - **/ - void delWithTxn(DBTransaction txn, Key k); - - /** - * - * Clear the database of all records. - * - * @throws DBException Raised if a database failure occurred. - * - **/ - void clear(); - - /** - * - * Close the database and destroy this database object. Subsequent - * calls to [close] or [remove] have no effect. - * - * @throws DBException Raised if a database failure occurred. - * - * @see DBEnvironment::openDB - * @see DBEnvironment::close - * @see remove - * - **/ - void close(); - - /** - * - * Remove the database and destroy this database object. Subsequent - * calls to [remove] or [close] have no effect. - * - * @throws DBException Raised if a database failure occurred. - * - * @see DBEnvironment::openDB - * @see DBEnvironment::close - * @see close - * - **/ - void remove(); - - /** - * - * Flush any cached information to the disk. Calling [sync] - * reduces the risk of losing data if the database is not closed - * properly. - * - * <note><para>If all the modifications to the database are done - * within the context of a transaction, it is not necessary to call - * [sync]. The transaction system ensures that all these - * modifications will be recoverable.</para></note> - * - * @see DB::sync - * - **/ - void sync(); - - /** - * - * Create an instance of [EvictionStrategy]. - * - * @return The new strategy. - * - * @see EvictionStrategy - * - **/ - EvictionStrategy createEvictionStrategy(); - - /** - * - * Create an instance of [IdleStrategy]. - * - * @return The new strategy. - * - * @see IdleStrategy - * - **/ - IdleStrategy createIdleStrategy(); - - /** - * - * Create a new evictor that uses this database to store - * identity/servant pairs. - * - * <note><para>Care must be taken to not to close this database, - * or the database environment this database belongs to, before - * the evictor has been properly deactivated. The evictor is - * deactivated by calling [Ice::ObjectAdapter::deactivate] on the - * object adapter in which this evictor is installed, or by shutting - * down all object adapters with [Ice::Communicator::shutdown] - * followed by [Ice::Communicator::waitForShutdown].</para></note> - * - * @param strategy The persistence strategy for the new evictor. - * - * @return The new evictor. - * - * @throws DBException Raised if the database has been closed. - * - * @see Evictor - * @see EvictorPersistenceMode - * - **/ - Evictor createEvictor(PersistenceStrategy strategy); -}; }; diff --git a/cpp/slice/Freeze/DBException.ice b/cpp/slice/Freeze/DBException.ice index 43b6669afb8..a6bf328df4d 100644 --- a/cpp/slice/Freeze/DBException.ice +++ b/cpp/slice/Freeze/DBException.ice @@ -58,6 +58,17 @@ local exception DBDeadlockException extends DBException { }; +/** + * + * This Freeze Iterator is not on a valid position, for example + * this position has been erased. + * + **/ +local exception DBInvalidPositionException extends DBException +{ +}; + + }; #endif diff --git a/cpp/slice/Freeze/DBF.ice b/cpp/slice/Freeze/DBF.ice deleted file mode 100644 index f120dddb879..00000000000 --- a/cpp/slice/Freeze/DBF.ice +++ /dev/null @@ -1,27 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003 -// ZeroC, Inc. -// Billerica, MA, USA -// -// All Rights Reserved. -// -// Ice is free software; you can redistribute it and/or modify it under -// the terms of the GNU General Public License version 2 as published by -// the Free Software Foundation. -// -// ********************************************************************** - -#ifndef FREEZE_DB_F_ICE -#define FREEZE_DB_F_ICE - -module Freeze -{ - -local interface DBEnvironment; -local interface DBTransaction; -local interface DB; - -}; - -#endif diff --git a/cpp/slice/Freeze/Evictor.ice b/cpp/slice/Freeze/Evictor.ice index d88903cecc6..9d61ae48f85 100644 --- a/cpp/slice/Freeze/Evictor.ice +++ b/cpp/slice/Freeze/Evictor.ice @@ -18,8 +18,6 @@ #include <Ice/ObjectAdapterF.ice> #include <Ice/ServantLocator.ice> #include <Freeze/DBException.ice> -#include <Freeze/DBF.ice> -#include <Freeze/StrategyF.ice> #include <Freeze/ObjectRecord.ice> module Freeze @@ -68,7 +66,20 @@ local exception NoSuchElementException /** * + * This exception is raised when attempting to use a destroyed iterator. + * + **/ +local exception IteratorDestroyedException +{ +}; + + +/** + * * An iterator for the identities managed by the evictor. + * Note that an EvictorIterator is not thread-safe: the application needs to + * serialize access to a given EvictorIterator, for example by using it + * in just one thread. * * @see Evictor * @@ -82,6 +93,16 @@ local interface EvictorIterator * @return True if the iterator has more elements, false * otherwise. * + * @throws IteratorDestroyedException Raised if the iterator was destroyed. + * + * @throws DBDeadlockException Raised if a deadlock occured, due to + * lock conflicts with another transaction or iterator. + * In this case, you need to destroy the iterator and retry + * your iteration. + * + * @throws DBException Raised if any other database failure + * occurred. + * **/ bool hasNext(); @@ -91,9 +112,16 @@ local interface EvictorIterator * * @returns The next identity in the iteration. * + * @throws IteratorDestroyedException Raised if the iterator was destroyed. + * * @throws NoSuchElementException Raised if there is no further * elements in the iteration. * + * @throws DBDeadlockException Raised if a deadlock occured, due to + * lock conflicts with another transaction or iterator. + * In this case, you need to destroy the iterator and retry + * your iteration. + * * @throws DBException Raised if any other database failure * occurred. * @@ -105,6 +133,9 @@ local interface EvictorIterator * Destroy the iterator. Once the iterator has been destroyed it * may no longer be accessed. * + * @throws IteratorDestroyedException Raised if the iterator was already + * destroyed. + * **/ void destroy(); }; @@ -120,17 +151,7 @@ local exception EvictorDeactivatedException /** * - * This exception is raised if the object has been destroyed. - * - **/ -local exception ObjectDestroyedException -{ -}; - - -/** - * - * A semi-automatic &Ice; object persistence manager, based on the + * An automatic &Ice; object persistence manager, based on the * evictor pattern. The evictor is a servant locator implementation * that stores the persistent state of its objects in a database. Any * number of objects can be registered with an evictor, but only a @@ -147,35 +168,7 @@ local exception ObjectDestroyedException **/ local interface Evictor extends Ice::ServantLocator { - /** - * - * Get the database object that created this evictor, in which the - * evictor stores the persistent state of its objects. - * - * @return The database used by this evictor. - * - * @throws EvictorDeactivatedException Raised if the evictor has - * been deactivated. - * - * @see DB::createEvictor - * - **/ - DB getDB(); - - /** - * - * Get the persistence strategy for this evictor. - * - * @return The persistence strategy used by this evictor. - * - * @throws EvictorDeactivatedException Raised if the evictor has - * been deactivated. - * - * @see DB::createEvictor - * - **/ - PersistenceStrategy getPersistenceStrategy(); - + /** * * Set the size of the evictor's servant queue. This is the @@ -190,7 +183,6 @@ local interface Evictor extends Ice::ServantLocator * the operation waits until a sufficient number of servants * complete their requests. * - * @throws DBException Raised if a database failure occurred. * * @throws EvictorDeactivatedException Raised if a the evictor has * been deactivated. @@ -219,6 +211,7 @@ local interface Evictor extends Ice::ServantLocator * Create a new &Ice; object for this evictor. The state of the * servant passed to this operation is saved in the evictor's * persistent store. + * If the object already exists, it is updated. * * @param identity The identity of the &Ice; object to create. * @@ -235,36 +228,11 @@ local interface Evictor extends Ice::ServantLocator **/ void createObject(Ice::Identity identity, Object servant); - - /** - * - * Save this &Ice; object immediately. The application must ensure - * that the persistent data members of the object are not modified - * by another thread during this operation. - * saveObject calls savedObject on the associated persistence - * strategy. - * - * @param identity The identity of the &Ice; object to save. - * - * @throws DBException Raised if a database failure occurred. - * - * @throws EvictorDeactivatedException Raised if the evictor has - * been deactivated. - * - * @throws ObjectDestroyedException Raised if the object has been - * destroyed - * - * @see Ice::Identity - * @see destroyObject - * - **/ - void saveObject(Ice::Identity identity); - /** * * Permanently destroy an &Ice; object by removing it from the - * evictor's persistent store. Furthermore, if a servant is - * currently active for the &Ice; object, it will be removed. + * evictor's persistent store. If the object does not exist, + * this operation does nothing. * * @param identity The identity of the &Ice; object to destroy. * @@ -321,6 +289,17 @@ local interface Evictor extends Ice::ServantLocator * **/ bool hasObject(Ice::Identity ident); + + + /** + * + * Saves immediately all created, modified and destroyed objects. + * + * @throws DBException Raised if a database failure occurred. + * + **/ + void saveNow(); + }; }; diff --git a/cpp/slice/Freeze/EvictorF.ice b/cpp/slice/Freeze/EvictorF.ice index 4174ffa680d..9526fbc8f20 100644 --- a/cpp/slice/Freeze/EvictorF.ice +++ b/cpp/slice/Freeze/EvictorF.ice @@ -19,7 +19,6 @@ module Freeze { local interface Evictor; -local interface PersistenceStrategy; }; diff --git a/cpp/slice/Freeze/Strategy.ice b/cpp/slice/Freeze/Strategy.ice deleted file mode 100644 index ebdbca3b63d..00000000000 --- a/cpp/slice/Freeze/Strategy.ice +++ /dev/null @@ -1,208 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003 -// ZeroC, Inc. -// Billerica, MA, USA -// -// All Rights Reserved. -// -// Ice is free software; you can redistribute it and/or modify it under -// the terms of the GNU General Public License version 2 as published by -// the Free Software Foundation. -// -// ********************************************************************** - -#ifndef FREEZE_STRATEGY_ICE -#define FREEZE_STRATEGY_ICE - -#include <Ice/Identity.ice> -#include <Freeze/DBException.ice> - -module Freeze -{ - -/** - * - * Provides a means for persistence strategy implementations to - * save an object's persistent state in the evictor's database. - * - * @see PersistenceStrategy - * - **/ -local interface ObjectStore -{ - /** - * - * Saves an object's persistent state. It is not safe to invoke - * this operation for a servant with pending mutating operations. - * - * @param ident The identity of the &Ice; object. - * - * @param servant The servant incarnating the &Ice; object. - * - * @throws DBException Raised if a database failure occurred. - * - **/ - void save(Ice::Identity ident, Object servant); -}; - -/** - * - * A persistence strategy determines when the evictor saves the - * persistent state of an object. - * - * @see Evictor - * - **/ -local interface PersistenceStrategy -{ - /** - * - * Called after the evictor activates a servant for an &Ice; object. - * This occurs when the object is first registered with the evictor, - * as well as when the evictor restores the object from persistent - * storage. If the evictor has a servant initializer, the initializer - * is invoked before [activatedObject]. - * - * @param ident The identity of the &Ice; object. - * - * @param servant The servant incarnating the &Ice; object. - * - * @return A local object representing private state that the - * strategy implementation associates with the &Ice; object. This - * "cookie" is supplied to the strategy in all subsequent - * invocations. - * - * @see Evictor::createObject - * - **/ - LocalObject activatedObject(Ice::Identity ident, Object servant); - - /** - * - * Called after the evictor destroys an object. - * - * @param ident The identity of the &Ice; object. - * - * @param cookie The strategy's private state associated with the &Ice; object. - * - * @see Evictor::destroyObject - * - **/ - void destroyedObject(Ice::Identity ident, LocalObject cookie); - - /** - * - * Called after the evictor has evicted a servant. The - * persistence strategy typically saves the object at this - * point, or may only save the object if it has been - * modified. - * - * @param store The object store. This value may be retained - * by the strategy if necessary. - * - * @param ident The identity of the &Ice; object. - * - * @param servant The servant incarnating the &Ice; object. - * - * @param cookie The strategy's private state associated with the &Ice; object. - * - * @see Evictor::destroyObject - * - **/ - void evictedObject(ObjectStore store, Ice::Identity ident, Object servant, LocalObject cookie); - - - /** - * - * Called after the evictor has saved a servant. - * - * @param store The object store. This value may be retained - * by the strategy if necessary. - * - * @param ident The identity of the &Ice; object. - * - * @param servant The servant incarnating the &Ice; object. - * - * @param cookie The strategy's private state associated with the &Ice; object. - * - * @param usageCount The number of operations currently using this object (>= 1). - * - * @see Evictor::saveObject - * - **/ - void savedObject(ObjectStore store, Ice::Identity ident, Object servant, LocalObject cookie, int usageCount); - - - /** - * - * Called before an operation is invoked on an object. - * - * @param store The object store. This value may be retained - * by the strategy if necessary. - * - * @param identity The identity of the &Ice; object. - * - * @param servant The servant incarnating the &Ice; object. - * - * @param mutating True if the operation was not declared as nonmutating, otherwise false. - * - * @param cookie The strategy's private state associated with the &Ice; object. - * - **/ - void preOperation(ObjectStore store, Ice::Identity ident, Object servant, bool mutating, LocalObject cookie); - - /** - * - * Called after an operation has been invoked on an object. - * - * @param store The object store. This value may be retained - * by the strategy if necessary. - * - * @param identity The identity of the &Ice; object. - * - * @param servant The servant incarnating the &Ice; object. - * - * @param mutating True if the operation was not declared as nonmutating, otherwise false. - * - * @param cookie The strategy's private state associated with the &Ice; object. - * - **/ - void postOperation(ObjectStore store, Ice::Identity ident, Object servant, bool mutating, LocalObject cookie); - - /** - * - * Called when the evictor is deactivated and there are no - * outstanding requests on the evictor's servants. - * - **/ - void destroy(); -}; - -/** - * - * Saves the persistent state of an object after eviction of the servant - * or deactivation of the evictor, but only if the object has been modified - * by a mutating operation since the last time it was saved. A mutating - * operation is one that is not defined as nonmutating. - * - **/ -local interface EvictionStrategy extends PersistenceStrategy -{ -}; - -/** - * - * Saves the persistent state of an object after the invocation of a - * mutating operation, but only when the object becomes idle (i.e., has - * no pending mutating operations). A mutating operation is one that is - * not defined as nonmutating. - * - **/ -local interface IdleStrategy extends PersistenceStrategy -{ -}; - -}; - -#endif diff --git a/cpp/slice/Freeze/StrategyF.ice b/cpp/slice/Freeze/StrategyF.ice deleted file mode 100644 index 83e84e9bcb3..00000000000 --- a/cpp/slice/Freeze/StrategyF.ice +++ /dev/null @@ -1,27 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003 -// ZeroC, Inc. -// Billerica, MA, USA -// -// All Rights Reserved. -// -// Ice is free software; you can redistribute it and/or modify it under -// the terms of the GNU General Public License version 2 as published by -// the Free Software Foundation. -// -// ********************************************************************** - -#ifndef FREEZE_STRATEGY_F_ICE -#define FREEZE_STRATEGY_F_ICE - -module Freeze -{ - -local interface PersistenceStrategy; -local interface EvictionStrategy; -local interface IdleStrategy; - -}; - -#endif diff --git a/cpp/slice/IceBox/IceBox.ice b/cpp/slice/IceBox/IceBox.ice index a25f32746f7..aef5ee60134 100644 --- a/cpp/slice/IceBox/IceBox.ice +++ b/cpp/slice/IceBox/IceBox.ice @@ -18,7 +18,6 @@ #include <Ice/BuiltinSequences.ice> #include <Ice/CommunicatorF.ice> #include <Ice/PropertiesF.ice> -#include <Freeze/DB.ice> /** * @@ -112,7 +111,7 @@ local interface FreezeService extends ServiceBase /** * * Start the service. The given communiator is created by the - * [ServiceManager] for use by the service. This communiator may + * [ServiceManager] for use by the service. This communicator may * also be used by other services, depending on the service * configuration. The database environment is created by the * [ServiceManager] for the exclusive use of the service. @@ -129,12 +128,12 @@ local interface FreezeService extends ServiceBase * @param args The service arguments that were not converted into * properties. * - * @param dbEnv The Freeze database environment. + * @param envName The name of the Freeze database environment. * * @throws FailureException Raised if [start] failed. * **/ - void start(string name, Ice::Communicator communicator, Ice::StringSeq args, Freeze::DBEnvironment dbEnv); + void start(string name, Ice::Communicator communicator, Ice::StringSeq args, string envName); }; /** diff --git a/cpp/src/Freeze/.depend b/cpp/src/Freeze/.depend index b6da6c8ba8b..f66d7c44dbf 100644 --- a/cpp/src/Freeze/.depend +++ b/cpp/src/Freeze/.depend @@ -1,18 +1,12 @@ -DB.o: DB.cpp ../../include/Freeze/DB.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Stream.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h DBException.o: DBException.cpp ../../include/Freeze/DBException.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h -Evictor.o: Evictor.cpp ../../include/Freeze/Evictor.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ServantLocator.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/StrategyF.h ../../include/Freeze/ObjectRecord.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Stream.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h +Evictor.o: Evictor.cpp ../../include/Freeze/Evictor.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ServantLocator.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Freeze/DBException.h ../../include/Freeze/ObjectRecord.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Stream.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h ObjectRecord.o: ObjectRecord.cpp ../../include/Freeze/ObjectRecord.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Stream.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h -Strategy.o: Strategy.cpp ../../include/Freeze/Strategy.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Identity.h ../../include/Freeze/DBException.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Stream.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h -DBI.o: DBI.cpp ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Buffer.h ../../include/Freeze/DBException.h ../Freeze/DBI.h ../../include/IceUtil/IceUtil.h ../../include/IceUtil/Functional.h ../../include/IceUtil/Unicode.h ../../include/IceUtil/UUID.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/RWRecMutex.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Base64.h ../../include/IceUtil/InputUtil.h ../../include/IceUtil/OutputUtil.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/DB.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../Freeze/EvictorI.h ../../include/Freeze/Evictor.h ../../include/Freeze/ObjectRecord.h ../../include/Freeze/Strategy.h ../Freeze/IdentityObjectRecordDict.h ../../include/Freeze/Map.h ../Freeze/StrategyI.h ../../include/Freeze/Initialize.h -EvictorI.o: EvictorI.cpp ../../include/Ice/Object.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/StreamF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../Freeze/EvictorI.h ../../include/IceUtil/IceUtil.h ../../include/IceUtil/Functional.h ../../include/IceUtil/Unicode.h ../../include/IceUtil/UUID.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/RWRecMutex.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Base64.h ../../include/IceUtil/InputUtil.h ../../include/IceUtil/OutputUtil.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/StrategyF.h ../../include/Freeze/ObjectRecord.h ../../include/Freeze/Strategy.h ../Freeze/IdentityObjectRecordDict.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../../include/Freeze/EvictorF.h -StrategyI.o: StrategyI.cpp ../Freeze/StrategyI.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/IceUtil/Thread.h ../../include/Freeze/Strategy.h ../../include/Freeze/DBException.h -IdentityObjectRecordDict.o: IdentityObjectRecordDict.cpp ../../include/IceXML/StreamI.h ../../include/Ice/Stream.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CommunicatorF.h ../../include/IceUtil/OutputUtil.h ../Freeze/IdentityObjectRecordDict.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/Freeze/ObjectRecord.h -Application.o: Application.cpp ../../include/Freeze/Application.h ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Freeze/Freeze.h ../../include/Freeze/Initialize.h ../../include/Freeze/DBF.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/Freeze/Evictor.h ../../include/Freeze/ObjectRecord.h ../../include/Freeze/Strategy.h ../../include/Freeze/Map.h -DB.cpp: ../../slice/Freeze/DB.ice ../../slice/Ice/CommunicatorF.ice ../../slice/Freeze/DBException.ice ../../slice/Freeze/DBF.ice ../../slice/Freeze/EvictorF.ice ../../slice/Freeze/StrategyF.ice -DBF.cpp: ../../slice/Freeze/DBF.ice +MapI.o: MapI.cpp ../Freeze/MapI.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../Freeze/SharedDbEnv.h +EvictorI.o: EvictorI.cpp ../../include/Ice/Object.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/StreamF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../Freeze/EvictorI.h ../../include/IceUtil/IceUtil.h ../../include/IceUtil/Functional.h ../../include/IceUtil/Unicode.h ../../include/IceUtil/UUID.h ../../include/IceUtil/AbstractMutex.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/RWRecMutex.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Base64.h ../../include/IceUtil/InputUtil.h ../../include/IceUtil/OutputUtil.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/ObjectRecord.h ../Freeze/IdentityObjectRecordDict.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../Freeze/SharedDbEnv.h ../../include/Freeze/Initialize.h ../../include/Freeze/EvictorF.h +SharedDbEnv.o: SharedDbEnv.cpp ../Freeze/SharedDbEnv.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/IceUtil/StaticMutex.h ../../include/IceUtil/Thread.h ../../include/Freeze/DBException.h +IdentityObjectRecordDict.o: IdentityObjectRecordDict.cpp ../../include/IceXML/StreamI.h ../../include/Ice/Stream.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CommunicatorF.h ../../include/IceUtil/OutputUtil.h ../Freeze/IdentityObjectRecordDict.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/ObjectRecord.h +DB.cpp: ../../slice/Freeze/DB.ice DBException.cpp: ../../slice/Freeze/DBException.ice -Evictor.cpp: ../../slice/Freeze/Evictor.ice ../../slice/Ice/ObjectAdapterF.ice ../../slice/Ice/ServantLocator.ice ../../slice/Ice/Current.ice ../../slice/Ice/Identity.ice ../../slice/Ice/Facet.ice ../../slice/Freeze/DBException.ice ../../slice/Freeze/DBF.ice ../../slice/Freeze/StrategyF.ice ../../slice/Freeze/ObjectRecord.ice +Evictor.cpp: ../../slice/Freeze/Evictor.ice ../../slice/Ice/ObjectAdapterF.ice ../../slice/Ice/ServantLocator.ice ../../slice/Ice/Current.ice ../../slice/Ice/Identity.ice ../../slice/Ice/Facet.ice ../../slice/Freeze/DBException.ice ../../slice/Freeze/ObjectRecord.ice EvictorF.cpp: ../../slice/Freeze/EvictorF.ice ObjectRecord.cpp: ../../slice/Freeze/ObjectRecord.ice -Strategy.cpp: ../../slice/Freeze/Strategy.ice ../../slice/Ice/Identity.ice ../../slice/Freeze/DBException.ice -StrategyF.cpp: ../../slice/Freeze/StrategyF.ice diff --git a/cpp/src/Freeze/Application.cpp b/cpp/src/Freeze/Application.cpp deleted file mode 100644 index ecd80f0e3b2..00000000000 --- a/cpp/src/Freeze/Application.cpp +++ /dev/null @@ -1,85 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003 -// ZeroC, Inc. -// Billerica, MA, USA -// -// All Rights Reserved. -// -// Ice is free software; you can redistribute it and/or modify it under -// the terms of the GNU General Public License version 2 as published by -// the Free Software Foundation. -// -// ********************************************************************** - -#include <Freeze/Application.h> - -using namespace std; -using namespace Ice; -using namespace Freeze; - -Freeze::Application::Application(const string& dbEnvName) : - _dbEnvName(dbEnvName) -{ -} - -Freeze::Application::~Application() -{ -} - -int -Freeze::Application::run(int argc, char* argv[]) -{ - ignoreInterrupt(); - - int status; - DBEnvironmentPtr dbEnv; - - try - { - dbEnv = Freeze::initialize(communicator(), _dbEnvName); - status = runFreeze(argc, argv, dbEnv); - } - catch(const DBException& ex) - { - cerr << appName() << ": " << ex << ": " << ex.message << endl; - status = EXIT_FAILURE; - } - // TODO: How does this compile? - catch(const Exception& ex) - { - cerr << appName() << ": " << ex << endl; - status = EXIT_FAILURE; - } - catch(...) - { - cerr << appName() << ": unknown exception" << endl; - status = EXIT_FAILURE; - } - - if(dbEnv) - { - try - { - dbEnv->close(); - } - catch(const DBException& ex) - { - cerr << appName() << ": " << ex << ": " << ex.message << endl; - status = EXIT_FAILURE; - } - catch(const Exception& ex) - { - cerr << appName() << ": " << ex << endl; - status = EXIT_FAILURE; - } - catch(...) - { - cerr << appName() << ": unknown exception" << endl; - status = EXIT_FAILURE; - } - dbEnv = 0; - } - - return status; -} diff --git a/cpp/src/Freeze/DBI.cpp b/cpp/src/Freeze/DBI.cpp deleted file mode 100644 index 441629fae5d..00000000000 --- a/cpp/src/Freeze/DBI.cpp +++ /dev/null @@ -1,1228 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003 -// ZeroC, Inc. -// Billerica, MA, USA -// -// All Rights Reserved. -// -// Ice is free software; you can redistribute it and/or modify it under -// the terms of the GNU General Public License version 2 as published by -// the Free Software Foundation. -// -// ********************************************************************** - -#include <Ice/BasicStream.h> // Not included in Ice/Ice.h -#include <Freeze/DBException.h> -#include <Freeze/DBI.h> -#include <Freeze/EvictorI.h> -#include <Freeze/StrategyI.h> -#include <Freeze/Initialize.h> -#include <sys/stat.h> -#include <stdlib.h> - -using namespace std; -using namespace Ice; -using namespace Freeze; - -#ifdef _WIN32 -# define FREEZE_DB_MODE 0 -#else -# define FREEZE_DB_MODE (S_IRUSR | S_IWUSR) -#endif - -class DBEnvironmentMap : public IceUtil::Mutex -{ -public: - - DBEnvironmentMap() : - _nextId(0) - { - } - - ~DBEnvironmentMap() - { - // - // Unfortunately we can't use this assertion here. If a Freeze - // application forks processes and if it can't execv a new - // process, the forked process will unload the Freeze shared - // library and the assertion will fail if a database - // environment was already open before the process forked. - // - // assert(_map.empty()); - } - - string - add(const DBEnvironmentPtr& env) - { - IceUtil::Mutex::Lock sync(*this); - - ostringstream os; - os << _nextId++; - - _map.insert(make_pair(os.str(), env)); - - return os.str(); - } - - void - remove(const string& id) - { - IceUtil::Mutex::Lock sync(*this); - - _map.erase(id); - } - - DBEnvironmentPtr - get(const string& id) - { - IceUtil::Mutex::Lock sync(*this); - - map<string, DBEnvironmentPtr>::iterator p = _map.find(id); - if(p != _map.end()) - { - return p->second; - } - - return 0; - } - -private: - - map<string, DBEnvironmentPtr> _map; - int _nextId; -}; - -static DBEnvironmentMap _dbEnvMap; - -extern "C" -{ -static void -FreezeErrCallFcn(const char* prefix, char* msg) -{ - DBEnvironmentPtr dbEnv = _dbEnvMap.get(prefix); - assert(dbEnv); - - Error out(dbEnv->getCommunicator()->getLogger()); - out << "Freeze database error: " << dbEnv->getName() << ": " << msg; -} -} - -void -Freeze::checkBerkeleyDBReturn(int ret, const string& prefix, const string& op) -{ - if(ret == 0) - { - return; // Everything ok - } - - ostringstream s; - s << prefix << op << ": " << db_strerror(ret); - - switch(ret) - { - case DB_LOCK_DEADLOCK: - { - DBDeadlockException ex(__FILE__, __LINE__);; - ex.message = s.str(); - throw ex; - } - - case ENOENT: // The case that db->open was called with a non-existent database - case DB_NOTFOUND: - { - DBNotFoundException ex(__FILE__, __LINE__); - ex.message = s.str(); - throw ex; - } - - default: - { - DBException ex(__FILE__, __LINE__); - ex.message = s.str(); - throw ex; - } - } -} - -Freeze::DBEnvironmentI::DBEnvironmentI(const CommunicatorPtr& communicator, const string& name, bool txn) : - _communicator(communicator), - _trace(0), - _dbEnv(0), - _name(name) -{ - _errorPrefix = "Freeze::DBEnvironment(\"" + _name + "\"): "; - _trace = _communicator->getProperties()->getPropertyAsInt("Freeze.Trace.DB"); - - if(_trace >= 1) - { - Trace out(_communicator->getLogger(), "DB"); - out << "opening database environment \"" << _name << "\""; - } - - checkBerkeleyDBReturn(db_env_create(&_dbEnv, 0), _errorPrefix, "db_env_create"); - -#ifdef _WIN32 - // - // Berkeley DB may use a different C++ runtime - // - checkBerkeleyDBReturn(_dbEnv->set_alloc(_dbEnv, ::malloc, ::realloc, ::free), _errorPrefix, "DB_ENV->set_alloc"); -#endif - - u_int32_t flags = DB_CREATE | DB_INIT_LOCK | DB_INIT_MPOOL; - if(txn) - { - flags = flags | DB_INIT_TXN | DB_INIT_LOG | DB_RECOVER; - } - -#ifdef __linux - // - // Use process-private memory and mutexes on Linux. In the way we can - // use a Berkeley DB built using the POSIX thread library, like the - // Berkeley DB that comes with RedHat 9. - // - // TODO: make setting or not setting DB_PRIVATE configurable. - // When DB_PRIVATE is set, only one process can use a DB environment - // at a time. - // - flags |= DB_PRIVATE; -#endif - - checkBerkeleyDBReturn(_dbEnv->open(_dbEnv, _name.c_str(), flags, FREEZE_DB_MODE), _errorPrefix, "DB_ENV->open"); - - // - // Add this environment to the environment map. This allow us to - // ensure that all environments are properly closed and also to - // use the envionment logger to log BerkeleyDB error messages. - // - _id = _dbEnvMap.add(this); - _dbEnv->set_errpfx(_dbEnv, _id.c_str()); - _dbEnv->set_errcall(_dbEnv, FreezeErrCallFcn); -} - -Freeze::DBEnvironmentI::~DBEnvironmentI() -{ - if(_dbEnv) - { - Warning out(_communicator->getLogger()); - out << _errorPrefix << "\"" << _name << "\" has not been closed"; - } -} - -string -Freeze::DBEnvironmentI::getName() -{ - // No mutex lock necessary, _name is immutable - return _name; -} - -CommunicatorPtr -Freeze::DBEnvironmentI::getCommunicator() -{ - // No mutex lock necessary, _communicator is immutable - return _communicator; -} - -DBPtr -Freeze::DBEnvironmentI::openDB(const string& name, bool create) -{ - return openDBImpl(0, name, create); -} - -DBPtr -Freeze::DBEnvironmentI::openDBWithTxn(const DBTransactionPtr& t, const string& name, bool create) -{ - DBTransactionPtr txn = t; - if(!t) - { - txn = startTransaction(); - } - - DBPtr db = openDBImpl(static_cast<const DBTransactionI*>(txn.get())->_tid, name, create); - - if(!t) - { - txn->commit(); - } - - return db; -} - -DBTransactionPtr -Freeze::DBEnvironmentI::startTransaction() -{ - IceUtil::RecMutex::Lock sync(*this); - - return new DBTransactionI(_communicator, _dbEnv, _name); -} - -void -Freeze::DBEnvironmentI::close() -{ - IceUtil::RecMutex::Lock sync(*this); - - if(!_dbEnv) - { - return; - } - - while(!_dbMap.empty()) - { - DBPtr db = _dbMap.begin()->second; - db->close(); - } - - if(_trace >= 1) - { - Trace out(_communicator->getLogger(), "DB"); - out << "closing database environment \"" << _name << "\""; - } - - checkBerkeleyDBReturn(_dbEnv->close(_dbEnv, 0), _errorPrefix, "DB_ENV->close"); - - _dbEnv = 0; - - _dbEnvMap.remove(_id); -} - -void -Freeze::DBEnvironmentI::sync() -{ - IceUtil::RecMutex::Lock sync(*this); - - if(!_dbEnv) - { - return; - } - - for(map<string, DBPtr>::iterator p = _dbMap.begin(); p != _dbMap.end(); ++p) - { - p->second->sync(); - } -} - -DBPtr -Freeze::DBEnvironmentI::openDBImpl(::DB_TXN* txn, const string& name, bool create) -{ - IceUtil::RecMutex::Lock sync(*this); - - if(!_dbEnv) - { - ostringstream s; - s << _errorPrefix << "\"" << _name << "\" has been closed"; - DBException ex(__FILE__, __LINE__); - ex.message = s.str(); - throw ex; - } - - map<string, DBPtr>::iterator p = _dbMap.find(name); - if(p != _dbMap.end()) - { - return p->second; - } - - ::DB* db; - checkBerkeleyDBReturn(db_create(&db, _dbEnv, 0), _errorPrefix, "db_create"); - - try - { - return new DBI(_communicator, this, db, txn, name, create); - } - catch(...) - { - db->close(db, 0); - throw; - } -} - -void -Freeze::DBEnvironmentI::add(const string& name, const DBPtr& db) -{ - IceUtil::RecMutex::Lock sync(*this); - - _dbMap[name] = db; -} - -void -Freeze::DBEnvironmentI::remove(const string& name) -{ - IceUtil::RecMutex::Lock sync(*this); - - _dbMap.erase(name); -} - -void -Freeze::DBEnvironmentI::eraseDB(const string& name) -{ - IceUtil::RecMutex::Lock sync(*this); - - // - // The database should not be open. - // - assert(_dbMap.find(name) == _dbMap.end()); - - ::DB* db; - - checkBerkeleyDBReturn(db_create(&db, _dbEnv, 0), _errorPrefix, "db_create"); - - // - // Any failure in remove will cause the database to be closed. - // - checkBerkeleyDBReturn(db->remove(db, name.c_str(), 0, 0), _errorPrefix, "DB->remove"); -} - -DBEnvironmentPtr -Freeze::initialize(const CommunicatorPtr& communicator, const string& name) -{ - return new DBEnvironmentI(communicator, name, false); -} - -DBEnvironmentPtr -Freeze::initializeWithTxn(const CommunicatorPtr& communicator, const string& name) -{ - return new DBEnvironmentI(communicator, name, true); -} - -Freeze::DBTransactionI::DBTransactionI(const CommunicatorPtr& communicator, ::DB_ENV* dbEnv, const string& name) : - _communicator(communicator), - _trace(0), - _tid(0), - _name(name) -{ - _errorPrefix = "Freeze::DBTransaction(\"" + _name + "\"): "; - _trace = _communicator->getProperties()->getPropertyAsInt("Freeze.Trace.DB"); - - if(_trace >= 2) - { - Trace out(_communicator->getLogger(), "DB"); - out << "starting transaction for environment \"" << _name << "\""; - } - - checkBerkeleyDBReturn(txn_begin(dbEnv, 0, &_tid, 0), _errorPrefix, "txn_begin"); -} - -Freeze::DBTransactionI::~DBTransactionI() -{ - if(_tid) - { - Warning out(_communicator->getLogger()); - out << _errorPrefix << "transaction has not been committed or aborted"; - } -} - -void -Freeze::DBTransactionI::commit() -{ - IceUtil::Mutex::Lock sync(*this); - - if(!_tid) - { - ostringstream s; - s << _errorPrefix << "transaction has already been committed or aborted"; - DBException ex(__FILE__, __LINE__); - ex.message = s.str(); - throw ex; - } - - if(_trace >= 2) - { - Trace out(_communicator->getLogger(), "DB"); - out << "committing transaction for environment \"" << _name << "\""; - } - - checkBerkeleyDBReturn(txn_commit(_tid, 0), _errorPrefix, "txn_commit"); - - _tid = 0; -} - -void -Freeze::DBTransactionI::abort() -{ - IceUtil::Mutex::Lock sync(*this); - - if(!_tid) - { - ostringstream s; - s << _errorPrefix << "transaction has already been committed or aborted"; - DBException ex(__FILE__, __LINE__); - ex.message = s.str(); - throw ex; - } - - if(_trace >= 2) - { - Trace out(_communicator->getLogger(), "DB"); - out << "aborting transaction for environment \"" << _name << "\" due to deadlock"; - } - - checkBerkeleyDBReturn(txn_abort(_tid), _errorPrefix, "txn_abort"); - - _tid = 0; -} - -DBCursorI::DBCursorI(const DBIPtr& db, - const ::Ice::CommunicatorPtr& communicator, - const std::string& name, - DBC* cursor) : - _db(db), - _communicator(communicator), - _trace(0), - _name(name), - _cursor(cursor) -{ - _errorPrefix = "Freeze::DBCursor(\"" + _name += "\"): "; - _trace = _communicator->getProperties()->getPropertyAsInt("Freeze.Trace.DB"); - - if(_trace >= 1) - { - Trace out(_communicator->getLogger(), "DB"); - out << "creating cursor for \"" << _name << "\""; - } -} - -DBCursorI::~DBCursorI() -{ - if(_cursor != 0) - { - Warning out(_communicator->getLogger()); - out << _errorPrefix << "\"" << _name << "\" has not been closed"; - } -} - -Ice::CommunicatorPtr -DBCursorI::getCommunicator() -{ - // immutable - return _communicator; -} - -void -DBCursorI::curr(Key& key, Value& value) -{ - IceUtil::Mutex::Lock sync(*_db.get()); - - if(!_cursor) - { - ostringstream s; - s << _errorPrefix << "\"" << _name << "\" has been closed"; - DBException ex(__FILE__, __LINE__); - ex.message = s.str(); - throw ex; - } - - DBT dbKey, dbData; - memset(&dbKey, 0, sizeof(dbKey)); - memset(&dbData, 0, sizeof(dbData)); - - if(_trace >= 1) - { - Trace out(_communicator->getLogger(), "DB"); - out << "reading current value from database \"" << _name << "\""; - } - - checkBerkeleyDBReturn(_cursor->c_get(_cursor, &dbKey, &dbData, DB_CURRENT), _errorPrefix, "DBcursor->c_get"); - - // - // Copy the data from the read key & data - // - key = Key(static_cast<Byte*>(dbKey.data), static_cast<Byte*>(dbKey.data) + dbKey.size); - value = Value(static_cast<Byte*>(dbData.data), static_cast<Byte*>(dbData.data) + dbData.size); -} - -void -DBCursorI::set(const Value& value) -{ - IceUtil::Mutex::Lock sync(*_db.get()); - - if(!_cursor) - { - ostringstream s; - s << _errorPrefix << "\"" << _name << "\" has been closed"; - DBException ex(__FILE__, __LINE__); - ex.message = s.str(); - throw ex; - } - - DBT dbKey, dbData; - memset(&dbKey, 0, sizeof(dbKey)); - memset(&dbData, 0, sizeof(dbData)); - dbData.data = const_cast<void*>(static_cast<const void*>(&value[0])); - dbData.size = (unsigned int) value.size(); - - if(_trace >= 1) - { - Trace out(_communicator->getLogger(), "DB"); - out << "setting current value in database \"" << _name << "\""; - } - - // - // Note that the dbKey element is ignored. - // - checkBerkeleyDBReturn(_cursor->c_put(_cursor, &dbKey, &dbData, DB_CURRENT), _errorPrefix, "DBcursor->c_set"); -} - -bool -DBCursorI::next() -{ - IceUtil::Mutex::Lock sync(*_db.get()); - - if(!_cursor) - { - ostringstream s; - s << _errorPrefix << "\"" << _name << "\" has been closed"; - DBException ex(__FILE__, __LINE__); - ex.message = s.str(); - throw ex; - } - - // - // This does a 0 byte partial read of the data for efficiency - // reasons. - // - DBT dbKey, dbData; - memset(&dbKey, 0, sizeof(dbKey)); - dbKey.flags = DB_DBT_PARTIAL; - memset(&dbData, 0, sizeof(dbData)); - dbData.flags = DB_DBT_PARTIAL; - - if(_trace >= 1) - { - Trace out(_communicator->getLogger(), "DB"); - out << "moving to next value in database \"" << _name << "\""; - } - - try - { - checkBerkeleyDBReturn(_cursor->c_get(_cursor, &dbKey, &dbData, DB_NEXT), _errorPrefix, "DBcursor->c_get"); - } - catch(const DBNotFoundException&) - { - return false; - } - return true; -} - -bool -DBCursorI::prev() -{ - IceUtil::Mutex::Lock sync(*_db.get()); - - if(!_cursor) - { - ostringstream s; - s << _errorPrefix << "\"" << _name << "\" has been closed"; - DBException ex(__FILE__, __LINE__); - ex.message = s.str(); - throw ex; - } - - // - // This does a 0 byte partial read of the data for efficiency - // reasons. - // - DBT dbKey, dbData; - memset(&dbKey, 0, sizeof(dbKey)); - dbKey.flags = DB_DBT_PARTIAL; - memset(&dbData, 0, sizeof(dbData)); - dbData.flags = DB_DBT_PARTIAL; - - if(_trace >= 1) - { - Trace out(_communicator->getLogger(), "DB"); - out << "moving to previous value in database \"" << _name << "\""; - } - - try - { - checkBerkeleyDBReturn(_cursor->c_get(_cursor, &dbKey, &dbData, DB_PREV), _errorPrefix, "DBcursor->c_get"); - } - catch(const DBNotFoundException&) - { - return false; - } - return true; -} - -void -DBCursorI::del() -{ - IceUtil::Mutex::Lock sync(*_db.get()); - - if(!_cursor) - { - ostringstream s; - s << _errorPrefix << "\"" << _name << "\" has been closed"; - DBException ex(__FILE__, __LINE__); - ex.message = s.str(); - throw ex; - } - - if(_trace >= 1) - { - Trace out(_communicator->getLogger(), "DB"); - out << "removing the current element in database \"" << _name << "\""; - } - - checkBerkeleyDBReturn(_cursor->c_del(_cursor, 0), _errorPrefix, "DBcursor->c_del"); -} - -DBCursorPtr -DBCursorI::clone() -{ - IceUtil::Mutex::Lock sync(*_db.get()); - - if(!_cursor) - { - ostringstream s; - s << _errorPrefix << "\"" << _name << "\" has been closed"; - DBException ex(__FILE__, __LINE__); - ex.message = s.str(); - throw ex; - } - - DBC* cursor; - _cursor->c_dup(_cursor, &cursor, DB_POSITION); - return new DBCursorI(_db, _communicator, _name, cursor); -} - -void -DBCursorI::close() -{ - IceUtil::Mutex::Lock sync(*_db.get()); - - if(!_cursor) - { - return; - } - - if(_trace >= 1) - { - Trace out(_communicator->getLogger(), "DB"); - out << "closing cursor \"" << _name << "\""; - } - - _cursor->c_close(_cursor); - _cursor = 0; -} - -Freeze::DBI::DBI(const CommunicatorPtr& communicator, const DBEnvironmentIPtr& dbEnvObj, ::DB* db, ::DB_TXN* txn, - const string& name, bool create) : - _communicator(communicator), - _trace(0), - _dbEnvObj(dbEnvObj), - _db(db), - _name(name) -{ - _errorPrefix = "Freeze::DB(\"" + _name + "\"): "; - _trace = _communicator->getProperties()->getPropertyAsInt("Freeze.Trace.DB"); - - if(_trace >= 1) - { - Trace out(_communicator->getLogger(), "DB"); - out << "opening database \"" << _name << "\" in environment \"" << _dbEnvObj->getName() << "\""; - } - - u_int32_t flags = (create) ? DB_CREATE : 0; -#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) - checkBerkeleyDBReturn(_db->open(_db, txn, _name.c_str(), 0, DB_BTREE, flags, FREEZE_DB_MODE), - _errorPrefix, "DB->open"); -#else - checkBerkeleyDBReturn(_db->open(_db, _name.c_str(), 0, DB_BTREE, flags, FREEZE_DB_MODE), - _errorPrefix, "DB->open"); -#endif - _dbEnvObj->add(_name, this); -} - -Freeze::DBI::~DBI() -{ - if(_db) - { - Warning out(_communicator->getLogger()); - out << _errorPrefix << "\"" << _name << "\" has not been closed"; - } -} - -string -Freeze::DBI::getName() -{ - // No mutex lock necessary, _name is immutable - return _name; -} - -CommunicatorPtr -Freeze::DBI::getCommunicator() -{ - // No mutex lock necessary, _communicator is immutable - return _communicator; -} - -Long -Freeze::DBI::getNumberOfRecords() -{ - IceUtil::Mutex::Lock sync(*this); - - if(!_db) - { - ostringstream s; - s << _errorPrefix << "\"" << _name << "\" has been closed"; - DBException ex(__FILE__, __LINE__); - ex.message = s.str(); - throw ex; - } - - // - // TODO: DB_FAST_STAT doesn't seem to do what the documentation says... - // - DB_BTREE_STAT* s; - checkBerkeleyDBReturn(_db->stat(_db, &s, 0), _errorPrefix, "DB->stat"); - Long num = s->bt_ndata; - free(s); - return num; -} - -DBCursorPtr -Freeze::DBI::getCursor() -{ - return getCursorImpl(0); -} - -DBCursorPtr -Freeze::DBI::getCursorAtKey(const Key& key) -{ - return getCursorAtKeyImpl(0, key); -} - -void -Freeze::DBI::put(const Key& key, const Value& value) -{ - putImpl(0, key, value); -} - -bool -Freeze::DBI::contains(const Key& key) -{ - return containsImpl(0, key); -} - -Value -Freeze::DBI::get(const Key& key) -{ - return getImpl(0, key); -} - -void -Freeze::DBI::del(const Key& key) -{ - delImpl(0, key); -} - -DBCursorPtr -Freeze::DBI::getCursorWithTxn(const DBTransactionPtr& txn) -{ - return getCursorImpl(static_cast<const DBTransactionI*>(txn.get())->_tid); -} - -DBCursorPtr -Freeze::DBI::getCursorAtKeyWithTxn(const DBTransactionPtr& txn, const Key& key) -{ - return getCursorAtKeyImpl(static_cast<const DBTransactionI*>(txn.get())->_tid, key); -} - -void -Freeze::DBI::putWithTxn(const DBTransactionPtr& txn, const Key& key, const Value& value) -{ - putImpl(static_cast<const DBTransactionI*>(txn.get())->_tid, key, value); -} - -bool -Freeze::DBI::containsWithTxn(const DBTransactionPtr& txn, const Key& key) -{ - return containsImpl(static_cast<const DBTransactionI*>(txn.get())->_tid, key); -} - -Value -Freeze::DBI::getWithTxn(const DBTransactionPtr& txn, const Key& key) -{ - return getImpl(static_cast<const DBTransactionI*>(txn.get())->_tid, key); -} - -void -Freeze::DBI::delWithTxn(const DBTransactionPtr& txn, const Key& key) -{ - delImpl(static_cast<const DBTransactionI*>(txn.get())->_tid, key); -} - -void -Freeze::DBI::clear() -{ - IceUtil::Mutex::Lock sync(*this); - - if(!_db) - { - ostringstream s; - s << _errorPrefix << "\"" << _name << "\" has been closed"; - DBException ex(__FILE__, __LINE__); - ex.message = s.str(); - throw ex; - } - - u_int32_t count; // ignored - checkBerkeleyDBReturn(_db->truncate(_db, 0, &count, 0), _errorPrefix, "DB->truncate"); -} - -void -Freeze::DBI::close() -{ - IceUtil::Mutex::Lock sync(*this); - - if(!_db) - { - return; - } - - if(_trace >= 1) - { - Trace out(_communicator->getLogger(), "DB"); - out << "closing database \"" << _name << "\""; - } - - checkBerkeleyDBReturn(_db->close(_db, 0), _errorPrefix, "DB->close"); - - _dbEnvObj->remove(_name); - _dbEnvObj = 0; - _db = 0; -} - -void -Freeze::DBI::remove() -{ - IceUtil::Mutex::Lock sync(*this); - - if(!_db) - { - return; - } - - if(_trace >= 1) - { - Trace out(_communicator->getLogger(), "DB"); - out << "removing database \"" << _name << "\""; - } - - // - // Remove first needs to close the database object. It's not - // possible to remove an open database. - // - checkBerkeleyDBReturn(_db->close(_db, 0), _errorPrefix, "DB->close"); - - // - // Take a copy of the DBEnvironment to make cleanup easier. - // - DBEnvironmentIPtr dbEnvCopy = _dbEnvObj; - - _dbEnvObj->remove(_name); - _dbEnvObj = 0; - _db = 0; - - // - // Ask the DBEnvironment to erase the database. - // - dbEnvCopy->eraseDB(_name); -} - -void -Freeze::DBI::sync() -{ - IceUtil::Mutex::Lock sync(*this); - - if(!_db) - { - return; - } - - if(_trace >= 1) - { - Trace out(_communicator->getLogger(), "DB"); - out << "synchronizing database \"" << _name << "\""; - } - - checkBerkeleyDBReturn(_db->sync(_db, 0), _errorPrefix, "DB->sync"); -} - -EvictionStrategyPtr -Freeze::DBI::createEvictionStrategy() -{ - return new EvictionStrategyI; -} - -IdleStrategyPtr -Freeze::DBI::createIdleStrategy() -{ - return new IdleStrategyI; -} - -Freeze::EvictorPtr -Freeze::DBI::createEvictor(const PersistenceStrategyPtr& strategy) -{ - IceUtil::Mutex::Lock sync(*this); - - if(!_db) - { - ostringstream s; - s << _errorPrefix << "\"" << _name << "\" has been closed"; - DBException ex(__FILE__, __LINE__); - ex.message = s.str(); - throw ex; - } - - return new EvictorI(this, strategy); -} - -DBCursorPtr -Freeze::DBI::getCursorImpl(::DB_TXN* txn) -{ - IceUtil::Mutex::Lock sync(*this); - - if(!_db) - { - ostringstream s; - s << _errorPrefix << "\"" << _name << "\" has been closed"; - DBException ex(__FILE__, __LINE__); - ex.message = s.str(); - throw ex; - } - - DBC* cursor; - - checkBerkeleyDBReturn(_db->cursor(_db, txn, &cursor, 0), _errorPrefix, "DB->cursor"); - - // - // Note that the read of the data is partial (that is the data - // will not actually be read into memory since it isn't needed - // yet). - // - DBT dbData, dbKey; - memset(&dbData, 0, sizeof(dbData)); - dbData.flags = DB_DBT_PARTIAL; - memset(&dbKey, 0, sizeof(dbKey)); - dbKey.flags = DB_DBT_PARTIAL; - - try - { - checkBerkeleyDBReturn(cursor->c_get(cursor, &dbKey, &dbData, DB_FIRST), _errorPrefix, "DBcursor->c_get"); - } - catch(const DBNotFoundException&) - { - // - // Cleanup. - // - cursor->c_close(cursor); - throw; - } - - return new DBCursorI(this, _communicator, _name, cursor); -} - -DBCursorPtr -Freeze::DBI::getCursorAtKeyImpl(::DB_TXN* txn, const Key& key) -{ - IceUtil::Mutex::Lock sync(*this); - - if(!_db) - { - ostringstream s; - s << _errorPrefix << "\"" << _name << "\" has been closed"; - DBException ex(__FILE__, __LINE__); - ex.message = s.str(); - throw ex; - } - - DBC* cursor; - - checkBerkeleyDBReturn(_db->cursor(_db, txn, &cursor, 0), _errorPrefix, "DB->cursor"); - - // - // Move to the requested record - // - DBT dbKey; - memset(&dbKey, 0, sizeof(dbKey)); - - // - // Note that the read of the data is partial (that is the data - // will not actually be read into memory since it isn't needed - // yet). - // - DBT dbData; - memset(&dbData, 0, sizeof(dbData)); - dbData.flags = DB_DBT_PARTIAL; - - dbKey.data = const_cast<void*>(static_cast<const void*>(&key[0])); - dbKey.size = (unsigned int) key.size(); - try - { - checkBerkeleyDBReturn(cursor->c_get(cursor, &dbKey, &dbData, DB_SET), _errorPrefix, "DBcursor->c_get"); - } - catch(const DBNotFoundException&) - { - // - // Cleanup on failure. - // - cursor->c_close(cursor); - throw; - } - - return new DBCursorI(this, _communicator, _name, cursor); -} - -void -Freeze::DBI::putImpl(::DB_TXN* txn, const Key& key, const Value& value) -{ - IceUtil::Mutex::Lock sync(*this); - - if(!_db) - { - ostringstream s; - s << _errorPrefix << "\"" << _name << "\" has been closed"; - DBException ex(__FILE__, __LINE__); - ex.message = s.str(); - throw ex; - } - - DBT dbKey, dbData; - memset(&dbKey, 0, sizeof(dbKey)); - memset(&dbData, 0, sizeof(dbData)); - dbKey.data = const_cast<void*>(static_cast<const void*>(&key[0])); - dbKey.size = (unsigned int) key.size(); - dbData.data = const_cast<void*>(static_cast<const void*>(&value[0])); - dbData.size = (unsigned int) value.size(); - - if(_trace >= 1) - { - Trace out(_communicator->getLogger(), "DB"); - out << "writing value in database \"" << _name << "\""; - } - - checkBerkeleyDBReturn(_db->put(_db, txn, &dbKey, &dbData, 0), _errorPrefix, "DB->put"); -} - -bool -Freeze::DBI::containsImpl(::DB_TXN* txn, const Key& key) -{ - IceUtil::Mutex::Lock sync(*this); - - if(!_db) - { - ostringstream s; - s << _errorPrefix << "\"" << _name << "\" has been closed"; - DBException ex(__FILE__, __LINE__); - ex.message = s.str(); - throw ex; - } - - DBT dbKey; - memset(&dbKey, 0, sizeof(dbKey)); - dbKey.data = const_cast<void*>(static_cast<const void*>(&key[0])); - dbKey.size = (unsigned int) key.size(); - - DBT dbData; - memset(&dbData, 0, sizeof(dbData)); - dbData.flags = DB_DBT_PARTIAL; - - if(_trace >= 1) - { - Trace out(_communicator->getLogger(), "DB"); - out << "checking key in database \"" << _name << "\""; - } - - int rc = _db->get(_db, txn, &dbKey, &dbData, 0); - if(rc == DB_NOTFOUND) - { - return false; - } - - checkBerkeleyDBReturn(rc, _errorPrefix, "DB->get"); - return true; -} - -Value -Freeze::DBI::getImpl(::DB_TXN* txn, const Key& key) -{ - IceUtil::Mutex::Lock sync(*this); - - if(!_db) - { - ostringstream s; - s << _errorPrefix << "\"" << _name << "\" has been closed"; - DBException ex(__FILE__, __LINE__); - ex.message = s.str(); - throw ex; - } - - DBT dbKey, dbData; - memset(&dbKey, 0, sizeof(dbKey)); - memset(&dbData, 0, sizeof(dbData)); - dbKey.data = const_cast<void*>(static_cast<const void*>(&key[0])); - dbKey.size = (unsigned int) key.size(); - - if(_trace >= 1) - { - Trace out(_communicator->getLogger(), "DB"); - out << "reading value from database \"" << _name << "\""; - } - - checkBerkeleyDBReturn(_db->get(_db, txn, &dbKey, &dbData, 0), _errorPrefix, "DB->get"); - - return Value(static_cast<Byte*>(dbData.data), static_cast<Byte*>(dbData.data) + dbData.size); -} - -void -Freeze::DBI::delImpl(::DB_TXN* txn, const Key& key) -{ - IceUtil::Mutex::Lock sync(*this); - - if(!_db) - { - ostringstream s; - s << _errorPrefix << "\"" << _name << "\" has been closed"; - DBException ex(__FILE__, __LINE__); - ex.message = s.str(); - throw ex; - } - - DBT dbKey; - memset(&dbKey, 0, sizeof(dbKey)); - dbKey.data = const_cast<void*>(static_cast<const void*>(&key[0])); - dbKey.size = (unsigned int) key.size(); - - if(_trace >= 1) - { - Trace out(_communicator->getLogger(), "DB"); - out << "deleting value from database \"" << _name << "\""; - } - - checkBerkeleyDBReturn(_db->del(_db, txn, &dbKey, 0), _errorPrefix, "DB->del"); -} - -// -// Print for the various exception types. -// -void -Freeze::DBDeadlockException::ice_print(ostream& out) const -{ - Exception::ice_print(out); - out << ":\ndatabase deadlock:\n" << message; -} - -void -Freeze::DBNotFoundException::ice_print(ostream& out) const -{ - Exception::ice_print(out); - out << ":\ndatabase record not found:\n" << message; -} - -void -Freeze::DBException::ice_print(ostream& out) const -{ - Exception::ice_print(out); - out << ":\n" << message; -} diff --git a/cpp/src/Freeze/DBI.h b/cpp/src/Freeze/DBI.h deleted file mode 100644 index 9fcb7a02499..00000000000 --- a/cpp/src/Freeze/DBI.h +++ /dev/null @@ -1,218 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003 -// ZeroC, Inc. -// Billerica, MA, USA -// -// All Rights Reserved. -// -// Ice is free software; you can redistribute it and/or modify it under -// the terms of the GNU General Public License version 2 as published by -// the Free Software Foundation. -// -// ********************************************************************** - -#ifndef FREEZE_DB_I_H -#define FREEZE_DB_I_H - -#include <IceUtil/IceUtil.h> -#include <Ice/Ice.h> -#include <Freeze/DB.h> -#include <db.h> - -#if DB_VERSION_MAJOR < 3 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR < 3) -# error "Berkeley DB versions older than 3.3 are not supported!" -#endif - -#ifdef _WIN32 - -# if DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR == 3 -# define ICE_DB_VERSION "33" -# elif DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 0 -# define ICE_DB_VERSION "40" -# elif DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1 -# define ICE_DB_VERSION "41" -# else -# error "Berkeley DB version is not supported!" -# endif - -# ifdef _DEBUG -# pragma comment(lib, "libdb" ICE_DB_VERSION "d.lib") -# else -# pragma comment(lib, "libdb" ICE_DB_VERSION ".lib") -# endif - -#endif - -namespace Freeze -{ - -// -// Check a Berkeley DB return result, and throw an apropriate -// exception. -// -void checkBerkeleyDBReturn(int ret, const std::string&, const std::string&); - -class DBEnvironmentI; -typedef IceUtil::Handle<DBEnvironmentI> DBEnvironmentIPtr; - -class DBEnvironmentI : public DBEnvironment, public IceUtil::RecMutex -{ -public: - - DBEnvironmentI(const ::Ice::CommunicatorPtr&, const std::string&, bool = false); - virtual ~DBEnvironmentI(); - - virtual std::string getName(); - virtual ::Ice::CommunicatorPtr getCommunicator(); - - virtual DBPtr openDB(const std::string&, bool); - - virtual DBPtr openDBWithTxn(const DBTransactionPtr&, const std::string&, bool); - - virtual DBTransactionPtr startTransaction(); - - virtual void close(); - - virtual void sync(); - -private: - - // DBI needs access to add, remove & eraseDB - friend class DBI; - DBPtr openDBImpl(::DB_TXN*, const std::string&, bool); - void add(const std::string&, const DBPtr&); - void remove(const std::string&); - void eraseDB(const std::string&); - - ::Ice::CommunicatorPtr _communicator; - int _trace; - - ::DB_ENV* _dbEnv; - - std::string _name; - std::string _errorPrefix; - std::string _id; - - std::map<std::string, DBPtr> _dbMap; -}; - -class DBTransactionI : public DBTransaction, public IceUtil::Mutex -{ -public: - - DBTransactionI(const ::Ice::CommunicatorPtr&, ::DB_ENV*, const std::string&); - virtual ~DBTransactionI(); - - virtual void commit(); - virtual void abort(); - -private: - - friend class DBEnvironmentI; - friend class DBI; - - ::Ice::CommunicatorPtr _communicator; - int _trace; - - ::DB_TXN* _tid; - - std::string _name; - std::string _errorPrefix; -}; - - -class DBI : public DB, public IceUtil::Mutex -{ -public: - - DBI(const ::Ice::CommunicatorPtr&, const DBEnvironmentIPtr&, ::DB*, ::DB_TXN*, const std::string&, bool); - virtual ~DBI(); - - virtual std::string getName(); - virtual ::Ice::CommunicatorPtr getCommunicator(); - - virtual ::Ice::Long getNumberOfRecords(); - - virtual DBCursorPtr getCursor(); - virtual DBCursorPtr getCursorAtKey(const Key&); - - virtual void put(const Key&, const Value&); - virtual bool contains(const Key&); - virtual Value get(const Key&); - virtual void del(const Key&); - - virtual DBCursorPtr getCursorWithTxn(const DBTransactionPtr&); - virtual DBCursorPtr getCursorAtKeyWithTxn(const DBTransactionPtr&, const Key&); - - virtual void putWithTxn(const DBTransactionPtr&, const Key&, const Value&); - virtual bool containsWithTxn(const DBTransactionPtr&, const Key&); - virtual Value getWithTxn(const DBTransactionPtr&, const Key&); - virtual void delWithTxn(const DBTransactionPtr&, const Key&); - - virtual void clear(); - - virtual void close(); - virtual void remove(); - virtual void sync(); - - virtual EvictionStrategyPtr createEvictionStrategy(); - virtual IdleStrategyPtr createIdleStrategy(); - - virtual Freeze::EvictorPtr createEvictor(const PersistenceStrategyPtr&); - -private: - - virtual DBCursorPtr getCursorImpl(::DB_TXN*); - virtual DBCursorPtr getCursorAtKeyImpl(::DB_TXN*, const Key&); - - virtual void putImpl(::DB_TXN*, const Key&, const Value&); - virtual bool containsImpl(::DB_TXN*, const Key&); - virtual Value getImpl(::DB_TXN*, const Key&); - virtual void delImpl(::DB_TXN*, const Key&); - - ::Ice::CommunicatorPtr _communicator; - int _trace; - - DBEnvironmentIPtr _dbEnvObj; - ::DB* _db; - - std::string _name; - std::string _errorPrefix; -}; - -typedef IceUtil::Handle<DBI> DBIPtr; - -class DBCursorI : public DBCursor -{ -public: - - DBCursorI(const DBIPtr&, const ::Ice::CommunicatorPtr&, const std::string&, DBC*); - ~DBCursorI(); - - virtual ::Ice::CommunicatorPtr getCommunicator(); - - virtual void curr(Key& key, Value& value); - virtual void set(const Value& value); - virtual bool next(); - virtual bool prev(); - virtual void del(); - - virtual DBCursorPtr clone(); - virtual void close(); - -private: - - DBIPtr _db; - ::Ice::CommunicatorPtr _communicator; - int _trace; - - std::string _name; - std::string _errorPrefix; - - DBC* _cursor; -}; - -} - -#endif diff --git a/cpp/src/Freeze/EvictorI.cpp b/cpp/src/Freeze/EvictorI.cpp index e0b2977aa7c..15be3ac13a4 100644 --- a/cpp/src/Freeze/EvictorI.cpp +++ b/cpp/src/Freeze/EvictorI.cpp @@ -14,11 +14,22 @@ #include <Ice/Object.h> // Not included in Ice/Ice.h #include <Freeze/EvictorI.h> +#include <Freeze/IdentityObjectRecordDict.h> +#include <Freeze/Initialize.h> +#include <sys/stat.h> +#include <IceUtil/AbstractMutex.h> +#include <typeinfo> using namespace std; using namespace Freeze; using namespace Ice; +#ifdef _WIN32 +# define FREEZE_DB_MODE 0 +#else +# define FREEZE_DB_MODE (S_IRUSR | S_IWUSR) +#endif + namespace Freeze { @@ -26,7 +37,8 @@ class EvictorIteratorI : public EvictorIterator { public: - EvictorIteratorI(const IdentityObjectRecordDict::const_iterator&, const IdentityObjectRecordDict::const_iterator&); + EvictorIteratorI(Db&, const CommunicatorPtr&); + virtual ~EvictorIteratorI(); virtual bool hasNext(); @@ -35,64 +47,156 @@ public: private: - IdentityObjectRecordDict::const_iterator _curr; - IdentityObjectRecordDict::const_iterator _end; + Dbc* _dbc; + Ice::Identity _current; + bool _currentSet; + CommunicatorPtr _communicator; + Key _key; }; } -Freeze::EvictorI::EvictorI(const DBPtr& db, const PersistenceStrategyPtr& strategy) : + +namespace +{ + +// +// Streamed objects +// +struct StreamedObject +{ + Key key; + Value value; + Ice::Byte status; +}; + +inline void +initializeDbt(vector<Ice::Byte>& v, Dbt& dbt) +{ + dbt.set_data(&v[0]); + dbt.set_size(v.size()); + dbt.set_ulen(v.size()); + dbt.set_dlen(0); + dbt.set_doff(0); + dbt.set_flags(DB_DBT_USERMEM); +} + +} + +Freeze::EvictorPtr +Freeze::createEvictor(const Ice::CommunicatorPtr& communicator, + const std::string& envName, + const std::string& dbName, + bool createDb) +{ + return new EvictorI(communicator, envName, dbName, createDb); +} + +Freeze::EvictorPtr +Freeze::createEvictor(const Ice::CommunicatorPtr& communicator, + DbEnv& dbEnv, + const std::string& dbName, + bool createDb) +{ + return new EvictorI(communicator, dbEnv, dbName, createDb); +} + + + +Freeze::EvictorI::EvictorI(const Ice::CommunicatorPtr communicator, + const std::string& envName, + const std::string& dbName, + bool createDb) : _evictorSize(10), _deactivated(false), - _dict(db), - _db(db), - _strategy(strategy), - _trace(0) + _communicator(communicator), + _dbEnv(0), + _dbEnvHolder(SharedDbEnv::get(communicator, envName)), + _trace(0), + _noSyncAllowed(false) { - _trace = _db->getCommunicator()->getProperties()->getPropertyAsInt("Freeze.Trace.Evictor"); + _dbEnv = _dbEnvHolder.get(); + init(envName, dbName, createDb); } -Freeze::EvictorI::~EvictorI() +Freeze::EvictorI::EvictorI(const Ice::CommunicatorPtr communicator, + DbEnv& dbEnv, + const std::string& dbName, + bool createDb) : + _evictorSize(10), + _deactivated(false), + _communicator(communicator), + _dbEnv(&dbEnv), + _trace(0), + _noSyncAllowed(false) { - if(!_deactivated) - { - Warning out(_db->getCommunicator()->getLogger()); - out << "evictor has not been deactivated"; - } - - _strategy->destroy(); + init("Extern", dbName, createDb); } -DBPtr -Freeze::EvictorI::getDB() +void +Freeze::EvictorI::init(const string& envName, const string& dbName, bool createDb) { - IceUtil::Mutex::Lock sync(*this); + _trace = _communicator->getProperties()->getPropertyAsInt("Freeze.Trace.Evictor"); + _noSyncAllowed = (_communicator->getProperties()->getPropertyAsInt("Freeze.Evictor.NoSyncAllowed") != 0); - if(_deactivated) + string propertyPrefix = string("Freeze.Evictor.") + envName + '.' + dbName; + + // + // By default, we save every minute or when the size of the modified queue + // reaches 10. + // + + _saveSizeTrigger = _communicator->getProperties()-> + getPropertyAsIntWithDefault(propertyPrefix + ".SaveSizeTrigger", 10); + + Int savePeriod = _communicator->getProperties()-> + getPropertyAsIntWithDefault(propertyPrefix + ".SavePeriod", 60 * 1000); + + _savePeriod = IceUtil::Time::milliSeconds(savePeriod); + + try { - throw EvictorDeactivatedException(__FILE__, __LINE__); + _db.reset(new Db(_dbEnv, 0)); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD; + if(createDb) + { + flags |= DB_CREATE; + } + _db->open(0, dbName.c_str(), 0, DB_BTREE, flags, FREEZE_DB_MODE); } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + + _lastSave = IceUtil::Time::now(); - return _db; + // + // Start saving thread + // + start(); } -PersistenceStrategyPtr -Freeze::EvictorI::getPersistenceStrategy() +Freeze::EvictorI::~EvictorI() { - IceUtil::Mutex::Lock sync(*this); - - if(_deactivated) + if(!_deactivated) { - throw EvictorDeactivatedException(__FILE__, __LINE__); - } + Warning out(_communicator->getLogger()); + out << "evictor has not been deactivated"; - return _strategy; + // + // Need to deactivate to save objects and join saving thread + // + deactivate(""); + } } void Freeze::EvictorI::setSize(Int evictorSize) { - IceUtil::Mutex::Lock sync(*this); + Lock sync(*this); if(_deactivated) { @@ -110,7 +214,7 @@ Freeze::EvictorI::setSize(Int evictorSize) // // Update the evictor size. // - _evictorSize = static_cast<map<Identity, EvictorElementPtr>::size_type>(evictorSize); + _evictorSize = static_cast<EvictorMap::size_type>(evictorSize); // // Evict as many elements as necessary. @@ -121,7 +225,7 @@ Freeze::EvictorI::setSize(Int evictorSize) Int Freeze::EvictorI::getSize() { - IceUtil::Mutex::Lock sync(*this); + Lock sync(*this); if(_deactivated) { @@ -132,102 +236,222 @@ Freeze::EvictorI::getSize() } void -Freeze::EvictorI::createObject(const Identity& ident, const ObjectPtr& servant) +Freeze::EvictorI::saveNow() { - IceUtil::Mutex::Lock sync(*this); + Lock sync(*this); if(_deactivated) { throw EvictorDeactivatedException(__FILE__, __LINE__); } - ObjectRecord rec; - rec.servant = servant; - rec.stats.creationTime = IceUtil::Time::now().toMilliSeconds(); - rec.stats.lastSaveTime = 0; - rec.stats.avgSaveTime = 0; - - // - // Save the Ice object's initial state and add it to the queue. - // - _dict.put(pair<const Identity, const ObjectRecord>(ident, rec)); - add(ident, rec); - - if(_trace >= 1) - { - Trace out(_db->getCommunicator()->getLogger(), "Evictor"); - out << "created \"" << ident << "\""; - } - - // - // Evict as many elements as necessary. - // - evict(); + saveNowNoSync(); } void -Freeze::EvictorI::saveObject(const Identity& ident) +Freeze::EvictorI::createObject(const Identity& ident, const ObjectPtr& servant) { - IceUtil::Mutex::Lock sync(*this); - + Lock sync(*this); + if(_deactivated) { throw EvictorDeactivatedException(__FILE__, __LINE__); } - - map<Identity, EvictorElementPtr>::iterator p = _evictorMap.find(ident); - if(p == _evictorMap.end()) + + EvictorMap::iterator p = _evictorMap.find(ident); + + if(p != _evictorMap.end()) { - throw ObjectDestroyedException(__FILE__, __LINE__); + EvictorElementPtr& element = p->second; + + { + IceUtil::Mutex::Lock lockRec(element->mutex); + + switch(element->status) + { + case clean: + { + element->status = modified; + addToModifiedQueue(p, element); + break; + } + case created: + case modified: + { + // + // Nothing to do. + // No need to push it on the modified queue as a created resp + // modified element is either already on the queue or about + // to be saved. When saved, it becomes clean. + // + break; + } + case destroyed: + { + element->status = modified; + // + // No need to push it on the modified queue, as a destroyed element + // is either already on the queue or about to be saved. When saved, + // it becomes dead. + // + break; + } + case dead: + { + element->status = created; + addToModifiedQueue(p, element); + break; + } + default: + { + assert(0); + break; + } + } + + element->rec.servant = servant; + } + _evictorList.erase(element->position); + _evictorList.push_front(p); + element->position = _evictorList.begin(); + } + else + { + // + // Create a new object + // + + ObjectRecord rec; + rec.servant = servant; + rec.stats.creationTime = IceUtil::Time::now().toMilliSeconds(); + rec.stats.lastSaveTime = 0; + rec.stats.avgSaveTime = 0; + + // + // Add an Ice object with its servant to the evictor queue. + // + + EvictorElementPtr element = new EvictorElement; + element->rec = rec; + element->usageCount = 0; + element->status = created; + + pair<EvictorMap::iterator, bool> pair = _evictorMap.insert(EvictorMap::value_type(ident, element)); + assert(pair.second); + + _evictorList.push_front(pair.first); + element->position = _evictorList.begin(); + + addToModifiedQueue(pair.first, element); + + // + // Evict as many elements as necessary. + // + evict(); + } + + sync.release(); + + if(_trace >= 1) + { + Trace out(_communicator->getLogger(), "Evictor"); + out << "created \"" << ident << "\""; } - EvictorElementPtr element = p->second; - assert(!element->destroyed); - - // - // TODO: another lookup is not very efficient! - // - save(ident, element->rec.servant); - - _strategy->savedObject(this, ident, element->rec.servant, element->strategyCookie, element->usageCount); } void Freeze::EvictorI::destroyObject(const Identity& ident) { - IceUtil::Mutex::Lock sync(*this); - + Lock sync(*this); + if(_deactivated) { throw EvictorDeactivatedException(__FILE__, __LINE__); } - EvictorElementPtr element = remove(ident); - if(element) + EvictorMap::iterator p = _evictorMap.find(ident); + if(p != _evictorMap.end()) { - element->destroyed = true; + EvictorElementPtr& element = p->second; - // - // Notify the persistence strategy. - // - _strategy->destroyedObject(ident, element->strategyCookie); + IceUtil::Mutex::Lock lockRec(element->mutex); + + switch(element->status) + { + case clean: + { + element->status = destroyed; + addToModifiedQueue(p, element); + break; + } + case created: + { + element->status = dead; + break; + } + case modified: + { + element->status = destroyed; + // + // Not necessary to push it on the modified queue, as a modified + // element is either on the queue already or about to be saved + // (at which point it becomes clean) + // + break; + } + case destroyed: + case dead: + { + // + // Nothing to do! + // + break; + } + default: + { + assert(0); + break; + } + } + } + else + { + // + // Set a real ObjectRecord in case this object gets recreated + // + ObjectRecord rec; + rec.servant = 0; + rec.stats.creationTime = IceUtil::Time::now().toMilliSeconds(); + rec.stats.lastSaveTime = 0; + rec.stats.avgSaveTime = 0; - if(_trace >= 1) - { - Trace out(_db->getCommunicator()->getLogger(), "Evictor"); - out << "destroyed \"" << ident << "\""; - } + EvictorElementPtr element = new EvictorElement; + element->rec = rec; + element->usageCount = 0; + element->status = destroyed; + + pair<EvictorMap::iterator, bool> pair = _evictorMap.insert(EvictorMap::value_type(ident, element)); + assert(pair.second); + element->position = _evictorList.insert(_evictorList.end(), pair.first); + + addToModifiedQueue(pair.first, element); + + evict(); } + + sync.release(); - // - // Delete the Ice object from the database. - // - _dict.erase(ident); + if(_trace >= 1) + { + Trace out(_communicator->getLogger(), "Evictor"); + out << "destroyed \"" << ident << "\""; + } } void Freeze::EvictorI::installServantInitializer(const ServantInitializerPtr& initializer) { - IceUtil::Mutex::Lock sync(*this); + Lock sync(*this); if(_deactivated) { @@ -240,220 +464,576 @@ Freeze::EvictorI::installServantInitializer(const ServantInitializerPtr& initial EvictorIteratorPtr Freeze::EvictorI::getIterator() { - IceUtil::Mutex::Lock sync(*this); - - if(_deactivated) { - throw EvictorDeactivatedException(__FILE__, __LINE__); + Lock sync(*this); + if(_deactivated) + { + throw EvictorDeactivatedException(__FILE__, __LINE__); + } + saveNowNoSync(); } - - return new EvictorIteratorI(_dict.begin(), _dict.end()); + + return new EvictorIteratorI(*_db, _communicator); } bool Freeze::EvictorI::hasObject(const Ice::Identity& ident) { - IceUtil::Mutex::Lock sync(*this); + Lock sync(*this); if(_deactivated) { throw EvictorDeactivatedException(__FILE__, __LINE__); } - return _dict.find(ident) != _dict.end(); + EvictorMap::iterator p = _evictorMap.find(ident); + + if(p != _evictorMap.end()) + { + EvictorElementPtr& element = p->second; + IceUtil::Mutex::Lock lockRec(element->mutex); + return (element->status != destroyed && element->status != dead); + } + else + { + // + // Release sync to increase concurrency + // + sync.release(); + + return dbHasObject(ident); + } } + ObjectPtr Freeze::EvictorI::locate(const Current& current, LocalObjectPtr& cookie) { - IceUtil::Mutex::Lock sync(*this); - - assert(_db); - - // - // If this operation is called on a deactivated servant locator, - // it's a bug in Ice. - // - assert(!_deactivated); - - EvictorElementPtr element; + ObjectRecord rec; + bool objectLoaded = false; - map<Identity, EvictorElementPtr>::iterator p = _evictorMap.find(current.id); - if(p != _evictorMap.end()) + for(;;) { - if(_trace >= 2) - { - Trace out(_db->getCommunicator()->getLogger(), "Evictor"); - out << "found \"" << current.id << "\" in the queue"; - } + EvictorMap::iterator p; + bool objectFound = false; - // - // Ice object found in evictor map. Push it to the front of - // the evictor list, so that it will be evicted last. - // - element = p->second; - _evictorList.erase(element->position); - _evictorList.push_front(current.id); - element->position = _evictorList.begin(); - } - else - { - if(_trace >= 2) { - Trace out(_db->getCommunicator()->getLogger(), "Evictor"); - out << "couldn't find \"" << current.id << "\" in the queue\n" - << "loading \"" << current.id << "\" from the database"; - } + Lock sync(*this); - // - // Load the Ice object from the database and add a - // servant for it. - // - IdentityObjectRecordDict::iterator q = _dict.find(current.id); - if(q == _dict.end()) - { + // + // If this operation is called on a deactivated servant locator, + // it's a bug in Ice. // - // The Ice object with the given identity does not exist, - // client will get an ObjectNotExistException. + assert(!_deactivated); + + p = _evictorMap.find(current.id); + objectFound = (p != _evictorMap.end()); + + if(objectFound) + { + // + // Ice object found in evictor map. Push it to the front of + // the evictor list, so that it will be evicted last. + // + EvictorElementPtr& element = p->second; + _evictorList.erase(element->position); + _evictorList.push_front(p); + element->position = _evictorList.begin(); + element->usageCount++; + cookie = element; + + // + // Later (after releasing the mutex), check that this + // object is not dead or destroyed + // + } + else if(objectLoaded) + { + // + // Proceed with the object loaded in the previous loop + // + + // + // If an initializer is installed, call it now. + // + if(_initializer) + { + _initializer->initialize(current.adapter, current.id, rec.servant); + } + + // + // Add an Ice object with its servant to the evictor queue. + // + + EvictorElementPtr element = new EvictorElement; + element->rec = rec; + element->usageCount = 1; + element->status = clean; + + pair<EvictorMap::iterator, bool> pair = _evictorMap.insert( + EvictorMap::value_type(current.id, element)); + assert(pair.second); + _evictorList.push_front(pair.first); + element->position = _evictorList.begin(); + + cookie = element; + + // + // Evict as many elements as necessary. + // + evict(); + + return rec.servant; + } + // + // Else fall to the after-sync processing // - return 0; } + + if(objectFound) + { + EvictorElementPtr& element = p->second; - // - // If an initializer is installed, call it now. - // - if(_initializer) + if(_trace >= 2) + { + Trace out(_communicator->getLogger(), "Evictor"); + out << "found \"" << current.id << "\" in the queue"; + } + + // + // Return servant if object not dead or destroyed + // + { + IceUtil::Mutex::Lock lockRec(element->mutex); + if(element->status != destroyed && element->status != dead) + { + return element->rec.servant; + } + } + + // + // Object is destroyed or dead: clean-up + // + if(_trace >= 2) + { + Trace out(_communicator->getLogger(), "Evictor"); + out << "\"" << current.id << "\" was dead or destroyed"; + } + Lock sync(*this); + element->usageCount--; + return 0; + } + else { - _initializer->initialize(current.adapter, current.id, q->second.servant); + // + // Load object now and loop + // + + if(_trace >= 2) + { + Trace out(_communicator->getLogger(), "Evictor"); + out << "couldn't find \"" << current.id << "\" in the queue\n" + << "loading \"" << current.id << "\" from the database"; + } + + if(getObject(current.id, rec)) + { + objectLoaded = true; + + // + // Loop + // + } + else + { + // + // The Ice object with the given identity does not exist, + // client will get an ObjectNotExistException. + // + return 0; + } } - - // - // Add the new servant to the evictor queue. - // - element = add(current.id, q->second); } - - // - // Increase the usage count of the evictor queue element. - // - ++element->usageCount; - - // - // Notify the persistence strategy about the operation. - // - _strategy->preOperation(this, current.id, element->rec.servant, current.mode != Nonmutating, - element->strategyCookie); - - // - // Evict as many elements as necessary. - // - evict(); - - // - // Set the cookie and return the servant for the Ice object. - // - cookie = element; - return element->rec.servant; } void Freeze::EvictorI::finished(const Current& current, const ObjectPtr& servant, const LocalObjectPtr& cookie) { - IceUtil::Mutex::Lock sync(*this); - - assert(_db); assert(servant); - // - // It's possible that the locator has been deactivated already. In - // this case, _evictorSize is set to zero. - // - assert(!_deactivated || !_evictorSize); + EvictorElementPtr element = EvictorElementPtr::dynamicCast(cookie); + assert(element); + + bool enqueue = false; + + if(current.mode != Nonmutating) + { + IceUtil::Mutex::Lock lockRec(element->mutex); + + if(element->status == clean) + { + // + // Assume this operation updated the object + // + element->status = modified; + enqueue = true; + } + } + + Lock sync(*this); + + assert(!_deactivated); // // Decrease the usage count of the evictor queue element. // - EvictorElementPtr element = EvictorElementPtr::dynamicCast(cookie); - assert(element); assert(element->usageCount >= 1); --element->usageCount; - // - // If the object has not been destroyed, notify the persistence - // strategy about a mutating operation. - // - if(!element->destroyed) + if(enqueue) { - _strategy->postOperation(this, current.id, servant, current.mode != Nonmutating, element->strategyCookie); + EvictorMap::iterator p = _evictorMap.find(current.id); + assert(p != _evictorMap.end()); + + addToModifiedQueue(p, element); + } + else + { + // + // Evict as many elements as necessary. + // + evict(); } - - // - // Evict as many elements as necessary. - // - evict(); } void Freeze::EvictorI::deactivate(const string&) { - IceUtil::Mutex::Lock sync(*this); - + Lock sync(*this); + if(!_deactivated) { - _deactivated = true; - + saveNowNoSync(); + if(_trace >= 1) { - Trace out(_db->getCommunicator()->getLogger(), "Evictor"); + Trace out(_communicator->getLogger(), "Evictor"); out << "deactivating, saving unsaved Ice objects to the database"; } - + // // Set the evictor size to zero, meaning that we will evict // everything possible. // _evictorSize = 0; evict(); + + _deactivated = true; + notifyAll(); + sync.release(); + getThreadControl().join(); + + try + { + _db->close(0); + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + _db.reset(); + _dbEnv = 0; + _dbEnvHolder = 0; } } void -Freeze::EvictorI::save(const Identity& ident, const ObjectPtr& servant) +Freeze::EvictorI::run() { - // - // NOTE: This operation is not mutex-protected, therefore it may - // only be invoked while the evictor is already locked. For - // example, it is safe to call this operation from a persistence - // strategy implementation, iff the persistence strategy is in - // the thread context of a locked evictor operation. - // - map<Identity, EvictorElementPtr>::iterator p = _evictorMap.find(ident); - assert(p != _evictorMap.end()); - EvictorElementPtr element = p->second; - - // - // Update statistics before saving. - // - Long now = IceUtil::Time::now().toMilliSeconds(); - Long diff = now - (element->rec.stats.creationTime + element->rec.stats.lastSaveTime); - if(element->rec.stats.lastSaveTime == 0) + for(;;) { - element->rec.stats.lastSaveTime = diff; - element->rec.stats.avgSaveTime = diff; - } - else - { - element->rec.stats.lastSaveTime = now - element->rec.stats.creationTime; - element->rec.stats.avgSaveTime = (Long)(element->rec.stats.avgSaveTime * 0.95 + diff * 0.05); - } + deque<EvictorMap::iterator> allObjects; + size_t saveNowThreadsSize = 0; + + { + Lock sync(*this); + while(!_deactivated && + (_saveNowThreads.size() == 0) && + (_saveSizeTrigger < 0 || static_cast<Int>(_modifiedQueue.size()) < _saveSizeTrigger)) + { + if(_savePeriod == IceUtil::Time::milliSeconds(0)) + { + wait(); + } + else if(timedWait(_savePeriod) == false) + { + // + // Timeout, so let's save + // + break; // while + } + } + + saveNowThreadsSize = _saveNowThreads.size(); + + if(_deactivated) + { + assert(_modifiedQueue.size() == 0); + if(saveNowThreadsSize > 0) + { + _saveNowThreads.clear(); + notifyAll(); + } + break; // for(;;) + } - _dict.put(pair<const Identity, const ObjectRecord>(ident, element->rec)); + // + // Check first if there is something to do! + // + if(_modifiedQueue.size() == 0) + { + if(saveNowThreadsSize > 0) + { + _saveNowThreads.clear(); + notifyAll(); + } + continue; // for(;;) + } + + _modifiedQueue.swap(allObjects); + } + + const size_t size = allObjects.size(); + + // + // Usage count release + // + deque<EvictorElementPtr> releaseAfterStreaming; + deque<EvictorElementPtr> releaseAfterCommit; + + deque<StreamedObject> streamedObjectQueue; + + Long saveStart = IceUtil::Time::now().toMilliSeconds(); + + // + // Stream each element + // + for(size_t i = 0; i < size; i++) + { + EvictorElementPtr& element = allObjects[i]->second; + + IceUtil::Mutex::Lock lockRec(element->mutex); + ObjectRecord& rec = element->rec; + + bool streamIt = true; + Ice::Byte status = element->status; + switch(status) + { + case created: + { + element->status = clean; + releaseAfterCommit.push_back(element); + break; + } + case modified: + { + element->status = clean; + releaseAfterStreaming.push_back(element); + break; + } + case destroyed: + { + element->status = dead; + releaseAfterCommit.push_back(element); + break; + } + default: + { + // + // Nothing to do (could be a duplicate) + // + streamIt = false; + releaseAfterStreaming.push_back(element); + break; + } + } + + if(streamIt) + { + size_t index = streamedObjectQueue.size(); + streamedObjectQueue.resize(index + 1); + StreamedObject& obj = streamedObjectQueue[index]; + IdentityObjectRecordDictKeyCodec::write(allObjects[i]->first, obj.key, _communicator); + obj.status = status; + if(status != destroyed) + { + IceUtil::AbstractMutex* mutex = dynamic_cast<IceUtil::AbstractMutex*>(rec.servant.get()); + if(mutex != 0) + { + IceUtil::AbstractMutex::Lock lockServant(*mutex); + writeObjectRecordToValue(saveStart, rec, obj.value); + } + else + { + if(_noSyncAllowed) + { + writeObjectRecordToValue(saveStart, rec, obj.value); + } + else + { + DBException ex(__FILE__, __LINE__); + ex.message = string(typeid(*rec.servant).name()) + + " does not implement IceUtil::AbstractMutex and Freeze.Evictor.NoSyncAllowed is 0"; + throw ex; + } + } + } + } + } + + allObjects.clear(); + + if(releaseAfterStreaming.size() > 0) + { + Lock sync(*this); + for(deque<EvictorElementPtr>::iterator q = releaseAfterStreaming.begin(); + q != releaseAfterStreaming.end(); q++) + { + (*q)->usageCount--; + } + releaseAfterStreaming.clear(); + } + + // + // Now let's save all these streamed objects to disk using a transaction + // + + // + // Each time we get a deadlock, we reduce the number of objects to save + // per transaction + // + size_t txSize = streamedObjectQueue.size(); + bool tryAgain; + + do + { + tryAgain = false; + + while(streamedObjectQueue.size() > 0) + { + if(txSize > streamedObjectQueue.size()) + { + txSize = streamedObjectQueue.size(); + } + + try + { + DbTxn* tx = 0; + _dbEnv->txn_begin(0, &tx, 0); + try + { + for(size_t i = 0; i < txSize; i++) + { + StreamedObject& obj = streamedObjectQueue[i]; + if(obj.status == destroyed) + { + // + // May not exist in the database + // + + Dbt dbKey; + initializeDbt(obj.key, dbKey); + int err = _db->del(tx, &dbKey, 0); + if(err != 0 && err != DB_NOTFOUND) + { + // + // Bug in Freeze + // + throw DBException(__FILE__, __LINE__); + } + + } + else + { + // + // We can't use NOOVERWRITE as some 'created' objects may + // actually be already in the database + // + + Dbt dbKey; + Dbt dbValue; + initializeDbt(obj.key, dbKey); + initializeDbt(obj.value, dbValue); + int err = _db->put(tx, &dbKey, &dbValue, 0); + if(err != 0) + { + // + // Bug in Freeze + // + throw DBException(__FILE__, __LINE__); + } + } + } + } + catch(...) + { + tx->abort(); + throw; + } + tx->commit(0); + streamedObjectQueue.erase(streamedObjectQueue.begin(), streamedObjectQueue.begin() + txSize); + + if(_trace >= 2) + { + Long now = IceUtil::Time::now().toMilliSeconds(); + Trace out(_communicator->getLogger(), "Evictor"); + out << "saved " << txSize << " objects in " + << static_cast<Int>(now - saveStart) << " ms"; + saveStart = now; + } + } + catch(const ::DbDeadlockException&) + { + tryAgain = true; + txSize = (txSize + 1)/2; + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + } + } while(tryAgain); + + + { + Lock sync(*this); + + for(deque<EvictorElementPtr>::iterator q = releaseAfterCommit.begin(); + q != releaseAfterCommit.end(); q++) + { + (*q)->usageCount--; + } + releaseAfterCommit.clear(); + + if(saveNowThreadsSize > 0) + { + _saveNowThreads.erase(_saveNowThreads.begin(), _saveNowThreads.begin() + saveNowThreadsSize); + notifyAll(); + } + } + _lastSave = IceUtil::Time::now(); + } } + void Freeze::EvictorI::evict() { - list<Identity>::reverse_iterator p = _evictorList.rbegin(); + list<EvictorMap::iterator>::reverse_iterator p = _evictorList.rbegin(); // // With most STL implementations, _evictorMap.size() is faster @@ -464,14 +1044,13 @@ Freeze::EvictorI::evict() // // Get the last unused element from the evictor queue. // - map<Identity, EvictorElementPtr>::iterator q; + EvictorMap::iterator q; while(p != _evictorList.rend()) { - q = _evictorMap.find(*p); - assert(q != _evictorMap.end()); + q = *p; if(q->second->usageCount == 0) { - break; // Fine, servant is not in use. + break; // Fine, servant is not in use (and not in the modifiedQueue) } ++p; } @@ -482,146 +1061,359 @@ Freeze::EvictorI::evict() // break; } - Identity ident = *p; - EvictorElementPtr element = q->second; + if(_trace >= 2) + { + Trace out(_communicator->getLogger(), "Evictor"); + out << "evicting \"" << q->first << "\" from the queue\n" + << "number of elements in the queue: " << _evictorMap.size(); + } - // - // Notify the persistence strategy about the evicted object. - // - _strategy->evictedObject(this, ident, element->rec.servant, element->strategyCookie); - + EvictorElementPtr& element = q->second; // // Remove last unused element from the evictor queue. // assert(--(p.base()) == element->position); - p = list<Identity>::reverse_iterator(_evictorList.erase(element->position)); + p = list<EvictorMap::iterator>::reverse_iterator(_evictorList.erase(element->position)); _evictorMap.erase(q); - - if(_trace >= 2) - { - Trace out(_db->getCommunicator()->getLogger(), "Evictor"); - out << "evicted \"" << ident << "\" from the queue\n" - << "number of elements in the queue: " << _evictorMap.size(); - } } +} +bool +Freeze::EvictorI::dbHasObject(const Ice::Identity& ident) +{ + Key key; + IdentityObjectRecordDictKeyCodec::write(ident, key, _communicator); + Dbt dbKey; + initializeDbt(key, dbKey); + // - // If we're deactivated, and if there are no more elements to - // evict, set _db to zero to break cyclic object dependencies. + // Keep 0 length since we're not interested in the data // - if(_deactivated && _evictorMap.empty()) + Dbt dbValue; + dbValue.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL); + + for(;;) { - assert(_evictorList.empty()); - assert(_evictorSize == 0); - _db = 0; + try + { + int err = _db->get(0, &dbKey, &dbValue, 0); + + if(err == 0) + { + return true; + } + else if(err == DB_NOTFOUND) + { + return false; + } + else + { + assert(0); + throw DBException(__FILE__, __LINE__); + } + } + catch(const ::DbDeadlockException&) + { + // + // Ignored, try again + // + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } } } -Freeze::EvictorI::EvictorElementPtr -Freeze::EvictorI::add(const Identity& ident, const ObjectRecord& rec) +bool +Freeze::EvictorI::getObject(const Ice::Identity& ident, ObjectRecord& rec) { - // - // Ignore the request if the Ice object is already in the queue. - // - map<Identity, EvictorElementPtr>::const_iterator p = _evictorMap.find(ident); - if(p != _evictorMap.end()) - { - return p->second; - } + Key key; + IdentityObjectRecordDictKeyCodec::write(ident, key, _communicator); + Dbt dbKey; + initializeDbt(key, dbKey); - // - // Add an Ice object with its servant to the evictor queue. - // - _evictorList.push_front(ident); + const size_t defaultValueSize = 1024; + Value value(defaultValueSize); - EvictorElementPtr element = new EvictorElement; - element->rec = rec; - element->position = _evictorList.begin(); - element->usageCount = 0; - element->destroyed = false; - element->strategyCookie = _strategy->activatedObject(ident, rec.servant); + Dbt dbValue; + initializeDbt(value, dbValue); - _evictorMap[ident] = element; - return element; + for(;;) + { + try + { + int err = _db->get(0, &dbKey, &dbValue, 0); + + if(err == 0) + { + value.resize(dbValue.get_size()); + IdentityObjectRecordDictValueCodec::read(rec, value, _communicator); + return true; + } + else if(err == DB_NOTFOUND) + { + return false; + } + else + { + assert(0); + throw DBException(__FILE__, __LINE__); + } + } + catch(const ::DbMemoryException dx) + { + if(dbValue.get_size() > dbValue.get_ulen()) + { + // + // Let's resize value + // + value.resize(dbValue.get_size()); + initializeDbt(value, dbValue); + } + else + { + // + // Real problem + // + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + } + catch(const ::DbDeadlockException&) + { + // + // Ignored, try again + // + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + } } -Freeze::EvictorI::EvictorElementPtr -Freeze::EvictorI::remove(const Identity& ident) +void +Freeze::EvictorI::addToModifiedQueue(const Freeze::EvictorI::EvictorMap::iterator& p, + const Freeze::EvictorI::EvictorElementPtr& element) { - // - // If the Ice object is currently in the evictor, remove it. - // - map<Identity, EvictorElementPtr>::iterator p = _evictorMap.find(ident); - EvictorElementPtr element; - if(p != _evictorMap.end()) + element->usageCount++; + _modifiedQueue.push_back(p); + + if(_saveSizeTrigger >= 0 && static_cast<Int>(_modifiedQueue.size()) >= _saveSizeTrigger) { - element = p->second; - _evictorList.erase(element->position); - _evictorMap.erase(p); + notifyAll(); } - return element; } void -Freeze::EvictorDeactivatedException::ice_print(ostream& out) const +Freeze::EvictorI::saveNowNoSync() { - Exception::ice_print(out); - out << ":\nunknown local exception"; + IceUtil::ThreadControl myself; + + _saveNowThreads.push_back(myself); + notifyAll(); + do + { + wait(); + } while(find(_saveNowThreads.begin(), _saveNowThreads.end(), myself) != _saveNowThreads.end()); } void -Freeze::ObjectDestroyedException::ice_print(ostream& out) const +Freeze::EvictorI::writeObjectRecordToValue(Long saveStart, ObjectRecord& rec, Value& value) { - Exception::ice_print(out); - out << ":\nunknown local exception"; + // + // Update stats first + // + Statistics& stats = rec.stats; + Long diff = saveStart - (stats.creationTime + stats.lastSaveTime); + if(stats.lastSaveTime == 0) + { + stats.lastSaveTime = diff; + stats.avgSaveTime = diff; + } + else + { + stats.lastSaveTime = saveStart - stats.creationTime; + stats.avgSaveTime = static_cast<Long>(stats.avgSaveTime * 0.95 + diff * 0.05); + } + IdentityObjectRecordDictValueCodec::write(rec, value, _communicator); } -Freeze::EvictorIteratorI::EvictorIteratorI(const IdentityObjectRecordDict::const_iterator& begin, - const IdentityObjectRecordDict::const_iterator& end) : - _curr(begin), - _end(end) + +Freeze::EvictorIteratorI::EvictorIteratorI(Db& db, const CommunicatorPtr& communicator) : + _dbc(0), + _currentSet(false), + _communicator(communicator), + _key(1024) { + try + { + db.cursor(0, &_dbc, 0); + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } } Freeze::EvictorIteratorI::~EvictorIteratorI() { + if(_dbc != 0) + { + destroy(); + } } bool Freeze::EvictorIteratorI::hasNext() { - return _curr != _end; + if(_dbc == 0) + { + throw Freeze::IteratorDestroyedException(__FILE__, __LINE__); + } + + if(_currentSet) + { + return true; + } + else + { + if(_key.size() < _key.capacity()) + { + _key.resize(_key.capacity()); + } + Dbt dbKey; + initializeDbt(_key, dbKey); + + // + // Keep 0 length since we're not interested in the data + // + Dbt dbValue; + dbValue.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL); + + for(;;) + { + try + { + if(_dbc->get(&dbKey, &dbValue, DB_NEXT) == 0) + { + _key.resize(dbKey.get_size()); + IdentityObjectRecordDictKeyCodec::read(_current, _key, _communicator); + _currentSet = true; + return true; + } + else + { + return false; + } + } + catch(const ::DbMemoryException dx) + { + if(dbKey.get_size() > dbKey.get_ulen()) + { + // + // Let's resize _key + // + _key.resize(dbKey.get_size()); + initializeDbt(_key, dbKey); + } + else + { + // + // Real problem + // + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + } + catch(const ::DbDeadlockException& dx) + { + DBDeadlockException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + } + } } Ice::Identity Freeze::EvictorIteratorI::next() { - if(_curr == _end) + if(hasNext()) + { + _currentSet = false; + return _current; + } + else { throw Freeze::NoSuchElementException(__FILE__, __LINE__); } - - Ice::Identity ident = _curr->first; - ++_curr; - return ident; } void Freeze::EvictorIteratorI::destroy() { - // - // Set the current element to the end. - // - _curr = _end; + if(_dbc == 0) + { + throw Freeze::IteratorDestroyedException(__FILE__, __LINE__); + } + else + { + try + { + _dbc->close(); + } + catch(const ::DbDeadlockException&) + { + // Ignored + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + _dbc = 0; + } } // // Print for the various exception types. // + +void +Freeze::EvictorDeactivatedException::ice_print(ostream& out) const +{ + Exception::ice_print(out); + out << ":\nevictor deactivated"; +} + void Freeze::NoSuchElementException::ice_print(ostream& out) const { Exception::ice_print(out); out << ":\nno such element"; } + +void +Freeze::IteratorDestroyedException::ice_print(ostream& out) const +{ + Exception::ice_print(out); + out << ":\niterator destroyed"; +} diff --git a/cpp/src/Freeze/EvictorI.h b/cpp/src/Freeze/EvictorI.h index 80ce52501c4..0f4a312edc8 100644 --- a/cpp/src/Freeze/EvictorI.h +++ b/cpp/src/Freeze/EvictorI.h @@ -18,29 +18,31 @@ #include <IceUtil/IceUtil.h> #include <Ice/Ice.h> #include <Freeze/Evictor.h> -#include <Freeze/Strategy.h> #include <Freeze/IdentityObjectRecordDict.h> - +#include <Freeze/SharedDbEnv.h> #include <list> +#include <vector> +#include <deque> + namespace Freeze { -class EvictorI : virtual public Evictor, virtual public ObjectStore, virtual public IceUtil::Mutex +class EvictorI : public Evictor, public IceUtil::Monitor<IceUtil::Mutex>, public IceUtil::Thread { public: - EvictorI(const Freeze::DBPtr&, const PersistenceStrategyPtr&); - virtual ~EvictorI(); + EvictorI(const Ice::CommunicatorPtr, const std::string&, const std::string&, bool); + EvictorI(const Ice::CommunicatorPtr, DbEnv&, const std::string&, bool); - virtual DBPtr getDB(); - virtual PersistenceStrategyPtr getPersistenceStrategy(); + virtual ~EvictorI(); virtual void setSize(Ice::Int); virtual Ice::Int getSize(); + + virtual void saveNow(); virtual void createObject(const Ice::Identity&, const Ice::ObjectPtr&); - virtual void saveObject(const Ice::Identity&); virtual void destroyObject(const Ice::Identity&); virtual void installServantInitializer(const ServantInitializerPtr&); @@ -51,34 +53,128 @@ public: virtual void finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::LocalObjectPtr&); virtual void deactivate(const std::string&); - virtual void save(const Ice::Identity&, const Ice::ObjectPtr&); + // + // Thread + // + virtual void run(); -private: + // + // Should be private, but the Sun C++ compiler forces us to + // make them public + // + struct EvictorElement; + typedef IceUtil::Handle<EvictorElement> EvictorElementPtr; + typedef std::map<Ice::Identity, EvictorElementPtr> EvictorMap; struct EvictorElement : public Ice::LocalObject { - ObjectRecord rec; - std::list<Ice::Identity>::iterator position; + // + // WARNING: status and rec are protected by mutex + // while position and usageCount are protected by the Evictor mutex. + // To avoid memory-tearing issues on platforms with aggressive + // memory optimizations such as Alpha/Tru64, it is essential to put + // them in different quadwords (64 bit). + // + IceUtil::Mutex mutex; + Ice::Byte status; + ObjectRecord rec; // 64 bit alignment + std::list<EvictorMap::iterator>::iterator position; int usageCount; - bool destroyed; - Ice::LocalObjectPtr strategyCookie; }; - typedef IceUtil::Handle<EvictorElement> EvictorElementPtr; + +private: + + void init(const std::string& envName, const std::string& dbName, bool createDb); + +#if defined(_MSC_VER) && (_MSC_VER <= 1200) + + enum + { + clean = 0, + created = 1, + modified = 2, + destroyed = 3, + dead = 4 + }; + +#else + // + // Clean object; can become modified or destroyed + // + static const Ice::Byte clean = 0; + + // + // New objects; can become clean, dead or destroyed + // + static const Ice::Byte created = 1; + + // + // Modified object; can become clean or destroyed + // + static const Ice::Byte modified = 2; + + // + // Being saved. Can become dead or created + // + static const Ice::Byte destroyed = 3; + + // + // Exists only in the Evictor; for example the object was created + // and later destroyed (without a save in between), or it was + // destroyed on disk but is still in use. Can become created. + // + static const Ice::Byte dead = 4; + +#endif void evict(); - EvictorElementPtr add(const Ice::Identity&, const ObjectRecord&); - EvictorElementPtr remove(const Ice::Identity&); + bool dbHasObject(const Ice::Identity&); + bool getObject(const Ice::Identity&, ObjectRecord&); + void addToModifiedQueue(const EvictorMap::iterator&, const EvictorElementPtr&); + void saveNowNoSync(); - std::map<Ice::Identity, EvictorElementPtr> _evictorMap; - std::list<Ice::Identity> _evictorList; - std::map<Ice::Identity, EvictorElementPtr>::size_type _evictorSize; + inline void writeObjectRecordToValue(Ice::Long, ObjectRecord&, Value&); + + EvictorMap _evictorMap; + + // + // The _evictorList contains a list of all objects we keep, + // with the most recently used first + // + // Note: relies on the stability of iterators in a std::map + // + std::list<EvictorMap::iterator> _evictorList; + EvictorMap::size_type _evictorSize; + + // + // The _modifiedQueue contains a queue of all modified objects + // Each element in the queue "owns" a usage count, to ensure the + // pointed element remains in the map. + // + // Note: relies on the stability of iterators in a std::map + // + std::deque<EvictorMap::iterator> _modifiedQueue; bool _deactivated; - IdentityObjectRecordDict _dict; - DBPtr _db; - PersistenceStrategyPtr _strategy; + + Ice::CommunicatorPtr _communicator; + + DbEnv* _dbEnv; + SharedDbEnvPtr _dbEnvHolder; + std::auto_ptr<Db> _db; ServantInitializerPtr _initializer; int _trace; + bool _noSyncAllowed; + + // + // Threads that have requested a "saveNow" and are waiting for + // its completion + // + std::deque<IceUtil::ThreadControl> _saveNowThreads; + + Ice::Int _saveSizeTrigger; + IceUtil::Time _savePeriod; + IceUtil::Time _lastSave; }; } diff --git a/cpp/src/Freeze/Makefile b/cpp/src/Freeze/Makefile index c6d745f94a7..a9b48fe8afc 100644 --- a/cpp/src/Freeze/Makefile +++ b/cpp/src/Freeze/Makefile @@ -21,27 +21,21 @@ LIBNAME = $(call mklibname,Freeze) TARGETS = $(libdir)/$(LIBFILENAME) $(libdir)/$(SONAME) $(libdir)/$(LIBNAME) -OBJS = DB.o \ - DBException.o \ +OBJS = DBException.o \ Evictor.o \ ObjectRecord.o \ - Strategy.o \ - DBI.o \ + MapI.o \ EvictorI.o \ - StrategyI.o \ - IdentityObjectRecordDict.o \ - Application.o + SharedDbEnv.o \ + IdentityObjectRecordDict.o SRCS = $(OBJS:.o=.cpp) SLICE_SRCS = $(SDIR)/DB.ice \ - $(SDIR)/DBF.ice \ - $(SDIR)/DBException.ice \ + $(SDIR)/DBException.ice \ $(SDIR)/Evictor.ice \ $(SDIR)/EvictorF.ice \ - $(SDIR)/ObjectRecord.ice \ - $(SDIR)/Strategy.ice \ - $(SDIR)/StrategyF.ice + $(SDIR)/ObjectRecord.ice HDIR = $(includedir)/Freeze SDIR = $(slicedir)/Freeze diff --git a/cpp/src/Freeze/MapI.cpp b/cpp/src/Freeze/MapI.cpp new file mode 100644 index 00000000000..7455c820e21 --- /dev/null +++ b/cpp/src/Freeze/MapI.cpp @@ -0,0 +1,1003 @@ +// ********************************************************************** +// +// Copyright (c) 2003 +// ZeroC, Inc. +// Billerica, MA, USA +// +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. +// +// ********************************************************************** + +#include <Freeze/MapI.h> +#include <Freeze/DBException.h> +#include <sys/stat.h> +#include <stdlib.h> + +using namespace std; +using namespace Ice; +using namespace Freeze; + +#ifdef _WIN32 +# define FREEZE_DB_MODE 0 +#else +# define FREEZE_DB_MODE (S_IRUSR | S_IWUSR) +#endif + + +namespace +{ + +inline void +initializeDbt(vector<Ice::Byte>& v, Dbt& dbt) +{ + dbt.set_data(&v[0]); + dbt.set_size(v.size()); + dbt.set_ulen(v.size()); + dbt.set_dlen(0); + dbt.set_doff(0); + dbt.set_flags(DB_DBT_USERMEM); +} + +} + + +// +// DBMapHelper (from Map.h) +// + +Freeze::DBMapHelper* +Freeze::DBMapHelper::create(const CommunicatorPtr& communicator, + const string& envName, + const string& dbName, + bool createDb) +{ + return new DBMapHelperI(communicator, envName, dbName, createDb); +} + +Freeze::DBMapHelper* +Freeze::DBMapHelper::create(const CommunicatorPtr& communicator, + DbEnv& dbEnv, + const string& dbName, + bool createDb) +{ + return new DBMapHelperI(communicator, dbEnv, dbName, createDb); +} + + +Freeze::DBMapHelper::DBMapHelper(const Ice::CommunicatorPtr& communicator) : + _communicator(communicator) +{ +} + +Freeze::DBMapHelper::~DBMapHelper() +{ +} + + +// +// DBIteratorHelper (from Map.h) +// + +Freeze::DBIteratorHelper* +Freeze::DBIteratorHelper::create(const DBMapHelper& m, bool readOnly) +{ + const DBMapHelperI& actualMap = dynamic_cast<const DBMapHelperI&>(m); + + auto_ptr<DBIteratorHelperI> r(new DBIteratorHelperI(actualMap, readOnly)); + if(r->findFirst()) + { + return r.release(); + } + else + { + return 0; + } +} + + +Freeze::DBIteratorHelper::~DBIteratorHelper() +{ +} + + + +// +// DBIteratorHelperI +// + + +Freeze::DBIteratorHelperI::DBIteratorHelperI(const DBMapHelperI& m, bool readOnly) : + _map(m), + _dbc(0), + _tx(0) +{ + + if(_map._trace >= 3) + { + Trace out(_map._communicator->getLogger(), "DB"); + out << "opening iterator on database \"" << _map._dbName.c_str() << "\""; + } + + DbTxn* txn = 0; + + if(!readOnly) + { + // + // Need to start a transaction + // + _tx = new Tx(_map); + txn = _tx->getTxn(); + } + + try + { + m._db.get()->cursor(txn, &_dbc, 0); + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } +} + +Freeze::DBIteratorHelperI::DBIteratorHelperI(const DBIteratorHelperI& it) : + _map(it._map), + _dbc(0), + _tx(0) +{ + if(_map._trace >= 3) + { + Trace out(_map._communicator->getLogger(), "DB"); + out << "duplicating iterator on database \"" << _map._dbName.c_str() << "\""; + } + + try + { + it._dbc->dup(&_dbc, DB_POSITION); + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + + _tx = it._tx; +} + +Freeze::DBIteratorHelperI::~DBIteratorHelperI() +{ + if(_map._trace >= 3) + { + Trace out(_map._communicator->getLogger(), "DB"); + out << "closing iterator on database \"" << _map._dbName.c_str() << "\""; + } + + try + { + _dbc->close(); + } + catch(const ::DbDeadlockException&) + { + // Ignored + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + _dbc = 0; + + _tx = 0; +} + +bool +Freeze::DBIteratorHelperI::findFirst() const +{ + return next(); +} + +bool +Freeze::DBIteratorHelperI::find(const Key& key) const +{ + Dbt dbKey; + initializeDbt(const_cast<Key&>(key), dbKey); + + // + // Keep 0 length since we're not interested in the data + // + Dbt dbValue; + dbValue.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL); + + try + { + if(_dbc->get(&dbKey, &dbValue, DB_SET) == 0) + { + return true; + } + else + { + return false; + } + } + catch(const ::DbDeadlockException& dx) + { + if(_tx != 0) + { + _tx->dead(); + } + + DBDeadlockException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } +} + +Freeze::DBIteratorHelper* +Freeze::DBIteratorHelperI::clone() const +{ + return new DBIteratorHelperI(*this); +} + +void +Freeze::DBIteratorHelperI::get(const Key*& key, const Value*& value) const +{ + key = &_key; + value = &_value; + + size_t keySize = _key.capacity(); + if(keySize < 1024) + { + keySize = 1024; + } + _key.resize(keySize); + Dbt dbKey; + initializeDbt(_key, dbKey); + + size_t valueSize = _value.capacity(); + if(valueSize < 1024) + { + valueSize = 1024; + } + _value.resize(valueSize); + Dbt dbValue; + initializeDbt(_value, dbValue); + + for(;;) + { + try + { + int err = _dbc->get(&dbKey, &dbValue, DB_CURRENT); + + if(err == 0) + { + _key.resize(dbKey.get_size()); + _value.resize(dbValue.get_size()); + break; // for(;;) + } + else if(err == DB_KEYEMPTY) + { + throw DBInvalidPositionException(__FILE__, __LINE__); + } + else + { + // + // Bug in Freeze + // + assert(0); + throw DBException(__FILE__, __LINE__); + } + } + catch(const ::DbMemoryException dx) + { + bool resizing = false; + if(dbKey.get_size() > dbKey.get_ulen()) + { + // + // Let's resize key + // + _key.resize(dbKey.get_size()); + initializeDbt(_key, dbKey); + resizing = true; + } + + if(dbValue.get_size() > dbValue.get_ulen()) + { + // + // Let's resize value + // + _value.resize(dbValue.get_size()); + initializeDbt(_value, dbValue); + resizing = true; + } + + if(!resizing) + { + // + // Real problem + // + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + } + catch(const ::DbDeadlockException& dx) + { + if(_tx != 0) + { + _tx->dead(); + } + + DBDeadlockException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + } +} + +const Freeze::Key* +Freeze::DBIteratorHelperI::get() const +{ + size_t keySize = _key.capacity(); + if(keySize < 1024) + { + keySize = 1024; + } + _key.resize(keySize); + Dbt dbKey; + initializeDbt(_key, dbKey); + + // + // Keep 0 length since we're not interested in the data + // + Dbt dbValue; + dbValue.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL); + + for(;;) + { + try + { + int err = _dbc->get(&dbKey, &dbValue, DB_CURRENT); + + if(err == 0) + { + _key.resize(dbKey.get_size()); + return &_key; + } + else if(err == DB_KEYEMPTY) + { + throw DBInvalidPositionException(__FILE__, __LINE__); + } + else + { + // + // Bug in Freeze + // + assert(0); + throw DBException(__FILE__, __LINE__); + } + } + catch(const ::DbMemoryException dx) + { + if(dbKey.get_size() > dbKey.get_ulen()) + { + // + // Let's resize key + // + _key.resize(dbKey.get_size()); + initializeDbt(_key, dbKey); + } + else + { + // + // Real problem + // + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + } + catch(const ::DbDeadlockException& dx) + { + if(_tx != 0) + { + _tx->dead(); + } + + DBDeadlockException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + } +} + +void +Freeze::DBIteratorHelperI::set(const Value& value) +{ + // + // key ignored + // + Dbt dbKey; + dbKey.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL); + + Dbt dbValue; + initializeDbt(const_cast<Value&>(value), dbValue); + + try + { + int err = _dbc->put(&dbKey, &dbValue, DB_CURRENT); + assert(err == 0); + } + catch(const ::DbDeadlockException& dx) + { + if(_tx != 0) + { + _tx->dead(); + } + + DBDeadlockException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } +} + +void +Freeze::DBIteratorHelperI::erase() +{ + try + { + int err = _dbc->del(0); + if(err == DB_KEYEMPTY) + { + throw DBInvalidPositionException(__FILE__, __LINE__); + } + assert(err == 0); + } + catch(const ::DbDeadlockException& dx) + { + if(_tx != 0) + { + _tx->dead(); + } + + DBDeadlockException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } +} + +bool +Freeze::DBIteratorHelperI::next() const +{ + // + // Keep 0 length since we're not interested in the data + // + Dbt dbKey; + dbKey.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL); + Dbt dbValue; + dbValue.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL); + + try + { + if(_dbc->get(&dbKey, &dbValue, DB_NEXT) == 0) + { + return true; + } + else + { + return false; + } + } + catch(const ::DbDeadlockException& dx) + { + if(_tx != 0) + { + _tx->dead(); + } + + DBDeadlockException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } +} + +bool +Freeze::DBIteratorHelperI::equals(const DBIteratorHelper& rhs) const +{ + if(this == &rhs) + { + return true; + } + else + { + // + // Compare keys + // + try + { + Key rhsKey = *dynamic_cast<const DBIteratorHelperI&>(rhs).get(); + return *get() == rhsKey; + } + catch(const DBInvalidPositionException&) + { + return false; + } + } +} + +const Ice::CommunicatorPtr& +Freeze::DBIteratorHelperI::getCommunicator() const +{ + return _map._communicator; +} + +// +// DBIteratorHelperI::Tx +// + + +Freeze::DBIteratorHelperI::Tx::Tx(const DBMapHelperI& m) : + _map(m), + _txn(0), + _dead(false) +{ + if(_map._trace >= 3) + { + Trace out(_map._communicator->getLogger(), "DB"); + out << "starting transaction for database \"" << _map._dbName.c_str() << "\""; + } + + try + { + _map._dbEnv->txn_begin(0, &_txn, 0); + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } +} + + +Freeze::DBIteratorHelperI::Tx::~Tx() +{ + if(_dead) + { + if(_map._trace >= 3) + { + Trace out(_map._communicator->getLogger(), "DB"); + out << "aborting transaction for database \"" << _map._dbName.c_str() << "\""; + } + + try + { + _txn->abort(); + } + catch(...) + { + // + // Ignore exceptions to avoid crash during stack unwinding + // + } + } + else + { + if(_map._trace >= 3) + { + Trace out(_map._communicator->getLogger(), "DB"); + out << "committing transaction for database \"" << _map._dbName.c_str() << "\""; + } + + try + { + _txn->commit(0); + } + catch(const ::DbDeadlockException& dx) + { + DBDeadlockException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + } +} + +void +Freeze::DBIteratorHelperI::Tx::dead() +{ + // + // No need for synchronization since DBIteratorHelperI is not + // thread-safe (see Berkeley DB doc) + // + + _dead = true; +} + + + +// +// DBMapHelperI +// + + +Freeze::DBMapHelperI::DBMapHelperI(const CommunicatorPtr& communicator, + const string& envName, + const string& dbName, + bool createDb) : + DBMapHelper(communicator), + _trace(0), + _dbEnv(0), + _dbEnvHolder(SharedDbEnv::get(communicator, envName)), + _dbName(dbName) +{ + _dbEnv = _dbEnvHolder.get(); + openDb(createDb); +} + +Freeze::DBMapHelperI::DBMapHelperI(const CommunicatorPtr& communicator, + DbEnv& dbEnv, + const string& dbName, + bool createDb) : + DBMapHelper(communicator), + _trace(0), + _dbEnv(&dbEnv), + _dbName(dbName) +{ + openDb(createDb); +} + +void +Freeze::DBMapHelperI::openDb(bool createDb) +{ + _trace = _communicator->getProperties()->getPropertyAsInt("Freeze.Trace.DB"); + + try + { + _db.reset(new Db(_dbEnv, 0)); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD; + + if(createDb) + { + flags |= DB_CREATE; + } + + if(_trace >= 2) + { + Trace out(_communicator->getLogger(), "DB"); + out << "opening database \"" << _dbName.c_str() << "\""; + } + + _db->open(0, _dbName.c_str(), 0, DB_BTREE, flags, FREEZE_DB_MODE); + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } +} + + +Freeze::DBMapHelperI::~DBMapHelperI() +{ + if(_db.get() != 0) + { + try + { + if(_trace >= 2) + { + Trace out(_communicator->getLogger(), "DB"); + out << "closing database \"" << _dbName.c_str() << "\""; + } + + _db->close(0); + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + _db.reset(); + } + _dbEnvHolder = 0; +} + +Freeze::DBIteratorHelper* +Freeze::DBMapHelperI::find(const Key& k, bool readOnly) const +{ + for(;;) + { + try + { + auto_ptr<DBIteratorHelperI> r(new DBIteratorHelperI(*this, readOnly)); + if(r->find(k)) + { + return r.release(); + } + else + { + return 0; + } + } + catch(const DBDeadlockException&) + { + // + // Ignored, try again + // + } + } +} + +void +Freeze::DBMapHelperI::put(const Key& key, const Value& value) +{ + Dbt dbKey; + Dbt dbValue; + initializeDbt(const_cast<Key&>(key), dbKey); + initializeDbt(const_cast<Value&>(value), dbValue); + + for(;;) + { + try + { + int err = _db->put(0, &dbKey, &dbValue, DB_AUTO_COMMIT); + + if(err == 0) + { + break; + } + else + { + // + // Bug in Freeze + // + throw DBException(__FILE__, __LINE__); + } + } + catch(const ::DbDeadlockException&) + { + // + // Ignored, try again + // + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + } +} + +size_t +Freeze::DBMapHelperI::erase(const Key& key) +{ + Dbt dbKey; + initializeDbt(const_cast<Key&>(key), dbKey); + + for(;;) + { + try + { + int err = _db->del(0, &dbKey, DB_AUTO_COMMIT); + + if(err == 0) + { + return true; + } + else if(err == DB_NOTFOUND) + { + return false; + } + else + { + assert(0); + throw DBException(__FILE__, __LINE__); + } + } + catch(const ::DbDeadlockException&) + { + // + // Ignored, try again + // + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + } +} + +size_t +Freeze::DBMapHelperI::count(const Key& key) const +{ + Dbt dbKey; + initializeDbt(const_cast<Key&>(key), dbKey); + + // + // Keep 0 length since we're not interested in the data + // + Dbt dbValue; + dbValue.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL); + + for(;;) + { + try + { + int err = _db->get(0, &dbKey, &dbValue, 0); + + if(err == 0) + { + return 1; + } + else if(err == DB_NOTFOUND) + { + return 0; + } + else + { + assert(0); + throw DBException(__FILE__, __LINE__); + } + } + catch(const ::DbDeadlockException&) + { + // + // Ignored, try again + // + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + } +} + +void +Freeze::DBMapHelperI::clear() +{ + for(;;) + { + try + { + u_int32_t count; + int err = _db->truncate(0, &count, DB_AUTO_COMMIT); + assert(err == 0); + break; + } + catch(const ::DbDeadlockException&) + { + // + // Ignored, try again + // + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + } +} + +void +Freeze::DBMapHelperI::destroy() +{ + try + { + _db->close(0); + _db.reset(); + + Db db(_dbEnv, 0); + db.remove(_dbName.c_str(), 0, 0); + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } +} + + + +size_t +Freeze::DBMapHelperI::size() const +{ + // + // TODO: DB_FAST_STAT doesn't seem to do what the documentation says... + // + DB_BTREE_STAT* s; + _db->stat(&s, 0); + + size_t num = s->bt_ndata; + free(s); + return num; +} + + + +// +// Print for the various exception types. +// +void +Freeze::DBDeadlockException::ice_print(ostream& out) const +{ + Exception::ice_print(out); + out << ":\ndatabase deadlock:\n" << message; +} + +void +Freeze::DBNotFoundException::ice_print(ostream& out) const +{ + Exception::ice_print(out); + out << ":\ndatabase record not found:\n" << message; +} + +void +Freeze::DBException::ice_print(ostream& out) const +{ + Exception::ice_print(out); + out << ":\n" << message; +} + + +void +Freeze::DBInvalidPositionException::ice_print(ostream& out) const +{ + Exception::ice_print(out); + out << ":\ninvalid position"; +} diff --git a/cpp/src/Freeze/MapI.h b/cpp/src/Freeze/MapI.h new file mode 100644 index 00000000000..0e3054751e8 --- /dev/null +++ b/cpp/src/Freeze/MapI.h @@ -0,0 +1,157 @@ +// ********************************************************************** +// +// Copyright (c) 2003 +// ZeroC, Inc. +// Billerica, MA, USA +// +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. +// +// ********************************************************************** + +#ifndef FREEZE_MAP_I_H +#define FREEZE_MAP_I_H + +#include <Freeze/Map.h> +#include <Freeze/SharedDbEnv.h> + +namespace Freeze +{ + +class DBMapHelperI; + + +class DBIteratorHelperI : public DBIteratorHelper +{ +public: + + DBIteratorHelperI(const DBMapHelperI& m, bool readOnly); + + DBIteratorHelperI(const DBIteratorHelperI&); + + virtual + ~DBIteratorHelperI(); + + bool + findFirst() const; + + bool + find(const Key& k) const; + + virtual DBIteratorHelper* + clone() const; + + const Key* + get() const; + + virtual void + get(const Key*&, const Value*&) const; + + virtual void + set(const Value&); + + virtual void + erase(); + + virtual bool + next() const; + + virtual bool + equals(const DBIteratorHelper&) const; + + virtual const Ice::CommunicatorPtr& + getCommunicator() const; + + + class Tx : public IceUtil::SimpleShared + { + public: + + Tx(const DBMapHelperI&); + ~Tx(); + + void dead(); + + DbTxn* getTxn() + { + return _txn; + } + + private: + const DBMapHelperI& _map; + DbTxn* _txn; + bool _dead; + }; + + typedef IceUtil::Handle<Tx> TxPtr; + +private: + + const DBMapHelperI& _map; + Dbc* _dbc; + TxPtr _tx; + + mutable Key _key; + mutable Value _value; +}; + + + +class DBMapHelperI : public DBMapHelper +{ +public: + + DBMapHelperI(const Ice::CommunicatorPtr& communicator, + const std::string& envName, const std::string& dbName, + bool createDb); + + DBMapHelperI(const Ice::CommunicatorPtr& communicator, + DbEnv& dbEnv, const std::string& dbName, + bool createDb); + + virtual ~DBMapHelperI(); + + virtual DBIteratorHelper* + find(const Key&, bool) const; + + virtual void + put(const Key&, const Value&); + + virtual size_t + erase(const Key&); + + virtual size_t + count(const Key&) const; + + virtual void + clear(); + + virtual void + destroy(); + + virtual size_t + size() const; + +private: + + void + openDb(bool); + + friend class DBIteratorHelperI; + friend class DBIteratorHelperI::Tx; + + int _trace; + DbEnv* _dbEnv; + SharedDbEnvPtr _dbEnvHolder; + std::auto_ptr<Db> _db; + const std::string _dbName; +}; + + + +} + +#endif diff --git a/cpp/src/Freeze/SharedDbEnv.cpp b/cpp/src/Freeze/SharedDbEnv.cpp new file mode 100644 index 00000000000..392f8cafe70 --- /dev/null +++ b/cpp/src/Freeze/SharedDbEnv.cpp @@ -0,0 +1,429 @@ +// ********************************************************************** +// +// Copyright (c) 2003 +// ZeroC, Inc. +// Billerica, MA, USA +// +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. +// +// ********************************************************************** + +#include <Freeze/SharedDbEnv.h> +#include <IceUtil/StaticMutex.h> +#include <IceUtil/Thread.h> +#include <Freeze/DBException.h> +#include <cstdlib> +#include <map> +#include <memory> +#include <sys/stat.h> + +using namespace std; +using namespace IceUtil; +using namespace Ice; + +#ifdef _WIN32 +# define FREEZE_DB_MODE 0 +#else +# define FREEZE_DB_MODE (S_IRUSR | S_IWUSR) +#endif + + +namespace Freeze +{ + +class CheckpointThread : public Thread, public Monitor<Mutex> +{ +public: + + CheckpointThread(SharedDbEnv&, const Time&, Int, bool); + + virtual void run(); + + void terminate(); + +private: + SharedDbEnv& _dbEnv; + bool _done; + Time _checkpointPeriod; + Int _kbyte; + bool _autoDelete; +}; + +} + +namespace +{ + +struct MapKey +{ + string envName; + Ice::CommunicatorPtr communicator; +}; + +inline bool +operator<(const MapKey& lhs, const MapKey& rhs) +{ + return (lhs.communicator < rhs.communicator) || + ((lhs.communicator == rhs.communicator) && (lhs.envName < rhs.envName)); +} + +void +dbErrCallback(const char* prefix, char* msg) +{ + const Freeze::SharedDbEnv* env = reinterpret_cast<const Freeze::SharedDbEnv*>(prefix); + assert(env != 0); + + Ice::Error out(env->getCommunicator()->getLogger()); + out << "Freeze database error in DbEnv(\"" << env->getEnvName() << "\"): " << msg; +} + + +StaticMutex _mapMutex = ICE_STATIC_MUTEX_INITIALIZER; +StaticMutex _refCountMutex = ICE_STATIC_MUTEX_INITIALIZER; + +typedef map<MapKey, Freeze::SharedDbEnv*> Map; +Map* sharedDbEnvMap; + +} + + +Freeze::SharedDbEnvPtr +Freeze::SharedDbEnv::get(const Ice::CommunicatorPtr& communicator, + const std::string& envName) +{ + StaticMutex::Lock lock(_mapMutex); + + if(sharedDbEnvMap == 0) + { + sharedDbEnvMap = new Map; + } + + MapKey key; + key.envName = envName; + key.communicator = communicator; + + { + Map::iterator p = sharedDbEnvMap->find(key); + if(p != sharedDbEnvMap->end()) + { + return p->second; + } + } + + // + // MapKey not found, let's create and open a new DbEnv + // + auto_ptr<SharedDbEnv> result(new SharedDbEnv(envName, communicator)); + + // + // Insert it into the map + // + pair<Map::iterator, bool> insertResult = sharedDbEnvMap->insert(Map::value_type(key, result.get())); + assert(insertResult.second); + + return result.release(); +} + +Freeze::SharedDbEnv::~SharedDbEnv() +{ + if(_trace >= 1) + { + Trace out(_communicator->getLogger(), "DB"); + out << "closing database environment \"" << _envName << "\""; + } + + // + // First terminate checkpointing thread + // + _thread->terminate(); + _thread = 0; + + try + { + close(0); + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } +} + +void Freeze::SharedDbEnv::__incRef() +{ + IceUtil::StaticMutex::Lock lock(_refCountMutex); + _refCount++; +} + +void Freeze::SharedDbEnv::__decRef() +{ + IceUtil::StaticMutex::Lock lock(_refCountMutex); + if(--_refCount == 0) + { + IceUtil::StaticMutex::TryLock mapLock(_mapMutex); + if(!mapLock.acquired()) + { + // + // Reacquire mutex in proper order and check again + // + lock.release(); + mapLock.acquire(); + lock.acquire(); + if(_refCount > 0) + { + return; + } + } + + // + // Remove from map + // + + MapKey key; + key.envName = _envName; + key.communicator = _communicator; + size_t one = sharedDbEnvMap->erase(key); + assert(one == 1); + + if(sharedDbEnvMap->size() == 0) + { + delete sharedDbEnvMap; + sharedDbEnvMap = 0; + } + + // + // Keep lock to prevent somebody else to re-open this DbEnv + // before it's closed. + // + delete this; + } +} + +void +Freeze::SharedDbEnv::deleteOldLogs() +{ + IceUtil::Mutex::Lock lock(_oldLogsMutex); + + char** list = 0; + + try + { + log_archive(&list, DB_ARCH_ABS); + + if(list != 0) + { + for(int i = 0; list[i] != 0; i++) + { + // + // Remove each file + // +#ifdef _WIN32 + +#if defined(_MSC_VER) && (_MSC_VER <= 1200) + BOOL ok = DeleteFile(list[i]); +#else + BOOL ok = DeleteFileA(list[i]); +#endif + if(!ok) + { + DWORD err = GetLastError(); + Warning out(_communicator->getLogger()); + out << "could not delete file: \"" << list[i] << "\" error number: " << err; + } +#else + int err = unlink(list[i]); + if(err != 0) + { + Warning out(_communicator->getLogger()); + out << "could not unlink file: \"" << list[i] << "\": " << strerror(err); + } +#endif + + } + } + } + catch(const ::DbException& dx) + { + free(list); + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + catch(...) + { + free(list); + throw; + } + free(list); +} + +void +Freeze::SharedDbEnv::moveOldLogs() +{ + // + // Not yet implemented + // + assert(0); +} + + +Freeze::SharedDbEnv::SharedDbEnv(const std::string& envName, + const Ice::CommunicatorPtr& communicator) : + DbEnv(0), + _envName(envName), + _communicator(communicator), + _refCount(0) +{ + Ice::PropertiesPtr properties = _communicator->getProperties(); + + _trace = properties->getPropertyAsInt("Freeze.Trace.DB"); + + if(_trace >= 1) + { + Trace out(_communicator->getLogger(), "DB"); + out << "opening database environment \"" << envName << "\""; + } + + string propertyPrefix = string("Freeze.") + envName; + + try + { + set_errpfx(reinterpret_cast<char*>(this)); + set_errcall(dbErrCallback); + +#ifdef _WIN32 + // + // Berkeley DB may use a different C++ runtime + // + set_alloc(::malloc, ::realloc, ::free); +#endif + + // + // Deadlock detection + // + set_lk_detect(DB_LOCK_MINLOCKS); + + // + // Async tx + // + set_flags(DB_TXN_NOSYNC, true); + + u_int32_t flags = DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN; + + if(properties->getPropertyAsInt(propertyPrefix + ".DbRecoverFatal") != 0) + { + flags |= DB_RECOVER_FATAL | DB_CREATE; + } + else + { + flags |= DB_RECOVER | DB_CREATE; + } + + if(properties->getPropertyAsIntWithDefault(propertyPrefix + ".DbPrivate", 1) != 0) + { + flags |= DB_PRIVATE; + } + + // + // Threading + // + flags |= DB_THREAD; + + string dbHome = properties->getPropertyWithDefault( + propertyPrefix + ".DbHome", envName); + + open(dbHome.c_str(), flags, FREEZE_DB_MODE); + } + catch(const ::DbException& dx) + { + DBException ex(__FILE__, __LINE__); + ex.message = dx.what(); + throw ex; + } + + // + // Default checkpoint period is every 3 minutes + // + Int checkpointPeriod = properties->getPropertyAsIntWithDefault( + propertyPrefix + ".CheckpointPeriod", 3); + Int kbyte = properties->getPropertyAsInt(propertyPrefix + ".PeriodicCheckpointMinSize"); + + bool autoDelete = (properties->getPropertyAsIntWithDefault( + propertyPrefix + ".OldLogsAutoDelete", 1) != 0); + + _thread = new CheckpointThread(*this, Time::seconds(checkpointPeriod * 60), kbyte, autoDelete); +} + + + +Freeze::CheckpointThread::CheckpointThread(SharedDbEnv& dbEnv, const Time& checkpointPeriod, Int kbyte, bool autoDelete) : + _dbEnv(dbEnv), + _done(false), + _checkpointPeriod(checkpointPeriod), + _kbyte(kbyte), + _autoDelete(autoDelete) +{ + start(); +} + +void +Freeze::CheckpointThread::terminate() +{ + { + Lock sync(*this); + _done = true; + notify(); + } + + getThreadControl().join(); +} + + +void +Freeze::CheckpointThread::run() +{ + for(;;) + { + { + Lock sync(*this); + while(!_done && timedWait(_checkpointPeriod)) + { + // + // Loop + // + } + if(_done) + { + return; + } + } + + try + { + _dbEnv.txn_checkpoint(_kbyte, 0, 0); + } + catch(const DbException& dx) + { + Warning out(_dbEnv.getCommunicator()->getLogger()); + out << "checkpoint on DbEnv \"" << _dbEnv.getEnvName() << "\" raised DbException: " << dx.what(); + } + + if(_autoDelete) + { + try + { + _dbEnv.deleteOldLogs(); + } + catch(const IceUtil::Exception& ex) + { + Warning out(_dbEnv.getCommunicator()->getLogger()); + out << "deleteOldLogs on DbEnv \"" << _dbEnv.getEnvName() << "\" raised: " << ex; + } + } + } +} diff --git a/cpp/src/Freeze/SharedDbEnv.h b/cpp/src/Freeze/SharedDbEnv.h new file mode 100644 index 00000000000..c2d0c88ce48 --- /dev/null +++ b/cpp/src/Freeze/SharedDbEnv.h @@ -0,0 +1,74 @@ +// ********************************************************************** +// +// Copyright (c) 2003 +// ZeroC, Inc. +// Billerica, MA, USA +// +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. +// +// ********************************************************************** + +#ifndef FREEZE_DB_ENV_MAP_H +#define FREEZE_DB_ENV_MAP_H + +#include <Ice/Config.h> +#include <Ice/Ice.h> +#include <IceUtil/Handle.h> +#include <db_cxx.h> + +namespace Freeze +{ + +class CheckpointThread; +typedef IceUtil::Handle<CheckpointThread> CheckpointThreadPtr; + +class SharedDbEnv; +typedef IceUtil::Handle<SharedDbEnv> SharedDbEnvPtr; + + +class SharedDbEnv : public ::DbEnv +{ +public: + + static SharedDbEnvPtr get(const Ice::CommunicatorPtr&, const std::string&); + + ~SharedDbEnv(); + + void __incRef(); + void __decRef(); + + void deleteOldLogs(); + void moveOldLogs(); + + const std::string& getEnvName() const; + const Ice::CommunicatorPtr& getCommunicator() const; + +private: + SharedDbEnv(const std::string&, const Ice::CommunicatorPtr&); + + const std::string _envName; + const Ice::CommunicatorPtr _communicator; + int _refCount; + Ice::Int _trace; + CheckpointThreadPtr _thread; + IceUtil::Mutex _oldLogsMutex; +}; + +inline const std::string& +SharedDbEnv::getEnvName() const +{ + return _envName; +} + +inline const Ice::CommunicatorPtr& +SharedDbEnv::getCommunicator() const +{ + return _communicator; +} + +} +#endif diff --git a/cpp/src/Freeze/StrategyI.cpp b/cpp/src/Freeze/StrategyI.cpp deleted file mode 100644 index edf5ec1f9eb..00000000000 --- a/cpp/src/Freeze/StrategyI.cpp +++ /dev/null @@ -1,201 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003 -// ZeroC, Inc. -// Billerica, MA, USA -// -// All Rights Reserved. -// -// Ice is free software; you can redistribute it and/or modify it under -// the terms of the GNU General Public License version 2 as published by -// the Free Software Foundation. -// -// ********************************************************************** - -#include <Freeze/StrategyI.h> - -using namespace std; -using namespace Freeze; -using namespace Ice; - -LocalObjectPtr -Freeze::EvictionStrategyI::activatedObject(const Identity& ident, - const ObjectPtr& servant) -{ - CookiePtr cookie = new Cookie; - cookie->mutated = false; - return cookie; -} - -void -Freeze::EvictionStrategyI::destroyedObject(const Identity& ident, const LocalObjectPtr& cookie) -{ - // Nothing to do -} - -void -Freeze::EvictionStrategyI::evictedObject(const ObjectStorePtr& store, - const Identity& ident, - const ObjectPtr& servant, - const LocalObjectPtr& cookie) -{ - // - // Only store the object's persistent state if it has been mutated. - // - CookiePtr c = CookiePtr::dynamicCast(cookie); - assert(c); - - if(c->mutated) - { - store->save(ident, servant); - c->mutated = false; - } -} - - -void -Freeze::EvictionStrategyI::savedObject(const ObjectStorePtr& store, - const Identity& ident, - const ObjectPtr& servant, - const LocalObjectPtr& cookie, - Ice::Int usageCount) -{ - assert(usageCount > 0); - - if(usageCount == 1) - { - CookiePtr c = CookiePtr::dynamicCast(cookie); - assert(c); - c->mutated = false; - } -} - - -void -Freeze::EvictionStrategyI::preOperation(const ObjectStorePtr& store, - const Identity& ident, - const ObjectPtr& servant, - bool mutating, - const LocalObjectPtr& cookie) -{ - if(mutating) - { - CookiePtr c = CookiePtr::dynamicCast(cookie); - assert(c); - c->mutated = true; - } -} - -void -Freeze::EvictionStrategyI::postOperation(const ObjectStorePtr& store, - const Identity& ident, - const ObjectPtr& servant, - bool mutating, - const LocalObjectPtr& cookie) -{ - // Nothing to do -} - -void -Freeze::EvictionStrategyI::destroy() -{ - // Nothing to do -} - -LocalObjectPtr -Freeze::IdleStrategyI::activatedObject(const Identity& ident, - const ObjectPtr& servant) -{ - CookiePtr cookie = new Cookie; - cookie->mutated = false; - cookie->mutatingCount = 0; - return cookie; -} - -void -Freeze::IdleStrategyI::destroyedObject(const Identity& ident, const LocalObjectPtr& cookie) -{ - // Nothing to do -} - -void -Freeze::IdleStrategyI::evictedObject(const ObjectStorePtr& store, - const Identity& ident, - const ObjectPtr& servant, - const LocalObjectPtr& cookie) -{ - // - // The object must reach the idle state in order for it to be - // evicted, therefore the object should have already been saved - // by invokedObject. - // - CookiePtr c = CookiePtr::dynamicCast(cookie); - assert(c); - assert(!c->mutated); -} - -void -Freeze::IdleStrategyI::savedObject(const ObjectStorePtr& store, - const Identity& ident, - const ObjectPtr& servant, - const LocalObjectPtr& cookie, - Ice::Int usageCount) -{ - assert(usageCount > 0); - - if(usageCount == 1) - { - CookiePtr c = CookiePtr::dynamicCast(cookie); - assert(c); - c->mutated = false; - } -} - - - -void -Freeze::IdleStrategyI::preOperation(const ObjectStorePtr& store, - const Identity& ident, - const ObjectPtr& servant, - bool mutating, - const LocalObjectPtr& cookie) -{ - CookiePtr c = CookiePtr::dynamicCast(cookie); - assert(c); - if(mutating) - { - ++c->mutatingCount; - c->mutated = true; - } -} - -void -Freeze::IdleStrategyI::postOperation(const ObjectStorePtr& store, - const Identity& ident, - const ObjectPtr& servant, - bool mutating, - const LocalObjectPtr& cookie) -{ - CookiePtr c = CookiePtr::dynamicCast(cookie); - assert(c); - if(mutating) - { - assert(c->mutatingCount >= 1); - --c->mutatingCount; - } - if(c->mutatingCount == 0 && c->mutated) - { - // - // Only store the object's persistent state if the object is idle - // and it has been mutated. - // - store->save(ident, servant); - c->mutated = false; - } -} - -void -Freeze::IdleStrategyI::destroy() -{ - // Nothing to do -} diff --git a/cpp/src/Freeze/StrategyI.h b/cpp/src/Freeze/StrategyI.h deleted file mode 100644 index 6ea188821d7..00000000000 --- a/cpp/src/Freeze/StrategyI.h +++ /dev/null @@ -1,117 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003 -// ZeroC, Inc. -// Billerica, MA, USA -// -// All Rights Reserved. -// -// Ice is free software; you can redistribute it and/or modify it under -// the terms of the GNU General Public License version 2 as published by -// the Free Software Foundation. -// -// ********************************************************************** - -#ifndef FREEZE_STRATEGY_I_H -#define FREEZE_STRATEGY_I_H - -#include <Ice/Ice.h> -#include <IceUtil/Thread.h> -#include <IceUtil/Monitor.h> -#include <Freeze/Strategy.h> - -#include <list> - -namespace Freeze -{ - -class EvictionStrategyI : virtual public EvictionStrategy -{ -public: - - virtual Ice::LocalObjectPtr activatedObject(const Ice::Identity&, - const Ice::ObjectPtr&); - - virtual void destroyedObject(const Ice::Identity&, const Ice::LocalObjectPtr&); - - virtual void evictedObject(const ObjectStorePtr&, - const Ice::Identity&, - const Ice::ObjectPtr&, - const Ice::LocalObjectPtr&); - - virtual void savedObject(const ObjectStorePtr&, - const Ice::Identity&, - const Ice::ObjectPtr&, - const Ice::LocalObjectPtr&, - Ice::Int); - - virtual void preOperation(const ObjectStorePtr&, - const Ice::Identity&, - const Ice::ObjectPtr&, - bool, - const Ice::LocalObjectPtr&); - - virtual void postOperation(const ObjectStorePtr&, - const Ice::Identity&, - const Ice::ObjectPtr&, - bool, - const Ice::LocalObjectPtr&); - - virtual void destroy(); - -private: - - struct Cookie : public Ice::LocalObject - { - bool mutated; - }; - typedef IceUtil::Handle<Cookie> CookiePtr; -}; - -class IdleStrategyI : virtual public IdleStrategy -{ -public: - - virtual Ice::LocalObjectPtr activatedObject(const Ice::Identity&, - const Ice::ObjectPtr&); - - virtual void destroyedObject(const Ice::Identity&, const Ice::LocalObjectPtr&); - - virtual void evictedObject(const ObjectStorePtr&, - const Ice::Identity&, - const Ice::ObjectPtr&, - const Ice::LocalObjectPtr&); - - virtual void savedObject(const ObjectStorePtr&, - const Ice::Identity&, - const Ice::ObjectPtr&, - const Ice::LocalObjectPtr&, - Ice::Int); - - virtual void preOperation(const ObjectStorePtr&, - const Ice::Identity&, - const Ice::ObjectPtr&, - bool, - const Ice::LocalObjectPtr&); - - virtual void postOperation(const ObjectStorePtr&, - const Ice::Identity&, - const Ice::ObjectPtr&, - bool, - const Ice::LocalObjectPtr&); - - virtual void destroy(); - -private: - - struct Cookie : public Ice::LocalObject - { - bool mutated; - Ice::Int mutatingCount; - }; - typedef IceUtil::Handle<Cookie> CookiePtr; -}; - -} - -#endif diff --git a/cpp/src/Freeze/freeze.dsp b/cpp/src/Freeze/freeze.dsp index 5a673d21027..f4869c764ac 100644 --- a/cpp/src/Freeze/freeze.dsp +++ b/cpp/src/Freeze/freeze.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/freeze11.dll" /implib:"Release/freeze.lib" /libpath:"../../../lib"
+# ADD LINK32 libdb41.lib /nologo /dll /machine:I386 /out:"Release/freeze11.dll" /implib:"Release/freeze.lib" /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
# Begin Special Build Tool
OutDir=.\Release
@@ -87,7 +87,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/freeze11d.dll" /implib:"Debug/freezed.lib" /libpath:"../../../lib"
+# ADD LINK32 libdb41d.lib /nologo /dll /debug /machine:I386 /out:"Debug/freeze11d.dll" /implib:"Debug/freezed.lib" /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none /nodefaultlib
# Begin Special Build Tool
OutDir=.\Debug
@@ -106,10 +106,6 @@ PostBuild_Cmds=copy $(OutDir)\freezed.lib ..\..\lib copy $(OutDir)\freeze11d.pdb # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=.\Application.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\DB.cpp
# End Source File
# Begin Source File
@@ -118,10 +114,6 @@ SOURCE=.\DBException.cpp # End Source File
# Begin Source File
-SOURCE=.\DBI.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\Evictor.cpp
# End Source File
# Begin Source File
@@ -134,15 +126,15 @@ SOURCE=.\IdentityObjectRecordDict.cpp # End Source File
# Begin Source File
-SOURCE=.\ObjectRecord.cpp
+SOURCE=.\MapI.cpp
# End Source File
# Begin Source File
-SOURCE=.\Strategy.cpp
+SOURCE=.\ObjectRecord.cpp
# End Source File
# Begin Source File
-SOURCE=.\StrategyI.cpp
+SOURCE=.\SharedDbEnv.cpp
# End Source File
# End Group
# Begin Group "Header Files"
@@ -304,39 +296,6 @@ BuildCmds= \ # End Source File
# Begin Source File
-SOURCE=..\..\slice\Freeze\DBF.ice
-
-!IF "$(CFG)" == "Freeze - Win32 Release"
-
-USERDEP__DBF_I="..\..\bin\slice2cpp.exe"
-# Begin Custom Build
-InputPath=..\..\slice\Freeze\DBF.ice
-
-"..\..\include\Freeze\DBF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- ..\..\bin\slice2cpp.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice ../../slice/Freeze/DBF.ice
- move DBF.h ..\..\include\Freeze
- del DBF.cpp
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "Freeze - Win32 Debug"
-
-USERDEP__DBF_I="..\..\bin\slice2cpp.exe"
-# Begin Custom Build
-InputPath=..\..\slice\Freeze\DBF.ice
-
-"..\..\include\Freeze\DBF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- ..\..\bin\slice2cpp.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice ../../slice/Freeze/DBF.ice
- move DBF.h ..\..\include\Freeze
- del DBF.cpp
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=..\..\slice\Freeze\Evictor.ice
!IF "$(CFG)" == "Freeze - Win32 Release"
@@ -493,82 +452,6 @@ BuildCmds= \ !ENDIF
# End Source File
-# Begin Source File
-
-SOURCE=..\..\slice\Freeze\Strategy.ice
-
-!IF "$(CFG)" == "Freeze - Win32 Release"
-
-USERDEP__STRAT="..\..\bin\slice2cpp.exe"
-# Begin Custom Build
-InputPath=..\..\slice\Freeze\Strategy.ice
-
-BuildCmds= \
- ..\..\bin\slice2cpp.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice ../../slice/Freeze/Strategy.ice \
- move Strategy.h ..\..\include\Freeze \
-
-
-"..\..\include\Freeze\Strategy.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"Strategy.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "Freeze - Win32 Debug"
-
-USERDEP__STRAT="..\..\bin\slice2cpp.exe"
-# Begin Custom Build
-InputPath=..\..\slice\Freeze\Strategy.ice
-
-BuildCmds= \
- ..\..\bin\slice2cpp.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice ../../slice/Freeze/Strategy.ice \
- move Strategy.h ..\..\include\Freeze \
-
-
-"..\..\include\Freeze\Strategy.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"Strategy.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\slice\Freeze\StrategyF.ice
-
-!IF "$(CFG)" == "Freeze - Win32 Release"
-
-USERDEP__STRATE="..\..\bin\slice2cpp.exe"
-# Begin Custom Build
-InputPath=..\..\slice\Freeze\StrategyF.ice
-
-"..\..\include\Freeze\StrategyF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- ..\..\bin\slice2cpp.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice ../../slice/Freeze/StrategyF.ice
- move StrategyF.h ..\..\include\Freeze
- del StrategyF.cpp
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "Freeze - Win32 Debug"
-
-USERDEP__STRATE="..\..\bin\slice2cpp.exe"
-# Begin Custom Build
-InputPath=..\..\slice\Freeze\StrategyF.ice
-
-"..\..\include\Freeze\StrategyF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- ..\..\bin\slice2cpp.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice ../../slice/Freeze/StrategyF.ice
- move StrategyF.h ..\..\include\Freeze
- del StrategyF.cpp
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
# End Group
# End Target
# End Project
diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp index db1d692c562..f006eea79fe 100644 --- a/cpp/src/Ice/PropertiesI.cpp +++ b/cpp/src/Ice/PropertiesI.cpp @@ -266,7 +266,8 @@ static const string glacierProps[] = static const string freezeProps[] = { "Trace.DB", - "Trace.Evictor" + "Trace.Evictor", + "Evictor.*" }; struct PropertyValues diff --git a/cpp/src/IceBox/.depend b/cpp/src/IceBox/.depend index fa194a743fd..a7817eee512 100644 --- a/cpp/src/IceBox/.depend +++ b/cpp/src/IceBox/.depend @@ -1,6 +1,6 @@ -IceBox.o: IceBox.cpp ../../include/IceBox/IceBox.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/Ice/LocalException.h ../../include/Ice/ObjectFactory.h ../../include/Ice/Stream.h -Exception.o: Exception.cpp ../../include/IceBox/IceBox.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h -ServiceManagerI.o: ServiceManagerI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Ice/DynamicLibrary.h ../../include/Ice/DynamicLibraryF.h ../IceBox/ServiceManagerI.h ../../include/IceBox/IceBox.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../Freeze/DBI.h ../../include/IceUtil/IceUtil.h ../../include/IceUtil/Functional.h ../../include/IceUtil/Unicode.h ../../include/IceUtil/UUID.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/RWRecMutex.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Base64.h ../../include/IceUtil/InputUtil.h ../../include/IceUtil/OutputUtil.h ../../include/Freeze/Initialize.h -Server.o: Server.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IceBox/ServiceManagerI.h ../../include/IceBox/IceBox.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/Ice/DynamicLibraryF.h ../Freeze/DBI.h ../../include/IceUtil/IceUtil.h ../../include/IceUtil/Functional.h ../../include/IceUtil/Unicode.h ../../include/IceUtil/UUID.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/RWRecMutex.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Base64.h ../../include/IceUtil/InputUtil.h ../../include/IceUtil/OutputUtil.h -Admin.o: Admin.cpp ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/IceBox/IceBox.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h -IceBox.cpp: ../../slice/IceBox/IceBox.ice ../../slice/Ice/BuiltinSequences.ice ../../slice/Ice/CommunicatorF.ice ../../slice/Ice/PropertiesF.ice ../../slice/Freeze/DB.ice ../../slice/Freeze/DBException.ice ../../slice/Freeze/DBF.ice ../../slice/Freeze/EvictorF.ice ../../slice/Freeze/StrategyF.ice +IceBox.o: IceBox.cpp ../../include/IceBox/IceBox.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalException.h ../../include/Ice/ObjectFactory.h ../../include/Ice/Stream.h +Exception.o: Exception.cpp ../../include/IceBox/IceBox.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h +ServiceManagerI.o: ServiceManagerI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Ice/DynamicLibrary.h ../../include/Ice/DynamicLibraryF.h ../IceBox/ServiceManagerI.h ../../include/IceBox/IceBox.h ../../include/Freeze/DBException.h +Server.o: Server.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IceBox/ServiceManagerI.h ../../include/IceBox/IceBox.h ../../include/Ice/DynamicLibraryF.h +Admin.o: Admin.cpp ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/IceBox/IceBox.h +IceBox.cpp: ../../slice/IceBox/IceBox.ice ../../slice/Ice/BuiltinSequences.ice ../../slice/Ice/CommunicatorF.ice ../../slice/Ice/PropertiesF.ice diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp index b4f5e305598..f4e8d5f5c17 100644 --- a/cpp/src/IceBox/ServiceManagerI.cpp +++ b/cpp/src/IceBox/ServiceManagerI.cpp @@ -15,7 +15,7 @@ #include <Ice/Ice.h> #include <Ice/DynamicLibrary.h> #include <IceBox/ServiceManagerI.h> -#include <Freeze/Initialize.h> +#include <Freeze/DBException.h> using namespace Ice; using namespace IceBox; @@ -311,9 +311,9 @@ IceBox::ServiceManagerI::start(const string& service, const string& entryPoint, // FreezeServicePtr fs = FreezeServicePtr::dynamicCast(info.service); - info.dbEnv = ::Freeze::initialize(communicator, properties->getProperty("IceBox.DBEnvName." + service)); + info.envName = properties->getProperty("IceBox.DBEnvName." + service); - fs->start(service, communicator, serviceArgs, info.dbEnv); + fs->start(service, communicator, serviceArgs, info.envName); } info.library = library; @@ -372,20 +372,6 @@ IceBox::ServiceManagerI::stopAll() Warning out(_logger); out << "ServiceManager: unknown exception in stop for service " << p->first; } - - if(info.dbEnv) - { - try - { - info.dbEnv->sync(); - } - catch(const Ice::Exception& ex) - { - Warning out(_logger); - out << "ServiceManager: exception in stop for service " << p->first << ":\n"; - out << ex; - } - } } for(p = _services.begin(); p != _services.end(); ++p) @@ -407,21 +393,6 @@ IceBox::ServiceManagerI::stopAll() } } - if(info.dbEnv) - { - try - { - info.dbEnv->close(); - info.dbEnv = 0; - } - catch(const Ice::Exception& ex) - { - Warning out(_logger); - out << "ServiceManager: exception in stop for service " << p->first << ":\n"; - out << ex; - } - } - // // Release the service, the service communicator and then the library. The order is important, // the service must be released before destroying the communicator so that the communicator diff --git a/cpp/src/IceBox/ServiceManagerI.h b/cpp/src/IceBox/ServiceManagerI.h index 7558d7df954..791ca9fd985 100644 --- a/cpp/src/IceBox/ServiceManagerI.h +++ b/cpp/src/IceBox/ServiceManagerI.h @@ -20,7 +20,6 @@ #include <Ice/CommunicatorF.h> #include <Ice/DynamicLibraryF.h> #include <Ice/Application.h> -#include <Freeze/DBI.h> #include <map> namespace IceBox @@ -42,7 +41,7 @@ public: ServiceBasePtr service; ::IceInternal::DynamicLibraryPtr library; ::Ice::CommunicatorPtr communicator; - ::Freeze::DBEnvironmentPtr dbEnv; + ::std::string envName; }; private: diff --git a/cpp/src/IcePack/.depend b/cpp/src/IcePack/.depend index 57e4e848821..766d6a62b5c 100644 --- a/cpp/src/IcePack/.depend +++ b/cpp/src/IcePack/.depend @@ -1,43 +1,43 @@ -Admin.o: Admin.cpp ../../include/IcePack/Admin.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../../include/Ice/BuiltinSequences.h ../../include/IceBox/IceBox.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IcePack/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/Stream.h +Admin.o: Admin.cpp ../../include/IcePack/Admin.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../../include/Ice/BuiltinSequences.h ../../include/IceBox/IceBox.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/IcePack/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/Stream.h Query.o: Query.cpp ../../include/IcePack/Query.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../../include/Ice/BuiltinSequences.h ../../include/IcePack/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/Stream.h Exception.o: Exception.cpp ../../include/IcePack/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../../include/Ice/LocalException.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Stream.h -Grammar.o: Grammar.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/Parser.h ../../include/IcePack/Admin.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IceBox/IceBox.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IcePack/Exception.h ../../include/IcePack/Query.h -Scanner.o: Scanner.cpp ../../include/IceUtil/Config.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/Parser.h ../../include/IcePack/Admin.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IceBox/IceBox.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IcePack/Exception.h ../../include/IcePack/Query.h ../IcePack/Grammar.h -Parser.o: Parser.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/Parser.h ../../include/IcePack/Admin.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IceBox/IceBox.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IcePack/Exception.h ../../include/IcePack/Query.h -Client.o: Client.cpp ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../IcePack/Parser.h ../../include/IcePack/Admin.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IceBox/IceBox.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IcePack/Exception.h ../../include/IcePack/Query.h -Internal.o: Internal.cpp ../IcePack/Internal.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../../include/Ice/BuiltinSequences.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IcePack/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/Stream.h +Grammar.o: Grammar.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/Parser.h ../../include/IcePack/Admin.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../../include/IcePack/Query.h +Scanner.o: Scanner.cpp ../../include/IceUtil/Config.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/Parser.h ../../include/IcePack/Admin.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../../include/IcePack/Query.h ../IcePack/Grammar.h +Parser.o: Parser.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/Parser.h ../../include/IcePack/Admin.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../../include/IcePack/Query.h +Client.o: Client.cpp ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../IcePack/Parser.h ../../include/IcePack/Admin.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../../include/IcePack/Query.h +Internal.o: Internal.cpp ../IcePack/Internal.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../../include/Ice/BuiltinSequences.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/IcePack/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/Stream.h TraceLevels.o: TraceLevels.cpp ../../include/Ice/Properties.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h ../IcePack/TraceLevels.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h -ComponentBuilder.o: ComponentBuilder.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/ComponentBuilder.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IcePack/Exception.h ../../include/Ice/Xerces.h -NodeInfo.o: NodeInfo.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/NodeInfo.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IcePack/Exception.h ../IcePack/ServerFactory.h ../IcePack/Activator.h ../IcePack/WaitQueue.h ../../include/IceUtil/Thread.h ../IcePack/TraceLevels.h -NodeI.o: NodeI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/NodeI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IcePack/Exception.h ../IcePack/Activator.h -ServiceBuilder.o: ServiceBuilder.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/ServiceBuilder.h ../IcePack/ComponentBuilder.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IcePack/Exception.h ../../include/Ice/Xerces.h ../IcePack/NodeInfo.h ../IcePack/ServerBuilder.h -ServerBuilder.o: ServerBuilder.cpp ../../include/IceUtil/UUID.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/ServerBuilder.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IcePack/Exception.h ../IcePack/NodeInfo.h ../IcePack/ComponentBuilder.h ../../include/Ice/Xerces.h ../IcePack/ServiceBuilder.h ../IcePack/AdapterFactory.h ../IcePack/ServerFactory.h ../IcePack/Activator.h ../IcePack/WaitQueue.h ../../include/IceUtil/Thread.h -ServerI.o: ServerI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/ServerI.h ../../include/Freeze/EvictorF.h ../IcePack/Activator.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../IcePack/Internal.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/StrategyF.h ../../include/IcePack/Exception.h ../IcePack/ServerFactory.h ../IcePack/WaitQueue.h ../../include/IceUtil/Thread.h ../IcePack/TraceLevels.h -ServerAdapterI.o: ServerAdapterI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/ServerAdapterI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IcePack/Exception.h ../IcePack/ServerFactory.h ../IcePack/Activator.h ../IcePack/WaitQueue.h ../../include/IceUtil/Thread.h ../IcePack/TraceLevels.h -ServerFactory.o: ServerFactory.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/IceUtil/UUID.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/Freeze/Evictor.h ../../include/Freeze/ObjectRecord.h ../../include/Freeze/Strategy.h ../IcePack/ServerFactory.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/Activator.h ../IcePack/WaitQueue.h ../../include/IceUtil/Thread.h ../IcePack/ServerI.h ../IcePack/ServerAdapterI.h ../IcePack/TraceLevels.h -ServerDeployerI.o: ServerDeployerI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/ServerDeployerI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IcePack/Exception.h ../IcePack/NodeInfo.h ../IcePack/ServerFactory.h ../IcePack/Activator.h ../IcePack/WaitQueue.h ../../include/IceUtil/Thread.h ../IcePack/ServerBuilder.h ../IcePack/ComponentBuilder.h ../../include/Ice/Xerces.h ../IcePack/TraceLevels.h -Activator.o: Activator.cpp ../IcePack/Activator.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../IcePack/Internal.h ../../include/Ice/BuiltinSequences.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IcePack/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/Stream.h -ActivatorI.o: ActivatorI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/ActivatorI.h ../../include/IceUtil/Thread.h ../IcePack/Activator.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../IcePack/Internal.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IcePack/Exception.h ../IcePack/TraceLevels.h +ComponentBuilder.o: ComponentBuilder.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/ComponentBuilder.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../../include/Ice/Xerces.h +NodeInfo.o: NodeInfo.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/NodeInfo.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/ServerFactory.h ../IcePack/Activator.h ../IcePack/WaitQueue.h ../../include/IceUtil/Thread.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/ObjectRecord.h ../IcePack/TraceLevels.h +NodeI.o: NodeI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/NodeI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/Activator.h +ServiceBuilder.o: ServiceBuilder.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/ServiceBuilder.h ../IcePack/ComponentBuilder.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../../include/Ice/Xerces.h ../IcePack/NodeInfo.h ../IcePack/ServerBuilder.h +ServerBuilder.o: ServerBuilder.cpp ../../include/IceUtil/UUID.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/ServerBuilder.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/NodeInfo.h ../IcePack/ComponentBuilder.h ../../include/Ice/Xerces.h ../IcePack/ServiceBuilder.h ../IcePack/AdapterFactory.h ../../include/Freeze/EvictorF.h ../IcePack/ServerFactory.h ../IcePack/Activator.h ../IcePack/WaitQueue.h ../../include/IceUtil/Thread.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/ObjectRecord.h +ServerI.o: ServerI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/ServerI.h ../../include/Freeze/EvictorF.h ../IcePack/Activator.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../IcePack/Internal.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../../include/IceUtil/AbstractMutex.h ../IcePack/ServerFactory.h ../IcePack/WaitQueue.h ../../include/IceUtil/Thread.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/ObjectRecord.h ../IcePack/TraceLevels.h +ServerAdapterI.o: ServerAdapterI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/ServerAdapterI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../../include/IceUtil/AbstractMutex.h ../IcePack/ServerFactory.h ../IcePack/Activator.h ../IcePack/WaitQueue.h ../../include/IceUtil/Thread.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/ObjectRecord.h ../IcePack/TraceLevels.h +ServerFactory.o: ServerFactory.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/IceUtil/UUID.h ../../include/Freeze/DB.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/ObjectRecord.h ../../include/Freeze/Initialize.h ../../include/Freeze/EvictorF.h ../IcePack/ServerFactory.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/Activator.h ../IcePack/WaitQueue.h ../../include/IceUtil/Thread.h ../IcePack/ServerI.h ../../include/IceUtil/AbstractMutex.h ../IcePack/ServerAdapterI.h ../IcePack/TraceLevels.h +ServerDeployerI.o: ServerDeployerI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/ServerDeployerI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/NodeInfo.h ../IcePack/ServerFactory.h ../IcePack/Activator.h ../IcePack/WaitQueue.h ../../include/IceUtil/Thread.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/ObjectRecord.h ../IcePack/ServerBuilder.h ../IcePack/ComponentBuilder.h ../../include/Ice/Xerces.h ../IcePack/TraceLevels.h +Activator.o: Activator.cpp ../IcePack/Activator.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../IcePack/Internal.h ../../include/Ice/BuiltinSequences.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/IcePack/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/Stream.h +ActivatorI.o: ActivatorI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/ActivatorI.h ../../include/IceUtil/Thread.h ../IcePack/Activator.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../IcePack/Internal.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/TraceLevels.h WaitQueue.o: WaitQueue.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/WaitQueue.h ../../include/IceUtil/Thread.h -Registry.o: Registry.cpp ../../include/IceUtil/UUID.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/Freeze.h ../../include/Freeze/Initialize.h ../../include/Freeze/DBF.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/Freeze/Evictor.h ../../include/Freeze/ObjectRecord.h ../../include/Freeze/Strategy.h ../../include/Freeze/Map.h ../IcePack/Registry.h ../IcePack/AdapterI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/AdapterFactory.h ../IcePack/ServerRegistryI.h ../IcePack/StringObjectProxyDict.h ../IcePack/AdapterRegistryI.h ../IcePack/ObjectRegistryI.h ../IcePack/IdentityObjectDescDict.h ../IcePack/StringObjectProxySeqDict.h ../IcePack/NodeRegistryI.h ../IcePack/LocatorI.h ../../include/Ice/Locator.h ../IcePack/LocatorRegistryI.h ../IcePack/AdminI.h ../IcePack/QueryI.h ../../include/IcePack/Query.h ../IcePack/TraceLevels.h -ObjectRegistryI.o: ObjectRegistryI.cpp ../IcePack/ObjectRegistryI.h ../IcePack/Internal.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../../include/Ice/BuiltinSequences.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IcePack/Exception.h ../IcePack/IdentityObjectDescDict.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/Application.h ../IcePack/StringObjectProxySeqDict.h ../IcePack/TraceLevels.h -AdapterRegistryI.o: AdapterRegistryI.cpp ../IcePack/AdapterRegistryI.h ../IcePack/Internal.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../../include/Ice/BuiltinSequences.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IcePack/Exception.h ../IcePack/StringObjectProxyDict.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/Application.h ../IcePack/TraceLevels.h -ServerRegistryI.o: ServerRegistryI.cpp ../IcePack/ServerRegistryI.h ../IcePack/Internal.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../../include/Ice/BuiltinSequences.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IcePack/Exception.h ../IcePack/StringObjectProxyDict.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/Application.h ../IcePack/TraceLevels.h -NodeRegistryI.o: NodeRegistryI.cpp ../IcePack/NodeRegistryI.h ../IcePack/Internal.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../../include/Ice/BuiltinSequences.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IcePack/Exception.h ../IcePack/StringObjectProxyDict.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/Application.h ../IcePack/AdapterFactory.h ../IcePack/TraceLevels.h -StringObjectProxyDict.o: StringObjectProxyDict.cpp ../../include/IceXML/StreamI.h ../../include/Ice/Stream.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CommunicatorF.h ../../include/IceUtil/OutputUtil.h ../IcePack/StringObjectProxyDict.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h -StringObjectProxySeqDict.o: StringObjectProxySeqDict.cpp ../../include/IceXML/StreamI.h ../../include/Ice/Stream.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CommunicatorF.h ../../include/IceUtil/OutputUtil.h ../IcePack/StringObjectProxySeqDict.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h -IdentityObjectDescDict.o: IdentityObjectDescDict.cpp ../../include/IceXML/StreamI.h ../../include/Ice/Stream.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CommunicatorF.h ../../include/IceUtil/OutputUtil.h ../IcePack/IdentityObjectDescDict.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h -LocatorI.o: LocatorI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/LocatorI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IcePack/Exception.h ../../include/Ice/Locator.h -LocatorRegistryI.o: LocatorRegistryI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/LocatorRegistryI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IcePack/Exception.h ../../include/Ice/Locator.h ../IcePack/AdapterI.h -ApplicationBuilder.o: ApplicationBuilder.cpp ../IcePack/ApplicationBuilder.h ../IcePack/ComponentBuilder.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../IcePack/Internal.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../../include/Ice/BuiltinSequences.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IcePack/Exception.h ../../include/Ice/Xerces.h -AdapterFactory.o: AdapterFactory.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/IceUtil/UUID.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/Freeze/Evictor.h ../../include/Freeze/ObjectRecord.h ../../include/Freeze/Strategy.h ../IcePack/AdapterFactory.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/AdapterI.h ../IcePack/TraceLevels.h -AdapterI.o: AdapterI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/AdapterI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IcePack/Exception.h ../IcePack/AdapterFactory.h ../IcePack/TraceLevels.h -AdminI.o: AdminI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/AdminI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IcePack/Exception.h ../IcePack/ApplicationBuilder.h ../IcePack/ComponentBuilder.h ../../include/Ice/Xerces.h -QueryI.o: QueryI.cpp ../IcePack/Internal.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../../include/Ice/BuiltinSequences.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IcePack/Exception.h ../IcePack/QueryI.h ../../include/IcePack/Query.h -IcePackNode.o: IcePackNode.cpp ../../include/IceUtil/UUID.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/IceUtil/CtrlCHandler.h ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Freeze/Freeze.h ../../include/Freeze/Initialize.h ../../include/Freeze/DBF.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/Freeze/Evictor.h ../../include/Freeze/ObjectRecord.h ../../include/Freeze/Strategy.h ../../include/Freeze/Map.h ../IcePack/ActivatorI.h ../../include/IceUtil/Thread.h ../IcePack/Activator.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../IcePack/Internal.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/ServerFactory.h ../IcePack/WaitQueue.h ../IcePack/AdapterFactory.h ../IcePack/ServerDeployerI.h ../IcePack/NodeInfo.h ../IcePack/AdapterI.h ../IcePack/NodeI.h ../IcePack/TraceLevels.h ../IcePack/Registry.h ../../include/Ice/Xerces.h -IcePackRegistry.o: IcePackRegistry.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/Freeze.h ../../include/Freeze/Initialize.h ../../include/Freeze/DBF.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/Freeze/Evictor.h ../../include/Freeze/ObjectRecord.h ../../include/Freeze/Strategy.h ../../include/Freeze/Map.h ../IcePack/Registry.h ../../include/Ice/Xerces.h -Admin.cpp: ../../slice/IcePack/Admin.ice ../../slice/Ice/Identity.ice ../../slice/Ice/BuiltinSequences.ice ../../slice/IceBox/IceBox.ice ../../slice/Ice/CommunicatorF.ice ../../slice/Ice/PropertiesF.ice ../../slice/Freeze/DB.ice ../../slice/Freeze/DBException.ice ../../slice/Freeze/DBF.ice ../../slice/Freeze/EvictorF.ice ../../slice/Freeze/StrategyF.ice ../../slice/IcePack/Exception.ice +Registry.o: Registry.cpp ../../include/IceUtil/UUID.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/Freeze.h ../../include/Freeze/Initialize.h ../../include/Freeze/EvictorF.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/ObjectRecord.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../IcePack/Registry.h ../IcePack/AdapterI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../../include/IceUtil/AbstractMutex.h ../IcePack/AdapterFactory.h ../IcePack/ServerRegistryI.h ../IcePack/StringObjectProxyDict.h ../IcePack/AdapterRegistryI.h ../IcePack/ObjectRegistryI.h ../IcePack/IdentityObjectDescDict.h ../IcePack/StringObjectProxySeqDict.h ../IcePack/NodeRegistryI.h ../IcePack/LocatorI.h ../../include/Ice/Locator.h ../IcePack/LocatorRegistryI.h ../IcePack/AdminI.h ../IcePack/QueryI.h ../../include/IcePack/Query.h ../IcePack/TraceLevels.h +ObjectRegistryI.o: ObjectRegistryI.cpp ../IcePack/ObjectRegistryI.h ../IcePack/Internal.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../../include/Ice/BuiltinSequences.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/IcePack/Exception.h ../IcePack/IdentityObjectDescDict.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/Application.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../IcePack/StringObjectProxySeqDict.h ../IcePack/TraceLevels.h +AdapterRegistryI.o: AdapterRegistryI.cpp ../IcePack/AdapterRegistryI.h ../IcePack/Internal.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../../include/Ice/BuiltinSequences.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/IcePack/Exception.h ../IcePack/StringObjectProxyDict.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/Application.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../IcePack/TraceLevels.h +ServerRegistryI.o: ServerRegistryI.cpp ../IcePack/ServerRegistryI.h ../IcePack/Internal.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../../include/Ice/BuiltinSequences.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/IcePack/Exception.h ../IcePack/StringObjectProxyDict.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/Application.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../IcePack/TraceLevels.h +NodeRegistryI.o: NodeRegistryI.cpp ../IcePack/NodeRegistryI.h ../IcePack/Internal.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../../include/Ice/BuiltinSequences.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/IcePack/Exception.h ../IcePack/StringObjectProxyDict.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/Application.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../IcePack/AdapterFactory.h ../../include/Freeze/EvictorF.h ../IcePack/TraceLevels.h +StringObjectProxyDict.o: StringObjectProxyDict.cpp ../../include/IceXML/StreamI.h ../../include/Ice/Stream.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CommunicatorF.h ../../include/IceUtil/OutputUtil.h ../IcePack/StringObjectProxyDict.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h +StringObjectProxySeqDict.o: StringObjectProxySeqDict.cpp ../../include/IceXML/StreamI.h ../../include/Ice/Stream.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CommunicatorF.h ../../include/IceUtil/OutputUtil.h ../IcePack/StringObjectProxySeqDict.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h +IdentityObjectDescDict.o: IdentityObjectDescDict.cpp ../../include/IceXML/StreamI.h ../../include/Ice/Stream.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CommunicatorF.h ../../include/IceUtil/OutputUtil.h ../IcePack/IdentityObjectDescDict.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h +LocatorI.o: LocatorI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/LocatorI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../../include/Ice/Locator.h +LocatorRegistryI.o: LocatorRegistryI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/LocatorRegistryI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../../include/Ice/Locator.h ../IcePack/AdapterI.h ../../include/IceUtil/AbstractMutex.h +ApplicationBuilder.o: ApplicationBuilder.cpp ../IcePack/ApplicationBuilder.h ../IcePack/ComponentBuilder.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../IcePack/Internal.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../../include/Ice/BuiltinSequences.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/IcePack/Exception.h ../../include/Ice/Xerces.h +AdapterFactory.o: AdapterFactory.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/IceUtil/UUID.h ../../include/Freeze/DB.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/ObjectRecord.h ../../include/Freeze/Initialize.h ../../include/Freeze/EvictorF.h ../IcePack/AdapterFactory.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/AdapterI.h ../../include/IceUtil/AbstractMutex.h ../IcePack/TraceLevels.h +AdapterI.o: AdapterI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/AdapterI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../../include/IceUtil/AbstractMutex.h ../IcePack/AdapterFactory.h ../../include/Freeze/EvictorF.h ../IcePack/TraceLevels.h +AdminI.o: AdminI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IcePack/AdminI.h ../IcePack/Internal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/ApplicationBuilder.h ../IcePack/ComponentBuilder.h ../../include/Ice/Xerces.h +QueryI.o: QueryI.cpp ../IcePack/Internal.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../../include/Ice/BuiltinSequences.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/IcePack/Exception.h ../IcePack/QueryI.h ../../include/IcePack/Query.h +IcePackNode.o: IcePackNode.cpp ../../include/IceUtil/UUID.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/IceUtil/CtrlCHandler.h ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Freeze/Freeze.h ../../include/Freeze/Initialize.h ../../include/Freeze/EvictorF.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/ObjectRecord.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../IcePack/ActivatorI.h ../../include/IceUtil/Thread.h ../IcePack/Activator.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../IcePack/Internal.h ../../include/IcePack/Admin.h ../../include/IceBox/IceBox.h ../../include/IcePack/Exception.h ../IcePack/ServerFactory.h ../IcePack/WaitQueue.h ../IcePack/AdapterFactory.h ../IcePack/ServerDeployerI.h ../IcePack/NodeInfo.h ../IcePack/AdapterI.h ../../include/IceUtil/AbstractMutex.h ../IcePack/NodeI.h ../IcePack/TraceLevels.h ../IcePack/Registry.h ../../include/Ice/Xerces.h +IcePackRegistry.o: IcePackRegistry.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/Freeze.h ../../include/Freeze/Initialize.h ../../include/Freeze/EvictorF.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/ObjectRecord.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../IcePack/Registry.h ../../include/Ice/Xerces.h +Admin.cpp: ../../slice/IcePack/Admin.ice ../../slice/Ice/Identity.ice ../../slice/Ice/BuiltinSequences.ice ../../slice/IceBox/IceBox.ice ../../slice/Ice/CommunicatorF.ice ../../slice/Ice/PropertiesF.ice ../../slice/IcePack/Exception.ice Exception.cpp: ../../slice/IcePack/Exception.ice Query.cpp: ../../slice/IcePack/Query.ice ../../slice/Ice/Identity.ice ../../slice/Ice/BuiltinSequences.ice ../../slice/IcePack/Exception.ice -Internal.cpp: Internal.ice ../../slice/Ice/Identity.ice ../../slice/Ice/BuiltinSequences.ice ../../slice/IcePack/Admin.ice ../../slice/IceBox/IceBox.ice ../../slice/Ice/CommunicatorF.ice ../../slice/Ice/PropertiesF.ice ../../slice/Freeze/DB.ice ../../slice/Freeze/DBException.ice ../../slice/Freeze/DBF.ice ../../slice/Freeze/EvictorF.ice ../../slice/Freeze/StrategyF.ice ../../slice/IcePack/Exception.ice -Activator.cpp: Activator.ice ../IcePack/Internal.ice ../../slice/Ice/Identity.ice ../../slice/Ice/BuiltinSequences.ice ../../slice/IcePack/Admin.ice ../../slice/IceBox/IceBox.ice ../../slice/Ice/CommunicatorF.ice ../../slice/Ice/PropertiesF.ice ../../slice/Freeze/DB.ice ../../slice/Freeze/DBException.ice ../../slice/Freeze/DBF.ice ../../slice/Freeze/EvictorF.ice ../../slice/Freeze/StrategyF.ice ../../slice/IcePack/Exception.ice +Internal.cpp: Internal.ice ../../slice/Ice/Identity.ice ../../slice/Ice/BuiltinSequences.ice ../../slice/IcePack/Admin.ice ../../slice/IceBox/IceBox.ice ../../slice/Ice/CommunicatorF.ice ../../slice/Ice/PropertiesF.ice ../../slice/IcePack/Exception.ice +Activator.cpp: Activator.ice ../IcePack/Internal.ice ../../slice/Ice/Identity.ice ../../slice/Ice/BuiltinSequences.ice ../../slice/IcePack/Admin.ice ../../slice/IceBox/IceBox.ice ../../slice/Ice/CommunicatorF.ice ../../slice/Ice/PropertiesF.ice ../../slice/IcePack/Exception.ice diff --git a/cpp/src/IcePack/AdapterFactory.cpp b/cpp/src/IcePack/AdapterFactory.cpp index fe57d70957b..e08fd404e0c 100644 --- a/cpp/src/IcePack/AdapterFactory.cpp +++ b/cpp/src/IcePack/AdapterFactory.cpp @@ -16,7 +16,7 @@ #include <IceUtil/UUID.h> #include <Freeze/DB.h> #include <Freeze/Evictor.h> -#include <Freeze/Strategy.h> +#include <Freeze/Initialize.h> #include <IcePack/AdapterFactory.h> #include <IcePack/AdapterI.h> #include <IcePack/TraceLevels.h> @@ -26,15 +26,14 @@ using namespace IcePack; IcePack::AdapterFactory::AdapterFactory(const Ice::ObjectAdapterPtr& adapter, const TraceLevelsPtr& traceLevels, - const Freeze::DBEnvironmentPtr& dbEnv) : + const string& envName) : _adapter(adapter), _traceLevels(traceLevels) { // // Create and install the freeze evictor for standalone adapter objects. // - Freeze::DBPtr dbAdapters = dbEnv->openDB("adapters", true); - _evictor = dbAdapters->createEvictor(dbAdapters->createEvictionStrategy()); + _evictor = Freeze::createEvictor(_adapter->getCommunicator(), envName, "adapter"); _evictor->setSize(1000); // diff --git a/cpp/src/IcePack/AdapterFactory.h b/cpp/src/IcePack/AdapterFactory.h index c614dbc0bce..74fd698a6a1 100644 --- a/cpp/src/IcePack/AdapterFactory.h +++ b/cpp/src/IcePack/AdapterFactory.h @@ -28,7 +28,7 @@ class AdapterFactory : public Ice::ObjectFactory { public: - AdapterFactory(const Ice::ObjectAdapterPtr&, const TraceLevelsPtr&, const Freeze::DBEnvironmentPtr&); + AdapterFactory(const Ice::ObjectAdapterPtr&, const TraceLevelsPtr&, const std::string&); // // Ice::ObjectFactory method implementation. diff --git a/cpp/src/IcePack/AdapterI.h b/cpp/src/IcePack/AdapterI.h index 3c20d2188b6..16926cfef81 100644 --- a/cpp/src/IcePack/AdapterI.h +++ b/cpp/src/IcePack/AdapterI.h @@ -17,6 +17,7 @@ #include <IceUtil/Mutex.h> #include <IcePack/Internal.h> +#include <IceUtil/AbstractMutex.h> namespace IcePack { @@ -24,7 +25,7 @@ namespace IcePack class AdapterFactory; typedef IceUtil::Handle<AdapterFactory> AdapterFactoryPtr; -class StandaloneAdapterI : public StandaloneAdapter, public IceUtil::Mutex +class StandaloneAdapterI : public StandaloneAdapter, public IceUtil::AbstractMutexI<IceUtil::Mutex> { public: diff --git a/cpp/src/IcePack/AdapterRegistryI.cpp b/cpp/src/IcePack/AdapterRegistryI.cpp index 9d5a5ee0c74..abd2b465bcf 100644 --- a/cpp/src/IcePack/AdapterRegistryI.cpp +++ b/cpp/src/IcePack/AdapterRegistryI.cpp @@ -18,8 +18,10 @@ using namespace std; using namespace IcePack; -IcePack::AdapterRegistryI::AdapterRegistryI(const Freeze::DBPtr& db, const TraceLevelsPtr& traceLevels) : - _dict(db), +IcePack::AdapterRegistryI::AdapterRegistryI(const Ice::CommunicatorPtr& communicator, + const string& envName, const string& dbName, + const TraceLevelsPtr& traceLevels) : + _dict(communicator, envName, dbName), _traceLevels(traceLevels) { } diff --git a/cpp/src/IcePack/AdapterRegistryI.h b/cpp/src/IcePack/AdapterRegistryI.h index e6316c16077..9378b691747 100644 --- a/cpp/src/IcePack/AdapterRegistryI.h +++ b/cpp/src/IcePack/AdapterRegistryI.h @@ -28,7 +28,7 @@ class AdapterRegistryI : public AdapterRegistry { public: - AdapterRegistryI(const Freeze::DBPtr&, const TraceLevelsPtr&); + AdapterRegistryI(const Ice::CommunicatorPtr&, const std::string&, const std::string&, const TraceLevelsPtr&); virtual void add(const std::string&, const AdapterPrx&, const ::Ice::Current&); virtual void remove(const std::string&, const ::Ice::Current&); diff --git a/cpp/src/IcePack/IcePackNode.cpp b/cpp/src/IcePack/IcePackNode.cpp index e32421a9530..248c7169baf 100644 --- a/cpp/src/IcePack/IcePackNode.cpp +++ b/cpp/src/IcePack/IcePackNode.cpp @@ -87,7 +87,7 @@ shutdownCallback(int) int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const Freeze::DBEnvironmentPtr& dbEnv) +run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const string& envName) { Ice::PropertiesPtr properties = communicator->getProperties(); @@ -184,7 +184,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const Free // installing the evictors and object factory necessary to persist // and create these objects. // - ServerFactoryPtr serverFactory = new ServerFactory(adapter, traceLevels, dbEnv, activator, waitQueue); + ServerFactoryPtr serverFactory = new ServerFactory(adapter, traceLevels, envName, activator, waitQueue); // // Create the node object and the node info. Because of circular @@ -343,7 +343,6 @@ main(int argc, char* argv[]) } Ice::CommunicatorPtr communicator; - Freeze::DBEnvironmentPtr dbEnv; int status; try @@ -437,7 +436,7 @@ main(int argc, char* argv[]) // Initialize the database environment (first setup the // directory structure if needed). // - string dbPath; + string envName; string dataPath = properties->getProperty("IcePack.Node.Data"); if(dataPath.empty()) { @@ -462,21 +461,20 @@ main(int argc, char* argv[]) dataPath += "/"; } - dbPath = dataPath + "db"; + envName = dataPath + "db"; string serversPath = dataPath + "servers"; - if(stat(dbPath.c_str(), &filestat) != 0) + if(stat(envName.c_str(), &filestat) != 0) { - mkdir(dbPath.c_str(), 0755); + mkdir(envName.c_str(), 0755); } if(stat(serversPath.c_str(), &filestat) != 0) { mkdir(serversPath.c_str(), 0755); } } - dbEnv = Freeze::initialize(communicator, dbPath); - status = run(argc, argv, communicator, dbEnv); + status = run(argc, argv, communicator, envName); } catch(const Ice::Exception& ex) { @@ -489,30 +487,6 @@ main(int argc, char* argv[]) status = EXIT_FAILURE; } - if(dbEnv) - { - try - { - dbEnv->close(); - } - catch(const Freeze::DBException& ex) - { - cerr << argv[0] << ": " << ex << ": " << ex.message << endl; - status = EXIT_FAILURE; - } - catch(const Ice::Exception& ex) - { - cerr << argv[0] << ": " << ex << endl; - status = EXIT_FAILURE; - } - catch(...) - { - cerr << argv[0] << ": unknown exception" << endl; - status = EXIT_FAILURE; - } - dbEnv = 0; - } - if(communicator) { try diff --git a/cpp/src/IcePack/NodeRegistryI.cpp b/cpp/src/IcePack/NodeRegistryI.cpp index a035d8167c4..bc4327f70b9 100644 --- a/cpp/src/IcePack/NodeRegistryI.cpp +++ b/cpp/src/IcePack/NodeRegistryI.cpp @@ -19,11 +19,13 @@ using namespace std; using namespace IcePack; -IcePack::NodeRegistryI::NodeRegistryI(const Freeze::DBPtr& db, +IcePack::NodeRegistryI::NodeRegistryI(const Ice::CommunicatorPtr& communicator, + const string& envName, + const string& dbName, const AdapterRegistryPtr& adapterRegistry, const AdapterFactoryPtr& adapterFactory, const TraceLevelsPtr& traceLevels) : - _dict(db), + _dict(communicator, envName, dbName), _adapterRegistry(adapterRegistry), _adapterFactory(adapterFactory), _traceLevels(traceLevels) @@ -96,7 +98,7 @@ IcePack::NodeRegistryI::add(const string& name, const NodePrx& node, const Ice:: // from the adapter registry to be able to run the node. // } - catch(AdapterNotExistException&) + catch(const AdapterNotExistException&) { // // Create and register the node adapter. diff --git a/cpp/src/IcePack/NodeRegistryI.h b/cpp/src/IcePack/NodeRegistryI.h index 76d12013373..3da69bb4ed9 100644 --- a/cpp/src/IcePack/NodeRegistryI.h +++ b/cpp/src/IcePack/NodeRegistryI.h @@ -31,7 +31,8 @@ class NodeRegistryI : public NodeRegistry, public IceUtil::Mutex { public: - NodeRegistryI(const Freeze::DBPtr&, const AdapterRegistryPtr&, const AdapterFactoryPtr&, const TraceLevelsPtr&); + NodeRegistryI(const Ice::CommunicatorPtr&, const std::string&, const std::string&, + const AdapterRegistryPtr&, const AdapterFactoryPtr&, const TraceLevelsPtr&); virtual void add(const std::string&, const NodePrx&, const ::Ice::Current&); virtual void remove(const std::string&, const ::Ice::Current& = Ice::Current()); diff --git a/cpp/src/IcePack/ObjectRegistryI.cpp b/cpp/src/IcePack/ObjectRegistryI.cpp index 897484c2d42..6f636313d3a 100644 --- a/cpp/src/IcePack/ObjectRegistryI.cpp +++ b/cpp/src/IcePack/ObjectRegistryI.cpp @@ -18,10 +18,13 @@ using namespace std; using namespace IcePack; -IcePack::ObjectRegistryI::ObjectRegistryI(const Freeze::DBPtr& objDb, const Freeze::DBPtr& typeDb, +IcePack::ObjectRegistryI::ObjectRegistryI(const Ice::CommunicatorPtr& communicator, + const string& envName, + const string& objectsDbName, + const string& typesDbName, const TraceLevelsPtr& traceLevels) : - _objects(objDb), - _types(typeDb), + _objects(communicator, envName, objectsDbName, true), + _types(communicator, envName, typesDbName, true), _traceLevels(traceLevels) { } diff --git a/cpp/src/IcePack/ObjectRegistryI.h b/cpp/src/IcePack/ObjectRegistryI.h index 8ea32cdd7b3..0553073e1a4 100644 --- a/cpp/src/IcePack/ObjectRegistryI.h +++ b/cpp/src/IcePack/ObjectRegistryI.h @@ -29,7 +29,11 @@ class ObjectRegistryI : public ObjectRegistry, public IceUtil::Mutex { public: - ObjectRegistryI(const Freeze::DBPtr&, const Freeze::DBPtr&, const TraceLevelsPtr&); + ObjectRegistryI(const Ice::CommunicatorPtr& communicator, + const std::string& envName, + const std::string& objectsDbName, + const std::string& typesDbName, + const TraceLevelsPtr& traceLevels); virtual void add(const IcePack::ObjectDescription&, const ::Ice::Current&); virtual void remove(const Ice::ObjectPrx&, const ::Ice::Current&); diff --git a/cpp/src/IcePack/Registry.cpp b/cpp/src/IcePack/Registry.cpp index d15a909d8cd..5a029a59f6e 100644 --- a/cpp/src/IcePack/Registry.cpp +++ b/cpp/src/IcePack/Registry.cpp @@ -44,29 +44,6 @@ IcePack::Registry::Registry(const CommunicatorPtr& communicator) : IcePack::Registry::~Registry() { - if(_dbEnv) - { - try - { - _dbEnv->close(); - } - catch(const Freeze::DBException& ex) - { - Error out(_communicator->getLogger()); - out << ex << ": " << ex.message; - } - catch(const Exception& ex) - { - Error out(_communicator->getLogger()); - out << ex; - } - catch(...) - { - Error out(_communicator->getLogger()); - out << "unknown exception"; - } - _dbEnv = 0; - } } bool @@ -78,8 +55,8 @@ IcePack::Registry::start(bool nowarn, bool requiresInternalEndpoints) // // Initialize the database environment. // - string dbPath = properties->getProperty("IcePack.Registry.Data"); - if(dbPath.empty()) + _envName = properties->getProperty("IcePack.Registry.Data"); + if(_envName.empty()) { Error out(_communicator->getLogger()); out << "property `IcePack.Registry.Data' is not set"; @@ -88,14 +65,13 @@ IcePack::Registry::start(bool nowarn, bool requiresInternalEndpoints) else { struct stat filestat; - if(stat(dbPath.c_str(), &filestat) != 0 || !S_ISDIR(filestat.st_mode)) + if(stat(_envName.c_str(), &filestat) != 0 || !S_ISDIR(filestat.st_mode)) { Error out(_communicator->getLogger()); out << "property `IcePack.Registry.Data' is not set to a valid directory path"; return false; } } - _dbEnv = Freeze::initialize(_communicator, dbPath); // // Check that required properties are set and valid. @@ -154,18 +130,18 @@ IcePack::Registry::start(bool nowarn, bool requiresInternalEndpoints) ObjectAdapterPtr registryAdapter = _communicator->createObjectAdapter("IcePack.Registry.Internal"); - AdapterFactoryPtr adapterFactory = new AdapterFactory(registryAdapter, traceLevels, _dbEnv); + AdapterFactoryPtr adapterFactory = new AdapterFactory(registryAdapter, traceLevels, _envName); - ObjectRegistryPtr objectRegistry = new ObjectRegistryI(_dbEnv->openDB("objectregistry", true), - _dbEnv->openDB("objectregistry-types", true), + ObjectRegistryPtr objectRegistry = new ObjectRegistryI(_communicator, _envName, + "objectregistry", "objectregistry-types", traceLevels); - AdapterRegistryPtr adapterRegistry = new AdapterRegistryI(_dbEnv->openDB("adapterregistry", true), traceLevels); + AdapterRegistryPtr adapterRegistry = new AdapterRegistryI(_communicator, _envName, "adapterregistry", traceLevels); - ServerRegistryPtr serverRegistry = new ServerRegistryI(_dbEnv->openDB("serverregistry", true), traceLevels); + ServerRegistryPtr serverRegistry = new ServerRegistryI(_communicator, _envName, "serverregistry", traceLevels); - NodeRegistryPtr nodeRegistry = new NodeRegistryI(_dbEnv->openDB("noderegistry", true), adapterRegistry, - adapterFactory, traceLevels); + NodeRegistryPtr nodeRegistry = new NodeRegistryI(_communicator, _envName, "noderegistry", + adapterRegistry, adapterFactory, traceLevels); registryAdapter->add(objectRegistry, stringToIdentity("IcePack/ObjectRegistry")); registryAdapter->add(adapterRegistry, stringToIdentity("IcePack/AdapterRegistry")); diff --git a/cpp/src/IcePack/Registry.h b/cpp/src/IcePack/Registry.h index 8a3c8157180..a49ea3535b9 100644 --- a/cpp/src/IcePack/Registry.h +++ b/cpp/src/IcePack/Registry.h @@ -31,7 +31,7 @@ private: Ice::CommunicatorPtr _communicator; - Freeze::DBEnvironmentPtr _dbEnv; + std::string _envName; }; } diff --git a/cpp/src/IcePack/ServerAdapterI.h b/cpp/src/IcePack/ServerAdapterI.h index 823f490f94b..739bf66251b 100644 --- a/cpp/src/IcePack/ServerAdapterI.h +++ b/cpp/src/IcePack/ServerAdapterI.h @@ -17,6 +17,7 @@ #include <IceUtil/Mutex.h> #include <IcePack/Internal.h> +#include <IceUtil/AbstractMutex.h> namespace IcePack { @@ -27,7 +28,7 @@ typedef IceUtil::Handle<TraceLevels> TraceLevelsPtr; class ServerFactory; typedef IceUtil::Handle<ServerFactory> ServerFactoryPtr; -class ServerAdapterI : public ServerAdapter, public ::IceUtil::Mutex +class ServerAdapterI : public ServerAdapter, public IceUtil::AbstractMutexI<IceUtil::Mutex> { public: diff --git a/cpp/src/IcePack/ServerFactory.cpp b/cpp/src/IcePack/ServerFactory.cpp index 6106a80aadd..5361356195b 100644 --- a/cpp/src/IcePack/ServerFactory.cpp +++ b/cpp/src/IcePack/ServerFactory.cpp @@ -16,7 +16,7 @@ #include <IceUtil/UUID.h> #include <Freeze/DB.h> #include <Freeze/Evictor.h> -#include <Freeze/Strategy.h> +#include <Freeze/Initialize.h> #include <IcePack/ServerFactory.h> #include <IcePack/ServerI.h> #include <IcePack/ServerAdapterI.h> @@ -59,7 +59,7 @@ public: IcePack::ServerFactory::ServerFactory(const Ice::ObjectAdapterPtr& adapter, const TraceLevelsPtr& traceLevels, - const Freeze::DBEnvironmentPtr& dbEnv, + const string& envName, const ActivatorPtr& activator, const WaitQueuePtr& waitQueue) : _adapter(adapter), @@ -75,16 +75,14 @@ IcePack::ServerFactory::ServerFactory(const Ice::ObjectAdapterPtr& adapter, // // Create and install the freeze evictor for server objects. // - Freeze::DBPtr dbServers = dbEnv->openDB("servers", true); - _serverEvictor = dbServers->createEvictor(dbServers->createEvictionStrategy()); + _serverEvictor = Freeze::createEvictor(_adapter->getCommunicator(), envName, "servers"); _serverEvictor->setSize(10000); _serverEvictor->installServantInitializer(initializer); // // Create and install the freeze evictor for server adapter objects. // - Freeze::DBPtr dbServerAdapters = dbEnv->openDB("serveradapters", true); - _serverAdapterEvictor = dbServerAdapters->createEvictor(dbServerAdapters->createEvictionStrategy()); + _serverAdapterEvictor = Freeze::createEvictor(_adapter->getCommunicator(), envName, "serveradapters"); _serverAdapterEvictor->setSize(10000); _serverAdapterEvictor->installServantInitializer(initializer); diff --git a/cpp/src/IcePack/ServerFactory.h b/cpp/src/IcePack/ServerFactory.h index f729ed05a88..b5c8ebdafa3 100644 --- a/cpp/src/IcePack/ServerFactory.h +++ b/cpp/src/IcePack/ServerFactory.h @@ -18,6 +18,7 @@ #include <IcePack/Internal.h> #include <IcePack/Activator.h> #include <IcePack/WaitQueue.h> +#include <Freeze/Evictor.h> namespace IcePack { @@ -29,7 +30,7 @@ class ServerFactory : public Ice::ObjectFactory { public: - ServerFactory(const Ice::ObjectAdapterPtr&, const TraceLevelsPtr&, const Freeze::DBEnvironmentPtr&, + ServerFactory(const Ice::ObjectAdapterPtr&, const TraceLevelsPtr&, const std::string&, const ActivatorPtr&, const WaitQueuePtr&); // diff --git a/cpp/src/IcePack/ServerI.h b/cpp/src/IcePack/ServerI.h index 55c03dd4579..4cece3a48e0 100644 --- a/cpp/src/IcePack/ServerI.h +++ b/cpp/src/IcePack/ServerI.h @@ -18,6 +18,7 @@ #include <IceUtil/Mutex.h> #include <Freeze/EvictorF.h> #include <IcePack/Activator.h> +#include <IceUtil/AbstractMutex.h> #include <IcePack/Internal.h> @@ -30,7 +31,7 @@ typedef IceUtil::Handle<TraceLevels> TraceLevelsPtr; class ServerFactory; typedef IceUtil::Handle<ServerFactory> ServerFactoryPtr; -class ServerI : public Server, public ::IceUtil::Monitor< ::IceUtil::Mutex> +class ServerI : public Server, public IceUtil::AbstractMutexI<IceUtil::Monitor<IceUtil::Mutex> > { public: diff --git a/cpp/src/IcePack/ServerRegistryI.cpp b/cpp/src/IcePack/ServerRegistryI.cpp index dadaf83dabe..036a63d5d0e 100644 --- a/cpp/src/IcePack/ServerRegistryI.cpp +++ b/cpp/src/IcePack/ServerRegistryI.cpp @@ -18,8 +18,10 @@ using namespace std; using namespace IcePack; -IcePack::ServerRegistryI::ServerRegistryI(const Freeze::DBPtr& db, const TraceLevelsPtr& traceLevels) : - _dict(db), +IcePack::ServerRegistryI::ServerRegistryI(const Ice::CommunicatorPtr& communicator, + const string& envName, const string& dbName, + const TraceLevelsPtr& traceLevels) : + _dict(communicator, envName, dbName), _traceLevels(traceLevels) { } diff --git a/cpp/src/IcePack/ServerRegistryI.h b/cpp/src/IcePack/ServerRegistryI.h index 887435b2e18..165b6a7def9 100644 --- a/cpp/src/IcePack/ServerRegistryI.h +++ b/cpp/src/IcePack/ServerRegistryI.h @@ -28,7 +28,7 @@ class ServerRegistryI : public ServerRegistry { public: - ServerRegistryI(const Freeze::DBPtr&, const TraceLevelsPtr&); + ServerRegistryI(const Ice::CommunicatorPtr&, const std::string&, const std::string&, const TraceLevelsPtr&); virtual void add(const std::string&, const ServerPrx&, const ::Ice::Current&); virtual void remove(const std::string&, const ::Ice::Current&); diff --git a/cpp/src/IceStorm/.depend b/cpp/src/IceStorm/.depend index 45ac1f7265c..0f2cf16cc5a 100644 --- a/cpp/src/IceStorm/.depend +++ b/cpp/src/IceStorm/.depend @@ -7,13 +7,13 @@ OnewaySubscriber.o: OnewaySubscriber.cpp ../../include/Ice/Ice.h ../../include/I OnewayBatchSubscriber.o: OnewayBatchSubscriber.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IceStorm/OnewayBatchSubscriber.h ../IceStorm/OnewaySubscriber.h ../IceStorm/Subscriber.h ../IceStorm/Event.h ../IceStorm/QueuedProxy.h ../IceStorm/Flushable.h ../IceStorm/TraceLevels.h ../IceStorm/Flusher.h LinkSubscriber.o: LinkSubscriber.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IceStorm/LinkSubscriber.h ../IceStorm/Flushable.h ../IceStorm/Subscriber.h ../IceStorm/Event.h ../IceStorm/IceStormInternal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IceStorm/IceStorm.h ../IceStorm/QueuedProxy.h ../IceStorm/SubscriberFactory.h ../../include/IceUtil/RecMutex.h ../IceStorm/TraceLevels.h SubscriberFactory.o: SubscriberFactory.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IceStorm/SubscriberFactory.h ../IceStorm/IceStormInternal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IceStorm/IceStorm.h ../IceStorm/QueuedProxy.h ../IceStorm/Event.h ../../include/IceUtil/RecMutex.h ../IceStorm/LinkSubscriber.h ../IceStorm/Flushable.h ../IceStorm/Subscriber.h ../IceStorm/OnewaySubscriber.h ../IceStorm/OnewayBatchSubscriber.h ../IceStorm/Flusher.h ../IceStorm/TraceLevels.h ../IceStorm/LinkProxy.h ../IceStorm/OnewayProxy.h -TopicI.o: TopicI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../IceStorm/TopicI.h ../../include/IceUtil/RecMutex.h ../IceStorm/IceStormInternal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IceStorm/IceStorm.h ../IceStorm/IdentityLinkDict.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../IceStorm/LinkDB.h ../IceStorm/SubscriberFactory.h ../IceStorm/QueuedProxy.h ../IceStorm/Event.h ../IceStorm/Subscriber.h ../IceStorm/TraceLevels.h -TopicManagerI.o: TopicManagerI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IceStorm/TopicManagerI.h ../../include/IceStorm/IceStorm.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../IceStorm/StringBoolDict.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../IceStorm/TopicI.h ../../include/IceUtil/RecMutex.h ../IceStorm/IceStormInternal.h ../IceStorm/IdentityLinkDict.h ../IceStorm/LinkDB.h ../IceStorm/SubscriberFactory.h ../IceStorm/QueuedProxy.h ../IceStorm/Event.h ../IceStorm/Flusher.h ../IceStorm/TraceLevels.h -StringBoolDict.o: StringBoolDict.cpp ../../include/IceXML/StreamI.h ../../include/Ice/Stream.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CommunicatorF.h ../../include/IceUtil/OutputUtil.h ../IceStorm/StringBoolDict.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h -IdentityLinkDict.o: IdentityLinkDict.cpp ../../include/IceXML/StreamI.h ../../include/Ice/Stream.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CommunicatorF.h ../../include/IceUtil/OutputUtil.h ../IceStorm/IdentityLinkDict.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../IceStorm/LinkDB.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../IceStorm/IceStormInternal.h ../../include/IceStorm/IceStorm.h +TopicI.o: TopicI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../IceStorm/TopicI.h ../../include/IceUtil/RecMutex.h ../IceStorm/IceStormInternal.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/IceStorm/IceStorm.h ../IceStorm/IdentityLinkDict.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../IceStorm/LinkDB.h ../IceStorm/SubscriberFactory.h ../IceStorm/QueuedProxy.h ../IceStorm/Event.h ../IceStorm/Subscriber.h ../IceStorm/TraceLevels.h +TopicManagerI.o: TopicManagerI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../IceStorm/TopicManagerI.h ../../include/IceStorm/IceStorm.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../IceStorm/StringBoolDict.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../IceStorm/TopicI.h ../../include/IceUtil/RecMutex.h ../IceStorm/IceStormInternal.h ../IceStorm/IdentityLinkDict.h ../IceStorm/LinkDB.h ../IceStorm/SubscriberFactory.h ../IceStorm/QueuedProxy.h ../IceStorm/Event.h ../IceStorm/Flusher.h ../IceStorm/TraceLevels.h +StringBoolDict.o: StringBoolDict.cpp ../../include/IceXML/StreamI.h ../../include/Ice/Stream.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CommunicatorF.h ../../include/IceUtil/OutputUtil.h ../IceStorm/StringBoolDict.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h +IdentityLinkDict.o: IdentityLinkDict.cpp ../../include/IceXML/StreamI.h ../../include/Ice/Stream.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CommunicatorF.h ../../include/IceUtil/OutputUtil.h ../IceStorm/IdentityLinkDict.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../IceStorm/LinkDB.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../IceStorm/IceStormInternal.h ../../include/IceStorm/IceStorm.h LinkDB.o: LinkDB.cpp ../IceStorm/LinkDB.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../IceStorm/IceStormInternal.h ../../include/IceStorm/IceStorm.h ../../include/Ice/LocalException.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Stream.h IceStormInternal.o: IceStormInternal.cpp ../IceStorm/IceStormInternal.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../../include/IceStorm/IceStorm.h ../../include/Ice/LocalException.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Stream.h -Service.o: Service.cpp ../IceStorm/TopicManagerI.h ../../include/IceStorm/IceStorm.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../IceStorm/StringBoolDict.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../IceStorm/TraceLevels.h ../../include/IceBox/IceBox.h +Service.o: Service.cpp ../IceStorm/TopicManagerI.h ../../include/IceStorm/IceStorm.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../IceStorm/StringBoolDict.h ../../include/Freeze/Map.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../IceStorm/TraceLevels.h ../../include/IceBox/IceBox.h QueuedProxy.o: QueuedProxy.cpp ../IceStorm/QueuedProxy.h ../../include/Ice/Proxy.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Handle.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../IceStorm/Event.h OnewayProxy.o: OnewayProxy.cpp ../IceStorm/OnewayProxy.h ../IceStorm/QueuedProxy.h ../../include/Ice/Proxy.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Handle.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../IceStorm/Event.h LinkProxy.o: LinkProxy.cpp ../IceStorm/LinkProxy.h ../IceStorm/IceStormInternal.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectFactory.h ../../include/IceStorm/IceStorm.h ../IceStorm/QueuedProxy.h ../IceStorm/Event.h diff --git a/cpp/src/IceStorm/Service.cpp b/cpp/src/IceStorm/Service.cpp index 81e67f906d7..2861657f620 100644 --- a/cpp/src/IceStorm/Service.cpp +++ b/cpp/src/IceStorm/Service.cpp @@ -38,7 +38,7 @@ public: virtual void start(const string&, const CommunicatorPtr&, const StringSeq&, - const DBEnvironmentPtr&); + const string&); virtual void stop(); @@ -77,15 +77,13 @@ void IceStorm::ServiceI::start(const string& name, const CommunicatorPtr& communicator, const StringSeq& args, - const DBEnvironmentPtr& dbEnv) + const string& envName) { - DBPtr dbTopicManager = dbEnv->openDB("topicmanager", true); - TraceLevelsPtr traceLevels = new TraceLevels(name, communicator->getProperties(), communicator->getLogger()); _topicAdapter = communicator->createObjectAdapter(name + ".TopicManager"); _publishAdapter = communicator->createObjectAdapter(name + ".Publish"); - _manager = new TopicManagerI(communicator, _topicAdapter, _publishAdapter, traceLevels, dbEnv, dbTopicManager); + _manager = new TopicManagerI(communicator, _topicAdapter, _publishAdapter, traceLevels, envName, "topicmanager"); _topicAdapter->add(_manager, stringToIdentity(name + "/TopicManager")); _topicAdapter->activate(); diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp index 91b4f4e6894..c907fdc814a 100644 --- a/cpp/src/IceStorm/TopicI.cpp +++ b/cpp/src/IceStorm/TopicI.cpp @@ -294,14 +294,14 @@ TopicLinkI::forward(const string& op, Ice::OperationMode mode, const ByteSeq& da } TopicI::TopicI(const Ice::ObjectAdapterPtr& adapter, const TraceLevelsPtr& traceLevels, const string& name, - const SubscriberFactoryPtr& factory, const Freeze::DBPtr& db) : + const SubscriberFactoryPtr& factory, + const string& envName, const string& dbName, bool createDb) : _adapter(adapter), _traceLevels(traceLevels), _name(name), _factory(factory), _destroyed(false), - _links(db), - _linksDb(db) + _links(adapter->getCommunicator(), envName, dbName, createDb) { _subscribers = new TopicSubscribers(_traceLevels); @@ -401,8 +401,7 @@ TopicI::destroy(const Ice::Current&) _adapter->remove(id); - _linksDb->remove(); - _linksDb = 0; + _links.destroy(); } void diff --git a/cpp/src/IceStorm/TopicI.h b/cpp/src/IceStorm/TopicI.h index 0c62f9451cc..e69238062be 100644 --- a/cpp/src/IceStorm/TopicI.h +++ b/cpp/src/IceStorm/TopicI.h @@ -74,8 +74,8 @@ class TopicI : public TopicInternal, public IceUtil::RecMutex { public: - TopicI(const Ice::ObjectAdapterPtr&, const TraceLevelsPtr&, const std::string&, const SubscriberFactoryPtr&, - const Freeze::DBPtr&); + TopicI(const Ice::ObjectAdapterPtr&, const TraceLevelsPtr&, const std::string&, + const SubscriberFactoryPtr&, const std::string&, const std::string&, bool); ~TopicI(); virtual std::string getName(const Ice::Current&) const; @@ -118,7 +118,6 @@ private: TopicSubscribersPtr _subscribers; // Set of Subscribers IdentityLinkDict _links; // The database of Topic links - Freeze::DBPtr _linksDb; }; typedef IceUtil::Handle<TopicI> TopicIPtr; diff --git a/cpp/src/IceStorm/TopicManagerI.cpp b/cpp/src/IceStorm/TopicManagerI.cpp index 3eb9a1dd588..2d17084902b 100644 --- a/cpp/src/IceStorm/TopicManagerI.cpp +++ b/cpp/src/IceStorm/TopicManagerI.cpp @@ -26,13 +26,13 @@ using namespace std; TopicManagerI::TopicManagerI(const Ice::CommunicatorPtr& communicator, const Ice::ObjectAdapterPtr& topicAdapter, const Ice::ObjectAdapterPtr& publishAdapter, const TraceLevelsPtr& traceLevels, - const Freeze::DBEnvironmentPtr& dbEnv, const Freeze::DBPtr& db) : + const string& envName, const string& dbName) : _communicator(communicator), _topicAdapter(topicAdapter), _publishAdapter(publishAdapter), _traceLevels(traceLevels), - _dbEnv(dbEnv), - _topics(db) + _envName(envName), + _topics(_communicator, envName, dbName) { _flusher = new Flusher(_communicator, _traceLevels); _factory = new SubscriberFactory(_traceLevels, _flusher); @@ -206,20 +206,17 @@ TopicManagerI::installTopic(const string& message, const string& name, bool crea // // Prepend "topic-" to the topic name in order to form a // unique name for the Freeze database. Since the name we - // supply to openDB is also used as a filename, we call - // getDatabaseName to obtain a name with any questionable - // filename characters converted to hex. + // supply is also used as a filename, we call getDatabaseName + // to obtain a name with any questionable filename characters converted to hex. // // TODO: instance // TODO: failure? cleanup database? // - string dbName = "topic-" + getDatabaseName(name); - Freeze::DBPtr db = _dbEnv->openDB(dbName, create); - + string dbName = "topic-" + getDatabaseName(name); // // Create topic implementation // - TopicIPtr topicI = new TopicI(_publishAdapter, _traceLevels, name, _factory, db); + TopicIPtr topicI = new TopicI(_publishAdapter, _traceLevels, name, _factory, _envName, dbName, create); // // The identity is the name of the Topic. diff --git a/cpp/src/IceStorm/TopicManagerI.h b/cpp/src/IceStorm/TopicManagerI.h index a23549a0163..88b32e668ef 100644 --- a/cpp/src/IceStorm/TopicManagerI.h +++ b/cpp/src/IceStorm/TopicManagerI.h @@ -49,7 +49,7 @@ class TopicManagerI : public TopicManager, public IceUtil::Mutex public: TopicManagerI(const Ice::CommunicatorPtr&, const Ice::ObjectAdapterPtr&, const Ice::ObjectAdapterPtr&, - const TraceLevelsPtr&, const Freeze::DBEnvironmentPtr&, const Freeze::DBPtr&); + const TraceLevelsPtr&, const std::string&, const std::string&); ~TopicManagerI(); virtual TopicPrx create(const std::string&, const Ice::Current&); @@ -70,7 +70,7 @@ private: TopicIMap _topicIMap; FlusherPtr _flusher; SubscriberFactoryPtr _factory; - Freeze::DBEnvironmentPtr _dbEnv; + std::string _envName; StringBoolDict _topics; }; diff --git a/cpp/src/IceUtil/StaticMutex.cpp b/cpp/src/IceUtil/StaticMutex.cpp index 091aa5035f4..3e326a8f173 100644 --- a/cpp/src/IceUtil/StaticMutex.cpp +++ b/cpp/src/IceUtil/StaticMutex.cpp @@ -50,8 +50,13 @@ Init::Init() Init::~Init() { - for_each(_criticalSectionList->begin(), _criticalSectionList->end(), - DeleteCriticalSection); + for(list<CRITICAL_SECTION*>::iterator p = _criticalSectionList->begin(); + p != _criticalSectionList->end(); ++p) + { + DeleteCriticalSection(*p); + delete *p; + } + delete _criticalSectionList; DeleteCriticalSection(&_criticalSection); } @@ -66,9 +71,10 @@ void IceUtil::StaticMutex::initialize() const EnterCriticalSection(&_criticalSection); if(!_mutexInitialized) { - InitializeCriticalSection(&_mutex); + _mutex = new CRITICAL_SECTION; + InitializeCriticalSection(_mutex); _mutexInitialized = true; - _criticalSectionList->push_back(&_mutex); + _criticalSectionList->push_back(_mutex); } LeaveCriticalSection(&_criticalSection); } diff --git a/cpp/src/XMLTransform/.depend b/cpp/src/XMLTransform/.depend index 9e5c87f1736..2f8044b68a5 100644 --- a/cpp/src/XMLTransform/.depend +++ b/cpp/src/XMLTransform/.depend @@ -1,3 +1,3 @@ ErrorReporter.o: ErrorReporter.cpp ../../include/IceUtil/Config.h ../XMLTransform/ErrorReporter.h ../../include/Ice/Xerces.h -XMLTransform.o: XMLTransform.cpp ../../include/IceUtil/InputUtil.h ../../include/IceUtil/Config.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/XMLTransform/XMLTransform.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IceUtil/OutputUtil.h ../../include/Ice/Xerces.h ../XMLTransform/ErrorReporter.h -TransformDB.o: TransformDB.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/XMLTransform/XMLTransform.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Freeze/StrategyF.h ../../include/IceUtil/OutputUtil.h ../../include/Ice/Xerces.h ../../include/Freeze/Freeze.h ../../include/Freeze/Initialize.h ../../include/Freeze/Evictor.h ../../include/Freeze/ObjectRecord.h ../../include/Freeze/Strategy.h ../../include/Freeze/Map.h +XMLTransform.o: XMLTransform.cpp ../../include/IceUtil/InputUtil.h ../../include/IceUtil/Config.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/XMLTransform/XMLTransform.h ../../include/IceUtil/OutputUtil.h ../../include/Ice/Xerces.h ../XMLTransform/ErrorReporter.h +TransformDB.o: TransformDB.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Stats.h ../../include/Ice/Communicator.h ../../include/Ice/StatsF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Application.h ../../include/XMLTransform/XMLTransform.h ../../include/IceUtil/OutputUtil.h ../../include/Ice/Xerces.h diff --git a/cpp/src/XMLTransform/Makefile b/cpp/src/XMLTransform/Makefile index 63cd4ddb048..52f40ab5f91 100644 --- a/cpp/src/XMLTransform/Makefile +++ b/cpp/src/XMLTransform/Makefile @@ -35,7 +35,7 @@ SDIR = $(slicedir)/XMLTransform include $(top_srcdir)/config/Make.rules -CPPFLAGS := -I.. $(CPPFLAGS) -DXML_TRANSFORM_API_EXPORTS $(XERCESC_FLAGS) +CPPFLAGS := -I.. $(CPPFLAGS) -DXML_TRANSFORM_API_EXPORTS $(XERCESC_FLAGS) $(DB_FLAGS) $(libdir)/$(LIBFILENAME): $(OBJS) rm -f $@ @@ -51,7 +51,7 @@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) $(TRANSFORM_DB): $(TRANSFORM_OBJS) $(libdir)/$(LIBNAME) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(TRANSFORM_OBJS) -lFreeze -lIceXML -lXMLTransform $(LIBS) $(XERCESC_LIBS) $(DB_LIBS) + $(CXX) $(LDFLAGS) -o $@ $(TRANSFORM_OBJS) -lIceXML -lXMLTransform $(LIBS) $(XERCESC_LIBS) $(DB_LIBS) clean:: rm -f $(TRANSFORM_DB) diff --git a/cpp/src/XMLTransform/TransformDB.cpp b/cpp/src/XMLTransform/TransformDB.cpp index ff7825a7176..e517b249aa8 100644 --- a/cpp/src/XMLTransform/TransformDB.cpp +++ b/cpp/src/XMLTransform/TransformDB.cpp @@ -14,7 +14,14 @@ #include <Ice/Ice.h> #include <XMLTransform/XMLTransform.h> -#include <Freeze/Freeze.h> +#include <db_cxx.h> +#include <sys/stat.h> + +#ifdef _WIN32 +# define FREEZE_DB_MODE 0 +#else +# define FREEZE_DB_MODE (S_IRUSR | S_IWUSR) +#endif using namespace std; @@ -41,8 +48,7 @@ int main(int argc, char* argv[]) { Ice::CommunicatorPtr communicator; - Freeze::DBEnvironmentPtr dbEnv; - Freeze::DBPtr db; + bool failure = false; try @@ -169,8 +175,22 @@ main(int argc, char* argv[]) try { - dbEnv = Freeze::initializeWithTxn(communicator, argv[1]); - db = dbEnv->openDBWithTxn(0, argv[2], false); + DbEnv dbEnv(0); + dbEnv.set_flags(DB_TXN_NOSYNC, true); + + u_int32_t flags = DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN | + DB_PRIVATE | DB_THREAD; + + // + // TODO: DB_RECOVER_FATAL option + // + flags |= DB_RECOVER | DB_CREATE; + + dbEnv.open(argv[1], flags, FREEZE_DB_MODE); + + Db db(&dbEnv, 0); + flags = DB_AUTO_COMMIT | DB_THREAD; + db.open(0, argv[2], 0, DB_UNKNOWN, flags, FREEZE_DB_MODE); XMLTransform::DBTransformer transformer(dbEnv, db, loadOld, loadNew, pathOld, pathNew, force); @@ -200,15 +220,19 @@ main(int argc, char* argv[]) { transformer.transform(argv[3], argv[4]); } + + db.close(0); + dbEnv.close(0); + } - catch(const Freeze::DBNotFoundException&) - { - cout << argv[0] << ": database `" << argv[2] << "' not found in environment `" << argv[1] << "'" << endl; - failure = true; - } - catch(const Freeze::DBException& ex) + catch(const DbException& ex) { - cout << argv[0] << ": database failure: " << ex << ": " << ex.message << endl; + // + // Note: from Berkeley DB 4.1 on, ~Db and ~DbEnv close their respective + // handles if not done before. + // + + cout << argv[0] << ": database failure: " << ex.what() << endl; failure = true; } } @@ -218,54 +242,7 @@ main(int argc, char* argv[]) failure = true; } - if(db) - { - try - { - db->close(); - } - catch(const Freeze::DBException& ex) - { - cerr << argv[0] << ": " << ex << ": " << ex.message << endl; - failure = true; - } - catch(const Ice::Exception& ex) - { - cerr << argv[0] << ": " << ex << endl; - failure = true; - } - catch(...) - { - cerr << argv[0] << ": unknown exception" << endl; - failure = true; - } - db = 0; - } - - if(dbEnv) - { - try - { - dbEnv->close(); - } - catch(const Freeze::DBException& ex) - { - cerr << argv[0] << ": " << ex << ": " << ex.message << endl; - failure = true; - } - catch(const Ice::Exception& ex) - { - cerr << argv[0] << ": " << ex << endl; - failure = true; - } - catch(...) - { - cerr << argv[0] << ": unknown exception" << endl; - failure = true; - } - dbEnv = 0; - } - + try { communicator->destroy(); diff --git a/cpp/src/XMLTransform/XMLTransform.cpp b/cpp/src/XMLTransform/XMLTransform.cpp index 9a82b790a44..489be2fb76f 100644 --- a/cpp/src/XMLTransform/XMLTransform.cpp +++ b/cpp/src/XMLTransform/XMLTransform.cpp @@ -21,8 +21,7 @@ #include <Ice/Ice.h> #include <XMLTransform/XMLTransform.h> #include <XMLTransform/ErrorReporter.h> -#include <Freeze/DB.h> - +#include <db_cxx.h> #include <Ice/Xerces.h> #include <xercesc/util/PlatformUtils.hpp> #include <xercesc/util/XMLString.hpp> @@ -48,7 +47,6 @@ #endif using namespace std; -using namespace Freeze; using namespace XMLTransform; // @@ -2888,7 +2886,7 @@ XMLTransform::Transformer::transform(::IceUtil::XMLOutput& os, ICE_XERCES_NS DOM } } -XMLTransform::DBTransformer::DBTransformer(const DBEnvironmentPtr& dbEnv, const DBPtr& db, +XMLTransform::DBTransformer::DBTransformer(DbEnv& dbEnv, Db& db, const Ice::StringSeq& loadOld, const Ice::StringSeq& loadNew, const Ice::StringSeq& pathOld, const Ice::StringSeq& pathNew, bool force) : @@ -2921,9 +2919,15 @@ XMLTransform::DBTransformer::transform(ICE_XERCES_NS DOMDocument* oldSchema, ICE parser.setDoNamespaces(true); parser.setErrorHandler(&errReporter); - DBCursorPtr cursor; - DBTransactionPtr txn; string reason; + vector<Dbt> keys(1); + keys[0].set_flags(DB_DBT_MALLOC); + + Dbt value; + value.set_flags(DB_DBT_REALLOC); + + DbTxn* txn = 0; + try { Transformer transformer(_loadOld, _loadNew, _pathOld, _pathNew, oldSchema, newSchema); @@ -2942,25 +2946,33 @@ XMLTransform::DBTransformer::transform(ICE_XERCES_NS DOMDocument* oldSchema, ICE // we can't use a cursor to perform the changes. We collect all of the // keys first, then update the records. // - vector<Key> keys; - cursor = _db->getCursor(); - do - { - Key k; - Value v; - cursor->curr(k, v); - keys.push_back(k); - } - while(cursor->next()); - cursor->close(); - cursor = 0; + { + Dbc* dbc = 0; + _db.cursor(0, &dbc, 0); + + // + // Not interested in value + // + Dbt dummy; + dummy.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL); + + while(dbc->get(&keys[keys.size() - 1], &dummy, DB_NEXT) == 0) + { + size_t index = keys.size(); + keys.resize(index + 1); + keys[index].set_flags(DB_DBT_MALLOC); + } + keys.resize(keys.size() - 1); + dbc->close(); + } - txn = _dbEnv->startTransaction(); + _dbEnv.txn_begin(0, &txn, 0); + + vector<Dbt>::iterator p; - vector<Key>::const_iterator p; for(p = keys.begin(); p != keys.end(); ++p) { - const Key& k = *p; + Dbt& k = *p; try { @@ -2969,7 +2981,7 @@ XMLTransform::DBTransformer::transform(ICE_XERCES_NS DOMDocument* oldSchema, ICE // string fullKey; fullKey.append(header); - fullKey.append(reinterpret_cast<const char*>(&k[0]), k.size()); + fullKey.append(static_cast<const char*>(k.get_data()), k.get_size()); fullKey.append(footer); ICE_XERCES_NS MemBufInputSource keySource((const XMLByte*)fullKey.data(), static_cast<unsigned int>(fullKey.size()), "key"); parser.parse(keySource); @@ -2978,19 +2990,18 @@ XMLTransform::DBTransformer::transform(ICE_XERCES_NS DOMDocument* oldSchema, ICE ostringstream keyStream; IceUtil::XMLOutput keyOut(keyStream); transformer.transform(keyOut, keyDoc, "Key", _force, false); - - Key newKey; + const std::string& keyStr = keyStream.str(); - newKey.resize(keyStr.size()); - std::copy(keyStr.begin(), keyStr.end(), newKey.begin()); + Dbt newKey(const_cast<char*>(keyStr.data()), keyStr.size()); // // Transform value // - Value value = _db->getWithTxn(txn, k); + _db.get(txn, &k, &value, 0); + string fullValue; fullValue.append(header); - fullValue.append(reinterpret_cast<const char*>(&value[0]), value.size()); + fullValue.append(static_cast<const char*>(value.get_data()), value.get_size()); fullValue.append(footer); ICE_XERCES_NS MemBufInputSource valueSource((const XMLByte*)fullValue.data(), static_cast<unsigned int>(fullValue.size()), @@ -3002,24 +3013,21 @@ XMLTransform::DBTransformer::transform(ICE_XERCES_NS DOMDocument* oldSchema, ICE IceUtil::XMLOutput valueOut(valueStream); transformer.transform(valueOut, valueDoc, "Value", _force, false); - Value newValue; const std::string& valueStr = valueStream.str(); - newValue.resize(valueStr.size()); - std::copy(valueStr.begin(), valueStr.end(), newValue.begin()); - + Dbt newValue(const_cast<char*>(valueStr.data()), valueStr.size()); // // Update database - only insert new key,value pair if the transformed // key doesn't match an existing key. // - _db->delWithTxn(txn, k); - if(_db->containsWithTxn(txn, newKey)) - { + _db.del(txn, &k, 0); + + if(_db.put(txn, &newKey, &newValue, DB_NOOVERWRITE) != 0) + { reason = "transformed key matches an existing record:\n" + keyStr; txn->abort(); - txn = 0; + txn = 0; break; } - _db->putWithTxn(txn, newKey, newValue); } catch(const MissingTypeException&) { @@ -3029,7 +3037,7 @@ XMLTransform::DBTransformer::transform(ICE_XERCES_NS DOMDocument* oldSchema, ICE // if(_force) { - _db->delWithTxn(txn, k); + _db.del(txn, &k, 0); } else { @@ -3038,16 +3046,12 @@ XMLTransform::DBTransformer::transform(ICE_XERCES_NS DOMDocument* oldSchema, ICE } } - if(txn) + if(txn != 0) { - txn->commit(); + txn->commit(0); txn = 0; } } - catch(const DBNotFoundException&) - { - // Database is empty - } catch(const ICE_XERCES_NS XMLException& ex) { reason = "XML exception: " + toString(ex.getMessage()); @@ -3062,29 +3066,44 @@ XMLTransform::DBTransformer::transform(ICE_XERCES_NS DOMDocument* oldSchema, ICE out << "DOM exception (" << ex.code << ") " << toString(ex.msg); reason = out.str(); } + catch(const DbException& ex) + { + ostringstream out; + out << "DbException: " << ex.what(); + reason = out.str(); + } catch(...) { - if(cursor) - { - cursor->close(); - } - if(txn) - { - txn->abort(); - } - throw; + // + // Clean up + // + for(vector<Dbt>::iterator p = keys.begin(); p != keys.end(); p++) + { + free(p->get_data()); + } + free(value.get_data()); + + if(txn != 0) + { + txn->abort(); + } + throw; } - if(cursor) + // + // Clean up + // + for(vector<Dbt>::iterator p = keys.begin(); p != keys.end(); p++) { - cursor->close(); + free(p->get_data()); } - - if(txn) + free(value.get_data()); + if(txn != 0) { - txn->abort(); + txn->abort(); } + if(!reason.empty()) { TransformException ex(__FILE__, __LINE__); diff --git a/cpp/src/XMLTransform/xmltransform.dsp b/cpp/src/XMLTransform/xmltransform.dsp index 262dafce7fa..97df0dcfc78 100644 --- a/cpp/src/XMLTransform/xmltransform.dsp +++ b/cpp/src/XMLTransform/xmltransform.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /dll /machine:I386 /out:"Release/xmltransform11.dll" /implib:"Release/xmltransform.lib" /libpath:"../../../lib"
+# ADD LINK32 xerces-c_2.lib libdb41.lib /nologo /dll /machine:I386 /out:"Release/xmltransform11.dll" /implib:"Release/xmltransform.lib" /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none /nodefaultlib
# Begin Special Build Tool
OutDir=.\Release
@@ -87,7 +87,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386
-# ADD LINK32 xerces-c_2D.lib /nologo /dll /debug /machine:I386 /out:"Debug/xmltransform11d.dll" /implib:"Debug/xmltransformd.lib" /libpath:"../../../lib"
+# ADD LINK32 xerces-c_2D.lib libdb41d.lib /nologo /dll /debug /machine:I386 /out:"Debug/xmltransform11d.dll" /implib:"Debug/xmltransformd.lib" /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none /nodefaultlib
# Begin Special Build Tool
OutDir=.\Debug
diff --git a/cpp/src/XMLTransform/xmltransformC.dsp b/cpp/src/XMLTransform/xmltransformC.dsp index 83772235df2..388686c62c3 100644 --- a/cpp/src/XMLTransform/xmltransformC.dsp +++ b/cpp/src/XMLTransform/xmltransformC.dsp @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 setargv.obj /nologo /subsystem:console /machine:I386 /out:"Release/transformdb.exe" /libpath:"../../../lib"
+# ADD LINK32 setargv.obj libdb41.lib /nologo /subsystem:console /machine:I386 /out:"Release/transformdb.exe" /libpath:"../../../lib"
# SUBTRACT LINK32 /debug /nodefaultlib
# Begin Special Build Tool
OutDir=.\Release
@@ -83,7 +83,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 setargv.obj /nologo /subsystem:console /debug /machine:I386 /out:"Debug/transformdb.exe" /pdbtype:sept /libpath:"../../../lib"
+# ADD LINK32 setargv.obj libdb41d.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/transformdb.exe" /pdbtype:sept /libpath:"../../../lib"
# SUBTRACT LINK32 /nodefaultlib
# Begin Special Build Tool
OutDir=.\Debug
diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp index c4f9398c8a5..c1ab8aae4d7 100644 --- a/cpp/src/slice2freezej/Main.cpp +++ b/cpp/src/slice2freezej/Main.cpp @@ -102,11 +102,16 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict) out << sb; // - // Constructor + // Constructors // - out << sp << nl << "public" << nl << name << "(Freeze.DB db)"; + out << sp << nl << "public" << nl << name << "(Ice.Communicator communicator, String envName, String dbName, boolean createDb)"; out << sb; - out << nl << "super(db);"; + out << nl << "super(communicator, envName, dbName, createDb);"; + out << eb; + + out << sp << nl << "public" << nl << name << "(Ice.Communicator communicator, com.sleepycat.db.DbEnv dbEnv, String dbName, boolean createDb)"; + out << sb; + out << nl << "super(communicator, dbEnv, dbName, createDb);"; out << eb; // @@ -191,8 +196,8 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict) // // encode // - out << sp << nl << "public byte[]" << nl << "encode" << keyValue - << "(Object o, Ice.Communicator communicator)"; + out << sp << nl << "public static byte[]" << nl << "encode" << keyValue + << "Impl(Object o, Ice.Communicator communicator)"; out << sb; out << nl << "assert(o instanceof " << typeS << ");"; if(_binary) @@ -234,11 +239,17 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict) } out << eb; + out << sp << nl << "public byte[]" << nl << "encode" << keyValue + << "(Object o, Ice.Communicator communicator)"; + out << sb; + out << nl << "return encode" << keyValue << "Impl(o, communicator);"; + out << eb; + // // decode // - out << sp << nl << "public Object" << nl << "decode" << keyValue - << "(byte[] b, Ice.Communicator communicator)"; + out << sp << nl << "public static Object" << nl << "decode" << keyValue + << "Impl(byte[] b, Ice.Communicator communicator)"; out << sb; if(_binary) { @@ -385,6 +396,12 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict) out << eb; } out << eb; + + out << sp << nl << "public Object" << nl << "decode" << keyValue + << "(byte[] b, Ice.Communicator communicator)"; + out << sb; + out << nl << "return decode" << keyValue << "Impl(b, communicator);"; + out << eb; } if(!_binary) diff --git a/cpp/test/Freeze/Makefile b/cpp/test/Freeze/Makefile index 62fe23a2f29..7f1162b3841 100644 --- a/cpp/test/Freeze/Makefile +++ b/cpp/test/Freeze/Makefile @@ -16,7 +16,7 @@ top_srcdir = ../.. include $(top_srcdir)/config/Make.rules -SUBDIRS = cursor evictor dbmap complex +SUBDIRS = dbmap complex evictor $(EVERYTHING):: @for subdir in $(SUBDIRS); \ diff --git a/cpp/test/Freeze/complex/.depend b/cpp/test/Freeze/complex/.depend index a50aef63a5e..9955ab907f4 100644 --- a/cpp/test/Freeze/complex/.depend +++ b/cpp/test/Freeze/complex/.depend @@ -1,7 +1,7 @@ -ComplexDict.o: ComplexDict.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h ComplexDict.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h Complex.h +ComplexDict.o: ComplexDict.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h ComplexDict.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h Complex.h Complex.o: Complex.cpp Complex.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/Stream.h Grammar.o: Grammar.cpp NodeI.h Complex.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/ObjectFactory.h Parser.h Scanner.o: Scanner.cpp ../../../include/IceUtil/Config.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h Parser.h Complex.h Grammar.h NodeI.h Parser.o: Parser.cpp Parser.h Complex.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h -Client.o: Client.cpp ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DBF.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Strategy.h ../../../include/Freeze/Map.h ComplexDict.h Complex.h ../../include/TestCommon.h NodeI.h Parser.h +Client.o: Client.cpp ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/DBException.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Map.h ../../../include/Freeze/DB.h ComplexDict.h Complex.h ../../include/TestCommon.h NodeI.h Parser.h Complex.cpp: Complex.ice diff --git a/cpp/test/Freeze/complex/Client.cpp b/cpp/test/Freeze/complex/Client.cpp index a8b3ecd2aba..9dd449d0449 100644 --- a/cpp/test/Freeze/complex/Client.cpp +++ b/cpp/test/Freeze/complex/Client.cpp @@ -30,10 +30,8 @@ using namespace Freeze; // static int -validate(const DBPtr& db) +validate(const Complex::ComplexDict& m) { - Complex::ComplexDict m(db); - cout << "testing database expressions... "; Complex::ComplexDict::const_iterator p; Parser myParser; @@ -72,10 +70,8 @@ static const char* expressions[] = static const size_t nexpressions = sizeof(expressions)/sizeof(expressions[0]); static int -populate(const DBPtr& db) +populate(Complex::ComplexDict& m) { - Complex::ComplexDict m(db); - cout << "populating the database... "; Parser myParser; for(size_t i = 0 ; i < nexpressions; ++i) @@ -102,12 +98,11 @@ usage(const char* name) } static int -run(int argc, char* argv[], const DBPtr& db) +run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, Complex::ComplexDict& m) { // // Register a factory for the node types. // - CommunicatorPtr communicator = db->getCommunicator(); Ice::ObjectFactoryPtr factory = new Complex::ObjectFactoryI; communicator->addObjectFactory(factory, "::Complex::NumberNode"); communicator->addObjectFactory(factory, "::Complex::AddNode"); @@ -115,11 +110,11 @@ run(int argc, char* argv[], const DBPtr& db) if(argc > 1 && strcmp(argv[1], "populate") == 0) { - return populate(db); + return populate(m); } if(argc > 1 && strcmp(argv[1], "validate") == 0) { - return validate(db); + return validate(m); } usage(argv[0]); @@ -131,9 +126,8 @@ main(int argc, char* argv[]) { int status; Ice::CommunicatorPtr communicator; - DBEnvironmentPtr dbEnv; - string dbEnvDir = "db"; - DBPtr db; + + string envName = "db"; try { @@ -151,9 +145,9 @@ main(int argc, char* argv[]) return EXIT_FAILURE; } - dbEnvDir = argv[i+1]; - dbEnvDir += "/"; - dbEnvDir += "db"; + envName = argv[i+1]; + envName += "/"; + envName += "db"; // // Consume arguments @@ -172,9 +166,8 @@ main(int argc, char* argv[]) } communicator = Ice::initialize(argc, argv); - dbEnv = Freeze::initialize(communicator, dbEnvDir); - db = dbEnv->openDB("test", true); - status = run(argc, argv, db); + Complex::ComplexDict m(communicator, envName, "test"); + status = run(argc, argv, communicator, m); } catch(const Ice::Exception& ex) { @@ -182,54 +175,6 @@ main(int argc, char* argv[]) status = EXIT_FAILURE; } - if(db) - { - try - { - db->close(); - } - catch(const DBException& ex) - { - cerr << argv[0] << ": " << ex << ": " << ex.message << endl; - status = EXIT_FAILURE; - } - catch(const Exception& ex) - { - cerr << argv[0] << ": " << ex << endl; - status = EXIT_FAILURE; - } - catch(...) - { - cerr << argv[0] << ": unknown exception" << endl; - status = EXIT_FAILURE; - } - db = 0; - } - - if(dbEnv) - { - try - { - dbEnv->close(); - } - catch(const DBException& ex) - { - cerr << argv[0] << ": " << ex << ": " << ex.message << endl; - status = EXIT_FAILURE; - } - catch(const Exception& ex) - { - cerr << argv[0] << ": " << ex << endl; - status = EXIT_FAILURE; - } - catch(...) - { - cerr << argv[0] << ": unknown exception" << endl; - status = EXIT_FAILURE; - } - dbEnv = 0; - } - try { communicator->destroy(); diff --git a/cpp/test/Freeze/complex/Makefile b/cpp/test/Freeze/complex/Makefile index ccb3a6a931f..a52a97dc90e 100644 --- a/cpp/test/Freeze/complex/Makefile +++ b/cpp/test/Freeze/complex/Makefile @@ -48,4 +48,7 @@ clean:: rm -f Grammar.cpp Grammar.h rm -f Scanner.cpp +clean:: + rm -f db/test db/log.* + include .depend diff --git a/cpp/test/Freeze/cursor/.depend b/cpp/test/Freeze/cursor/.depend index dc0825bdc61..e69de29bb2d 100644 --- a/cpp/test/Freeze/cursor/.depend +++ b/cpp/test/Freeze/cursor/.depend @@ -1 +0,0 @@ -Client.o: Client.cpp ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DBF.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Strategy.h ../../../include/Freeze/Map.h ../../include/TestCommon.h diff --git a/cpp/test/Freeze/dbmap/.depend b/cpp/test/Freeze/dbmap/.depend index bacb15c472c..95de7d53b3e 100644 --- a/cpp/test/Freeze/dbmap/.depend +++ b/cpp/test/Freeze/dbmap/.depend @@ -1,3 +1,3 @@ -Client.o: Client.cpp ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Base64.h ../../../include/IceUtil/InputUtil.h ../../../include/IceUtil/OutputUtil.h ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DBF.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Strategy.h ../../../include/Freeze/Map.h ../../include/TestCommon.h ByteIntMapXML.h ByteIntMapBinary.h -ByteIntMapXML.o: ByteIntMapXML.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h ByteIntMapXML.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h -ByteIntMapBinary.o: ByteIntMapBinary.cpp ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ObjectF.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Buffer.h ByteIntMapBinary.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h +Client.o: Client.cpp ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/AbstractMutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Base64.h ../../../include/IceUtil/InputUtil.h ../../../include/IceUtil/OutputUtil.h ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/DBException.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Map.h ../../../include/Freeze/DB.h ../../include/TestCommon.h ByteIntMapXML.h ByteIntMapBinary.h +ByteIntMapXML.o: ByteIntMapXML.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h ByteIntMapXML.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h +ByteIntMapBinary.o: ByteIntMapBinary.cpp ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ObjectF.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Buffer.h ByteIntMapBinary.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h diff --git a/cpp/test/Freeze/dbmap/Client.cpp b/cpp/test/Freeze/dbmap/Client.cpp index a45df540df1..bc8cbbfe037 100644 --- a/cpp/test/Freeze/dbmap/Client.cpp +++ b/cpp/test/Freeze/dbmap/Client.cpp @@ -138,6 +138,11 @@ run(int argc, char* argv[], MAP& m) cp = m.find(*j); test(cp != m.end()); test(cp->first == 'n' && cp->second == j - alphabet.begin()); + + // + // Close the iterator to release locks + // + cp = m.end(); cout << "ok" << endl; cout << " testing erase... "; @@ -157,6 +162,12 @@ run(int argc, char* argv[], MAP& m) p = m.find(*j); test(p != m.end()); m.erase(p); + // + // Need to release the iterator to commit the transaction + // and release the locks + // + p = m.end(); + p = m.find(*j); test(p == m.end()); vector<Byte>::iterator r = find(alphabet.begin(), alphabet.end(), *j); @@ -235,7 +246,8 @@ run(int argc, char* argv[], MAP& m) p2 = p++; test(c == p2->first); // p2 should still be the same test(p2->first != p->first && (++p2)->first == p->first); - + p2 = m.end(); + cout << "ok" << endl; // @@ -245,6 +257,7 @@ run(int argc, char* argv[], MAP& m) p = m.find('d'); test(p != m.end() && p->second == 3); + p = m.end(); test(m.find('a') == m.end()); typename MAP::value_type i1('a', 1); @@ -256,6 +269,7 @@ run(int argc, char* argv[], MAP& m) p = m.find('a'); test(p != m.end() && p->second == 1); + p = m.end(); typename MAP::value_type i2('a', 0); m.put(i2); @@ -266,7 +280,7 @@ run(int argc, char* argv[], MAP& m) p = m.find('a'); test(p != m.end() && p->second == 0); - + p = m.end(); // // Test inserts // @@ -281,10 +295,12 @@ run(int argc, char* argv[], MAP& m) test(insertResult.first == m.find('a')); test(insertResult.first->second == 0); test(insertResult.second == false); + insertResult.first = m.end(); p = m.insert(m.end(), i3); test(p == m.find('a')); test(p->second == 0); + p = m.end(); typename MAP::value_type i4('b', 7); @@ -292,19 +308,23 @@ run(int argc, char* argv[], MAP& m) test(insertResult.first == m.find('b')); test(insertResult.first->second == 7); test(insertResult.second == true); + insertResult.first = m.end(); typename MAP::value_type i5('c', 8); p = m.insert(m.end(), i5); test(p == m.find('c')); test(p->second == 8); + p = m.end(); p = m.find('a'); test(p != m.end() && p->second == 0); p.set(1); test(p != m.end() && p->second == 1); + p = m.end(); p = m.find('a'); test(p != m.end() && p->second == 1); + p = m.end(); cout << "ok" << endl; // @@ -393,28 +413,25 @@ main(int argc, char* argv[]) { int status; Ice::CommunicatorPtr communicator; - DBEnvironmentPtr dbEnv; - string dbEnvDir = "db"; - DBPtr xmlDB, binaryDB; + + string envName = "db"; try { communicator = Ice::initialize(argc, argv); if(argc != 1) { - dbEnvDir = argv[1]; - dbEnvDir += "/"; - dbEnvDir += "db"; + envName = argv[1]; + envName += "/"; + envName += "db"; } - dbEnv = Freeze::initialize(communicator, dbEnvDir); - xmlDB = dbEnv->openDB("xml", true); - ByteIntMapXML xml(xmlDB); + + ByteIntMapXML xml(communicator, envName, "xml"); cout << "testing XML encoding..." << endl; status = run(argc, argv, xml); if(status == EXIT_SUCCESS) { - binaryDB = dbEnv->openDB("binary", true); - ByteIntMapBinary binary(binaryDB); + ByteIntMapBinary binary(communicator, envName, "binary"); cout << "testing binary encoding..." << endl; status = run(argc, argv, binary); } @@ -425,78 +442,6 @@ main(int argc, char* argv[]) status = EXIT_FAILURE; } - if(xmlDB) - { - try - { - xmlDB->close(); - } - catch(const DBException& ex) - { - cerr << argv[0] << ": " << ex << ": " << ex.message << endl; - status = EXIT_FAILURE; - } - catch(const Exception& ex) - { - cerr << argv[0] << ": " << ex << endl; - status = EXIT_FAILURE; - } - catch(...) - { - cerr << argv[0] << ": unknown exception" << endl; - status = EXIT_FAILURE; - } - xmlDB = 0; - } - - if(binaryDB) - { - try - { - binaryDB->close(); - } - catch(const DBException& ex) - { - cerr << argv[0] << ": " << ex << ": " << ex.message << endl; - status = EXIT_FAILURE; - } - catch(const Exception& ex) - { - cerr << argv[0] << ": " << ex << endl; - status = EXIT_FAILURE; - } - catch(...) - { - cerr << argv[0] << ": unknown exception" << endl; - status = EXIT_FAILURE; - } - binaryDB = 0; - } - - if(dbEnv) - { - try - { - dbEnv->close(); - } - catch(const DBException& ex) - { - cerr << argv[0] << ": " << ex << ": " << ex.message << endl; - status = EXIT_FAILURE; - } - catch(const Exception& ex) - { - cerr << argv[0] << ": " << ex << endl; - status = EXIT_FAILURE; - } - catch(...) - { - cerr << argv[0] << ": unknown exception" << endl; - status = EXIT_FAILURE; - } - dbEnv = 0; - } - try { communicator->destroy(); diff --git a/cpp/test/Freeze/dbmap/Makefile b/cpp/test/Freeze/dbmap/Makefile index a3d1398f93e..df9de420fa7 100644 --- a/cpp/test/Freeze/dbmap/Makefile +++ b/cpp/test/Freeze/dbmap/Makefile @@ -44,4 +44,7 @@ clean:: rm -f ByteIntMapXML.h ByteIntMapXML.cpp rm -f ByteIntMapBinary.h ByteIntMapBinary.cpp +clean:: + rm -f db/xml db/log.* + include .depend diff --git a/cpp/test/Freeze/evictor/.depend b/cpp/test/Freeze/evictor/.depend index def4be98fe6..7c7005c909f 100644 --- a/cpp/test/Freeze/evictor/.depend +++ b/cpp/test/Freeze/evictor/.depend @@ -1,5 +1,5 @@ Test.o: Test.cpp Test.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/Stream.h Client.o: Client.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/IceUtil/Thread.h ../../include/TestCommon.h Test.h -TestI.o: TestI.cpp ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Base64.h ../../../include/IceUtil/InputUtil.h ../../../include/IceUtil/OutputUtil.h ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DBF.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Strategy.h ../../../include/Freeze/Map.h TestI.h Test.h -Server.o: Server.cpp ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Base64.h ../../../include/IceUtil/InputUtil.h ../../../include/IceUtil/OutputUtil.h ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DBF.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Strategy.h ../../../include/Freeze/Map.h TestI.h Test.h +TestI.o: TestI.cpp ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/AbstractMutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Base64.h ../../../include/IceUtil/InputUtil.h ../../../include/IceUtil/OutputUtil.h ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/DBException.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Map.h ../../../include/Freeze/DB.h TestI.h Test.h +Server.o: Server.cpp ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/AbstractMutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Base64.h ../../../include/IceUtil/InputUtil.h ../../../include/IceUtil/OutputUtil.h TestI.h ../../../include/Freeze/EvictorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/Ice/StreamF.h Test.h ../../../include/Ice/Proxy.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Direct.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/Application.h Test.cpp: Test.ice diff --git a/cpp/test/Freeze/evictor/Client.cpp b/cpp/test/Freeze/evictor/Client.cpp index 08d7077b77d..ddb81a38d25 100644 --- a/cpp/test/Freeze/evictor/Client.cpp +++ b/cpp/test/Freeze/evictor/Client.cpp @@ -35,338 +35,169 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) test(base); Test::RemoteEvictorFactoryPrx factory = Test::RemoteEvictorFactoryPrx::checkedCast(base); + cout << "testing Freeze Evictor... " << flush; + + const Ice::Int size = 5; + Ice::Int i; + + Test::RemoteEvictorPrx evictor = factory->createEvictor("Test"); + evictor->setSize(size); + // - // Test EvictionStrategy + // Create some servants and verify they did not get saved // + vector<Test::ServantPrx> servants; + for(i = 0; i < size; i++) { - cout << "testing EvictionStrategy... " << flush; - - const Ice::Int size = 5; - Ice::Int i; - - Test::RemoteEvictorPrx evictor = factory->createEvictor("EvictionStrategy", Test::Eviction); - evictor->setSize(size); - - // - // Create the same number of servants as the evictor size - // (i.e., don't exceed queue size). Servants should be - // saved immediately. - // - vector<Test::ServantPrx> servants; - for(i = 0; i < size; i++) - { - servants.push_back(evictor->createServant(i, i)); - test(evictor->getLastSavedValue() == i); - } - - // - // Evict and verify values. - // - evictor->setSize(0); - evictor->setSize(size); - evictor->clearLastSavedValue(); - for(i = 0; i < size; i++) - { - test(servants[i]->getValue() == i); - } - - // - // Mutate servants. - // - for(i = 0; i < size; i++) - { - servants[i]->setValue(i + 100); - } - - // - // Servants should not be saved yet. - // - test(evictor->getLastSavedValue() == -1); - for(i = 0; i < size; i++) - { - test(servants[i]->getValue() == i + 100); - } - - // - // Evict and verify values. - // - evictor->setSize(0); - evictor->setSize(size); - for(i = 0; i < size; i++) - { - test(servants[i]->getValue() == i + 100); - } - - // - // Destroy servants and verify ObjectNotExistException. - // - for(i = 0; i < size; i++) - { - servants[i]->destroy(); - try - { - servants[i]->getValue(); - test(false); - } - catch(const Ice::ObjectNotExistException&) - { - // Expected - } - } - - // - // Allocate space for size+1 servants. - // - servants.clear(); - - // - // Recreate servants. - // - for(i = 0; i < size; i++) - { - servants.push_back(evictor->createServant(i, i)); - } - - // - // Deactivate and recreate evictor, to ensure that servants - // are restored properly after database close and reopen. - // - evictor->deactivate(); - evictor = factory->createEvictor("EvictionStrategy", Test::Eviction); - evictor->setSize(size); - for(i = 0; i < size; i++) - { - servants[i] = evictor->getServant(i); - test(servants[i]->getValue() == i); - } - - // - // No servants should have been evicted yet. - // - test(evictor->getLastEvictedValue() == -1); - - // - // Create new servant - should cause eviction. - // - servants.push_back(evictor->createServant(size, size)); - test(evictor->getLastEvictedValue() == 0); + servants.push_back(evictor->createServant(i, i)); + test(evictor->getLastSavedValue() == -1); + } + + // + // save and verify + // + evictor->saveNow(); + test(evictor->getLastSavedValue() == i - 1); - // - // Restore the evicted servant, which evicts another - // servant, and so on. - // - for(i = 0; i <= size; i++) - { - test(servants[i]->getValue() == i); - test(evictor->getLastEvictedValue() == (i + 1) % (size + 1)); - } + + // + // Evict and verify values. + // + evictor->setSize(0); + evictor->setSize(size); + evictor->clearLastSavedValue(); + for(i = 0; i < size; i++) + { + test(servants[i]->getValue() == i); + } + + // + // Mutate servants. + // + for(i = 0; i < size; i++) + { + servants[i]->setValue(i + 100); + } + + // + // Servants should not be saved yet. + // + test(evictor->getLastSavedValue() == -1); + for(i = 0; i < size; i++) + { + test(servants[i]->getValue() == i + 100); + } + + // + // Evict and verify values. + // + evictor->setSize(0); + evictor->setSize(size); + for(i = 0; i < size; i++) + { + test(servants[i]->getValue() == i + 100); + } + + evictor->saveNow(); - // - // Destroy new servant and verify eviction no longer occurs. - // - servants[size]->destroy(); - evictor->clearLastEvictedValue(); - for(i = 0; i < size; i++) - { - test(servants[i]->getValue() == i); - } - test(evictor->getLastEvictedValue() == -1); + // + // Test saving while busy + // + Test::AMI_Servant_setValueAsyncPtr setCB = new AMI_Servant_setValueAsyncI; + for(i = 0; i < size; i++) + { + evictor->clearLastSavedValue(); - // - // Test explicit saves // - for(i = 0; i < size; i++) - { - servants[i]->saveValue(i + 1); - test(evictor->getLastSavedValue() == i + 1); - } - - // - // Clean up. - // - for(i = 0; i < size; i++) - { - servants[i]->destroy(); - } + // Start a mutating operation so that the object is not idle. + // + servants[i]->setValueAsync_async(setCB, i + 300); + // + // Wait for setValueAsync to be dispatched. + // + IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(100)); + // + // Object should not have been modified or saved yet. + // + test(servants[i]->getValue() == i + 100); + test(evictor->getLastSavedValue() == -1); + // + // This operation modifies the object state but is not saved + // because the setValueAsync operation is still pending. + // + servants[i]->setValue(i + 200); + test(servants[i]->getValue() == i + 200); + test(evictor->getLastSavedValue() == -1); + + evictor->saveNow(); + test(evictor->getLastSavedValue() == i + 200); - evictor->deactivate(); - cout << "ok" << endl; + // + // Force the response to setValueAsync + // + servants[i]->releaseAsync(); + test(servants[i]->getValue() == i + 300); + test(evictor->getLastSavedValue() == i + 200); + evictor->saveNow(); + test(evictor->getLastSavedValue() == i + 300); } - + // - // Test IdleStrategy + // Destroy servants and verify ObjectNotExistException. // + for(i = 0; i < size; i++) { - cout << "testing IdleStrategy... " << flush; - - const Ice::Int size = 5; - Ice::Int i; - - Test::RemoteEvictorPrx evictor = factory->createEvictor("IdleStrategy", Test::Idle); - evictor->setSize(size); - - // - // Create the same number of servants as the evictor size - // (i.e., don't exceed queue size). Servants should be - // saved immediately. - // - vector<Test::ServantPrx> servants; - for(i = 0; i < size; i++) - { - servants.push_back(evictor->createServant(i, i)); - test(evictor->getLastSavedValue() == i); - } - - // - // Evict and verify values. - // - evictor->setSize(0); - evictor->setSize(size); - for(i = 0; i < size; i++) - { - test(servants[i]->getValue() == i); - } - - // - // Mutate servants and verify they have been saved. - // - for(i = 0; i < size; i++) - { - servants[i]->setValue(i + 100); - test(evictor->getLastSavedValue() == i + 100); - } - - // - // Evict and verify values. - // - evictor->setSize(0); - evictor->setSize(size); - for(i = 0; i < size; i++) - { - test(servants[i]->getValue() == i + 100); - } - - // - // No servants should have been saved yet. - // - test(evictor->getLastSavedValue() == -1); - - // - // Test idle behavior. - // - Test::AMI_Servant_setValueAsyncPtr setCB = new AMI_Servant_setValueAsyncI; - for(i = 0; i < size; i++) - { - // - // Start a mutating operation so that the object is not idle. - // - servants[i]->setValueAsync_async(setCB, i + 300); - // - // Wait for setValueAsync to be dispatched. - // - IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(100)); - // - // Object should not have been modified or saved yet. - // - test(servants[i]->getValue() == i + 100); - test(evictor->getLastSavedValue() == -1); - // - // This operation modifies the object state but is not saved - // because the setValueAsync operation is still pending. - // - servants[i]->setValue(i + 200); - test(servants[i]->getValue() == i + 200); - test(evictor->getLastSavedValue() == -1); - // - // Force the response to setValueAsync, which should cause - // the object to be saved. - // - servants[i]->releaseAsync(); - test(servants[i]->getValue() == i + 300); - test(evictor->getLastSavedValue() == i + 300); - } - - // - // Destroy servants and verify ObjectNotExistException. - // - for(i = 0; i < size; i++) - { - servants[i]->destroy(); - try - { - servants[i]->getValue(); - test(false); - } - catch(const Ice::ObjectNotExistException&) - { - // Expected - } - } - - // - // Allocate space for size+1 servants. - // - servants.clear(); - - // - // Recreate servants. - // - for(i = 0; i < size; i++) - { - servants.push_back(evictor->createServant(i, i)); - } - - // - // Deactivate and recreate evictor, to ensure that servants - // are restored properly after database close and reopen. - // - evictor->deactivate(); - evictor = factory->createEvictor("IdleStrategy", Test::Idle); - evictor->setSize(size); - for(i = 0; i < size; i++) - { - servants[i] = evictor->getServant(i); - test(servants[i]->getValue() == i); - } - - // - // No servants should have been saved yet. - // - test(evictor->getLastSavedValue() == -1); - - // - // Create new servant - should cause eviction but no - // servants should be saved. - // - servants.push_back(evictor->createServant(size, size)); - test(evictor->getLastSavedValue() == size); - test(evictor->getLastEvictedValue() != -1); - - // - // Restore the evicted servant, which evicts another - // servant, and so on. - // - for(i = 0; i <= size; i++) - { - test(servants[i]->getValue() == i); - test(evictor->getLastEvictedValue() == (i + 1) % (size + 1)); - } - test(evictor->getLastSavedValue() == -1); - - // - // Clean up. - // - for(i = 0; i <= size; i++) - { - servants[i]->destroy(); - } - - evictor->deactivate(); - cout << "ok" << endl; + servants[i]->destroy(); + try + { + servants[i]->getValue(); + test(false); + } + catch(const Ice::ObjectNotExistException&) + { + // Expected + } } + + // + // Allocate space for size+1 servants. + // + servants.clear(); + + // + // Recreate servants. + // + for(i = 0; i < size; i++) + { + servants.push_back(evictor->createServant(i, i)); + } + + // + // Deactivate and recreate evictor, to ensure that servants + // are restored properly after database close and reopen. + // + evictor->deactivate(); + evictor = factory->createEvictor("Test"); + evictor->setSize(size); + for(i = 0; i < size; i++) + { + servants[i] = evictor->getServant(i); + test(servants[i]->getValue() == i); + } + + // + // Clean up. + // + for(i = 0; i < size; i++) + { + servants[i]->destroy(); + } + + evictor->deactivate(); + cout << "ok" << endl; factory->shutdown(); - + return EXIT_SUCCESS; } diff --git a/cpp/test/Freeze/evictor/Makefile b/cpp/test/Freeze/evictor/Makefile index 2736f7146a5..0f086f8b160 100644 --- a/cpp/test/Freeze/evictor/Makefile +++ b/cpp/test/Freeze/evictor/Makefile @@ -44,4 +44,7 @@ $(SERVER): $(OBJS) $(SOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) -lFreeze -lIceXML $(LIBS) $(DB_LIBS) +clean:: + rm -f db/Test db/log.* + include .depend diff --git a/cpp/test/Freeze/evictor/Server.cpp b/cpp/test/Freeze/evictor/Server.cpp index 08302080020..b5110d372e7 100644 --- a/cpp/test/Freeze/evictor/Server.cpp +++ b/cpp/test/Freeze/evictor/Server.cpp @@ -13,8 +13,8 @@ // ********************************************************************** #include <IceUtil/IceUtil.h> -#include <Freeze/Freeze.h> #include <TestI.h> +#include <Ice/Ice.h> using namespace std; @@ -36,13 +36,13 @@ public: }; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const Freeze::DBEnvironmentPtr& dbEnv) +run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const string& envName) { communicator->getProperties()->setProperty("Factory.Endpoints", "default -p 12345 -t 2000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Factory"); - Test::RemoteEvictorFactoryPtr factory = new Test::RemoteEvictorFactoryI(adapter, dbEnv); + Test::RemoteEvictorFactoryPtr factory = new Test::RemoteEvictorFactoryI(adapter, envName); adapter->add(factory, Ice::stringToIdentity("factory")); Ice::ObjectFactoryPtr servantFactory = new ServantFactory; @@ -60,20 +60,17 @@ main(int argc, char* argv[]) { int status; Ice::CommunicatorPtr communicator; - Freeze::DBEnvironmentPtr dbEnv; - string dbEnvDir = "db"; + string envName = "db"; try { communicator = Ice::initialize(argc, argv); if(argc != 1) { - dbEnvDir = argv[1]; - dbEnvDir += "/"; - dbEnvDir += "db"; + envName = argv[1]; + envName += "/db"; } - dbEnv = Freeze::initialize(communicator, dbEnvDir); - status = run(argc, argv, communicator, dbEnv); + status = run(argc, argv, communicator, envName); } catch(const Ice::Exception& ex) { @@ -81,12 +78,6 @@ main(int argc, char* argv[]) status = EXIT_FAILURE; } - if(dbEnv) - { - dbEnv->close(); - dbEnv = 0; - } - if(communicator) { try diff --git a/cpp/test/Freeze/evictor/Test.ice b/cpp/test/Freeze/evictor/Test.ice index 4850f02fec0..e7ba8d797e6 100644 --- a/cpp/test/Freeze/evictor/Test.ice +++ b/cpp/test/Freeze/evictor/Test.ice @@ -21,12 +21,9 @@ module Test class Servant { nonmutating int getValue(); - void setValue(int value); - ["ami", "amd"] void setValueAsync(int value); - - void saveValue(int value); + ["ami", "amd"] void setValueAsync(int value); nonmutating void releaseAsync(); void destroy(); @@ -41,20 +38,13 @@ interface RemoteEvictor Servant* getServant(int id); nonmutating int getLastSavedValue(); void clearLastSavedValue(); - nonmutating int getLastEvictedValue(); - void clearLastEvictedValue(); + void saveNow(); void deactivate(); }; -enum Strategy -{ - Eviction, - Idle -}; - interface RemoteEvictorFactory { - RemoteEvictor* createEvictor(string name, Strategy s); + RemoteEvictor* createEvictor(string name); void shutdown(); }; diff --git a/cpp/test/Freeze/evictor/TestI.cpp b/cpp/test/Freeze/evictor/TestI.cpp index bbdfb88d5db..e479f38ee5d 100644 --- a/cpp/test/Freeze/evictor/TestI.cpp +++ b/cpp/test/Freeze/evictor/TestI.cpp @@ -40,26 +40,22 @@ Test::ServantI::init(const RemoteEvictorIPtr& remoteEvictor, const Freeze::Evict Int Test::ServantI::getValue(const Current&) const { + Lock sync(*this); return value; } void Test::ServantI::setValue(Int val, const Current&) { + Lock sync(*this); value = val; } -void -Test::ServantI::saveValue(Int val, const Current& current) -{ - value = val; - _evictor->saveObject(current.id); -} - void Test::ServantI::setValueAsync_async(const AMD_Servant_setValueAsyncPtr& __cb, Int value, const Current&) { + Lock sync(*this); _setValueAsyncCB = __cb; _setValueAsyncValue = value; } @@ -69,6 +65,7 @@ Test::ServantI::releaseAsync(const Current& current) const { if(_setValueAsyncCB) { + Lock sync(*this); const_cast<Int&>(value) = _setValueAsyncValue; _setValueAsyncCB->ice_response(); const_cast<AMD_Servant_setValueAsyncPtr&>(_setValueAsyncCB) = 0; @@ -97,12 +94,10 @@ Test::ServantI::__marshal(const StreamPtr& os) const Servant::__marshal(os); } -Test::RemoteEvictorI::RemoteEvictorI(const ObjectAdapterPtr& adapter, const string& category, const Freeze::DBPtr& db, - const StrategyIPtr& strategy, const Freeze::EvictorPtr& evictor) : +Test::RemoteEvictorI::RemoteEvictorI(const ObjectAdapterPtr& adapter, const string& category, + const Freeze::EvictorPtr& evictor) : _adapter(adapter), _category(category), - _db(db), - _strategy(strategy), _evictor(evictor), _lastSavedValue(-1) { @@ -146,7 +141,6 @@ Int Test::RemoteEvictorI::getLastSavedValue(const Current&) const { Int result = _lastSavedValue; - (const_cast<RemoteEvictorI*>(this))->_lastSavedValue = -1; return result; } @@ -156,16 +150,11 @@ Test::RemoteEvictorI::clearLastSavedValue(const Current&) _lastSavedValue = -1; } -Int -Test::RemoteEvictorI::getLastEvictedValue(const Current&) const -{ - return _strategy->getLastEvictedValue(); -} void -Test::RemoteEvictorI::clearLastEvictedValue(const Current&) +Test::RemoteEvictorI::saveNow(const Current&) { - _strategy->clearLastEvictedValue(); + _evictor->saveNow(); } void @@ -174,7 +163,6 @@ Test::RemoteEvictorI::deactivate(const Current& current) _evictorAdapter->deactivate(); _evictorAdapter->waitForDeactivate(); _adapter->remove(stringToIdentity(_category)); - _db->close(); } void @@ -207,32 +195,19 @@ private: }; Test::RemoteEvictorFactoryI::RemoteEvictorFactoryI(const ObjectAdapterPtr& adapter, - const Freeze::DBEnvironmentPtr& dbEnv) : + const std::string& envName) : _adapter(adapter), - _dbEnv(dbEnv) + _envName(envName) { } ::Test::RemoteEvictorPrx Test::RemoteEvictorFactoryI::createEvictor(const string& name, - Test::Strategy mode, const Current& current) { - Freeze::DBPtr db = _dbEnv->openDB(name, true); + Freeze::EvictorPtr evictor = Freeze::createEvictor(_adapter->getCommunicator(), _envName, name); - Freeze::PersistenceStrategyPtr delegate; - if(mode == Test::Eviction) - { - delegate = db->createEvictionStrategy(); - } - else - { - delegate = db->createIdleStrategy(); - } - StrategyIPtr strategy = new StrategyI(delegate); - Freeze::EvictorPtr evictor = db->createEvictor(strategy); - - RemoteEvictorIPtr remoteEvictor = new RemoteEvictorI(_adapter, name, db, strategy, evictor); + RemoteEvictorIPtr remoteEvictor = new RemoteEvictorI(_adapter, name, evictor); Freeze::ServantInitializerPtr initializer = new Initializer(remoteEvictor, evictor); evictor->installServantInitializer(initializer); return RemoteEvictorPrx::uncheckedCast(_adapter->add(remoteEvictor, stringToIdentity(name))); @@ -241,86 +216,6 @@ Test::RemoteEvictorFactoryI::createEvictor(const string& name, void Test::RemoteEvictorFactoryI::shutdown(const Current&) { - _dbEnv->getCommunicator()->shutdown(); + _adapter->getCommunicator()->shutdown(); } -Test::StrategyI::StrategyI(const Freeze::PersistenceStrategyPtr& delegate) : - _delegate(delegate), _lastEvictedValue(-1) -{ -} - -LocalObjectPtr -Test::StrategyI::activatedObject(const Identity& ident, - const ObjectPtr& servant) -{ - return _delegate->activatedObject(ident, servant); -} - -void -Test::StrategyI::destroyedObject(const Identity& ident, const LocalObjectPtr& cookie) -{ - _delegate->destroyedObject(ident, cookie); -} - -void -Test::StrategyI::evictedObject(const Freeze::ObjectStorePtr& store, - const Identity& ident, - const ObjectPtr& servant, - const LocalObjectPtr& cookie) -{ - ServantIPtr s = ServantIPtr::dynamicCast(servant); - _lastEvictedValue = s->getValue(); - - _delegate->evictedObject(store, ident, servant, cookie); -} - -void -Test::StrategyI::savedObject(const Freeze::ObjectStorePtr& store, - const Identity& ident, - const ObjectPtr& servant, - const LocalObjectPtr& cookie, - Ice::Int usageCount) -{ - _delegate->savedObject(store, ident, servant, cookie, usageCount); -} - - -void -Test::StrategyI::preOperation(const Freeze::ObjectStorePtr& store, - const Identity& ident, - const ObjectPtr& servant, - bool mutating, - const LocalObjectPtr& cookie) -{ - _delegate->preOperation(store, ident, servant, mutating, cookie); -} - -void -Test::StrategyI::postOperation(const Freeze::ObjectStorePtr& store, - const Identity& ident, - const ObjectPtr& servant, - bool mutating, - const LocalObjectPtr& cookie) -{ - _delegate->postOperation(store, ident, servant, mutating, cookie); -} - -void -Test::StrategyI::destroy() -{ - _delegate->destroy(); -} - -Int -Test::StrategyI::getLastEvictedValue() -{ - Int result = _lastEvictedValue; - _lastEvictedValue = -1; - return result; -} - -void -Test::StrategyI::clearLastEvictedValue() -{ - _lastEvictedValue = -1; -} diff --git a/cpp/test/Freeze/evictor/TestI.h b/cpp/test/Freeze/evictor/TestI.h index 4f2150c799a..511957e46dc 100644 --- a/cpp/test/Freeze/evictor/TestI.h +++ b/cpp/test/Freeze/evictor/TestI.h @@ -16,8 +16,8 @@ #define TEST_I_H #include <Freeze/EvictorF.h> -#include <Freeze/DBF.h> #include <Test.h> +#include <IceUtil/AbstractMutex.h> namespace Test { @@ -28,10 +28,7 @@ typedef IceUtil::Handle<ServantI> ServantIPtr; class RemoteEvictorI; typedef IceUtil::Handle<RemoteEvictorI> RemoteEvictorIPtr; -class StrategyI; -typedef IceUtil::Handle<StrategyI> StrategyIPtr; - -class ServantI : virtual public Servant +class ServantI : virtual public Servant, public IceUtil::AbstractMutexI<IceUtil::Mutex> { public: @@ -47,8 +44,6 @@ public: virtual void setValueAsync_async(const AMD_Servant_setValueAsyncPtr&, Ice::Int, const Ice::Current& = Ice::Current()); - virtual void saveValue(Ice::Int, const Ice::Current&); - virtual void releaseAsync(const Ice::Current& = Ice::Current()) const; virtual void destroy(const Ice::Current& = Ice::Current()); @@ -69,8 +64,8 @@ class RemoteEvictorI : virtual public RemoteEvictor { public: - RemoteEvictorI(const Ice::ObjectAdapterPtr&, const std::string&, const Freeze::DBPtr& db, - const StrategyIPtr& strategy, const Freeze::EvictorPtr&); + RemoteEvictorI(const Ice::ObjectAdapterPtr&, const std::string&, + const Freeze::EvictorPtr&); virtual void setSize(::Ice::Int, const Ice::Current&); @@ -82,9 +77,7 @@ public: virtual void clearLastSavedValue(const Ice::Current&); - virtual ::Ice::Int getLastEvictedValue(const Ice::Current&) const; - - virtual void clearLastEvictedValue(const Ice::Current&); + virtual void saveNow(const Ice::Current&); virtual void deactivate(const Ice::Current&); @@ -94,8 +87,6 @@ private: Ice::ObjectAdapterPtr _adapter; std::string _category; - Freeze::DBPtr _db; - StrategyIPtr _strategy; Freeze::EvictorPtr _evictor; Ice::ObjectAdapterPtr _evictorAdapter; Ice::Int _lastSavedValue; @@ -105,10 +96,9 @@ class RemoteEvictorFactoryI : virtual public RemoteEvictorFactory { public: - RemoteEvictorFactoryI(const Ice::ObjectAdapterPtr&, const Freeze::DBEnvironmentPtr&); + RemoteEvictorFactoryI(const Ice::ObjectAdapterPtr&, const std::string&); virtual ::Test::RemoteEvictorPrx createEvictor(const ::std::string&, - ::Test::Strategy, const Ice::Current&); virtual void shutdown(const Ice::Current&); @@ -116,53 +106,7 @@ public: private: Ice::ObjectAdapterPtr _adapter; - Freeze::DBEnvironmentPtr _dbEnv; -}; - -class StrategyI : virtual public Freeze::PersistenceStrategy -{ -public: - - StrategyI(const Freeze::PersistenceStrategyPtr&); - - virtual Ice::LocalObjectPtr activatedObject(const Ice::Identity&, - const Ice::ObjectPtr&); - - virtual void destroyedObject(const Ice::Identity&, const Ice::LocalObjectPtr&); - - virtual void evictedObject(const Freeze::ObjectStorePtr&, - const Ice::Identity&, - const Ice::ObjectPtr&, - const Ice::LocalObjectPtr&); - - virtual void savedObject(const Freeze::ObjectStorePtr&, - const Ice::Identity&, - const Ice::ObjectPtr&, - const Ice::LocalObjectPtr&, - Ice::Int); - - virtual void preOperation(const Freeze::ObjectStorePtr&, - const Ice::Identity&, - const Ice::ObjectPtr&, - bool, - const Ice::LocalObjectPtr&); - - virtual void postOperation(const Freeze::ObjectStorePtr&, - const Ice::Identity&, - const Ice::ObjectPtr&, - bool, - const Ice::LocalObjectPtr&); - - virtual void destroy(); - - Ice::Int getLastEvictedValue(); - - void clearLastEvictedValue(); - -private: - - Freeze::PersistenceStrategyPtr _delegate; - Ice::Int _lastEvictedValue; + const std::string _envName; }; } diff --git a/cpp/test/Freeze/evictor/config b/cpp/test/Freeze/evictor/config new file mode 100644 index 00000000000..f00c7ebae94 --- /dev/null +++ b/cpp/test/Freeze/evictor/config @@ -0,0 +1,10 @@ +# +# Disable automatic saves +# +Freeze.Evictor.db.Test.SaveSizeTrigger=-1 +Freeze.Evictor.db.Test.SavePeriod=0 +Freeze.Trace.DB=1 +Freeze.Trace.Evictor=1 + + + diff --git a/cpp/test/Freeze/evictor/run.py b/cpp/test/Freeze/evictor/run.py index ca10669c7b2..c738788d03f 100755 --- a/cpp/test/Freeze/evictor/run.py +++ b/cpp/test/Freeze/evictor/run.py @@ -31,5 +31,7 @@ testdir = os.path.join(toplevel, "test", name) dbdir = os.path.join(testdir, "db") TestUtil.cleanDbDir(dbdir) -TestUtil.clientServerTestWithOptions(name, " " + testdir, "") +testOptions = " --Ice.Config=" + testdir + "/config "; + +TestUtil.clientServerTestWithOptions(name, " " + testdir, testOptions) sys.exit(0) diff --git a/cpp/test/IcePack/deployer/.depend b/cpp/test/IcePack/deployer/.depend index ba9ccb4275d..d20eee6ec14 100644 --- a/cpp/test/IcePack/deployer/.depend +++ b/cpp/test/IcePack/deployer/.depend @@ -1,8 +1,8 @@ Test.o: Test.cpp Test.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/Stream.h Client.o: Client.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../include/TestCommon.h Test.h -AllTests.o: AllTests.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/IcePack/Query.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h ../../../include/IcePack/Exception.h ../../../include/IcePack/Admin.h ../../../include/IceBox/IceBox.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h ../../include/TestCommon.h Test.h +AllTests.o: AllTests.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/IcePack/Query.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h ../../../include/IcePack/Exception.h ../../../include/IcePack/Admin.h ../../../include/IceBox/IceBox.h ../../include/TestCommon.h Test.h TestI.o: TestI.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h TestI.h Test.h Server.o: Server.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h TestI.h Test.h ../../include/TestCommon.h TestI.o: TestI.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h TestI.h Test.h -Service.o: Service.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/IceBox/IceBox.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Strategy.h ../../../include/Freeze/Map.h TestI.h Test.h +Service.o: Service.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/IceBox/IceBox.h ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/DBException.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Map.h ../../../include/Freeze/DB.h TestI.h Test.h Test.cpp: Test.ice diff --git a/cpp/test/IcePack/deployer/Makefile b/cpp/test/IcePack/deployer/Makefile index 0739beabe90..177b31955e1 100644 --- a/cpp/test/IcePack/deployer/Makefile +++ b/cpp/test/IcePack/deployer/Makefile @@ -66,4 +66,8 @@ $(SVCLIBNAME): $(SVCSONAME) rm -f $@ ln -s $(SVCSONAME) $@ +clean:: + rm -f db/node/db/servers db/node/db/serveradapters db/node/db/log.* + rm -f db/registry/* + include .depend diff --git a/cpp/test/IcePack/deployer/Service.cpp b/cpp/test/IcePack/deployer/Service.cpp index c8535eb1b84..8cb518b199f 100644 --- a/cpp/test/IcePack/deployer/Service.cpp +++ b/cpp/test/IcePack/deployer/Service.cpp @@ -33,8 +33,8 @@ public: virtual ~ServiceI(); virtual void start(const string&, - const CommunicatorPtr&, - const StringSeq&); + const CommunicatorPtr&, + const StringSeq&); virtual void stop(); }; @@ -49,7 +49,7 @@ public: virtual void start(const string&, const CommunicatorPtr&, const StringSeq&, - const Freeze::DBEnvironmentPtr&); + const std::string&); virtual void stop(); }; @@ -112,13 +112,8 @@ void FreezeServiceI::start(const string& name, const CommunicatorPtr& communicator, const StringSeq& args, - const Freeze::DBEnvironmentPtr& dbEnv) + const std::string& envName) { - // - // Ensure that we can create an environment. - // - Freeze::DBPtr db = dbEnv->openDB("testdb", true); - Ice::PropertiesPtr properties = communicator->getProperties(); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter(name); diff --git a/cpp/test/IcePack/simple/.depend b/cpp/test/IcePack/simple/.depend index 45ed36dcb80..29726d5b864 100644 --- a/cpp/test/IcePack/simple/.depend +++ b/cpp/test/IcePack/simple/.depend @@ -1,6 +1,6 @@ Test.o: Test.cpp Test.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/Stream.h Client.o: Client.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../include/TestCommon.h Test.h -AllTests.o: AllTests.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/IcePack/Admin.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h ../../../include/IceBox/IceBox.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h ../../../include/IcePack/Exception.h ../../include/TestCommon.h Test.h +AllTests.o: AllTests.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/IcePack/Admin.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h ../../../include/IceBox/IceBox.h ../../../include/IcePack/Exception.h ../../include/TestCommon.h Test.h TestI.o: TestI.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h TestI.h Test.h Server.o: Server.cpp ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h TestI.h Test.h Test.cpp: Test.ice diff --git a/cpp/test/IcePack/simple/Makefile b/cpp/test/IcePack/simple/Makefile index 827adcfca75..024f0d6e47b 100644 --- a/cpp/test/IcePack/simple/Makefile +++ b/cpp/test/IcePack/simple/Makefile @@ -45,4 +45,8 @@ $(SERVER): $(OBJS) $(SOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) +clean:: + rm -f db/node/db/servers db/node/db/serveradapters db/node/db/log.* + rm -f db/registry/* + include .depend diff --git a/cpp/test/IceStorm/federation/Makefile b/cpp/test/IceStorm/federation/Makefile index 441d16f5971..38457b1ceb7 100644 --- a/cpp/test/IceStorm/federation/Makefile +++ b/cpp/test/IceStorm/federation/Makefile @@ -44,4 +44,7 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) +clean:: + rm -f db/topicmanager db/log.* + include .depend diff --git a/cpp/test/IceStorm/single/Makefile b/cpp/test/IceStorm/single/Makefile index 32a7fd284ff..4a480d66ed6 100644 --- a/cpp/test/IceStorm/single/Makefile +++ b/cpp/test/IceStorm/single/Makefile @@ -44,4 +44,7 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) +clean:: + rm -f db/topicmanager db/log.* + include .depend diff --git a/cpp/test/XMLTransform/transform/.depend b/cpp/test/XMLTransform/transform/.depend index 37eb5b5f583..d34f3697898 100644 --- a/cpp/test/XMLTransform/transform/.depend +++ b/cpp/test/XMLTransform/transform/.depend @@ -1,34 +1,34 @@ -Populate.o: Populate.cpp ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DBF.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Strategy.h ../../../include/Freeze/Map.h ../../../include/XMLTransform/XMLTransform.h ../../../include/IceUtil/OutputUtil.h ../../../include/Ice/Xerces.h ../../include/TestCommon.h IntByteMap.h IntShortMap.h IntIntMap.h IntLongMap.h IntFloatMap.h IntDoubleMap.h IntSeq1MapOld.h TestOld.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h IntSeq2MapOld.h IntSeq3MapOld.h IntSeq4MapOld.h IntE1MapOld.h IntD1MapOld.h IntS1MapOld.h IntC1MapOld.h -IntByteMap.o: IntByteMap.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntByteMap.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h -IntShortMap.o: IntShortMap.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntShortMap.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h -IntIntMap.o: IntIntMap.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntIntMap.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h -IntLongMap.o: IntLongMap.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntLongMap.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h -IntFloatMap.o: IntFloatMap.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntFloatMap.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h -IntDoubleMap.o: IntDoubleMap.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntDoubleMap.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h -IntSeq1MapOld.o: IntSeq1MapOld.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntSeq1MapOld.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h TestOld.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h -IntSeq2MapOld.o: IntSeq2MapOld.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntSeq2MapOld.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h TestOld.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h -IntSeq3MapOld.o: IntSeq3MapOld.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntSeq3MapOld.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h TestOld.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h -IntSeq4MapOld.o: IntSeq4MapOld.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntSeq4MapOld.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h TestOld.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h -IntE1MapOld.o: IntE1MapOld.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntE1MapOld.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h TestOld.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h -IntD1MapOld.o: IntD1MapOld.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntD1MapOld.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h TestOld.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h -IntS1MapOld.o: IntS1MapOld.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntS1MapOld.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h TestOld.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h -IntC1MapOld.o: IntC1MapOld.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntC1MapOld.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h TestOld.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h +Populate.o: Populate.cpp ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/DBException.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Map.h ../../../include/Freeze/DB.h ../../../include/XMLTransform/XMLTransform.h ../../../include/IceUtil/OutputUtil.h ../../../include/Ice/Xerces.h ../../include/TestCommon.h IntByteMap.h IntShortMap.h IntIntMap.h IntLongMap.h IntFloatMap.h IntDoubleMap.h IntSeq1MapOld.h TestOld.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h IntSeq2MapOld.h IntSeq3MapOld.h IntSeq4MapOld.h IntE1MapOld.h IntD1MapOld.h IntS1MapOld.h IntC1MapOld.h +IntByteMap.o: IntByteMap.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntByteMap.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h +IntShortMap.o: IntShortMap.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntShortMap.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h +IntIntMap.o: IntIntMap.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntIntMap.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h +IntLongMap.o: IntLongMap.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntLongMap.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h +IntFloatMap.o: IntFloatMap.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntFloatMap.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h +IntDoubleMap.o: IntDoubleMap.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntDoubleMap.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h +IntSeq1MapOld.o: IntSeq1MapOld.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntSeq1MapOld.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h TestOld.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h +IntSeq2MapOld.o: IntSeq2MapOld.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntSeq2MapOld.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h TestOld.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h +IntSeq3MapOld.o: IntSeq3MapOld.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntSeq3MapOld.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h TestOld.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h +IntSeq4MapOld.o: IntSeq4MapOld.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntSeq4MapOld.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h TestOld.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h +IntE1MapOld.o: IntE1MapOld.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntE1MapOld.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h TestOld.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h +IntD1MapOld.o: IntD1MapOld.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntD1MapOld.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h TestOld.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h +IntS1MapOld.o: IntS1MapOld.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntS1MapOld.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h TestOld.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h +IntC1MapOld.o: IntC1MapOld.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntC1MapOld.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h TestOld.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h TestOld.o: TestOld.cpp TestOld.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/LocalException.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Stream.h -Validate.o: Validate.cpp ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DBF.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Strategy.h ../../../include/Freeze/Map.h ../../include/TestCommon.h IntByteMap.h IntShortMap.h IntIntMap.h IntLongMap.h IntFloatMap.h IntDoubleMap.h IntSeq1MapNew.h TestNew.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h IntSeq2MapNew.h IntSeq3MapNew.h IntSeq4MapNew.h IntE1MapNew.h IntD1MapNew.h IntS1MapNew.h IntC1MapNew.h -IntByteMap.o: IntByteMap.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntByteMap.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h -IntShortMap.o: IntShortMap.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntShortMap.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h -IntIntMap.o: IntIntMap.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntIntMap.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h -IntLongMap.o: IntLongMap.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntLongMap.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h -IntFloatMap.o: IntFloatMap.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntFloatMap.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h -IntDoubleMap.o: IntDoubleMap.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntDoubleMap.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h -IntSeq1MapNew.o: IntSeq1MapNew.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntSeq1MapNew.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h TestNew.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h -IntSeq2MapNew.o: IntSeq2MapNew.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntSeq2MapNew.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h TestNew.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h -IntSeq3MapNew.o: IntSeq3MapNew.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntSeq3MapNew.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h TestNew.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h -IntSeq4MapNew.o: IntSeq4MapNew.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntSeq4MapNew.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h TestNew.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h -IntE1MapNew.o: IntE1MapNew.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntE1MapNew.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h TestNew.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h -IntD1MapNew.o: IntD1MapNew.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntD1MapNew.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h TestNew.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h -IntS1MapNew.o: IntS1MapNew.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntS1MapNew.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h TestNew.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h -IntC1MapNew.o: IntC1MapNew.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntC1MapNew.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h ../../../include/Freeze/DBF.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/StrategyF.h TestNew.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h +Validate.o: Validate.cpp ../../../include/Freeze/Freeze.h ../../../include/Freeze/Initialize.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/CommunicatorF.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/InstanceF.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/EvictorF.h ../../../include/Freeze/Evictor.h ../../../include/Freeze/DBException.h ../../../include/Freeze/ObjectRecord.h ../../../include/Freeze/Map.h ../../../include/Freeze/DB.h ../../include/TestCommon.h IntByteMap.h IntShortMap.h IntIntMap.h IntLongMap.h IntFloatMap.h IntDoubleMap.h IntSeq1MapNew.h TestNew.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h IntSeq2MapNew.h IntSeq3MapNew.h IntSeq4MapNew.h IntE1MapNew.h IntD1MapNew.h IntS1MapNew.h IntC1MapNew.h +IntByteMap.o: IntByteMap.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntByteMap.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h +IntShortMap.o: IntShortMap.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntShortMap.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h +IntIntMap.o: IntIntMap.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntIntMap.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h +IntLongMap.o: IntLongMap.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntLongMap.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h +IntFloatMap.o: IntFloatMap.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntFloatMap.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h +IntDoubleMap.o: IntDoubleMap.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntDoubleMap.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h +IntSeq1MapNew.o: IntSeq1MapNew.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntSeq1MapNew.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h TestNew.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h +IntSeq2MapNew.o: IntSeq2MapNew.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntSeq2MapNew.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h TestNew.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h +IntSeq3MapNew.o: IntSeq3MapNew.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntSeq3MapNew.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h TestNew.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h +IntSeq4MapNew.o: IntSeq4MapNew.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntSeq4MapNew.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h TestNew.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h +IntE1MapNew.o: IntE1MapNew.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntE1MapNew.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h TestNew.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h +IntD1MapNew.o: IntD1MapNew.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntD1MapNew.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h TestNew.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h +IntS1MapNew.o: IntS1MapNew.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntS1MapNew.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h TestNew.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h +IntC1MapNew.o: IntC1MapNew.cpp ../../../include/IceXML/StreamI.h ../../../include/Ice/Stream.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/CommunicatorF.h ../../../include/IceUtil/OutputUtil.h IntC1MapNew.h ../../../include/Freeze/Map.h ../../../include/Ice/Ice.h ../../../include/Ice/Initialize.h ../../../include/Ice/PropertiesF.h ../../../include/Ice/LocalException.h ../../../include/Ice/Properties.h ../../../include/Ice/Logger.h ../../../include/Ice/LoggerUtil.h ../../../include/Ice/LoggerF.h ../../../include/Ice/Stats.h ../../../include/Ice/Communicator.h ../../../include/Ice/StatsF.h ../../../include/Ice/RouterF.h ../../../include/Ice/LocatorF.h ../../../include/Ice/PluginF.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/ObjectAdapter.h ../../../include/Ice/ServantLocator.h ../../../include/Ice/IdentityUtil.h ../../../include/Ice/OutgoingAsync.h ../../../include/Ice/IncomingAsync.h ../../../include/Ice/Application.h ../../../include/Freeze/DB.h ../../../include/Freeze/DBException.h TestNew.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h TestNew.o: TestNew.cpp TestNew.h ../../../include/Ice/LocalObjectF.h ../../../include/Ice/Handle.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/Ice/Config.h ../../../include/Ice/ProxyF.h ../../../include/Ice/ProxyHandle.h ../../../include/Ice/ObjectF.h ../../../include/Ice/Exception.h ../../../include/Ice/LocalObject.h ../../../include/IceUtil/Shared.h ../../../include/Ice/StreamF.h ../../../include/Ice/Proxy.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/ThreadException.h ../../../include/Ice/ProxyFactoryF.h ../../../include/Ice/ConnectionF.h ../../../include/Ice/EndpointF.h ../../../include/Ice/ObjectAdapterF.h ../../../include/Ice/ReferenceF.h ../../../include/Ice/OutgoingAsyncF.h ../../../include/Ice/Current.h ../../../include/Ice/Identity.h ../../../include/Ice/Facet.h ../../../include/Ice/Object.h ../../../include/Ice/IncomingAsyncF.h ../../../include/Ice/Outgoing.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Time.h ../../../include/Ice/BasicStream.h ../../../include/Ice/InstanceF.h ../../../include/Ice/ObjectFactoryF.h ../../../include/Ice/Buffer.h ../../../include/Ice/Incoming.h ../../../include/Ice/ServantLocatorF.h ../../../include/Ice/ServantManagerF.h ../../../include/Ice/Direct.h ../../../include/Ice/FactoryTable.h ../../../include/Ice/FactoryTableDef.h ../../../include/IceUtil/StaticMutex.h ../../../include/Ice/UserExceptionFactory.h ../../../include/Ice/ObjectFactory.h ../../../include/Ice/LocalException.h ../../../include/Ice/BuiltinSequences.h ../../../include/Ice/Stream.h TestOld.cpp: TestOld.ice TestNew.cpp: TestNew.ice diff --git a/cpp/test/XMLTransform/transform/Populate.cpp b/cpp/test/XMLTransform/transform/Populate.cpp index 306f13b46f4..cd85ff91ea2 100644 --- a/cpp/test/XMLTransform/transform/Populate.cpp +++ b/cpp/test/XMLTransform/transform/Populate.cpp @@ -29,9 +29,17 @@ #include <IntD1MapOld.h> #include <IntS1MapOld.h> #include <IntC1MapOld.h> +#include <db_cxx.h> #include <fstream> +#include <sys/stat.h> +#ifdef _WIN32 +# define FREEZE_DB_MODE 0 +#else +# define FREEZE_DB_MODE (S_IRUSR | S_IWUSR) +#endif + using namespace std; using namespace Freeze; using namespace Ice; @@ -78,404 +86,382 @@ emitSchemas(const string& fromValueType, const string& toValueType) } static void -transformPrimitive(const DBEnvironmentPtr& dbEnv) +transformPrimitive(const CommunicatorPtr& communicator, DbEnv& dbEnv) { Int i; - DBPtr db; StringSeq dummy; cout << "transforming primitives... " << flush; - try + + // + // Transform byte to short + // { - // - // Transform byte to short - // - db = dbEnv->openDB("byteToShort", true); - db->clear(); - - { - IntByteMap map(db); - for(i = 0; i < NUM_KEYS; i++) - { - map.put(IntByteMap::value_type(i, i)); - } - } - db->close(); - db = 0; - - db = dbEnv->openDBWithTxn(0, "byteToShort", false); - emitSchemas("xs:byte", "xs:short"); - { - XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); - transformer.transform(oldSchema, newSchema); - } - db->close(); - db = 0; - - // - // Transform short to int - // - db = dbEnv->openDB("shortToInt", true); - db->clear(); - - { - IntShortMap map(db); - for(i = 0; i < NUM_KEYS; i++) - { - map.put(IntShortMap::value_type(i, i)); - } - } - db->close(); - db = 0; - - db = dbEnv->openDBWithTxn(0, "shortToInt", false); - emitSchemas("xs:short", "xs:int"); - { - XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); - transformer.transform(oldSchema, newSchema); - } - db->close(); - db = 0; - - // - // Transform int to long - // - db = dbEnv->openDB("intToLong", true); - db->clear(); - - { - IntIntMap map(db); - for(i = 0; i < NUM_KEYS; i++) - { - map.put(IntIntMap::value_type(i, i)); - } - } - db->close(); - db = 0; - - db = dbEnv->openDBWithTxn(0, "intToLong", false); - emitSchemas("xs:int", "xs:long"); - { - XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); - transformer.transform(oldSchema, newSchema); - } - db->close(); - db = 0; - - // - // Transform long to byte - // - db = dbEnv->openDB("longToByte", true); - db->clear(); - - { - IntLongMap map(db); - for(i = 0; i < NUM_KEYS; i++) - { - map.put(IntLongMap::value_type(i, i)); - } - } - db->close(); - db = 0; - - db = dbEnv->openDBWithTxn(0, "longToByte", false); - emitSchemas("xs:long", "xs:byte"); - { - XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); - transformer.transform(oldSchema, newSchema); - } - db->close(); - db = 0; - - // - // Transform float to double - // - db = dbEnv->openDB("floatToDouble", true); - db->clear(); - - { - IntFloatMap map(db); - for(i = 0; i < NUM_KEYS; i++) - { - map.put(IntFloatMap::value_type(i, static_cast<float>(i))); - } - } - db->close(); - db = 0; - - db = dbEnv->openDBWithTxn(0, "floatToDouble", false); - emitSchemas("xs:float", "xs:double"); - { - XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); - transformer.transform(oldSchema, newSchema); - } - db->close(); - db = 0; - - // - // Transform long to byte (should fail) - // - db = dbEnv->openDB("failure", true); - db->clear(); - - { - IntLongMap map(db); - Long l; - l = SCHAR_MIN; - map.put(IntLongMap::value_type(0, l)); - map.put(IntLongMap::value_type(1, l - 1)); // Out of range for byte. - l = SCHAR_MAX; - map.put(IntLongMap::value_type(2, l)); - map.put(IntLongMap::value_type(3, l + 1)); // Out of range for byte. - } - db->close(); - db = 0; - - db = dbEnv->openDBWithTxn(0, "failure", false); - emitSchemas("xs:long", "xs:byte"); - try - { - XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); - transformer.transform(oldSchema, newSchema); - test(false); - } - catch(const XMLTransform::IllegalTransform&) - { - // Expected. - } - db->close(); - db = 0; - - // - // Transform long to short (should fail) - // - db = dbEnv->openDB("failure", true); - db->clear(); - - { - IntLongMap map(db); - Long l; - l = SHRT_MIN; - map.put(IntLongMap::value_type(0, l)); - map.put(IntLongMap::value_type(1, l - 1)); // Out of range for short. - l = SHRT_MAX; - map.put(IntLongMap::value_type(2, l)); - map.put(IntLongMap::value_type(3, l + 1)); // Out of range for short. - } - db->close(); - db = 0; - - db = dbEnv->openDBWithTxn(0, "failure", false); - emitSchemas("xs:long", "xs:short"); - try - { - XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); - transformer.transform(oldSchema, newSchema); - test(false); - } - catch(const XMLTransform::IllegalTransform&) - { - // Expected. - } - db->close(); - db = 0; - - // - // Transform long to int (should fail) - // - db = dbEnv->openDB("failure", true); - db->clear(); - - { - IntLongMap map(db); - Long l; - l = INT_MIN; - map.put(IntLongMap::value_type(0, l)); - map.put(IntLongMap::value_type(1, l - 1)); // Out of range for int. - l = INT_MAX; - map.put(IntLongMap::value_type(2, l)); - map.put(IntLongMap::value_type(3, l + 1)); // Out of range for int. - } - db->close(); - db = 0; - - db = dbEnv->openDBWithTxn(0, "failure", false); - emitSchemas("xs:long", "xs:int"); - try - { - XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); - transformer.transform(oldSchema, newSchema); - test(false); - } - catch(const XMLTransform::IllegalTransform&) - { - // Expected. - } - db->close(); - db = 0; + IntByteMap map(communicator, dbEnv, "byteToShort"); + map.clear(); + for(i = 0; i < NUM_KEYS; i++) + { + map.put(IntByteMap::value_type(i, i)); + } + } + + { + Db db(&dbEnv, 0); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD; + db.open(0, "byteToShort", 0, DB_UNKNOWN, flags, FREEZE_DB_MODE); + emitSchemas("xs:byte", "xs:short"); + { + XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); + transformer.transform(oldSchema, newSchema); + } + db.close(0); + } + + + { + IntShortMap map(communicator, dbEnv, "shortToInt"); + map.clear(); + for(i = 0; i < NUM_KEYS; i++) + { + map.put(IntShortMap::value_type(i, i)); + } + } + + { + Db db(&dbEnv, 0); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD; + db.open(0, "shortToInt", 0, DB_UNKNOWN, flags, FREEZE_DB_MODE); + emitSchemas("xs:short", "xs:int"); + { + XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); + transformer.transform(oldSchema, newSchema); + } + db.close(0); + } + - cout << "ok" << endl; + // + // Transform int to long + // + + + { + IntIntMap map(communicator, dbEnv, "intToLong"); + map.clear(); + for(i = 0; i < NUM_KEYS; i++) + { + map.put(IntIntMap::value_type(i, i)); + } } - catch(...) + { - cout << "failed" << endl; - if(db) - { - db->close(); - } - throw; + Db db(&dbEnv, 0); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD; + db.open(0, "intToLong", 0, DB_UNKNOWN, flags, FREEZE_DB_MODE); + + emitSchemas("xs:int", "xs:long"); + { + XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); + transformer.transform(oldSchema, newSchema); + } + db.close(0); } - if(db) + // + // Transform long to byte + // + { + IntLongMap map(communicator, dbEnv, "longToByte"); + map.clear(); + for(i = 0; i < NUM_KEYS; i++) + { + map.put(IntLongMap::value_type(i, i)); + } + } + + { + Db db(&dbEnv, 0); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD; + db.open(0, "longToByte", 0, DB_UNKNOWN, flags, FREEZE_DB_MODE); + + emitSchemas("xs:long", "xs:byte"); + { + XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); + transformer.transform(oldSchema, newSchema); + } + db.close(0); + } + + + // + // Transform float to double + // + { + IntFloatMap map(communicator, dbEnv, "floatToDouble"); + map.clear(); + for(i = 0; i < NUM_KEYS; i++) + { + map.put(IntFloatMap::value_type(i, static_cast<float>(i))); + } + } + + + { + Db db(&dbEnv, 0); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD; + db.open(0, "floatToDouble", 0, DB_UNKNOWN, flags, FREEZE_DB_MODE); + emitSchemas("xs:float", "xs:double"); + { + XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); + transformer.transform(oldSchema, newSchema); + } + db.close(0); + } + + + // + // Transform long to byte (should fail) + // + + { + IntLongMap map(communicator, dbEnv, "failure"); + map.clear(); + Long l; + l = SCHAR_MIN; + map.put(IntLongMap::value_type(0, l)); + map.put(IntLongMap::value_type(1, l - 1)); // Out of range for byte. + l = SCHAR_MAX; + map.put(IntLongMap::value_type(2, l)); + map.put(IntLongMap::value_type(3, l + 1)); // Out of range for byte. + } + + { + Db db(&dbEnv, 0); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD; + db.open(0, "failure", 0, DB_UNKNOWN, flags, FREEZE_DB_MODE); + emitSchemas("xs:long", "xs:byte"); + try + { + XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); + transformer.transform(oldSchema, newSchema); + test(false); + } + catch(const XMLTransform::IllegalTransform&) + { + // Expected. + } + db.close(0); + } + + // + // Transform long to short (should fail) + // + { + IntLongMap map(communicator, dbEnv, "failure"); + map.clear(); + Long l; + l = SHRT_MIN; + map.put(IntLongMap::value_type(0, l)); + map.put(IntLongMap::value_type(1, l - 1)); // Out of range for short. + l = SHRT_MAX; + map.put(IntLongMap::value_type(2, l)); + map.put(IntLongMap::value_type(3, l + 1)); // Out of range for short. + } + + { + Db db(&dbEnv, 0); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD; + db.open(0, "failure", 0, DB_UNKNOWN, flags, FREEZE_DB_MODE); + emitSchemas("xs:long", "xs:short"); + try + { + XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); + transformer.transform(oldSchema, newSchema); + test(false); + } + catch(const XMLTransform::IllegalTransform&) + { + // Expected. + } + db.close(0); + } + + // + // Transform long to int (should fail) + // + + { + IntLongMap map(communicator, dbEnv, "failure"); + map.clear(); + Long l; + l = INT_MIN; + map.put(IntLongMap::value_type(0, l)); + map.put(IntLongMap::value_type(1, l - 1)); // Out of range for int. + l = INT_MAX; + map.put(IntLongMap::value_type(2, l)); + map.put(IntLongMap::value_type(3, l + 1)); // Out of range for int. + } + { - db->close(); + Db db(&dbEnv, 0); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD; + db.open(0, "failure", 0, DB_UNKNOWN, flags, FREEZE_DB_MODE); + emitSchemas("xs:long", "xs:int"); + try + { + XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); + transformer.transform(oldSchema, newSchema); + test(false); + } + catch(const XMLTransform::IllegalTransform&) + { + // Expected. + } + db.close(0); } + + cout << "ok" << endl; + } static void -transformPrimitiveSequence(const DBEnvironmentPtr& dbEnv) +transformPrimitiveSequence(const CommunicatorPtr& communicator, DbEnv& dbEnv) { Int i; - DBPtr db; StringSeq dummy; cout << "transforming primitive sequences... " << flush; - try - { - // - // Transform byte to short sequence - // - db = dbEnv->openDB("byteToShortSeq", true); - db->clear(); - - { - IntSeq1Map map(db); - Test::Seq1 seq; - for(i = 0; i < NUM_ELEMENTS; i++) - { - seq.push_back(i); - } - map.put(IntSeq1Map::value_type(0, seq)); - } - db->close(); - db = 0; + + // + // Transform byte to short sequence + // - db = dbEnv->openDBWithTxn(0, "byteToShortSeq", false); + { + IntSeq1Map map(communicator, dbEnv, "byteToShortSeq"); + map.clear(); + Test::Seq1 seq; + for(i = 0; i < NUM_ELEMENTS; i++) + { + seq.push_back(i); + } + map.put(IntSeq1Map::value_type(0, seq)); + } + + { + Db db(&dbEnv, 0); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD; + db.open(0, "byteToShortSeq", 0, DB_UNKNOWN, flags, FREEZE_DB_MODE); emitSchemas("tns:_internal.Test.Seq1Type", "tns:_internal.Test.Seq1Type"); { XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); transformer.transform(oldSchema, newSchema); } - db->close(); - db = 0; - - // - // Transform short to int sequence - // - db = dbEnv->openDB("shortToIntSeq", true); - db->clear(); - - { - IntSeq2Map map(db); - Test::Seq2 seq; - for(i = 0; i < NUM_ELEMENTS; i++) - { - seq.push_back(i); - } - map.put(IntSeq2Map::value_type(0, seq)); - } - db->close(); - db = 0; + db.close(0); + } - db = dbEnv->openDBWithTxn(0, "shortToIntSeq", false); + + { + IntSeq2Map map(communicator, dbEnv, "shortToIntSeq"); + map.clear(); + Test::Seq2 seq; + for(i = 0; i < NUM_ELEMENTS; i++) + { + seq.push_back(i); + } + map.put(IntSeq2Map::value_type(0, seq)); + } + + { + Db db(&dbEnv, 0); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD; + db.open(0, "shortToIntSeq", 0, DB_UNKNOWN, flags, FREEZE_DB_MODE); emitSchemas("tns:_internal.Test.Seq2Type", "tns:_internal.Test.Seq2Type"); { XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); transformer.transform(oldSchema, newSchema); } - db->close(); - db = 0; - - // - // Transform int to long sequence - // - db = dbEnv->openDB("intToLongSeq", true); - db->clear(); - - { - IntSeq3Map map(db); - Test::Seq3 seq; - for(i = 0; i < NUM_ELEMENTS; i++) - { - seq.push_back(i); - } - map.put(IntSeq3Map::value_type(0, seq)); - } - db->close(); - db = 0; + db.close(0); + } - db = dbEnv->openDBWithTxn(0, "intToLongSeq", false); + // + // Transform int to long sequence + // + { + IntSeq3Map map(communicator, dbEnv, "intToLongSeq"); + map.clear(); + Test::Seq3 seq; + for(i = 0; i < NUM_ELEMENTS; i++) + { + seq.push_back(i); + } + map.put(IntSeq3Map::value_type(0, seq)); + } + + { + Db db(&dbEnv, 0); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD; + db.open(0, "intToLongSeq", 0, DB_UNKNOWN, flags, FREEZE_DB_MODE); emitSchemas("tns:_internal.Test.Seq3Type", "tns:_internal.Test.Seq3Type"); { XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); transformer.transform(oldSchema, newSchema); } - db->close(); - db = 0; - - // - // Transform long to byte sequence - // - db = dbEnv->openDB("longToByteSeq", true); - db->clear(); - - { - IntSeq4Map map(db); - Test::Seq4 seq; - for(i = 0; i < NUM_ELEMENTS; i++) - { - seq.push_back(i); - } - map.put(IntSeq4Map::value_type(0, seq)); - } - db->close(); - db = 0; + db.close(0); + } - db = dbEnv->openDBWithTxn(0, "longToByteSeq", false); + // + // Transform long to byte sequence + // + { + + IntSeq4Map map(communicator, dbEnv, "longToByteSeq"); + map.clear(); + Test::Seq4 seq; + for(i = 0; i < NUM_ELEMENTS; i++) + { + seq.push_back(i); + } + map.put(IntSeq4Map::value_type(0, seq)); + } + + { + Db db(&dbEnv, 0); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD; + db.open(0, "longToByteSeq", 0, DB_UNKNOWN, flags, FREEZE_DB_MODE); emitSchemas("tns:_internal.Test.Seq4Type", "tns:_internal.Test.Seq4Type"); { XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); transformer.transform(oldSchema, newSchema); } - db->close(); - db = 0; + db.close(0); + } // // Transform long to byte sequence (should fail) // - db = dbEnv->openDB("failure", true); - db->clear(); - - { - IntSeq4Map map(db); - Test::Seq4 seq; - Long l; - l = SCHAR_MIN; - seq.push_back(l); - seq.push_back(l - 1); // Out of range for byte. - l = SCHAR_MAX; - seq.push_back(l); - seq.push_back(l + 1); // Out of range for byte. - map.put(IntSeq4Map::value_type(0, seq)); - } - db->close(); - db = 0; - - db = dbEnv->openDBWithTxn(0, "failure", false); + + { + IntSeq4Map map(communicator, dbEnv, "failure"); + map.clear(); + Test::Seq4 seq; + Long l; + l = SCHAR_MIN; + seq.push_back(l); + seq.push_back(l - 1); // Out of range for byte. + l = SCHAR_MAX; + seq.push_back(l); + seq.push_back(l + 1); // Out of range for byte. + map.put(IntSeq4Map::value_type(0, seq)); + } + + { + Db db(&dbEnv, 0); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD; + db.open(0, "failure", 0, DB_UNKNOWN, flags, FREEZE_DB_MODE); emitSchemas("tns:_internal.Test.Seq4Type", "tns:_internal.Test.Seq4Type"); try { @@ -487,77 +473,63 @@ transformPrimitiveSequence(const DBEnvironmentPtr& dbEnv) { // Expected. } - db->close(); - db = 0; - - cout << "ok" << endl; - } - catch(...) - { - cout << "failed" << endl; - if(db) - { - db->close(); - } - throw; + + db.close(0); } - if(db) - { - db->close(); - } + cout << "ok" << endl; } static void -transformEnum(const DBEnvironmentPtr& dbEnv) +transformEnum(const CommunicatorPtr& communicator, DbEnv& dbEnv) { - DBPtr db; + StringSeq dummy; cout << "transforming enumerations... " << flush; - try + // + // Don't use E1::three, which is removed in new schema + // + { - // - // Don't use E1::three, which is removed in new schema - // - db = dbEnv->openDB("enum", true); - db->clear(); - - { - IntE1Map map(db); - map.put(IntE1Map::value_type(0, Test::one)); - map.put(IntE1Map::value_type(1, Test::two)); - } - db->close(); - db = 0; - - db = dbEnv->openDBWithTxn(0, "enum", false); + IntE1Map map(communicator, dbEnv, "enum"); + map.clear(); + map.put(IntE1Map::value_type(0, Test::one)); + map.put(IntE1Map::value_type(1, Test::two)); + } + + { + Db db(&dbEnv, 0); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD; + db.open(0, "enum", 0, DB_UNKNOWN, flags, FREEZE_DB_MODE); emitSchemas("tns:_internal.Test.E1Type", "tns:_internal.Test.E1Type"); { XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); transformer.transform(oldSchema, newSchema); } - db->close(); - db = 0; + db.close(0); + } + // // Use E1::three, which is removed in new schema (should fail) // - db = dbEnv->openDB("failure", true); - db->clear(); - - { - IntE1Map map(db); - map.put(IntE1Map::value_type(0, Test::one)); - map.put(IntE1Map::value_type(1, Test::two)); - map.put(IntE1Map::value_type(2, Test::three)); - } - db->close(); - db = 0; + + { + IntE1Map map(communicator, dbEnv, "failure"); + map.clear(); + map.put(IntE1Map::value_type(0, Test::one)); + map.put(IntE1Map::value_type(1, Test::two)); + map.put(IntE1Map::value_type(2, Test::three)); + } + + { + Db db(&dbEnv, 0); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD; + db.open(0, "failure", 0, DB_UNKNOWN, flags, FREEZE_DB_MODE); - db = dbEnv->openDBWithTxn(0, "failure", false); - emitSchemas("tns:_internal.Test.E1Type", "tns:_internal.Test.E1Type"); + emitSchemas("tns:_internal.Test.E1Type", "tns:_internal.Test.E1Type"); try { XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); @@ -568,80 +540,64 @@ transformEnum(const DBEnvironmentPtr& dbEnv) { // Expected. } - db->close(); - db = 0; - - cout << "ok" << endl; - } - catch(...) - { - cout << "failed" << endl; - if(db) - { - db->close(); - } - throw; + db.close(0); } - if(db) - { - db->close(); - } + cout << "ok" << endl; } static void -transformDictionary(const DBEnvironmentPtr& dbEnv) +transformDictionary(const CommunicatorPtr& communicator, DbEnv& dbEnv) { - DBPtr db; StringSeq dummy; cout << "transforming dictionaries... " << flush; - try + + // + // Don't use E1::three, which is removed in new schema + // + { - // - // Don't use E1::three, which is removed in new schema - // - db = dbEnv->openDB("dict", true); - db->clear(); - - { - IntD1Map map(db); - Test::D1 dict; - dict.insert(make_pair(string("one"), Test::one)); - dict.insert(make_pair(string("two"), Test::two)); - map.put(IntD1Map::value_type(0, dict)); - } - db->close(); - db = 0; - - db = dbEnv->openDBWithTxn(0, "dict", false); + IntD1Map map(communicator, dbEnv, "dict"); + map.clear(); + Test::D1 dict; + dict.insert(make_pair(string("one"), Test::one)); + dict.insert(make_pair(string("two"), Test::two)); + map.put(IntD1Map::value_type(0, dict)); + } + + { + Db db(&dbEnv, 0); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD; + db.open(0, "dict", 0, DB_UNKNOWN, flags, FREEZE_DB_MODE); emitSchemas("tns:_internal.Test.D1Type", "tns:_internal.Test.D1Type"); { XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); transformer.transform(oldSchema, newSchema); } - db->close(); - db = 0; - - // - // Use E1::three, which is removed in new schema (should fail) - // - db = dbEnv->openDB("failure", true); - db->clear(); + db.close(0); + } + - { - IntD1Map map(db); - Test::D1 dict; - dict.insert(make_pair(string("one"), Test::one)); - dict.insert(make_pair(string("two"), Test::two)); - dict.insert(make_pair(string("three"), Test::three)); - map.put(IntD1Map::value_type(0, dict)); - } - db->close(); - db = 0; + // + // Use E1::three, which is removed in new schema (should fail) + // - db = dbEnv->openDBWithTxn(0, "failure", false); + { + IntD1Map map(communicator, dbEnv, "failure"); + map.clear(); + Test::D1 dict; + dict.insert(make_pair(string("one"), Test::one)); + dict.insert(make_pair(string("two"), Test::two)); + dict.insert(make_pair(string("three"), Test::three)); + map.put(IntD1Map::value_type(0, dict)); + } + + { + Db db(&dbEnv, 0); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD; + db.open(0, "failure", 0, DB_UNKNOWN, flags, FREEZE_DB_MODE); emitSchemas("tns:_internal.Test.D1Type", "tns:_internal.Test.D1Type"); try { @@ -653,91 +609,70 @@ transformDictionary(const DBEnvironmentPtr& dbEnv) { // Expected. } - db->close(); - db = 0; - - cout << "ok" << endl; - } - catch(...) - { - cout << "failed" << endl; - if(db) - { - db->close(); - } - throw; - } - - if(db) - { - db->close(); + db.close(0); } + + cout << "ok" << endl; } static void -transformStruct(const DBEnvironmentPtr& dbEnv) +transformStruct(const CommunicatorPtr& communicator, DbEnv& dbEnv) { - DBPtr db; StringSeq dummy; cout << "transforming structs... " << flush; - - try + { - // - // Transform S1 - // - db = dbEnv->openDB("struct", true); - db->clear(); - - { - IntS1Map map(db); - Test::S1 s1; - s1.b = false; - s1.i = 0; - map.put(IntS1Map::value_type(0, s1)); - s1.b = true; - s1.i = 1; - map.put(IntS1Map::value_type(1, s1)); - s1.b = true; - s1.i = 2; - map.put(IntS1Map::value_type(2, s1)); - } - db->close(); - db = 0; - - db = dbEnv->openDBWithTxn(0, "struct", false); - emitSchemas("tns:_internal.Test.S1Type", "tns:_internal.Test.S1Type"); - { - XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); - transformer.transform(oldSchema, newSchema); - } - db->close(); - db = 0; - - // - // Transform S1 (should fail) - // - db = dbEnv->openDB("failure", true); - db->clear(); - - { - IntS1Map map(db); - Test::S1 s1; - s1.b = false; - s1.i = SCHAR_MIN; - map.put(IntS1Map::value_type(0, s1)); - s1.b = true; - s1.i = SCHAR_MAX; - map.put(IntS1Map::value_type(1, s1)); - s1.b = true; - s1.i = ((Int)SCHAR_MAX) + 1; // Out of range for byte - map.put(IntS1Map::value_type(2, s1)); - } - db->close(); - db = 0; + IntS1Map map(communicator, dbEnv, "struct"); + map.clear(); + Test::S1 s1; + s1.b = false; + s1.i = 0; + map.put(IntS1Map::value_type(0, s1)); + s1.b = true; + s1.i = 1; + map.put(IntS1Map::value_type(1, s1)); + s1.b = true; + s1.i = 2; + map.put(IntS1Map::value_type(2, s1)); + } + + { + Db db(&dbEnv, 0); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD; + db.open(0, "struct", 0, DB_UNKNOWN, flags, FREEZE_DB_MODE); + emitSchemas("tns:_internal.Test.S1Type", "tns:_internal.Test.S1Type"); + { + XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); + transformer.transform(oldSchema, newSchema); + } + db.close(0); + } + - db = dbEnv->openDBWithTxn(0, "failure", false); + // + // Transform S1 (should fail) + // + + { + IntS1Map map(communicator, dbEnv, "failure"); + map.clear(); + Test::S1 s1; + s1.b = false; + s1.i = SCHAR_MIN; + map.put(IntS1Map::value_type(0, s1)); + s1.b = true; + s1.i = SCHAR_MAX; + map.put(IntS1Map::value_type(1, s1)); + s1.b = true; + s1.i = ((Int)SCHAR_MAX) + 1; // Out of range for byte + map.put(IntS1Map::value_type(2, s1)); + } + + { + Db db(&dbEnv, 0); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD; + db.open(0, "failure", 0, DB_UNKNOWN, flags, FREEZE_DB_MODE); emitSchemas("tns:_internal.Test.S1Type", "tns:_internal.Test.S1Type"); try { @@ -749,225 +684,184 @@ transformStruct(const DBEnvironmentPtr& dbEnv) { // Expected. } - db->close(); - db = 0; - - // - // Make sure nothing changed. - // - db = dbEnv->openDB("failure", false); - { - IntS1Map map(db); - for(IntS1Map::iterator p = map.begin(); p != map.end(); ++p) - { - Test::S1 s1 = p->second; - s1.b = false; - } - } - db->close(); - db = 0; - - cout << "ok" << endl; - } - catch(...) - { - cout << "failed" << endl; - if(db) - { - db->close(); - } - throw; + db.close(0); } + - if(db) + // + // Make sure nothing changed. + // { - db->close(); + IntS1Map map(communicator, dbEnv, "failure"); + for(IntS1Map::iterator p = map.begin(); p != map.end(); ++p) + { + Test::S1 s1 = p->second; + s1.b = false; + } } + + cout << "ok" << endl; } static void -transformClass(const DBEnvironmentPtr& dbEnv) +transformClass(const CommunicatorPtr& communicator, DbEnv& dbEnv) { - DBPtr db; StringSeq dummy; cout << "transforming classes... " << flush; - try + // + // Transform C2 + // + { - // - // Transform C2 - // - db = dbEnv->openDB("class", true); - db->clear(); - - { - IntC1Map map(db); - Test::C2Ptr c2; - c2 = new Test::C2; - c2->s = "0"; - c2->f = 0; - c2->b = 0; - c2->i = 0; - c2->l = 0; - c2->d = 0; - map.put(IntC1Map::value_type(0, c2)); - c2 = new Test::C2; - c2->s = "1"; - c2->f = 1; - c2->b = 1; - c2->i = 1; - c2->l = 1; - c2->d = 1; - map.put(IntC1Map::value_type(1, c2)); - c2 = new Test::C2; - c2->s = "2"; - c2->f = 2; - c2->b = 2; - c2->i = 2; - c2->l = 2; - c2->d = 2; - map.put(IntC1Map::value_type(2, c2)); - - // - // Add an object with facets. - // - Test::C1Ptr c1Facet; - Test::C2Ptr c2Facet; - c2 = new Test::C2; - c2->s = "3"; - c2->f = 3; - c2->b = 3; - c2->i = 3; - c2->l = 3; - c2->d = 3; - c1Facet = new Test::C1; - c1Facet->s = "c1-0"; - c1Facet->f = 0; - c1Facet->b = 0; - c2->ice_addFacet(c1Facet, "c1-0"); - c1Facet = new Test::C1; - c1Facet->s = "c1-1"; - c1Facet->f = 1; - c1Facet->b = 1; - c2->ice_addFacet(c1Facet, "c1-1"); - c2Facet = new Test::C2; - c2Facet->s = "c1-2"; - c2Facet->f = 2; - c2Facet->b = 2; - c2Facet->i = 2; - c2Facet->l = 2; - c2Facet->d = 2; - c1Facet = new Test::C1; - c1Facet->s = "c2-0"; - c1Facet->f = 0; - c1Facet->b = 0; - c2Facet->ice_addFacet(c1Facet, "c2-0"); // Nested facet - c2->ice_addFacet(c2Facet, "c1-2"); - map.put(IntC1Map::value_type(3, c2)); - } - db->close(); - db = 0; - - db = dbEnv->openDBWithTxn(0, "class", false); - emitSchemas("tns:_internal.Test.C1Type", "tns:_internal.Test.C1Type"); - { - XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); - transformer.transform(oldSchema, newSchema); - } - db->close(); - db = 0; - - // - // Transform C2 (should fail) - // - db = dbEnv->openDB("failure", true); - db->clear(); - - { - IntC1Map map(db); - Test::C2Ptr c2; - c2 = new Test::C2; - c2->s = "0"; - c2->f = 0; - c2->b = 0; - c2->i = 0; - c2->l = INT_MIN; - c2->d = 0; - map.put(IntC1Map::value_type(0, c2)); - c2 = new Test::C2; - c2->s = "1"; - c2->f = 1; - c2->b = 1; - c2->i = 1; - c2->l = INT_MAX; - c2->d = 1; - map.put(IntC1Map::value_type(1, c2)); - c2 = new Test::C2; - c2->s = "2"; - c2->f = 2; - c2->b = 2; - c2->i = 2; - c2->l = INT_MAX; - c2->l++; // Out of range for int - c2->d = 2; - map.put(IntC1Map::value_type(2, c2)); - } - db->close(); - db = 0; - - db = dbEnv->openDBWithTxn(0, "failure", false); - emitSchemas("tns:_internal.Test.C1Type", "tns:_internal.Test.C1Type"); - try - { - XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); - transformer.transform(oldSchema, newSchema); - test(false); - } - catch(const XMLTransform::IllegalTransform&) - { - // Expected. - } - db->close(); - db = 0; - + IntC1Map map(communicator, dbEnv, "class"); + map.clear(); + Test::C2Ptr c2; + c2 = new Test::C2; + c2->s = "0"; + c2->f = 0; + c2->b = 0; + c2->i = 0; + c2->l = 0; + c2->d = 0; + map.put(IntC1Map::value_type(0, c2)); + c2 = new Test::C2; + c2->s = "1"; + c2->f = 1; + c2->b = 1; + c2->i = 1; + c2->l = 1; + c2->d = 1; + map.put(IntC1Map::value_type(1, c2)); + c2 = new Test::C2; + c2->s = "2"; + c2->f = 2; + c2->b = 2; + c2->i = 2; + c2->l = 2; + c2->d = 2; + map.put(IntC1Map::value_type(2, c2)); + // - // Make sure nothing changed. + // Add an object with facets. // - db = dbEnv->openDB("failure", false); - { - IntC1Map map(db); - for(IntC1Map::iterator p = map.begin(); p != map.end(); ++p) - { - Test::C1Ptr c1 = p->second; - } - } - - db->close(); - db = 0; - - cout << "ok" << endl; + Test::C1Ptr c1Facet; + Test::C2Ptr c2Facet; + c2 = new Test::C2; + c2->s = "3"; + c2->f = 3; + c2->b = 3; + c2->i = 3; + c2->l = 3; + c2->d = 3; + c1Facet = new Test::C1; + c1Facet->s = "c1-0"; + c1Facet->f = 0; + c1Facet->b = 0; + c2->ice_addFacet(c1Facet, "c1-0"); + c1Facet = new Test::C1; + c1Facet->s = "c1-1"; + c1Facet->f = 1; + c1Facet->b = 1; + c2->ice_addFacet(c1Facet, "c1-1"); + c2Facet = new Test::C2; + c2Facet->s = "c1-2"; + c2Facet->f = 2; + c2Facet->b = 2; + c2Facet->i = 2; + c2Facet->l = 2; + c2Facet->d = 2; + c1Facet = new Test::C1; + c1Facet->s = "c2-0"; + c1Facet->f = 0; + c1Facet->b = 0; + c2Facet->ice_addFacet(c1Facet, "c2-0"); // Nested facet + c2->ice_addFacet(c2Facet, "c1-2"); + map.put(IntC1Map::value_type(3, c2)); } - catch(...) + { - cout << "failed" << endl; - if(db) - { - db->close(); - } - throw; + Db db(&dbEnv, 0); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD; + db.open(0, "class", 0, DB_UNKNOWN, flags, FREEZE_DB_MODE); + emitSchemas("tns:_internal.Test.C1Type", "tns:_internal.Test.C1Type"); + { + XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); + transformer.transform(oldSchema, newSchema); + } + db.close(0); } - - if(db) + + + // + // Transform C2 (should fail) + // + + { + IntC1Map map(communicator, dbEnv, "failure"); + map.clear(); + Test::C2Ptr c2; + c2 = new Test::C2; + c2->s = "0"; + c2->f = 0; + c2->b = 0; + c2->i = 0; + c2->l = INT_MIN; + c2->d = 0; + map.put(IntC1Map::value_type(0, c2)); + c2 = new Test::C2; + c2->s = "1"; + c2->f = 1; + c2->b = 1; + c2->i = 1; + c2->l = INT_MAX; + c2->d = 1; + map.put(IntC1Map::value_type(1, c2)); + c2 = new Test::C2; + c2->s = "2"; + c2->f = 2; + c2->b = 2; + c2->i = 2; + c2->l = INT_MAX; + c2->l++; // Out of range for int + c2->d = 2; + map.put(IntC1Map::value_type(2, c2)); + } + { - db->close(); + Db db(&dbEnv, 0); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD; + db.open(0, "failure", 0, DB_UNKNOWN, flags, FREEZE_DB_MODE); + emitSchemas("tns:_internal.Test.C1Type", "tns:_internal.Test.C1Type"); + try + { + XMLTransform::DBTransformer transformer(dbEnv, db, dummy, dummy, paths, paths, false); + transformer.transform(oldSchema, newSchema); + test(false); + } + catch(const XMLTransform::IllegalTransform&) + { + // Expected. + } + db.close(0); } + + { + IntC1Map map(communicator, dbEnv, "failure"); + for(IntC1Map::iterator p = map.begin(); p != map.end(); ++p) + { + Test::C1Ptr c1 = p->second; + } + } + + cout << "ok" << endl; } static void -transformEvictor(const DBEnvironmentPtr& dbEnv) +transformEvictor(const CommunicatorPtr& communicator, DbEnv& dbEnv) { - DBPtr db; + StringSeq loadOld, loadNew; Identity ident; Freeze::EvictorPtr evictor; @@ -992,173 +886,171 @@ transformEvictor(const DBEnvironmentPtr& dbEnv) cout << "transforming evictor map... " << flush; - try + + // + // Transform C2 + // { - // - // Transform C2 - // - db = dbEnv->openDB("evictor", true); - db->clear(); - evictor = db->createEvictor(db->createEvictionStrategy()); - - { - Test::C2Ptr c2; - c2 = new Test::C2; - c2->s = "0"; - c2->f = 0; - c2->b = 0; - c2->i = 0; - c2->l = 0; - c2->d = 0; - ident.name = "0"; - evictor->createObject(ident, c2); - c2 = new Test::C2; - c2->s = "1"; - c2->f = 1; - c2->b = 1; - c2->i = 1; - c2->l = 1; - c2->d = 1; - ident.name = "1"; - evictor->createObject(ident, c2); - c2 = new Test::C2; - c2->s = "2"; - c2->f = 2; - c2->b = 2; - c2->i = 2; - c2->l = 2; - c2->d = 2; - ident.name = "2"; - evictor->createObject(ident, c2); - - // - // Add an object with facets. - // - Test::C1Ptr c1Facet; - Test::C2Ptr c2Facet; - c2 = new Test::C2; - c2->s = "3"; - c2->f = 3; - c2->b = 3; - c2->i = 3; - c2->l = 3; - c2->d = 3; - c1Facet = new Test::C1; - c1Facet->s = "c1-0"; - c1Facet->f = 0; - c1Facet->b = 0; - c2->ice_addFacet(c1Facet, "c1-0"); - c1Facet = new Test::C1; - c1Facet->s = "c1-1"; - c1Facet->f = 1; - c1Facet->b = 1; - c2->ice_addFacet(c1Facet, "c1-1"); - c2Facet = new Test::C2; - c2Facet->s = "c1-2"; - c2Facet->f = 2; - c2Facet->b = 2; - c2Facet->i = 2; - c2Facet->l = 2; - c2Facet->d = 2; - c1Facet = new Test::C1; - c1Facet->s = "c2-0"; - c1Facet->f = 0; - c1Facet->b = 0; - c2Facet->ice_addFacet(c1Facet, "c2-0"); // Nested facet - c2->ice_addFacet(c2Facet, "c1-2"); - ident.name = "3"; - evictor->createObject(ident, c2); - } - evictor->deactivate(""); - db->close(); - db = 0; - - db = dbEnv->openDBWithTxn(0, "evictor", false); - { - XMLTransform::DBTransformer transformer(dbEnv, db, loadOld, loadNew, paths, paths, false); - transformer.transform(evictorSchema); - } - db->close(); - db = 0; - - // - // Transform C2 (should fail) - // - db = dbEnv->openDB("failure", true); - db->clear(); - evictor = db->createEvictor(db->createEvictionStrategy()); - - { - Test::C2Ptr c2; - c2 = new Test::C2; - c2->s = "0"; - c2->f = 0; - c2->b = 0; - c2->i = 0; - c2->l = INT_MIN; - c2->d = 0; - ident.name = "0"; - evictor->createObject(ident, c2); - c2 = new Test::C2; - c2->s = "1"; - c2->f = 1; - c2->b = 1; - c2->i = 1; - c2->l = INT_MAX; - c2->d = 1; - ident.name = "1"; - evictor->createObject(ident, c2); - c2 = new Test::C2; - c2->s = "2"; - c2->f = 2; - c2->b = 2; - c2->i = 2; - c2->l = INT_MAX; - c2->l++; // Out of range for int - c2->d = 2; - ident.name = "2"; - evictor->createObject(ident, c2); - } - evictor->deactivate(""); - db->close(); - db = 0; - - db = dbEnv->openDBWithTxn(0, "failure", false); - try - { - XMLTransform::DBTransformer transformer(dbEnv, db, loadOld, loadNew, paths, paths, false); - transformer.transform(evictorSchema); - test(false); - } - catch(const XMLTransform::IllegalTransform&) - { - // Expected. - } - db->close(); - db = 0; - - cout << "ok" << endl; + Db db(&dbEnv, 0); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD | DB_TRUNCATE | DB_CREATE; + db.open(0, "evictor", 0, DB_BTREE, flags, FREEZE_DB_MODE); + db.close(0); } - catch(...) + + evictor = Freeze::createEvictor(communicator, dbEnv, "evictor"); + { - cout << "failed" << endl; - if(db) - { - db->close(); - } - throw; + Test::C2Ptr c2; + c2 = new Test::C2; + c2->s = "0"; + c2->f = 0; + c2->b = 0; + c2->i = 0; + c2->l = 0; + c2->d = 0; + ident.name = "0"; + evictor->createObject(ident, c2); + c2 = new Test::C2; + c2->s = "1"; + c2->f = 1; + c2->b = 1; + c2->i = 1; + c2->l = 1; + c2->d = 1; + ident.name = "1"; + evictor->createObject(ident, c2); + c2 = new Test::C2; + c2->s = "2"; + c2->f = 2; + c2->b = 2; + c2->i = 2; + c2->l = 2; + c2->d = 2; + ident.name = "2"; + evictor->createObject(ident, c2); + + // + // Add an object with facets. + // + Test::C1Ptr c1Facet; + Test::C2Ptr c2Facet; + c2 = new Test::C2; + c2->s = "3"; + c2->f = 3; + c2->b = 3; + c2->i = 3; + c2->l = 3; + c2->d = 3; + c1Facet = new Test::C1; + c1Facet->s = "c1-0"; + c1Facet->f = 0; + c1Facet->b = 0; + c2->ice_addFacet(c1Facet, "c1-0"); + c1Facet = new Test::C1; + c1Facet->s = "c1-1"; + c1Facet->f = 1; + c1Facet->b = 1; + c2->ice_addFacet(c1Facet, "c1-1"); + c2Facet = new Test::C2; + c2Facet->s = "c1-2"; + c2Facet->f = 2; + c2Facet->b = 2; + c2Facet->i = 2; + c2Facet->l = 2; + c2Facet->d = 2; + c1Facet = new Test::C1; + c1Facet->s = "c2-0"; + c1Facet->f = 0; + c1Facet->b = 0; + c2Facet->ice_addFacet(c1Facet, "c2-0"); // Nested facet + c2->ice_addFacet(c2Facet, "c1-2"); + ident.name = "3"; + evictor->createObject(ident, c2); } - - if(db) + evictor->deactivate(""); + + { + Db db(&dbEnv, 0); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD; + db.open(0, "evictor", 0, DB_UNKNOWN, flags, FREEZE_DB_MODE); + { + XMLTransform::DBTransformer transformer(dbEnv, db, loadOld, loadNew, paths, paths, false); + transformer.transform(evictorSchema); + } + db.close(0); + } + + + // + // Transform C2 (should fail) + // + + { + Db db(&dbEnv, 0); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD | DB_TRUNCATE | DB_CREATE; + db.open(0, "failure", 0, DB_BTREE, flags, FREEZE_DB_MODE); + db.close(0); + } + + evictor = Freeze::createEvictor(communicator, dbEnv, "failure"); + + { + Test::C2Ptr c2; + c2 = new Test::C2; + c2->s = "0"; + c2->f = 0; + c2->b = 0; + c2->i = 0; + c2->l = INT_MIN; + c2->d = 0; + ident.name = "0"; + evictor->createObject(ident, c2); + c2 = new Test::C2; + c2->s = "1"; + c2->f = 1; + c2->b = 1; + c2->i = 1; + c2->l = INT_MAX; + c2->d = 1; + ident.name = "1"; + evictor->createObject(ident, c2); + c2 = new Test::C2; + c2->s = "2"; + c2->f = 2; + c2->b = 2; + c2->i = 2; + c2->l = INT_MAX; + c2->l++; // Out of range for int + c2->d = 2; + ident.name = "2"; + evictor->createObject(ident, c2); + } + evictor->deactivate(""); + { - db->close(); + Db db(&dbEnv, 0); + u_int32_t flags = DB_AUTO_COMMIT | DB_THREAD; + db.open(0, "failure", 0, DB_UNKNOWN, flags, FREEZE_DB_MODE); + try + { + XMLTransform::DBTransformer transformer(dbEnv, db, loadOld, loadNew, paths, paths, false); + transformer.transform(evictorSchema); + test(false); + } + catch(const XMLTransform::IllegalTransform&) + { + // Expected. + } + db.close(0); } + + cout << "ok" << endl; } static int run(int argc, char* argv[], const CommunicatorPtr& communicator) { - string dbEnvDir = "db"; + string envName = "db"; communicator->addObjectFactory(Test::C1::ice_factory(), Test::C1::ice_staticId()); communicator->addObjectFactory(Test::C2::ice_factory(), Test::C2::ice_staticId()); @@ -1189,7 +1081,7 @@ run(int argc, char* argv[], const CommunicatorPtr& communicator) return EXIT_FAILURE; } - dbEnvDir = argv[idx + 1]; + envName = argv[idx + 1]; for(int i = idx ; i + 2 < argc ; ++i) { argv[i] = argv[i + 2]; @@ -1208,33 +1100,24 @@ run(int argc, char* argv[], const CommunicatorPtr& communicator) } } - DBEnvironmentPtr dbEnv; + DbEnv dbEnv(0); + dbEnv.set_flags(DB_TXN_NOSYNC, true); - try - { - dbEnv = Freeze::initializeWithTxn(communicator, dbEnvDir); - transformPrimitive(dbEnv); - transformPrimitiveSequence(dbEnv); - transformEnum(dbEnv); - transformDictionary(dbEnv); - transformStruct(dbEnv); - transformClass(dbEnv); - transformEvictor(dbEnv); - } - catch(...) - { - if(dbEnv) - { - dbEnv->close(); - } - throw; - } + u_int32_t flags = DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN | + DB_PRIVATE | DB_THREAD | DB_RECOVER | DB_CREATE; + + dbEnv.open(envName.c_str(), flags, FREEZE_DB_MODE); - if(dbEnv) - { - dbEnv->close(); - } + transformPrimitive(communicator, dbEnv); + transformPrimitiveSequence(communicator, dbEnv); + transformEnum(communicator, dbEnv); + transformDictionary(communicator, dbEnv); + transformStruct(communicator,dbEnv); + transformClass(communicator, dbEnv); + transformEvictor(communicator, dbEnv); + dbEnv.close(0); + return EXIT_SUCCESS; } @@ -1249,6 +1132,11 @@ main(int argc, char* argv[]) communicator = Ice::initialize(argc, argv); status = run(argc, argv, communicator); } + catch(const DbException& ex) + { + cerr << ex.what() << endl; + status = EXIT_FAILURE; + } catch(const Exception& ex) { cerr << ex << endl; diff --git a/cpp/test/XMLTransform/transform/Validate.cpp b/cpp/test/XMLTransform/transform/Validate.cpp index a872d3b391c..f8ed0fd0efc 100644 --- a/cpp/test/XMLTransform/transform/Validate.cpp +++ b/cpp/test/XMLTransform/transform/Validate.cpp @@ -49,572 +49,371 @@ usage(const char* n) } static void -validatePrimitive(const DBEnvironmentPtr& dbEnv) -{ - DBPtr db; - +validatePrimitive(const CommunicatorPtr& communicator, const string& envName) +{ cout << "validating primitive transformations... " << flush; - - try + + // + // Validate byte to short transformation + // + { + IntShortMap map(communicator, envName, "byteToShort", false); + for(IntShortMap::iterator p = map.begin(); p != map.end(); ++p) + { + test(p->second == p->first); + } + } - // - // Validate byte to short transformation - // - db = dbEnv->openDB("byteToShort", false); - - { - IntShortMap map(db); - for(IntShortMap::iterator p = map.begin(); p != map.end(); ++p) - { - test(p->second == p->first); - } - } - - db->close(); - db = 0; - - // - // Validate short to int transformation - // - db = dbEnv->openDB("shortToInt", false); - - { - IntIntMap map(db); - for(IntIntMap::iterator p = map.begin(); p != map.end(); ++p) - { - test(p->second == p->first); - } - } - - db->close(); - db = 0; - - // - // Validate int to long transformation - // - db = dbEnv->openDB("intToLong", false); - - { - IntLongMap map(db); - for(IntLongMap::iterator p = map.begin(); p != map.end(); ++p) - { - test(p->second == p->first); - } - } - - db->close(); - db = 0; - - // - // Validate long to byte transformation - // - db = dbEnv->openDB("longToByte", false); - - { - IntByteMap map(db); - for(IntByteMap::iterator p = map.begin(); p != map.end(); ++p) - { - test(p->second == p->first); - } - } - - db->close(); - db = 0; - - // - // Validate float to double transformation - // - db = dbEnv->openDB("floatToDouble", false); - - { - IntDoubleMap map(db); - for(IntDoubleMap::iterator p = map.begin(); p != map.end(); ++p) - { - test(p->second - p->first <= 0.001); - } - } - - db->close(); - db = 0; - - cout << "ok" << endl; + // + // Validate short to int transformation + // + + { + IntIntMap map(communicator, envName, "shortToInt", false); + for(IntIntMap::iterator p = map.begin(); p != map.end(); ++p) + { + test(p->second == p->first); + } } - catch(...) + + // + // Validate int to long transformation + // + { - cout << "failed" << endl; - if(db) - { - db->close(); - } - throw; + IntLongMap map(communicator, envName, "intToLong", false); + for(IntLongMap::iterator p = map.begin(); p != map.end(); ++p) + { + test(p->second == p->first); + } } - - if(db) + + // + // Validate long to byte transformation + // + { + IntByteMap map(communicator, envName, "longToByte", false); + for(IntByteMap::iterator p = map.begin(); p != map.end(); ++p) + { + test(p->second == p->first); + } + } + { - db->close(); + IntDoubleMap map(communicator, envName, "floatToDouble", false); + for(IntDoubleMap::iterator p = map.begin(); p != map.end(); ++p) + { + test(p->second - p->first <= 0.001); + } } + + cout << "ok" << endl; + } static void -validatePrimitiveSequence(const DBEnvironmentPtr& dbEnv) +validatePrimitiveSequence(const CommunicatorPtr& communicator, const string& envName) { Int i; - DBPtr db; - cout << "validating primitive sequence transformations... " << flush; - try + // + // Validate byte to short sequence transformation + // + { - // - // Validate byte to short sequence transformation - // - db = dbEnv->openDB("byteToShortSeq", false); - - { - IntSeq1Map map(db); - test(map.size() == 1); - IntSeq1Map::iterator p = map.find(0); - test(p != map.end()); - const Test::Seq1& seq = p->second; - test(seq.size() == NUM_ELEMENTS); - for(i = 0; i < NUM_ELEMENTS; i++) - { - test(seq[i] == i); - } - } - - db->close(); - db = 0; - - // - // Validate short to int sequence transformation - // - db = dbEnv->openDB("shortToIntSeq", false); - - { - IntSeq2Map map(db); - test(map.size() == 1); - IntSeq2Map::iterator p = map.find(0); - test(p != map.end()); - const Test::Seq2& seq = p->second; - test(seq.size() == NUM_ELEMENTS); - for(i = 0; i < NUM_ELEMENTS; i++) - { - test(seq[i] == i); - } - } - - db->close(); - db = 0; - - // - // Validate int to long sequence transformation - // - db = dbEnv->openDB("intToLongSeq", false); - - { - IntSeq3Map map(db); - test(map.size() == 1); - IntSeq3Map::iterator p = map.find(0); - test(p != map.end()); - const Test::Seq3& seq = p->second; - test(seq.size() == NUM_ELEMENTS); - for(i = 0; i < NUM_ELEMENTS; i++) - { - test(seq[i] == i); - } - } - - db->close(); - db = 0; - - // - // Validate long to byte sequence transformation - // - db = dbEnv->openDB("longToByteSeq", false); - - { - IntSeq4Map map(db); - test(map.size() == 1); - IntSeq4Map::iterator p = map.find(0); - test(p != map.end()); - const Test::Seq4& seq = p->second; - test(seq.size() == NUM_ELEMENTS); - for(i = 0; i < NUM_ELEMENTS; i++) - { - test(seq[i] == i); - } - } - - db->close(); - db = 0; - - cout << "ok" << endl; + IntSeq1Map map(communicator, envName, "byteToShortSeq", false); + test(map.size() == 1); + IntSeq1Map::iterator p = map.find(0); + test(p != map.end()); + const Test::Seq1& seq = p->second; + test(seq.size() == NUM_ELEMENTS); + for(i = 0; i < NUM_ELEMENTS; i++) + { + test(seq[i] == i); + } } - catch(...) + + // + // Validate short to int sequence transformation + // + { - cout << "failed" << endl; - if(db) - { - db->close(); - } - throw; + IntSeq2Map map(communicator, envName, "shortToIntSeq", false); + test(map.size() == 1); + IntSeq2Map::iterator p = map.find(0); + test(p != map.end()); + const Test::Seq2& seq = p->second; + test(seq.size() == NUM_ELEMENTS); + for(i = 0; i < NUM_ELEMENTS; i++) + { + test(seq[i] == i); + } + } + + // + // Validate int to long sequence transformation + // + + { + IntSeq3Map map(communicator, envName, "intToLongSeq", false); + test(map.size() == 1); + IntSeq3Map::iterator p = map.find(0); + test(p != map.end()); + const Test::Seq3& seq = p->second; + test(seq.size() == NUM_ELEMENTS); + for(i = 0; i < NUM_ELEMENTS; i++) + { + test(seq[i] == i); + } } - if(db) + // + // Validate long to byte sequence transformation + // { - db->close(); + IntSeq4Map map(communicator, envName, "longToByteSeq", false); + test(map.size() == 1); + IntSeq4Map::iterator p = map.find(0); + test(p != map.end()); + const Test::Seq4& seq = p->second; + test(seq.size() == NUM_ELEMENTS); + for(i = 0; i < NUM_ELEMENTS; i++) + { + test(seq[i] == i); + } } + + cout << "ok" << endl; } static void -validateEnum(const DBEnvironmentPtr& dbEnv) +validateEnum(const CommunicatorPtr& communicator, const string& envName) { - DBPtr db; - cout << "validating enumeration transformations... " << flush; - try - { - // - // Validate removal of E1::three - // - db = dbEnv->openDB("enum", false); - - { - IntE1Map map(db); - test(map.size() == 2); - IntE1Map::iterator p; - p = map.find(0); - test(p != map.end()); - test(p->second == Test::one); - p = map.find(1); - test(p != map.end()); - test(p->second == Test::two); - } - - db->close(); - db = 0; - - cout << "ok" << endl; - } - catch(...) + + // + // Validate removal of E1::three + // { - cout << "failed" << endl; - if(db) - { - db->close(); - } - throw; + IntE1Map map(communicator, envName, "enum", false); + test(map.size() == 2); + IntE1Map::iterator p; + p = map.find(0); + test(p != map.end()); + test(p->second == Test::one); + p = map.find(1); + test(p != map.end()); + test(p->second == Test::two); } - if(db) - { - db->close(); - } + cout << "ok" << endl; } static void -validateDictionary(const DBEnvironmentPtr& dbEnv) +validateDictionary(const CommunicatorPtr& communicator, const string& envName) { - DBPtr db; - cout << "validating dictionary transformations... " << flush; - try + // + // Validate removal of E1::three + // { - // - // Validate removal of E1::three - // - db = dbEnv->openDB("dict", false); - - { - IntD1Map map(db); - IntD1Map::iterator p = map.find(0); - test(p != map.end()); - const Test::D1& dict = p->second; - test(dict.size() == 2); - Test::D1::const_iterator q; - q = dict.find("one"); - test(q != dict.end()); - test(q->second == Test::one); - q = dict.find("two"); - test(q != dict.end()); - test(q->second == Test::two); - } - - db->close(); - db = 0; - - cout << "ok" << endl; - } - catch(...) - { - cout << "failed" << endl; - if(db) - { - db->close(); - } - throw; - } - - if(db) - { - db->close(); + IntD1Map map(communicator, envName, "dict", false); + IntD1Map::iterator p = map.find(0); + test(p != map.end()); + const Test::D1& dict = p->second; + test(dict.size() == 2); + Test::D1::const_iterator q; + q = dict.find("one"); + test(q != dict.end()); + test(q->second == Test::one); + q = dict.find("two"); + test(q != dict.end()); + test(q->second == Test::two); } + cout << "ok" << endl; } static void -validateStruct(const DBEnvironmentPtr& dbEnv) +validateStruct(const CommunicatorPtr& communicator, const string& envName) { - DBPtr db; - cout << "validating struct transformations... " << flush; - try - { - // - // Validate S1 - // - db = dbEnv->openDB("struct", false); - - { - IntS1Map map(db); - for(IntS1Map::iterator p = map.begin(); p != map.end(); ++p) - { - test(p->second.i == p->first); - test(p->second.s == 0); - } - } - - db->close(); - db = 0; - - cout << "ok" << endl; - } - catch(...) - { - cout << "failed" << endl; - if(db) - { - db->close(); - } - throw; - } - - if(db) + + // + // Validate S1 + // { - db->close(); + IntS1Map map(communicator, envName, "struct", false); + for(IntS1Map::iterator p = map.begin(); p != map.end(); ++p) + { + test(p->second.i == p->first); + test(p->second.s == 0); + } } + cout << "ok" << endl; + } static void -validateClass(const DBEnvironmentPtr& dbEnv) +validateClass(const CommunicatorPtr& communicator, const string& envName) { - DBPtr db; - - CommunicatorPtr communicator = dbEnv->getCommunicator(); communicator->addObjectFactory(Test::C1::ice_factory(), Test::C1::ice_staticId()); communicator->addObjectFactory(Test::C2::ice_factory(), Test::C2::ice_staticId()); cout << "validating class transformations... " << flush; - try { - // - // Validate C2 - // - db = dbEnv->openDB("class", false); - - { - IntC1Map map(db); - for(IntC1Map::iterator p = map.begin(); p != map.end(); ++p) - { - Test::C2Ptr c2 = Test::C2Ptr::dynamicCast(p->second); - test(c2); - test(c2->s.size() == 1 && c2->s[0] == '0' + p->first); - test(c2->b == p->first); - test(c2->l == p->first); - test(c2->i == p->first); - if(c2->s == "3") - { - // - // Test facets - // - Ice::ObjectPtr obj; - Test::C1Ptr c1; - - obj = c2->ice_findFacet("c1-0"); - test(obj); - c1 = Test::C1Ptr::dynamicCast(obj); - test(c1); - test(c1->s == "c1-0"); - test(c1->b == 0); - - obj = c2->ice_findFacet("c1-1"); - test(obj); - c1 = Test::C1Ptr::dynamicCast(obj); - test(c1); - test(c1->s == "c1-1"); - test(c1->b == 1); - - obj = c2->ice_findFacet("c1-2"); - test(obj); - Test::C2Ptr c2Facet = Test::C2Ptr::dynamicCast(obj); - test(c2Facet); - test(c2Facet->s == "c1-2"); - test(c2Facet->b == 2); - test(c2Facet->i == 2); - test(c2Facet->l == 2); - - obj = c2Facet->ice_findFacet("c2-0"); - test(obj); - c1 = Test::C1Ptr::dynamicCast(obj); - test(c1); - test(c1->s == "c2-0"); - test(c1->b == 0); - } - } - } - - db->close(); - db = 0; - - cout << "ok" << endl; - } - catch(...) - { - cout << "failed" << endl; - if(db) - { - db->close(); - } - throw; + IntC1Map map(communicator, envName, "class", false); + for(IntC1Map::iterator p = map.begin(); p != map.end(); ++p) + { + Test::C2Ptr c2 = Test::C2Ptr::dynamicCast(p->second); + test(c2); + test(c2->s.size() == 1 && c2->s[0] == '0' + p->first); + test(c2->b == p->first); + test(c2->l == p->first); + test(c2->i == p->first); + if(c2->s == "3") + { + // + // Test facets + // + Ice::ObjectPtr obj; + Test::C1Ptr c1; + + obj = c2->ice_findFacet("c1-0"); + test(obj); + c1 = Test::C1Ptr::dynamicCast(obj); + test(c1); + test(c1->s == "c1-0"); + test(c1->b == 0); + + obj = c2->ice_findFacet("c1-1"); + test(obj); + c1 = Test::C1Ptr::dynamicCast(obj); + test(c1); + test(c1->s == "c1-1"); + test(c1->b == 1); + + obj = c2->ice_findFacet("c1-2"); + test(obj); + Test::C2Ptr c2Facet = Test::C2Ptr::dynamicCast(obj); + test(c2Facet); + test(c2Facet->s == "c1-2"); + test(c2Facet->b == 2); + test(c2Facet->i == 2); + test(c2Facet->l == 2); + + obj = c2Facet->ice_findFacet("c2-0"); + test(obj); + c1 = Test::C1Ptr::dynamicCast(obj); + test(c1); + test(c1->s == "c2-0"); + test(c1->b == 0); + } + } } - communicator->removeObjectFactory(Test::C1::ice_staticId()); - communicator->removeObjectFactory(Test::C2::ice_staticId()); + cout << "ok" << endl; - if(db) - { - db->close(); - } + communicator->removeObjectFactory(Test::C1::ice_staticId()); + communicator->removeObjectFactory(Test::C2::ice_staticId()); } static void -validateEvictor(const DBEnvironmentPtr& dbEnv) +validateEvictor(const CommunicatorPtr& communicator, const string& envName) { - DBPtr db; Freeze::EvictorPtr evictor; - CommunicatorPtr communicator = dbEnv->getCommunicator(); communicator->addObjectFactory(Test::C1::ice_factory(), Test::C1::ice_staticId()); communicator->addObjectFactory(Test::C2::ice_factory(), Test::C2::ice_staticId()); cout << "validating evictor transformations... " << flush; - try + + // + // Validate C2 + // + evictor = Freeze::createEvictor(communicator, envName, "evictor", false); { - // - // Validate C2 - // - db = dbEnv->openDB("evictor", false); - evictor = db->createEvictor(db->createEvictionStrategy()); - - { - EvictorIteratorPtr iter = evictor->getIterator(); - while(iter->hasNext()) - { - Current current; - LocalObjectPtr cookie; - - current.id = iter->next(); - - ObjectPtr object = evictor->locate(current, cookie); - test(object); - - Test::C2Ptr c2 = Test::C2Ptr::dynamicCast(object); - test(c2); - test(c2->s.size() == 1 && c2->s == current.id.name); - int i = current.id.name[0] - '0'; - test(c2->b == i); - test(c2->l == i); - test(c2->i == i); - if(c2->s == "3") - { - // - // Test facets - // - Ice::ObjectPtr obj; - Test::C1Ptr c1; - - obj = c2->ice_findFacet("c1-0"); - test(obj); - c1 = Test::C1Ptr::dynamicCast(obj); - test(c1); - test(c1->s == "c1-0"); - test(c1->b == 0); - - obj = c2->ice_findFacet("c1-1"); - test(obj); - c1 = Test::C1Ptr::dynamicCast(obj); - test(c1); - test(c1->s == "c1-1"); - test(c1->b == 1); - - obj = c2->ice_findFacet("c1-2"); - test(obj); - Test::C2Ptr c2Facet = Test::C2Ptr::dynamicCast(obj); - test(c2Facet); - test(c2Facet->s == "c1-2"); - test(c2Facet->b == 2); - test(c2Facet->i == 2); - test(c2Facet->l == 2); - - obj = c2Facet->ice_findFacet("c2-0"); - test(obj); - c1 = Test::C1Ptr::dynamicCast(obj); - test(c1); - test(c1->s == "c2-0"); - test(c1->b == 0); - } - - evictor->finished(current, object, cookie); - } - iter->destroy(); - } - - evictor->deactivate(""); - db->close(); - db = 0; - - cout << "ok" << endl; - } - catch(...) - { - cout << "failed" << endl; - if(db) - { - db->close(); - } - throw; + EvictorIteratorPtr iter = evictor->getIterator(); + while(iter->hasNext()) + { + Current current; + LocalObjectPtr cookie; + + current.id = iter->next(); + + ObjectPtr object = evictor->locate(current, cookie); + test(object); + + Test::C2Ptr c2 = Test::C2Ptr::dynamicCast(object); + test(c2); + test(c2->s.size() == 1 && c2->s == current.id.name); + int i = current.id.name[0] - '0'; + test(c2->b == i); + test(c2->l == i); + test(c2->i == i); + if(c2->s == "3") + { + // + // Test facets + // + Ice::ObjectPtr obj; + Test::C1Ptr c1; + + obj = c2->ice_findFacet("c1-0"); + test(obj); + c1 = Test::C1Ptr::dynamicCast(obj); + test(c1); + test(c1->s == "c1-0"); + test(c1->b == 0); + + obj = c2->ice_findFacet("c1-1"); + test(obj); + c1 = Test::C1Ptr::dynamicCast(obj); + test(c1); + test(c1->s == "c1-1"); + test(c1->b == 1); + + obj = c2->ice_findFacet("c1-2"); + test(obj); + Test::C2Ptr c2Facet = Test::C2Ptr::dynamicCast(obj); + test(c2Facet); + test(c2Facet->s == "c1-2"); + test(c2Facet->b == 2); + test(c2Facet->i == 2); + test(c2Facet->l == 2); + + obj = c2Facet->ice_findFacet("c2-0"); + test(obj); + c1 = Test::C1Ptr::dynamicCast(obj); + test(c1); + test(c1->s == "c2-0"); + test(c1->b == 0); + } + + evictor->finished(current, object, cookie); + } + iter->destroy(); } + + evictor->deactivate(""); + + cout << "ok" << endl; communicator->removeObjectFactory(Test::C1::ice_staticId()); communicator->removeObjectFactory(Test::C2::ice_staticId()); - - if(db) - { - db->close(); - } } static int run(int argc, char* argv[], const CommunicatorPtr& communicator) { - string dbEnvDir = "db"; + string envName = "db"; int idx = 1; while(idx < argc) @@ -628,7 +427,7 @@ run(int argc, char* argv[], const CommunicatorPtr& communicator) return EXIT_FAILURE; } - dbEnvDir = argv[idx + 1]; + envName = argv[idx + 1]; for(int i = idx ; i + 2 < argc ; ++i) { argv[i] = argv[i + 2]; @@ -647,31 +446,25 @@ run(int argc, char* argv[], const CommunicatorPtr& communicator) } } - DBEnvironmentPtr dbEnv; - try { - dbEnv = Freeze::initialize(communicator, dbEnvDir); - validatePrimitive(dbEnv); - validatePrimitiveSequence(dbEnv); - validateEnum(dbEnv); - validateDictionary(dbEnv); - validateStruct(dbEnv); - validateClass(dbEnv); - validateEvictor(dbEnv); + validatePrimitive(communicator, envName); + validatePrimitiveSequence(communicator, envName); + validateEnum(communicator, envName); + validateDictionary(communicator, envName); + validateStruct(communicator, envName); + validateClass(communicator, envName); + validateEvictor(communicator, envName); } - catch(...) + catch(Exception& ex) { - if(dbEnv) - { - dbEnv->close(); - } - throw; + cerr << "Caught Exception" << endl; + cerr << ex << endl; } - - if(dbEnv) + catch(...) { - dbEnv->close(); + cerr << "Caught exception" << endl; + throw; } return EXIT_SUCCESS; diff --git a/cpp/test/XMLTransform/transform/config b/cpp/test/XMLTransform/transform/config new file mode 100644 index 00000000000..af6f1318b3c --- /dev/null +++ b/cpp/test/XMLTransform/transform/config @@ -0,0 +1 @@ +Freeze.Evictor.NoSyncAllowed=1 diff --git a/cpp/test/XMLTransform/transform/run.py b/cpp/test/XMLTransform/transform/run.py index f4f2ea5e03b..fbaa881b106 100755 --- a/cpp/test/XMLTransform/transform/run.py +++ b/cpp/test/XMLTransform/transform/run.py @@ -32,7 +32,8 @@ dbdir = os.path.join(testdir, "db") TestUtil.cleanDbDir(dbdir) populate = os.path.join(testdir, "populate") -populateOptions = TestUtil.clientOptions + " -I" + toplevel + "/schema -I" + testdir + " --db-dir " + dbdir; +populateOptions = TestUtil.clientOptions + " --Ice.Config=" + testdir + "/config -I" + \ + toplevel + "/schema -I" + testdir + " --db-dir " + dbdir; print "starting populate...", populatePipe = os.popen(populate + populateOptions) @@ -47,7 +48,8 @@ if populateStatus: sys.exit(1) validate = os.path.join(testdir, "validate") -validateOptions = TestUtil.clientOptions + " --db-dir " + dbdir; +validateOptions = TestUtil.clientOptions + " --Ice.Config=" + testdir + "/config " + \ + " --db-dir " + dbdir; print "starting validate...", validatePipe = os.popen(validate + validateOptions) diff --git a/cpp/test/XMLTransform/transform/transformP.dsp b/cpp/test/XMLTransform/transform/transformP.dsp index 53601c42a3e..2de3f81b196 100644 --- a/cpp/test/XMLTransform/transform/transformP.dsp +++ b/cpp/test/XMLTransform/transform/transformP.dsp @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"populate.exe" /libpath:"../../../lib"
+# ADD LINK32 libdb41.lib /nologo /subsystem:console /machine:I386 /out:"populate.exe" /libpath:"../../../lib"
# SUBTRACT LINK32 /debug /nodefaultlib
!ELSEIF "$(CFG)" == "transformP - Win32 Debug"
@@ -77,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"populate.exe" /pdbtype:sept /libpath:"../../../lib"
+# ADD LINK32 libdb41d.lib /nologo /subsystem:console /debug /machine:I386 /out:"populate.exe" /pdbtype:sept /libpath:"../../../lib"
# SUBTRACT LINK32 /nodefaultlib
!ENDIF
diff --git a/cpp/test/XMLTransform/transform/transformV.dsp b/cpp/test/XMLTransform/transform/transformV.dsp index ccb2e36bb9c..7e31cbed2ff 100644 --- a/cpp/test/XMLTransform/transform/transformV.dsp +++ b/cpp/test/XMLTransform/transform/transformV.dsp @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"validate.exe" /libpath:"../../../lib"
+# ADD LINK32 libdb41.lib /nologo /subsystem:console /machine:I386 /out:"validate.exe" /libpath:"../../../lib"
# SUBTRACT LINK32 /debug /nodefaultlib
!ELSEIF "$(CFG)" == "transformV - Win32 Debug"
@@ -77,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"validate.exe" /pdbtype:sept /libpath:"../../../lib"
+# ADD LINK32 libdb41d.lib /nologo /subsystem:console /debug /machine:I386 /out:"validate.exe" /pdbtype:sept /libpath:"../../../lib"
# SUBTRACT LINK32 /nodefaultlib
!ENDIF
diff --git a/java/CHANGES b/java/CHANGES index 20ff92d9716..ac4e414380a 100644 --- a/java/CHANGES +++ b/java/CHANGES @@ -1,6 +1,9 @@ Changes since version 1.1.0 --------------------------- +- Major Freeze update + See corresponding entry in the Ice CHANGES file. + - Added Ice.MessageSizeMax property. This property controls the maximum message size accepted by the Ice protocol in kiloBytes. The default value is 1024 (1 MB). diff --git a/java/allTests.py b/java/allTests.py index 2448b7f15c3..d585ed5901a 100755 --- a/java/allTests.py +++ b/java/allTests.py @@ -38,7 +38,6 @@ tests = [ \ "Ice/slicing/objects", \ "Ice/custom", \ "IceXML/encoding", \ - "Freeze/cursor", \ "Freeze/dbmap", \ "Freeze/complex", \ "Freeze/evictor", \ diff --git a/java/build.xml b/java/build.xml index b57a8920b87..99f6d41e338 100644 --- a/java/build.xml +++ b/java/build.xml @@ -81,7 +81,6 @@ the Free Software Foundation. <include name="DBException.ice" /> <include name="Evictor.ice" /> <include name="ObjectRecord.ice" /> - <include name="Strategy.ice" /> </fileset> <fileset dir="${slice.dir}/IceBox"> <include name="IceBox.ice" /> diff --git a/java/demo/Freeze/bench/Client.java b/java/demo/Freeze/bench/Client.java index 66536b08a1b..764f3201e08 100644 --- a/java/demo/Freeze/bench/Client.java +++ b/java/demo/Freeze/bench/Client.java @@ -12,28 +12,27 @@ // // ********************************************************************** -class TestApp extends Freeze.Application +class TestApp extends Ice.Application { - TestApp(String dbEnvName) + TestApp(String envName) { - super(dbEnvName); + _envName = envName; } void - IntIntMapTest(Freeze.DBEnvironment dbEnv, boolean fast) + IntIntMapTest(boolean fast) { - Freeze.DB db; + IntIntMap m; + if(fast) { - db = dbEnv.openDB("IntIntMap.fast", true); + m = new IntIntMap(communicator(), _envName, "IntIntMap.fast", true); } else { - db = dbEnv.openDB("IntIntMap", true); + m = new IntIntMap(communicator(), _envName, "IntIntMap", true); } - IntIntMap m = new IntIntMap(db); - // // Populate the database. // @@ -99,7 +98,7 @@ class TestApp extends Freeze.Application System.out.println("\ttime for " + _repetitions + " " + ((fast) ? "fast " : "") + "removes: " + total + "ms"); System.out.println("\ttime per remove: " + perRecord + "ms"); - db.close(); + m.close(); } interface Generator @@ -183,11 +182,9 @@ class TestApp extends Freeze.Application } void - IntIntMapReadTest(Freeze.DBEnvironment dbEnv) + IntIntMapReadTest() { - Freeze.DB db = dbEnv.openDB("IntIntMap", true); - - IntIntMap m = new IntIntMap(db); + IntIntMap m = new IntIntMap(communicator(), _envName, "IntIntMap", true); // // Populate the database. @@ -236,15 +233,13 @@ class TestApp extends Freeze.Application System.out.println("\ttime per remove: " + perRecord + "ms"); */ - db.close(); + m.close(); } void - Struct1Struct2MapTest(Freeze.DBEnvironment dbEnv) + Struct1Struct2MapTest() { - Freeze.DB db = dbEnv.openDB("Struct1Struct2", true); - - Struct1Struct2Map m = new Struct1Struct2Map(db); + Struct1Struct2Map m = new Struct1Struct2Map(communicator(), _envName, "Struct1Struct2", true); // // Populate the database. @@ -296,15 +291,13 @@ class TestApp extends Freeze.Application System.out.println("\ttime for " + _repetitions + " removes: " + total + "ms"); System.out.println("\ttime per remove: " + perRecord + "ms"); - db.close(); + m.close(); } void - Struct1Class1MapTest(Freeze.DBEnvironment dbEnv) + Struct1Class1MapTest() { - Freeze.DB db = dbEnv.openDB("Struct1Class1", true); - - Struct1Class1Map m = new Struct1Class1Map(db); + Struct1Class1Map m = new Struct1Class1Map(communicator(), _envName, "Struct1Class1", true); // // Populate the database. @@ -356,15 +349,13 @@ class TestApp extends Freeze.Application System.out.println("\ttime for " + _repetitions + " removes: " + total + "ms"); System.out.println("\ttime per remove: " + perRecord + "ms"); - db.close(); + m.close(); } void - Struct1ObjectMapTest(Freeze.DBEnvironment dbEnv) + Struct1ObjectMapTest() { - Freeze.DB db = dbEnv.openDB("Struct1Object", true); - - Struct1ObjectMap m = new Struct1ObjectMap(db); + Struct1ObjectMap m = new Struct1ObjectMap(communicator(), _envName, "Struct1Object", true); // // Populate the database. @@ -443,32 +434,32 @@ class TestApp extends Freeze.Application System.out.println("\ttime for " + _repetitions + " removes: " + total + "ms"); System.out.println("\ttime per remove: " + perRecord + "ms"); - db.close(); + m.close(); } public int - runFreeze(String[] args, Freeze.DBEnvironment dbEnv) + run(String[] args) { System.out.println("IntIntMap (Collections API)"); - IntIntMapTest(dbEnv, false); + IntIntMapTest(false); System.out.println("IntIntMap (Fast API)"); - IntIntMapTest(dbEnv, true); + IntIntMapTest(true); System.out.println("Struct1Struct2Map"); - Struct1Struct2MapTest(dbEnv); + Struct1Struct2MapTest(); System.out.println("Struct1Class1Map"); - Struct1Class1MapTest(dbEnv); + Struct1Class1MapTest(); MyFactory factory = new MyFactory(); - factory.install(dbEnv.getCommunicator()); + factory.install(communicator()); System.out.println("Struct1ObjectMap"); - Struct1ObjectMapTest(dbEnv); + Struct1ObjectMapTest(); System.out.println("IntIntMap (read test)"); - IntIntMapReadTest(dbEnv); + IntIntMapReadTest(); return 0; } @@ -513,6 +504,7 @@ class TestApp extends Freeze.Application private int _repetitions = 10000; private StopWatch _watch = new StopWatch(); + private String _envName; } public class Client diff --git a/java/demo/Freeze/bench/build.xml b/java/demo/Freeze/bench/build.xml index ffc8343eed6..790a604109c 100644 --- a/java/demo/Freeze/bench/build.xml +++ b/java/demo/Freeze/bench/build.xml @@ -85,6 +85,10 @@ the Free Software Foundation. <target name="clean"> <delete dir="${generated.dir}"/> <delete dir="${class.dir}"/> + <delete> + <fileset dir="db" includes="log.*"/> + <fileset dir="db" includes="IntIntMap.fast,Struct1Object,IntIntMap,Struct1Class1,Struct1Struct2"/> + </delete> </target> </project> diff --git a/java/demo/Freeze/library/Collocated.java b/java/demo/Freeze/library/Collocated.java index 1eeab28e45b..23490847fee 100644 --- a/java/demo/Freeze/library/Collocated.java +++ b/java/demo/Freeze/library/Collocated.java @@ -12,29 +12,17 @@ // // ********************************************************************** -class LibraryCollocated extends Freeze.Application +class LibraryCollocated extends Ice.Application { public int - runFreeze(String[] args, Freeze.DBEnvironment dbEnv) + run(String[] args) { Ice.Properties properties = communicator().getProperties(); - - Freeze.DB dbBooks = dbEnv.openDB("books", true); - Freeze.DB dbAuthors = dbEnv.openDB("authors", true); - + // // Create an Evictor for books. // - Freeze.PersistenceStrategy strategy; - if(properties.getPropertyAsInt("Library.IdleStrategy") > 0) - { - strategy = dbBooks.createIdleStrategy(); - } - else - { - strategy = dbBooks.createEvictionStrategy(); - } - Freeze.Evictor evictor = dbBooks.createEvictor(strategy); + Freeze.Evictor evictor = Freeze.Util.createEvictor(communicator(), _envName, "books", true); int evictorSize = properties.getPropertyAsInt("Library.EvictorSize"); if(evictorSize > 0) { @@ -51,7 +39,7 @@ class LibraryCollocated extends Freeze.Application // // Create the library, and add it to the Object Adapter. // - LibraryI library = new LibraryI(dbAuthors, evictor); + LibraryI library = new LibraryI(communicator(), _envName, "authors", evictor); adapter.add(library, Ice.Util.stringToIdentity("library")); // @@ -67,13 +55,16 @@ class LibraryCollocated extends Freeze.Application adapter.deactivate(); adapter.waitForDeactivate(); + library.close(); return status; } - LibraryCollocated(String dbEnvName) + LibraryCollocated(String envName) { - super(dbEnvName); + _envName = envName; } + + private String _envName; } public class Collocated diff --git a/java/demo/Freeze/library/LibraryI.java b/java/demo/Freeze/library/LibraryI.java index 8e328da5375..72c37ce3fa1 100644 --- a/java/demo/Freeze/library/LibraryI.java +++ b/java/demo/Freeze/library/LibraryI.java @@ -223,10 +223,16 @@ class LibraryI extends _LibraryDisp } } - LibraryI(Freeze.DB db, Freeze.Evictor evictor) + LibraryI(Ice.Communicator communicator, String envName, String dbName, Freeze.Evictor evictor) { _evictor = evictor; - _authors = new StringIsbnSeqDict(db); + _authors = new StringIsbnSeqDict(communicator, envName, dbName, true); + } + + void + close() + { + _authors.close(); } private Ice.Identity diff --git a/java/demo/Freeze/library/Server.java b/java/demo/Freeze/library/Server.java index ad892ad1e73..1da96868cb6 100644 --- a/java/demo/Freeze/library/Server.java +++ b/java/demo/Freeze/library/Server.java @@ -12,29 +12,17 @@ // // ********************************************************************** -class LibraryServer extends Freeze.Application +class LibraryServer extends Ice.Application { public int - runFreeze(String[] args, Freeze.DBEnvironment dbEnv) + run(String[] args) { Ice.Properties properties = communicator().getProperties(); - Freeze.DB dbBooks = dbEnv.openDB("books", true); - Freeze.DB dbAuthors = dbEnv.openDB("authors", true); - // // Create an Evictor for books. // - Freeze.PersistenceStrategy strategy; - if(properties.getPropertyAsInt("Library.IdleStrategy") > 0) - { - strategy = dbBooks.createIdleStrategy(); - } - else - { - strategy = dbBooks.createEvictionStrategy(); - } - Freeze.Evictor evictor = dbBooks.createEvictor(strategy); + Freeze.Evictor evictor = Freeze.Util.createEvictor(communicator(), _envName, "books", true); int evictorSize = properties.getPropertyAsInt("Library.EvictorSize"); if(evictorSize > 0) { @@ -51,7 +39,7 @@ class LibraryServer extends Freeze.Application // // Create the library, and add it to the Object Adapter. // - LibraryI library = new LibraryI(dbAuthors, evictor); + LibraryI library = new LibraryI(communicator(), _envName, "authors", evictor); adapter.add(library, Ice.Util.stringToIdentity("library")); // @@ -69,13 +57,16 @@ class LibraryServer extends Freeze.Application communicator().waitForShutdown(); defaultInterrupt(); + library.close(); return 0; } - LibraryServer(String dbEnvName) + LibraryServer(String envName) { - super(dbEnvName); + _envName = envName; } + + private String _envName; } public class Server diff --git a/java/demo/Freeze/library/build.xml b/java/demo/Freeze/library/build.xml index 3b2e466feb8..07c9360c9d7 100644 --- a/java/demo/Freeze/library/build.xml +++ b/java/demo/Freeze/library/build.xml @@ -80,6 +80,10 @@ the Free Software Foundation. <target name="clean"> <delete dir="${generated.dir}"/> <delete dir="${class.dir}"/> + <delete> + <fileset dir="db" includes="log.*"/> + <fileset dir="db" includes="authors,books"/> + </delete> </target> </project> diff --git a/java/demo/Freeze/library/config b/java/demo/Freeze/library/config index f879a342312..26f0e6b48b2 100644 --- a/java/demo/Freeze/library/config +++ b/java/demo/Freeze/library/config @@ -4,6 +4,5 @@ Ice.Warn.Connections=1 #Ice.Trace.Protocol=1 Library.Proxy=library:default -p 10000 Library.EvictorSize=3 -#Library.IdleStrategy=1 Freeze.Trace.DB=1 Freeze.Trace.Evictor=2 diff --git a/java/demo/Freeze/phonebook/Collocated.java b/java/demo/Freeze/phonebook/Collocated.java index 4a1c3de8b55..6770d1a28bb 100644 --- a/java/demo/Freeze/phonebook/Collocated.java +++ b/java/demo/Freeze/phonebook/Collocated.java @@ -12,29 +12,17 @@ // // ********************************************************************** -class PhoneBookCollocated extends Freeze.Application +class PhoneBookCollocated extends Ice.Application { public int - runFreeze(String[] args, Freeze.DBEnvironment dbEnv) + run(String[] args) { Ice.Properties properties = communicator().getProperties(); - Freeze.DB dbPhoneBook = dbEnv.openDB("phonebook", true); - Freeze.DB dbContacts = dbEnv.openDB("contacts", true); - // // Create an Evictor for contacts. // - Freeze.PersistenceStrategy strategy; - if(properties.getPropertyAsInt("PhoneBook.IdleStrategy") > 0) - { - strategy = dbContacts.createIdleStrategy(); - } - else - { - strategy = dbContacts.createEvictionStrategy(); - } - Freeze.Evictor evictor = dbContacts.createEvictor(strategy); + Freeze.Evictor evictor = Freeze.Util.createEvictor(communicator(), _envName, "contacts", true); int evictorSize = properties.getPropertyAsInt("PhoneBook.EvictorSize"); if(evictorSize > 0) { @@ -51,7 +39,7 @@ class PhoneBookCollocated extends Freeze.Application // // Create the phonebook, and add it to the Object Adapter. // - PhoneBookI phoneBook = new PhoneBookI(dbPhoneBook, evictor); + PhoneBookI phoneBook = new PhoneBookI(communicator(), _envName, "phonebook", evictor); adapter.add(phoneBook, Ice.Util.stringToIdentity("phonebook")); // @@ -68,14 +56,17 @@ class PhoneBookCollocated extends Freeze.Application int status = RunParser.runParser(appName(), args, communicator()); adapter.deactivate(); adapter.waitForDeactivate(); + phoneBook.close(); return status; } - PhoneBookCollocated(String dbEnvName) + PhoneBookCollocated(String envName) { - super(dbEnvName); + _envName = envName; } + + private String _envName; } public class Collocated diff --git a/java/demo/Freeze/phonebook/PhoneBookI.java b/java/demo/Freeze/phonebook/PhoneBookI.java index e3413b37aad..bd6316d847f 100644 --- a/java/demo/Freeze/phonebook/PhoneBookI.java +++ b/java/demo/Freeze/phonebook/PhoneBookI.java @@ -235,12 +235,18 @@ class PhoneBookI extends _PhoneBookDisp } } - PhoneBookI(Freeze.DB db, Freeze.Evictor evictor) + PhoneBookI(Ice.Communicator communicator, String envName, String dbName, Freeze.Evictor evictor) { _evictor = evictor; - _nameIdentitiesDict = new NameIdentitiesDict(db); + _nameIdentitiesDict = new NameIdentitiesDict(communicator, envName, dbName, true); } + void + close() + { + _nameIdentitiesDict.close(); + } + // // It's not strictly necessary in the Java implementation to have // a private removeI implememnation since there is no problem with diff --git a/java/demo/Freeze/phonebook/Server.java b/java/demo/Freeze/phonebook/Server.java index 05adb3524cf..d5c08905aa9 100644 --- a/java/demo/Freeze/phonebook/Server.java +++ b/java/demo/Freeze/phonebook/Server.java @@ -12,29 +12,17 @@ // // ********************************************************************** -class PhoneBookServer extends Freeze.Application +class PhoneBookServer extends Ice.Application { public int - runFreeze(String[] args, Freeze.DBEnvironment dbEnv) + run(String[] args) { Ice.Properties properties = communicator().getProperties(); - Freeze.DB dbPhoneBook = dbEnv.openDB("phonebook", true); - Freeze.DB dbContacts = dbEnv.openDB("contacts", true); - // // Create an Evictor for contacts. // - Freeze.PersistenceStrategy strategy; - if(properties.getPropertyAsInt("PhoneBook.IdleStrategy") > 0) - { - strategy = dbContacts.createIdleStrategy(); - } - else - { - strategy = dbContacts.createEvictionStrategy(); - } - Freeze.Evictor evictor = dbContacts.createEvictor(strategy); + Freeze.Evictor evictor = Freeze.Util.createEvictor(communicator(), _envName, "contacts", true); int evictorSize = properties.getPropertyAsInt("PhoneBook.EvictorSize"); if(evictorSize > 0) { @@ -51,7 +39,7 @@ class PhoneBookServer extends Freeze.Application // // Create the phonebook, and add it to the Object Adapter. // - PhoneBookI phoneBook = new PhoneBookI(dbPhoneBook, evictor); + PhoneBookI phoneBook = new PhoneBookI(communicator(), _envName, "phonebook", evictor); adapter.add(phoneBook, Ice.Util.stringToIdentity("phonebook")); // @@ -70,14 +58,17 @@ class PhoneBookServer extends Freeze.Application shutdownOnInterrupt(); communicator().waitForShutdown(); defaultInterrupt(); - + + phoneBook.close(); return 0; } - PhoneBookServer(String dbEnvName) + PhoneBookServer(String envName) { - super(dbEnvName); + _envName = envName; } + + private String _envName; } public class Server @@ -86,6 +77,6 @@ public class Server main(String[] args) { PhoneBookServer app = new PhoneBookServer("db"); - app.main("demo.Freeze.phonebook.Server", args, "config"); + app.main("demo.Freeze.phonebook.Server", args); } } diff --git a/java/demo/Freeze/phonebook/build.xml b/java/demo/Freeze/phonebook/build.xml index fd3957029b6..b4a03240934 100644 --- a/java/demo/Freeze/phonebook/build.xml +++ b/java/demo/Freeze/phonebook/build.xml @@ -77,6 +77,10 @@ the Free Software Foundation. <target name="clean"> <delete dir="${generated.dir}"/> <delete dir="${class.dir}"/> + <delete> + <fileset dir="db" includes="log.*"/> + <fileset dir="db" includes="contacts,phonebook"/> + </delete> </target> </project> diff --git a/java/src/Freeze/Application.java b/java/src/Freeze/Application.java deleted file mode 100644 index 3bbf724fa81..00000000000 --- a/java/src/Freeze/Application.java +++ /dev/null @@ -1,82 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003 -// ZeroC, Inc. -// Billerica, MA, USA -// -// All Rights Reserved. -// -// Ice is free software; you can redistribute it and/or modify it under -// the terms of the GNU General Public License version 2 as published by -// the Free Software Foundation. -// -// ********************************************************************** - -package Freeze; - -public abstract class Application extends Ice.Application -{ - public - Application(String dbEnvName) - { - _dbEnvName = dbEnvName; - } - - public int - run(String[] args) - { - int status; - DBEnvironment dbEnv = null; - - try - { - dbEnv = Freeze.Util.initialize(communicator(), _dbEnvName); - status = runFreeze(args, dbEnv); - } - catch(DBException ex) - { - System.err.println(appName() + ": " + ex + ": " + ex.message); - status = 1; - } - catch(Ice.LocalException ex) - { - System.err.println(appName() + ": " + ex); - ex.printStackTrace(); - status = 1; - } - catch(Exception ex) - { - System.err.println(appName() + ": unknown exception"); - ex.printStackTrace(); - status = 1; - } - - if(dbEnv != null) - { - try - { - dbEnv.close(); - } - catch(DBException ex) - { - System.err.println(appName() + ": " + ex + ": " + ex.message); - ex.printStackTrace(); - status = 1; - } - catch(Exception ex) - { - System.err.println(appName() + ": unknown exception"); - ex.printStackTrace(); - status = 1; - } - dbEnv = null; - } - - return status; - } - - public abstract int - runFreeze(String[] args, DBEnvironment dbEnv); - - private String _dbEnvName; -} diff --git a/java/src/Freeze/DBCursorI.java b/java/src/Freeze/DBCursorI.java deleted file mode 100644 index e67c6be3718..00000000000 --- a/java/src/Freeze/DBCursorI.java +++ /dev/null @@ -1,307 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003 -// ZeroC, Inc. -// Billerica, MA, USA -// -// All Rights Reserved. -// -// Ice is free software; you can redistribute it and/or modify it under -// the terms of the GNU General Public License version 2 as published by -// the Free Software Foundation. -// -// ********************************************************************** - -package Freeze; - -class DBCursorI extends Ice.LocalObjectImpl implements DBCursor -{ - public Ice.Communicator - getCommunicator() - { - // immutable - return _communicator; - } - - synchronized public void - curr(KeyHolder k, ValueHolder v) - { - if(_cursor == null) - { - DBException ex = new DBException(); - ex.message = _errorPrefix + "\"" + _name + "\" has been closed"; - throw ex; - } - - com.sleepycat.db.Dbt dbKey = new com.sleepycat.db.Dbt(); - com.sleepycat.db.Dbt dbData = new com.sleepycat.db.Dbt(); - - if(_trace >= 1) - { - _communicator.getLogger().trace("DB", "reading current value from database \"" + _name + "\""); - } - - try - { - int rc = _cursor.get(dbKey, dbData, com.sleepycat.db.Db.DB_CURRENT); - if(rc == com.sleepycat.db.Db.DB_NOTFOUND) - { - DBNotFoundException ex = new DBNotFoundException(); - ex.message = _errorPrefix + "Dbc.get: DB_NOTFOUND"; - throw ex; - } - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "Dbc.get: " + e.getMessage(); - throw ex; - } - - // - // Copy the data from the read key & data - // - k.value = dbKey.get_data(); - v.value = dbData.get_data(); - } - - synchronized public void - set(byte[] v) - { - if(_cursor == null) - { - DBException ex = new DBException(); - ex.message = _errorPrefix + "\"" + _name + "\" has been closed"; - throw ex; - } - - // - // TODO: Although the API docs say that the key argument to Dbc.put() - // is ignored, an exception is raised if the Dbt object isn't initialized. - // Sleepycat has acknowledged that this is a bug. - // - com.sleepycat.db.Dbt dbKey = new com.sleepycat.db.Dbt(new byte[0]); - com.sleepycat.db.Dbt dbData = new com.sleepycat.db.Dbt(v); - - if(_trace >= 1) - { - _communicator.getLogger().trace("DB", "setting current value in database \"" + _name + "\""); - } - - try - { - int rc = _cursor.put(dbKey, dbData, com.sleepycat.db.Db.DB_CURRENT); - /* Since the underlying data is btree this cannot occur. - * - if(rc == com.sleepycat.db.Db.DB_NOTFOUND) - { - DBNotFoundException ex = new DBNotFoundException(); - ex.message = _errorPrefix + "Dbc.put: DB_NOTFOUND"; - throw ex; - } - */ - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "Dbc.put: " + e.getMessage(); - throw ex; - } - } - - synchronized public boolean - next() - { - if(_cursor == null) - { - DBException ex = new DBException(); - ex.message = _errorPrefix + "\"" + _name + "\" has been closed"; - throw ex; - } - - com.sleepycat.db.Dbt dbKey = new com.sleepycat.db.Dbt(); - dbKey.set_flags(com.sleepycat.db.Db.DB_DBT_PARTIAL); - com.sleepycat.db.Dbt dbData = new com.sleepycat.db.Dbt(); - dbData.set_flags(com.sleepycat.db.Db.DB_DBT_PARTIAL); - - if(_trace >= 1) - { - _communicator.getLogger().trace("DB", "moving to next value in database \"" + _name + "\""); - } - - try - { - int rc = _cursor.get(dbKey, dbData, com.sleepycat.db.Db.DB_NEXT); - if(rc == com.sleepycat.db.Db.DB_NOTFOUND) - { - return false; - } - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "Dbc.get: " + e.getMessage(); - throw ex; - } - - return true; - } - - synchronized public boolean - prev() - { - if(_cursor == null) - { - DBException ex = new DBException(); - ex.message = _errorPrefix + "\"" + _name + "\" has been closed"; - throw ex; - } - - com.sleepycat.db.Dbt dbKey = new com.sleepycat.db.Dbt(); - dbKey.set_flags(com.sleepycat.db.Db.DB_DBT_PARTIAL); - com.sleepycat.db.Dbt dbData = new com.sleepycat.db.Dbt(); - dbData.set_flags(com.sleepycat.db.Db.DB_DBT_PARTIAL); - - if(_trace >= 1) - { - _communicator.getLogger().trace("DB", "moving to previous value in database \"" + _name + "\""); - } - - try - { - int rc = _cursor.get(dbKey, dbData, com.sleepycat.db.Db.DB_PREV); - if(rc == com.sleepycat.db.Db.DB_NOTFOUND) - { - return false; - } - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "Dbc.get: " + e.getMessage(); - throw ex; - } - - return true; - } - - synchronized public void - del() - { - if(_cursor == null) - { - DBException ex = new DBException(); - ex.message = _errorPrefix + "\"" + _name + "\" has been closed"; - throw ex; - } - - if(_trace >= 1) - { - _communicator.getLogger().trace("DB", "removing the current element in database \"" + _name + "\""); - } - - try - { - int rc = _cursor.del(0); - if(rc == com.sleepycat.db.Db.DB_KEYEMPTY) - { - DBException ex = new DBException(); - ex.message = _errorPrefix + "Dbc.del: DB_KEYEMPTY"; - throw ex; - } - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "Dbc.get: " + e.getMessage(); - throw ex; - } - } - - synchronized public DBCursor - _clone() - { - if(_cursor == null) - { - DBException ex = new DBException(); - ex.message = _errorPrefix + "\"" + _name + "\" has been closed"; - throw ex; - } - - com.sleepycat.db.Dbc cursor; - try - { - cursor = _cursor.dup(com.sleepycat.db.Db.DB_POSITION); - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "Dbc.close: " + e.getMessage(); - throw ex; - } - return new DBCursorI(_communicator, _name, cursor); - } - - synchronized public void - close() - { - if(_cursor == null) - { - return; - } - - if(_trace >= 1) - { - _communicator.getLogger().trace("DB", "closing cursor \"" + _name + "\""); - } - - try - { - _cursor.close(); - } - catch(com.sleepycat.db.DbDeadlockException e) - { - DBDeadlockException ex = new DBDeadlockException(); - ex.initCause(e); - ex.message = _errorPrefix + "Dbc.close: " + e.getMessage(); - throw ex; - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "Dbc.close: " + e.getMessage(); - throw ex; - } - - _cursor = null; - } - - DBCursorI(Ice.Communicator communicator, String name, com.sleepycat.db.Dbc cursor) - { - _communicator = communicator; - _name = name; - _cursor = cursor; - _errorPrefix = "Freeze::DBCursor(\"" + _name + "\"): "; - _trace = _communicator.getProperties().getPropertyAsInt("Freeze.Trace.DB"); - - if(_trace >= 1) - { - _communicator.getLogger().trace("DB", "creating cursor for \"" + _name + "\""); - } - } - - private Ice.Communicator _communicator; - private int _trace = 0; - - private String _name; - private String _errorPrefix; - - private com.sleepycat.db.Dbc _cursor; -} diff --git a/java/src/Freeze/DBEnvironmentI.java b/java/src/Freeze/DBEnvironmentI.java deleted file mode 100644 index 974e10b1e31..00000000000 --- a/java/src/Freeze/DBEnvironmentI.java +++ /dev/null @@ -1,327 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003 -// ZeroC, Inc. -// Billerica, MA, USA -// -// All Rights Reserved. -// -// Ice is free software; you can redistribute it and/or modify it under -// the terms of the GNU General Public License version 2 as published by -// the Free Software Foundation. -// -// ********************************************************************** - -package Freeze; - -class DBEnvironmentI extends Ice.LocalObjectImpl implements DBEnvironment, com.sleepycat.db.DbErrcall -{ - public String - getName() - { - // No mutex lock necessary, _name is immutable - return _name; - } - - public Ice.Communicator - getCommunicator() - { - // No mutex lock necessary, _communicator is immutable - return _communicator; - } - - synchronized public DB - openDB(String name, boolean create) - { - return openDBImpl(null, name, create); - } - - synchronized public DB - openDBWithTxn(DBTransaction t, String name, boolean create) - { - DBTransaction txn = t; - if(t == null) - { - txn = startTransaction(); - } - - DB db = openDBImpl(((DBTransactionI)txn).getTxnId(), name, create); - - if(t == null) - { - txn.commit(); - } - - return db; - } - - public DBTransaction - startTransaction() - { - return new DBTransactionI(_communicator, _dbEnv, _name); - } - - synchronized public void - close() - { - if(_dbEnv == null) - { - return; - } - - // - // Build a list of values from the iterator. The iterator - // cannot be used directly since closing each database - // modifies the content of the map (hence invalidating the - // iterator). - // - java.util.List dbs = new java.util.ArrayList(); - java.util.Iterator p = _dbMap.values().iterator(); - while(p.hasNext()) - { - dbs.add(p.next()); - } - - p = dbs.iterator(); - while(p.hasNext()) - { - DB db = (DB)p.next(); - db.close(); - } - - if(_trace >= 1) - { - _communicator.getLogger().trace("DB", "closing database environment \"" + _name + "\""); - } - - try - { - _dbEnv.close(0); - } - catch(com.sleepycat.db.DbException e) - { - _dbEnv = null; - - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "DbEnv.close: " + e.getMessage(); - throw ex; - } - - _dbEnv = null; - } - - synchronized public void - sync() - { - if(_dbEnv == null) - { - return; - } - - java.util.Iterator p = _dbMap.values().iterator(); - while(p.hasNext()) - { - DB db = (DB)p.next(); - db.sync(); - } - } - - protected DB - openDBImpl(com.sleepycat.db.DbTxn txn, String name, boolean create) - { - if(_dbEnv == null) - { - DBException ex = new DBException(); - ex.message = _errorPrefix + "\"" + _name + "\" has been closed"; - throw ex; - } - - DB p = (DB)_dbMap.get(name); - if(p != null) - { - return p; - } - - com.sleepycat.db.Db db; - - try - { - db = new com.sleepycat.db.Db(_dbEnv, 0); - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "Db.Db: " + e.getMessage(); - throw ex; - } - - try - { - return new DBI(_communicator, this, db, txn, name, create); - } - catch(DBException e) - { - try - { - db.close(0); - } - catch(com.sleepycat.db.DbException ignore) - { - } - throw e; - } - } - - synchronized protected void - add(String name, DB db) - { - _dbMap.put(name, db); - } - - synchronized protected void - remove(String name) - { - _dbMap.remove(name); - } - - synchronized protected void - eraseDB(String name) - { - // - // The database should not be open. - // - assert(_dbMap.get(name) == null); - - com.sleepycat.db.Db db; - try - { - db = new com.sleepycat.db.Db(_dbEnv, 0); - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "Db.Db: " + e.getMessage(); - throw ex; - } - - try - { - // - // Any failure in remove will cause the database to be - // closed. - // - db.remove(name, null, 0); - } - catch(java.io.FileNotFoundException e) - { - DBNotFoundException ex = new DBNotFoundException(); - ex.initCause(e); - ex.message = _errorPrefix + "Db.remove: " + e.getMessage(); - throw ex; - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "Db.remove: " + e.getMessage(); - throw ex; - } - } - - DBEnvironmentI(Ice.Communicator communicator, String name, boolean txn) - { - _communicator = communicator; - _name = name; - _errorPrefix = "Freeze::DBEnvironment(\"" + _name + "\"): "; - _trace = getCommunicator().getProperties().getPropertyAsInt("Freeze.Trace.DB"); - - try - { - _dbEnv = new com.sleepycat.db.DbEnv(0); - // - // This is a portability workaround. The DbEnv constructor - // is declared as throwing DbException in version 4.1.x, - // but not in earlier versions. Without a bogus throw - // statement, the compiler will complain. - // - if(_dbEnv == null) - { - throw new com.sleepycat.db.DbException(""); - } - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "DbEnv.init: " + e.getMessage(); - throw ex; - } - - if(_trace >= 1) - { - _communicator.getLogger().trace("DB", "opening database environment \"" + _name + "\""); - } - - int flags = com.sleepycat.db.Db.DB_CREATE | com.sleepycat.db.Db.DB_INIT_LOCK | - com.sleepycat.db.Db.DB_INIT_MPOOL; - - if(txn) - { - flags = flags | com.sleepycat.db.Db.DB_INIT_LOG | com.sleepycat.db.Db.DB_INIT_TXN | - com.sleepycat.db.Db.DB_RECOVER; - } - - // - // Use process-private memory and mutexes. In the way we can use a - // Berkeley DB built using the POSIX thread library on Linux, like the - // Berkeley DB that comes with RedHat 9. - // - // TODO: make setting or not setting DB_PRIVATE configurable. - // When DB_PRIVATE is set, only one process can use a DB environment - // at a time. - // - - flags |= com.sleepycat.db.Db.DB_PRIVATE; - - try - { - _dbEnv.open(_name, flags, 0); //TODO: FREEZE_DB_MODE) - } - catch(java.io.FileNotFoundException e) - { - DBNotFoundException ex = new DBNotFoundException(); - ex.initCause(e); - ex.message = _errorPrefix + "DbEnv.open: " + e.getMessage(); - throw ex; - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "DbEnv.open: " + e.getMessage(); - throw ex; - } - - _dbEnv.set_errcall(this); - } - - // - // com.sleepycat.db.DbErrcall interface implementation. - // - public void - errcall(String errorPrefix, String message) - { - _communicator.getLogger().error("Freeze database error: " + _name + ": " + message); - } - - private Ice.Communicator _communicator; - private int _trace = 0; - private com.sleepycat.db.DbEnv _dbEnv; - private String _name; - private String _errorPrefix; - - private java.util.HashMap _dbMap = new java.util.HashMap(); -} diff --git a/java/src/Freeze/DBI.java b/java/src/Freeze/DBI.java deleted file mode 100644 index 155d82c7c23..00000000000 --- a/java/src/Freeze/DBI.java +++ /dev/null @@ -1,747 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003 -// ZeroC, Inc. -// Billerica, MA, USA -// -// All Rights Reserved. -// -// Ice is free software; you can redistribute it and/or modify it under -// the terms of the GNU General Public License version 2 as published by -// the Free Software Foundation. -// -// ********************************************************************** - -package Freeze; - -class DBI extends Ice.LocalObjectImpl implements DB -{ - public String - getName() - { - // No mutex lock necessary, _name is immutable - return _name; - } - - public Ice.Communicator - getCommunicator() - { - // No mutex lock necessary, _communicator is immutable - return _communicator; - } - - synchronized public long - getNumberOfRecords() - { - if(_db == null) - { - DBException ex = new DBException(); - ex.message = _errorPrefix + "\"" + _name + "\" has been closed"; - throw ex; - } - - // - // TODO: DB_FAST_STAT doesn't seem to do what the - // documentation says... - // - try - { - com.sleepycat.db.DbBtreeStat s = (com.sleepycat.db.DbBtreeStat)_db.stat(0); - return s.bt_ndata; - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "Db.stat: " + e.getMessage(); - throw ex; - } - } - - synchronized public DBCursor - getCursor() - { - return getCursorImpl(null); - } - - synchronized public DBCursor - getCursorAtKey(byte[] key) - { - return getCursorAtKeyImpl(null, key); - } - - synchronized public void - put(byte[] key, byte[] value) - { - putImpl(null, key, value); - } - - synchronized public boolean - contains(byte[] key) - { - return containsImpl(null, key); - } - - synchronized public byte[] - get(byte[] key) - { - return getImpl(null, key); - } - - synchronized public void - del(byte[] key) - { - delImpl(null, key); - } - - synchronized public DBCursor - getCursorWithTxn(DBTransaction txn) - { - assert txn != null; - return getCursorImpl(((DBTransactionI)txn).getTxnId()); - } - - synchronized public DBCursor - getCursorAtKeyWithTxn(DBTransaction txn, byte[] key) - { - assert txn != null; - return getCursorAtKeyImpl(((DBTransactionI)txn).getTxnId(), key); - } - - synchronized public void - putWithTxn(DBTransaction txn, byte[] key, byte[] value) - { - assert txn != null; - putImpl(((DBTransactionI)txn).getTxnId(), key, value); - } - - synchronized public boolean - containsWithTxn(DBTransaction txn, byte[] key) - { - assert txn != null; - return containsImpl(((DBTransactionI)txn).getTxnId(), key); - } - - synchronized public byte[] - getWithTxn(DBTransaction txn, byte[] key) - { - assert txn != null; - return getImpl(((DBTransactionI)txn).getTxnId(), key); - } - - synchronized public void - delWithTxn(DBTransaction txn, byte[] key) - { - assert txn != null; - delImpl(((DBTransactionI)txn).getTxnId(), key); - } - - synchronized public void - clear() - { - if(_db == null) - { - DBException ex = new DBException(); - ex.message = _errorPrefix + "\"" + _name + "\" has been closed"; - throw ex; - } - - int count; // ignored - try - { - _db.truncate(null, 0); - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "Db.truncate: " + e.getMessage(); - throw ex; - } - } - - synchronized public void - close() - { - if(_db == null) - { - return; - } - - if(_trace >= 1) - { - _communicator.getLogger().trace("DB", "closing database \"" + _name + "\""); - } - - try - { - _db.close(0); - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "Db.truncate: " + e.getMessage(); - throw ex; - } - - _dbEnvObj.remove(_name); - _dbEnvObj = null; - _db = null; - } - - synchronized public void - remove() - { - if(_db == null) - { - return; - } - - if(_trace >= 1) - { - _communicator.getLogger().trace("DB", "removing database \"" + _name + "\""); - } - - // - // Remove first needs to close the database object. It's not - // possible to remove an open database. - // - try - { - _db.close(0); - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "Db.remove: " + e.getMessage(); - throw ex; - } - - // - // Take a copy of the DBEnvironment to make cleanup easier. - // - DBEnvironmentI dbEnvCopy = _dbEnvObj; - - _dbEnvObj.remove(_name); - _dbEnvObj = null; - _db = null; - - // - // Ask the DBEnvironment to erase the database. - // - dbEnvCopy.eraseDB(_name); - } - - synchronized public void - sync() - { - if(_db == null) - { - return; - } - - if(_trace >= 1) - { - _communicator.getLogger().trace("DB", "synchronizing database \"" + _name + "\""); - } - - try - { - _db.sync(0); - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "Db.sync: " + e.getMessage(); - throw ex; - } - } - - public EvictionStrategy - createEvictionStrategy() - { - return new EvictionStrategyI(); - } - - public IdleStrategy - createIdleStrategy() - { - return new IdleStrategyI(); - } - - synchronized public Evictor - createEvictor(PersistenceStrategy strategy) - { - if(_db == null) - { - DBException ex = new DBException(); - ex.message = _errorPrefix + "\"" + _name + "\" has been closed"; - throw ex; - } - - return new EvictorI(this, strategy); - } - - DBI(Ice.Communicator communicator, DBEnvironmentI dbEnvObj, com.sleepycat.db.Db db, com.sleepycat.db.DbTxn txn, - String name, boolean create) - { - _communicator = communicator; - _dbEnvObj = dbEnvObj; - _db = db; - _name = name; - _errorPrefix = "Freeze::DB(\"" + _name + "\"): "; - _trace = _communicator.getProperties().getPropertyAsInt("Freeze.Trace.DB"); - - if(_trace >= 1) - { - _communicator.getLogger().trace("DB","opening database \"" + _name + "\" in environment \"" + - _dbEnvObj.getName() + "\""); - } - - int flags = (create) ? com.sleepycat.db.Db.DB_CREATE : 0; - try - { - // - // The signature for the open() method changed in version 4.1. - // We use reflection to invoke it with the proper arguments. - // - java.lang.reflect.Method m; - Class[] types; - Object[] args; - if(com.sleepycat.db.Db.DB_VERSION_MAJOR > 4 || - (com.sleepycat.db.Db.DB_VERSION_MAJOR == 4 && com.sleepycat.db.Db.DB_VERSION_MINOR >= 1)) - { - types = new Class[6]; - types[0] = com.sleepycat.db.DbTxn.class; - types[1] = String.class; - types[2] = String.class; - types[3] = Integer.TYPE; - types[4] = Integer.TYPE; - types[5] = Integer.TYPE; - args = new Object[6]; - args[0] = txn; - args[1] = _name; - args[2] = null; - args[3] = new Integer(com.sleepycat.db.Db.DB_BTREE); - args[4] = new Integer(flags); - args[5] = new Integer(0); - // - // Equivalent to: - // - //_db.open(null, _name, null, com.sleepycat.db.Db.DB_BTREE, flags, 0); - } - else - { - types = new Class[5]; - types[0] = String.class; - types[1] = String.class; - types[2] = Integer.TYPE; - types[3] = Integer.TYPE; - types[4] = Integer.TYPE; - args = new Object[5]; - args[0] = _name; - args[1] = null; - args[2] = new Integer(com.sleepycat.db.Db.DB_BTREE); - args[3] = new Integer(flags); - args[4] = new Integer(0); - // - // Equivalent to: - // - //_db.open(_name, null, com.sleepycat.db.Db.DB_BTREE, flags, 0); - } - - m = com.sleepycat.db.Db.class.getDeclaredMethod("open", types); - m.invoke(_db, args); - //TODO: FREEZE_DB_MODE - } - catch(NoSuchMethodException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = "reflection error"; - throw ex; - } - catch(IllegalAccessException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = "reflection error"; - throw ex; - } - catch(IllegalArgumentException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = "reflection error"; - throw ex; - } - catch(java.lang.reflect.InvocationTargetException e) - { - Throwable t = e.getCause(); - if(t instanceof java.io.FileNotFoundException) - { - DBNotFoundException ex = new DBNotFoundException(); - ex.initCause(t); - ex.message = _errorPrefix + "Db.open: " + t.getMessage(); - throw ex; - } - else if(t instanceof com.sleepycat.db.DbException) - { - DBException ex = new DBException(); - ex.initCause(t); - ex.message = _errorPrefix + "Db.open: " + t.getMessage(); - throw ex; - } - else - { - DBException ex = new DBException(); - ex.initCause(t); - ex.message = "Db.open: unexpected exception"; - throw ex; - } - } - - _dbEnvObj.add(_name, this); - } - - private DBCursor - getCursorImpl(com.sleepycat.db.DbTxn txn) - { - if(_db == null) - { - DBException ex = new DBException(); - ex.message = _errorPrefix + "\"" + _name + "\" has been closed"; - throw ex; - } - - com.sleepycat.db.Dbc cursor; - - try - { - cursor = _db.cursor(txn, 0); - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "Db.cursor: " + e.getMessage(); - throw ex; - } - - // - // Note that the read of the data is partial (that is the data - // will not actually be read into memory since it isn't needed - // yet). - // - com.sleepycat.db.Dbt dbData = new com.sleepycat.db.Dbt(); - dbData.set_flags(com.sleepycat.db.Db.DB_DBT_PARTIAL); - com.sleepycat.db.Dbt dbKey = new com.sleepycat.db.Dbt(); - dbKey.set_flags(com.sleepycat.db.Db.DB_DBT_PARTIAL); - - try - { - try - { - int rc = cursor.get(dbKey, dbData, com.sleepycat.db.Db.DB_FIRST); - if(rc == com.sleepycat.db.Db.DB_NOTFOUND) - { - DBNotFoundException ex = new DBNotFoundException(); - ex.message = _errorPrefix + "Dbc.get: DB_NOTFOUND"; - throw ex; - } - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "Dbc.get: " + e.getMessage(); - throw ex; - } - } - catch(DBException e) - { - // - // Cleanup on failure. - // - try - { - cursor.close(); - } - catch(com.sleepycat.db.DbException ignore) - { - // Ignore - } - throw e; - } - - return new DBCursorI(_communicator, _name, cursor); - } - - private DBCursor - getCursorAtKeyImpl(com.sleepycat.db.DbTxn txn, byte[] key) - { - if(_db == null) - { - DBException ex = new DBException(); - ex.message = _errorPrefix + "\"" + _name + "\" has been closed"; - throw ex; - } - - com.sleepycat.db.Dbc cursor; - - try - { - cursor = _db.cursor(txn, 0); - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "Db.cursor: " + e.getMessage(); - throw ex; - } - - // - // Move to the requested record - // - com.sleepycat.db.Dbt dbKey = new com.sleepycat.db.Dbt(key); - - // - // Note that the read of the data is partial (that is the data - // will not actually be read into memory since it isn't needed - // yet). - // - com.sleepycat.db.Dbt dbData = new com.sleepycat.db.Dbt(); - dbData.set_flags(com.sleepycat.db.Db.DB_DBT_PARTIAL); - - try - { - try - { - int rc = cursor.get(dbKey, dbData, com.sleepycat.db.Db.DB_SET); - if(rc == com.sleepycat.db.Db.DB_NOTFOUND) - { - DBNotFoundException ex = new DBNotFoundException(); - ex.message = _errorPrefix + "Dbc.get: DB_NOTFOUND"; - throw ex; - } - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "Dbc.get: " + e.getMessage(); - throw ex; - } - } - catch(DBException e) - { - // - // Cleanup on failure. - // - try - { - cursor.close(); - } - catch(com.sleepycat.db.DbException ignore) - { - // Ignore - } - throw e; - } - - return new DBCursorI(_communicator, _name, cursor); - } - - private void - putImpl(com.sleepycat.db.DbTxn txn, byte[] key, byte[] value) - { - if(_db == null) - { - DBException ex = new DBException(); - ex.message = _errorPrefix + "\"" + _name + "\" has been closed"; - throw ex; - } - - // - // TODO: This can be optimized so that these only need to be - // allocated once. - // - com.sleepycat.db.Dbt dbKey = new com.sleepycat.db.Dbt(key); - com.sleepycat.db.Dbt dbData = new com.sleepycat.db.Dbt(value); - - if(_trace >= 1) - { - _communicator.getLogger().trace("DB", "writing value in database \"" + _name + "\""); - } - - try - { - _db.put(txn, dbKey, dbData, 0); - } - catch(com.sleepycat.db.DbDeadlockException e) - { - DBDeadlockException ex = new DBDeadlockException(); - ex.initCause(e); - ex.message = _errorPrefix + "Db.put: " + e.getMessage(); - throw ex; - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "Db.put: " + e.getMessage(); - throw ex; - } - } - - private boolean - containsImpl(com.sleepycat.db.DbTxn txn, byte[] key) - { - if(_db == null) - { - DBException ex = new DBException(); - ex.message = _errorPrefix + "\"" + _name + "\" has been closed"; - throw ex; - } - - com.sleepycat.db.Dbt dbKey = new com.sleepycat.db.Dbt(key); - - com.sleepycat.db.Dbt dbData = new com.sleepycat.db.Dbt(); - dbData.set_flags(com.sleepycat.db.Db.DB_DBT_PARTIAL); - - if(_trace >= 1) - { - _communicator.getLogger().trace("DB", "checking key in database \"" + _name + "\""); - } - - try - { - int rc =_db.get(txn, dbKey, dbData, 0); - if(rc == com.sleepycat.db.Db.DB_NOTFOUND) - { - return false; - } - else - { - assert(rc == 0); - return true; - } - } - catch(com.sleepycat.db.DbDeadlockException e) - { - DBDeadlockException ex = new DBDeadlockException(); - ex.initCause(e); - ex.message = _errorPrefix + "Db.get: " + e.getMessage(); - throw ex; - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "Db.get: " + e.getMessage(); - throw ex; - } - } - - private byte[] - getImpl(com.sleepycat.db.DbTxn txn, byte[] key) - { - if(_db == null) - { - DBException ex = new DBException(); - ex.message = _errorPrefix + "\"" + _name + "\" has been closed"; - throw ex; - } - - com.sleepycat.db.Dbt dbKey = new com.sleepycat.db.Dbt(key); - com.sleepycat.db.Dbt dbData = new com.sleepycat.db.Dbt(); - - if(_trace >= 1) - { - _communicator.getLogger().trace("DB", "reading value from database \"" + _name + "\""); - } - - try - { - int rc =_db.get(txn, dbKey, dbData, 0); - if(rc == com.sleepycat.db.Db.DB_NOTFOUND) - { - DBNotFoundException ex = new DBNotFoundException(); - ex.message = _errorPrefix + "Db.get: DB_NOTFOUND"; - throw ex; - } - } - catch(com.sleepycat.db.DbDeadlockException e) - { - DBDeadlockException ex = new DBDeadlockException(); - ex.initCause(e); - ex.message = _errorPrefix + "Db.get: " + e.getMessage(); - throw ex; - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "Db.get: " + e.getMessage(); - throw ex; - } - - return dbData.get_data(); - } - - private void - delImpl(com.sleepycat.db.DbTxn txn, byte[] key) - { - if(_db == null) - { - DBException ex = new DBException(); - ex.message = _errorPrefix + "\"" + _name + "\" has been closed"; - throw ex; - } - - com.sleepycat.db.Dbt dbKey = new com.sleepycat.db.Dbt(key); - - if(_trace >= 1) - { - _communicator.getLogger().trace("DB", "deleting value from database \"" + _name + "\""); - } - - try - { - int rc =_db.del(txn, dbKey, 0); - if(rc == com.sleepycat.db.Db.DB_NOTFOUND) - { - DBNotFoundException ex = new DBNotFoundException(); - ex.message = _errorPrefix + "Db.del: DB_NOTFOUND"; - throw ex; - } - } - catch(com.sleepycat.db.DbDeadlockException e) - { - DBDeadlockException ex = new DBDeadlockException(); - ex.initCause(e); - ex.message = _errorPrefix + "Db.del: " + e.getMessage(); - throw ex; - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "Db.del: " + e.getMessage(); - throw ex; - } - } - - private Ice.Communicator _communicator; - private int _trace = 0; - - private DBEnvironmentI _dbEnvObj; - private com.sleepycat.db.Db _db; - - private String _name; - private String _errorPrefix; -} diff --git a/java/src/Freeze/DBTransactionI.java b/java/src/Freeze/DBTransactionI.java deleted file mode 100644 index 1e31ad9a13a..00000000000 --- a/java/src/Freeze/DBTransactionI.java +++ /dev/null @@ -1,128 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003 -// ZeroC, Inc. -// Billerica, MA, USA -// -// All Rights Reserved. -// -// Ice is free software; you can redistribute it and/or modify it under -// the terms of the GNU General Public License version 2 as published by -// the Free Software Foundation. -// -// ********************************************************************** - -package Freeze; - -class DBTransactionI extends Ice.LocalObjectImpl implements DBTransaction -{ - public synchronized void - commit() - { - if(_tid == null) - { - String s = _errorPrefix + "transaction has already been committed or aborted"; - DBException ex = new DBException(); - ex.message = s; - throw ex; - } - - if(_trace >= 2) - { - _communicator.getLogger().trace("DB", "committing transaction for environment \"" + _name + "\""); - } - - try - { - _tid.commit(0); - } - catch(com.sleepycat.db.DbDeadlockException e) - { - DBDeadlockException ex = new DBDeadlockException(); - ex.initCause(e); - ex.message = _errorPrefix + "DbTxn.commit: " + e.getMessage(); - throw ex; - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "DbTxn.commit: " + e.getMessage(); - throw ex; - } - - _tid = null; - } - - public synchronized void - abort() - { - if(_tid == null) - { - String s = _errorPrefix + "transaction has already been committed or aborted"; - DBException ex = new DBException(); - ex.message = s; - throw ex; - } - - if(_trace >= 2) - { - _communicator.getLogger().trace("DB", "aborting transaction for environment \"" + _name + - "\" due to deadlock"); - } - - try - { - _tid.abort(); - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "DbTxn.abort: " + e.getMessage(); - throw ex; - } - - _tid = null; - } - - com.sleepycat.db.DbTxn - getTxnId() - { - return _tid; - } - - - DBTransactionI(Ice.Communicator communicator, com.sleepycat.db.DbEnv dbEnv, String name) - { - _communicator = communicator; - _name = name; - _errorPrefix = "Freeze::DBTransaction(\"" + _name + "\"): "; - _trace = _communicator.getProperties().getPropertyAsInt("Freeze.Trace.DB"); - - if(_trace >= 2) - { - _communicator.getLogger().trace("DB", "starting transaction for environment \"" + _name + "\""); - } - - try - { - _tid = dbEnv.txn_begin(null, 0); - } - catch(com.sleepycat.db.DbException e) - { - DBException ex = new DBException(); - ex.initCause(e); - ex.message = _errorPrefix + "DbEnv.txn_begin: " + e.getMessage(); - throw ex; - } - } - - private Ice.Communicator _communicator; - private int _trace = 0; - - private com.sleepycat.db.DbTxn _tid; - - private String _name; - private String _errorPrefix; -} diff --git a/java/src/Freeze/EvictionStrategyI.java b/java/src/Freeze/EvictionStrategyI.java deleted file mode 100644 index f95fe0c1f72..00000000000 --- a/java/src/Freeze/EvictionStrategyI.java +++ /dev/null @@ -1,88 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003 -// ZeroC, Inc. -// Billerica, MA, USA -// -// All Rights Reserved. -// -// Ice is free software; you can redistribute it and/or modify it under -// the terms of the GNU General Public License version 2 as published by -// the Free Software Foundation. -// -// ********************************************************************** - -package Freeze; - -public final class EvictionStrategyI extends Ice.LocalObjectImpl implements EvictionStrategy -{ - public - EvictionStrategyI() - { - } - - public Ice.LocalObject - activatedObject(Ice.Identity ident, Ice.Object servant) - { - return new Cookie(); - } - - public void - destroyedObject(Ice.Identity ident, Ice.LocalObject cookie) - { - // Nothing to do - } - - public void - evictedObject(ObjectStore store, Ice.Identity ident, Ice.Object servant, Ice.LocalObject cookie) - { - // - // Only store the object's persistent state if it has been mutated. - // - Cookie c = (Cookie)cookie; - if(c.mutated) - { - store.save(ident, servant); - c.mutated = false; - } - } - - public void - savedObject(ObjectStore store, Ice.Identity ident, Ice.Object servant, Ice.LocalObject cookie, int usageCount) - { - assert(usageCount > 0); - - if(usageCount == 1) - { - Cookie c = (Cookie)cookie; - c.mutated = false; - } - } - - public void - preOperation(ObjectStore store, Ice.Identity ident, Ice.Object servant, boolean mutating, Ice.LocalObject cookie) - { - if(mutating) - { - Cookie c = (Cookie)cookie; - c.mutated = true; - } - } - - public void - postOperation(ObjectStore store, Ice.Identity ident, Ice.Object servant, boolean mutating, Ice.LocalObject cookie) - { - // Nothing to do - } - - public void - destroy() - { - // Nothing to do - } - - private static class Cookie extends Ice.LocalObjectImpl - { - boolean mutated = false; - } -} diff --git a/java/src/Freeze/EvictorI.java b/java/src/Freeze/EvictorI.java index 9a80a82122c..77b6084e3b6 100644 --- a/java/src/Freeze/EvictorI.java +++ b/java/src/Freeze/EvictorI.java @@ -14,30 +14,37 @@ package Freeze; -class EvictorI extends Ice.LocalObjectImpl implements Evictor, ObjectStore +class EvictorI extends Ice.LocalObjectImpl implements Evictor, Runnable { - synchronized public DB - getDB() + public EvictorI(Ice.Communicator communicator, String envName, + String dbName, boolean createDb) { - if(_deactivated) - { - throw new EvictorDeactivatedException(); - } + _communicator = communicator; + _dbEnvHolder = SharedDbEnv.get(communicator, envName); + _dbEnv = _dbEnvHolder; - return _db; + init(envName, dbName, createDb); } - synchronized public PersistenceStrategy - getPersistenceStrategy() + public EvictorI(Ice.Communicator communicator, com.sleepycat.db.DbEnv dbEnv, + String dbName, boolean createDb) + { + _communicator = communicator; + _dbEnvHolder = null; + _dbEnv = dbEnv; + + init("External", dbName, createDb); + } + + protected void + finalize() { - if(_deactivated) + if(!_deactivated) { - throw new EvictorDeactivatedException(); + _communicator.getLogger().warning("evictor has not been deactivated"); } - - return _strategy; } - + synchronized public void setSize(int evictorSize) { @@ -77,6 +84,17 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, ObjectStore } synchronized public void + saveNow() + { + if(_deactivated) + { + throw new EvictorDeactivatedException(); + } + + saveNowNoSync(); + } + + synchronized public void createObject(Ice.Identity ident, Ice.Object servant) { if(_deactivated) @@ -85,39 +103,113 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, ObjectStore } // - // Copy the identity. This is necessary for add(). + // Make a copy of ident in case the user later changes it + // (used when inserting into list or map) // Ice.Identity identCopy = new Ice.Identity(); identCopy.name = ident.name; identCopy.category = ident.category; + + EvictorElement element = (EvictorElement)_evictorMap.get(ident); + if(element != null) + { + synchronized(element) + { + switch(element.status) + { + case clean: + { + element.status = modified; + addToModifiedQueue(identCopy, element); + break; + } + case created: + case modified: + { + // + // Nothing to do. + // No need to push it on the modified queue as a created resp + // modified element is either already on the queue or about + // to be saved. When saved, it becomes clean. + // + break; + } + case destroyed: + { + element.status = modified; + // + // No need to push it on the modified queue, as a destroyed element + // is either already on the queue or about to be saved. When saved, + // it becomes dead. + // + break; + } + case dead: + { + element.status = created; + addToModifiedQueue(identCopy, element); + break; + } + default: + { + assert(false); + break; + } + } + element.rec.servant = servant; + } - ObjectRecord rec = new ObjectRecord(); - rec.servant = servant; - rec.stats = new Statistics(); - rec.stats.creationTime = System.currentTimeMillis(); - rec.stats.lastSaveTime = 0; - rec.stats.avgSaveTime = 0; - - // - // Save the Ice object's initial state and add it to the queue. - // - _dict.fastPut(ident, rec); - add(identCopy, rec); - - if(_trace >= 1) + element.position.remove(); + _evictorList.addFirst(identCopy); + element.position = _evictorList.iterator(); + } + else { - _db.getCommunicator().getLogger().trace("Freeze::Evictor", - "created \"" + Ice.Util.identityToString(ident) + "\""); + // + // Create a new object + // + + ObjectRecord rec = new ObjectRecord(); + rec.servant = servant; + rec.stats = new Statistics(); + rec.stats.creationTime = System.currentTimeMillis(); + rec.stats.lastSaveTime = 0; + rec.stats.avgSaveTime = 0; + + // + // Add an Ice object with its servant to the evictor queue. + // + element = new EvictorElement(); + element.rec = rec; + element.usageCount = 0; + element.status = created; + + _evictorMap.put(identCopy, element); + _evictorList.addFirst(identCopy); + + element.position = _evictorList.iterator(); + // + // Position the iterator "on" the element. + // + element.position.next(); + + addToModifiedQueue(identCopy, element); + + // + // Evict as many elements as necessary. + // + evict(); } - // - // Evict as many elements as necessary. - // - evict(); + if(_trace >= 1) + { + _communicator.getLogger().trace("Freeze::Evictor", + "created \"" + Ice.Util.identityToString(ident) + "\""); + } } synchronized public void - saveObject(Ice.Identity ident) + destroyObject(Ice.Identity ident) { if(_deactivated) { @@ -125,46 +217,110 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, ObjectStore } EvictorElement element = (EvictorElement)_evictorMap.get(ident); - if(element == null) + if(element != null) { - throw new ObjectDestroyedException(); - } - assert(!element.destroyed); + synchronized(element) + { + switch(element.status) + { + case clean: + { + element.status = destroyed; - save(ident, element.rec.servant); - _strategy.savedObject(this, ident, element.rec.servant, element.strategyCookie, element.usageCount); - } + // + // Make a copy of ident in case the user later changes it + // (used when inserting into list or map) + // + Ice.Identity identCopy = new Ice.Identity(); + identCopy.name = ident.name; + identCopy.category = ident.category; + + addToModifiedQueue(identCopy, element); + break; + } + case created: + { + element.status = dead; + break; + } + case modified: + { + element.status = destroyed; + // + // Not necessary to push it on the modified queue, as a modified + // element is either on the queue already or about to be saved + // (at which point it becomes clean) + // + break; + } + case destroyed: + case dead: + { + // + // Nothing to do! + // + break; + } + default: + { + assert(false); + break; + } + } + } + } + else + { + // + // Set a real ObjectRecord in case this object gets recreated + // + ObjectRecord rec = new ObjectRecord(); + rec.servant = null; + rec.stats = new Statistics(); + rec.stats.creationTime = System.currentTimeMillis(); + rec.stats.lastSaveTime = 0; + rec.stats.avgSaveTime = 0; - synchronized public void - destroyObject(Ice.Identity ident) - { - if(_deactivated) - { - throw new EvictorDeactivatedException(); + // + // Add an Ice object with its servant to the evictor queue. + // + element = new EvictorElement(); + element.rec = rec; + element.usageCount = 0; + element.status = destroyed; + + + // + // Make a copy of ident in case the user later changes it + // (used when inserting into list or map) + // + Ice.Identity identCopy = new Ice.Identity(); + identCopy.name = ident.name; + identCopy.category = ident.category; + + _evictorMap.put(identCopy, element); + _evictorList.addFirst(identCopy); + + element.position = _evictorList.iterator(); + // + // Position the iterator "on" the element. + // + element.position.next(); + + addToModifiedQueue(identCopy, element); + + // + // Evict as many elements as necessary. + // + evict(); } - - EvictorElement element = remove(ident); - if(element != null) + + if(_trace >= 1) { - element.destroyed = true; - - // - // Notify the persistence strategy. - // - _strategy.destroyedObject(ident, element.strategyCookie); - - if(_trace >= 1) - { - _db.getCommunicator().getLogger().trace("Freeze::Evictor", "destroyed \"" + - Ice.Util.identityToString(ident) + "\""); - } + _communicator.getLogger().trace("Freeze::Evictor", "destroyed \"" + + Ice.Util.identityToString(ident) + "\""); } - - // - // Delete the Ice object from the database. - // - _dict.fastRemove(ident); } synchronized public void @@ -178,239 +334,671 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, ObjectStore _initializer = initializer; } - synchronized public EvictorIterator + public EvictorIterator getIterator() { - if(_deactivated) + synchronized(this) { - throw new EvictorDeactivatedException(); + if(_deactivated) + { + throw new EvictorDeactivatedException(); + } + saveNowNoSync(); } - return new EvictorIteratorI(_dict.entrySet().iterator()); + return new EvictorIteratorI(_db, _communicator, _errorPrefix); } synchronized public boolean hasObject(Ice.Identity ident) { - if(_deactivated) + synchronized(this) { - throw new EvictorDeactivatedException(); + if(_deactivated) + { + throw new EvictorDeactivatedException(); + } + + EvictorElement element = (EvictorElement)_evictorMap.get(ident); + if(element != null) + { + synchronized(element) + { + return (element.status != destroyed && element.status != dead); + } + } } - return _dict.containsKey(ident); + return dbHasObject(ident); } - synchronized public Ice.Object + public Ice.Object locate(Ice.Current current, Ice.LocalObjectHolder cookie) { - assert(_db != null); - - // - // If this operation is called on a deactivated servant locator, - // it's a bug in Ice. // - assert(!_deactivated); - - // - // First copy current.identity. This is necessary since this - // identity is later added to the evictor list (and - // potentially the map). + // Need to copy current.id, as Ice caches and reuses it // Ice.Identity ident = new Ice.Identity(); ident.name = current.id.name; ident.category = current.id.category; - - EvictorElement element = (EvictorElement)_evictorMap.get(ident); - if(element != null) + + ObjectRecord rec = null; + + for(;;) { - if(_trace >= 2) + EvictorElement element; + + synchronized(this) { - _db.getCommunicator().getLogger().trace("Freeze::Evictor", - "found \"" + Ice.Util.identityToString(ident) + - "\" in the queue"); - } - - // - // Ice object found in evictor map. Push it to the front of - // the evictor list, so that it will be evicted last. - // - element.position.remove(); - _evictorList.addFirst(ident); - element.position = _evictorList.iterator(); + // + // If this operation is called on a deactivated servant locator, + // it's a bug in Ice. + // + assert(!_deactivated); - // - // Position the iterator "on" the element. - // - element.position.next(); - } - else - { - if(_trace >= 2) + element = (EvictorElement)_evictorMap.get(ident); + + if(element != null) + { + // + // Ice object found in evictor map. Push it to the front of + // the evictor list, so that it will be evicted last. + // + element.position.remove(); + _evictorList.addFirst(ident); + element.position = _evictorList.iterator(); + // + // Position the iterator "on" the element. + // + element.position.next(); + + element.usageCount++; + cookie.value = (Ice.LocalObject)element; + + // + // Later (after releasing the mutex), check that this + // object is not dead or destroyed + // + } + else if(rec != null) + { + // + // Proceed with the object loaded in the previous loop + // + + // + // If an initializer is installed, call it now. + // + if(_initializer != null) + { + _initializer.initialize(current.adapter, ident, rec.servant); + } + + // + // Add an Ice object with its servant to the evictor queue. + // + + element = new EvictorElement(); + element.rec = rec; + element.usageCount = 1; + element.status = clean; + + _evictorMap.put(ident, element); + _evictorList.addFirst(ident); + + element.position = _evictorList.iterator(); + // + // Position the iterator "on" the element. + // + element.position.next(); + + cookie.value = (Ice.LocalObject)element; + + // + // Evict as many elements as necessary. + // + evict(); + + return rec.servant; + } + // + // Else fall to the after-sync processing + // + } + + if(element != null) { - _db.getCommunicator().getLogger().trace( - "Freeze::Evictor", - "couldn't find \"" + Ice.Util.identityToString(ident) + "\" in the queue\n" - + "loading \"" + Ice.Util.identityToString(ident) + "\" from the database"); + if(_trace >= 2) + { + _communicator.getLogger().trace("Freeze::Evictor", + "found \"" + Ice.Util.identityToString(ident) + + "\" in the queue"); + } + + // + // Return servant if object not dead or destroyed + // + synchronized(element) + { + if(element.status != destroyed && element.status != dead) + { + return element.rec.servant; + } + } + + // + // Object is destroyed or dead: clean-up + // + if(_trace >= 2) + { + _communicator.getLogger().trace("Freeze::Evictor", + "\"" + Ice.Util.identityToString(ident) + + "\" was dead or destroyed"); + } + synchronized(this) + { + element.usageCount--; + return null; + } } - - // - // Load the Ice object from the database and add a - // servant for it. - // - ObjectRecord rec = (ObjectRecord)_dict.get(ident); - if(rec == null) + else { // - // The Ice object with the given identity does not exist, - // client will get an ObjectNotExistException. + // Load object now and loop + // + + if(_trace >= 2) + { + _communicator.getLogger().trace( + "Freeze::Evictor", + "couldn't find \"" + Ice.Util.identityToString(ident) + "\" in the queue\n" + + "loading \"" + Ice.Util.identityToString(ident) + "\" from the database"); + } + + rec = getObject(ident); + + if(rec == null) + { + // + // The Ice object with the given identity does not exist, + // client will get an ObjectNotExistException. + // + return null; + } + // + // Else loop // - return null; } + } + } - // - // If an initializer is installed, call it now. - // - if(_initializer != null) + + public void + finished(Ice.Current current, Ice.Object servant, Ice.LocalObject cookie) + { + assert(servant != null); + + EvictorElement element = (EvictorElement)cookie; + boolean enqueue = false; + + if(current.mode != Ice.OperationMode.Nonmutating) + { + synchronized(element) { - _initializer.initialize(current.adapter, ident, rec.servant); + if(element.status == clean) + { + // + // Assume this operation updated the object + // + element.status = modified; + enqueue = true; + } } + } + + synchronized(this) + { + assert(!_deactivated); // - // Add the new servant to the evictor queue. + // Decrease the usage count of the evictor queue element. // - element = add(ident, rec); + assert(element.usageCount >= 1); + element.usageCount--; + + if(enqueue) + { + // + // Need to copy current.id, as Ice caches and reuses it + // + Ice.Identity ident = new Ice.Identity(); + ident.name = current.id.name; + ident.category = current.id.category; + + addToModifiedQueue(ident, element); + } + else + { + // + // Evict as many elements as necessary. + // + evict(); + } } - - // - // Increase the usage count of the evictor queue element. - // - ++element.usageCount; - - // - // Notify the persistence strategy about the operation. - // - _strategy.preOperation(this, ident, element.rec.servant, current.mode != Ice.OperationMode.Nonmutating, - element.strategyCookie); - - // - // Evict as many elements as necessary. - // - evict(); - - // - // Set the cookie and return the servant for the Ice object. - // - cookie.value = (Ice.LocalObject)element; - return element.rec.servant; } - synchronized public void - finished(Ice.Current current, Ice.Object servant, Ice.LocalObject cookie) + public void + deactivate(String category) { - assert(_db != null); - assert(servant != null); - - // - // It's possible that the locator has been deactivated already. In - // this case, _evictorSize is set to zero. - // - assert(!_deactivated || _evictorSize == 0); - - // - // Decrease the usage count of the evictor queue element. - // - EvictorElement element = (EvictorElement)cookie; - assert(element.usageCount >= 1); - --element.usageCount; - - // - // If the object has not been destroyed, notify the persistence - // strategy about the operation. - // - if(!element.destroyed) - { - _strategy.postOperation(this, current.id, servant, current.mode != Ice.OperationMode.Nonmutating, - element.strategyCookie); - } + boolean joinAndClose = false; + + synchronized(this) + { + if(!_deactivated) + { + if(_trace >= 1) + { + _communicator.getLogger().trace( + "Freeze::Evictor", + "deactivating, saving unsaved Ice objects to the database"); + } + + saveNowNoSync(); + + // + // Set the evictor size to zero, meaning that we will evict + // everything possible. + // + _evictorSize = 0; + evict(); + + _deactivated = true; + notifyAll(); + joinAndClose = true; + } + } - // - // Evict as many elements as necessary. - // - evict(); + if(joinAndClose) + { + for(;;) + { + try + { + _thread.join(); + break; + } + catch(InterruptedException ex) + { + } + } + + try + { + _db.close(0); + } + catch(com.sleepycat.db.DbException dx) + { + DBException ex = new DBException(); + ex.initCause(dx); + ex.message = _errorPrefix + "Db.close: " + dx.getMessage(); + throw ex; + } + _db = null; + if(_dbEnvHolder != null) + { + _dbEnvHolder.close(); + _dbEnvHolder = null; + } + _dbEnv = null; + } } - synchronized public void - deactivate(String category) + public void + run() { - if(!_deactivated) + for(;;) { - _deactivated = true; + java.util.List allObjects; + int saveNowThreadsSize = 0; - if(_trace >= 1) + synchronized(this) { - _db.getCommunicator().getLogger().trace("Freeze::Evictor", - "deactivating, saving unsaved Ice objects to the database"); + while((!_deactivated) && + (_saveNowThreads.size() == 0) && + (_saveSizeTrigger < 0 || _modifiedQueue.size() < _saveSizeTrigger)) + { + try + { + if(_savePeriod == 0) + { + wait(); + } + else + { + long preSave = System.currentTimeMillis(); + wait(_savePeriod); + if(System.currentTimeMillis() > preSave + _savePeriod) + { + break; + } + } + } + catch(InterruptedException ex) + { + } + } + + saveNowThreadsSize = _saveNowThreads.size(); + + if(_deactivated) + { + assert(_modifiedQueue.size() == 0); + if(saveNowThreadsSize > 0) + { + _saveNowThreads.clear(); + notifyAll(); + } + break; // for(;;) + } + + // + // Check first if there is something to do! + // + if(_modifiedQueue.size() == 0) + { + if(saveNowThreadsSize > 0) + { + _saveNowThreads.clear(); + notifyAll(); + } + continue; // for(;;) + } + + allObjects = _modifiedQueue; + _modifiedQueue = new java.util.ArrayList(); } + int size = allObjects.size(); + // - // Set the evictor size to zero, meaning that we will evict - // everything possible. + // Usage count release // - _evictorSize = 0; - evict(); + java.util.List releaseAfterStreaming = new java.util.ArrayList(); + java.util.List releaseAfterCommit = new java.util.ArrayList(); + + java.util.List streamedObjectQueue = new java.util.ArrayList(); + + long saveStart = System.currentTimeMillis(); + + // + // Stream each element + // + for(int i = 0; i < size; i++) + { + EvictorElement element = (EvictorElement)_evictorMap.get((Ice.Identity)allObjects.get(i)); + + synchronized(element) + { + ObjectRecord rec = element.rec; + + boolean streamIt = true; + byte status = element.status; + + switch(status) + { + case created: + { + element.status = clean; + releaseAfterCommit.add(element); + break; + } + case modified: + { + element.status = clean; + releaseAfterStreaming.add(element); + break; + } + case destroyed: + { + element.status = dead; + releaseAfterCommit.add(element); + break; + } + default: + { + // + // Nothing to do (could be a duplicate) + // + streamIt = false; + releaseAfterStreaming.add(element); + break; + } + } + + if(streamIt) + { + int index = streamedObjectQueue.size(); + StreamedObject obj = new StreamedObject(); + streamedObjectQueue.add(obj); + + obj.key = IdentityObjectRecordDict.encodeKeyImpl(allObjects.get(i), _communicator); + obj.status = status; + if(status != destroyed) + { + synchronized(rec.servant) + { + + obj.value = writeObjectRecordToValue(saveStart, rec); + } + } + } + } + } + + allObjects.clear(); + + if(releaseAfterStreaming.size() > 0) + { + synchronized(this) + { + for(int i = 0; i < releaseAfterStreaming.size(); i++) + { + EvictorElement element = (EvictorElement)releaseAfterStreaming.get(i); + element.usageCount--; + } + } + releaseAfterStreaming.clear(); + } + + // + // Now let's save all these streamed objects to disk using a transaction + // + + // + // Each time we get a deadlock, we reduce the number of objects to save + // per transaction + // + int txSize = streamedObjectQueue.size(); + boolean tryAgain; + + do + { + tryAgain = false; + + while(streamedObjectQueue.size() > 0) + { + if(txSize > streamedObjectQueue.size()) + { + txSize = streamedObjectQueue.size(); + } + + try + { + com.sleepycat.db.DbTxn tx = _dbEnv.txn_begin(null, 0); + try + { + for(int i = 0; i < txSize; i++) + { + StreamedObject obj = (StreamedObject) streamedObjectQueue.get(i); + + if(obj.status == destroyed) + { + // + // May not exist in the database + // + com.sleepycat.db.Dbt dbKey = new com.sleepycat.db.Dbt(obj.key); + + int err = _db.del(tx, dbKey, 0); + if(err != 0 && err != com.sleepycat.db.Db.DB_NOTFOUND) + { + // + // Bug in Freeze + // + throw new DBException(); + } + } + else + { + // + // We can't use NOOVERWRITE as some 'created' objects may + // actually be already in the database + // + + com.sleepycat.db.Dbt dbKey = new com.sleepycat.db.Dbt(obj.key); + com.sleepycat.db.Dbt dbValue = new com.sleepycat.db.Dbt(obj.value); + + int err = _db.put(tx, dbKey, dbValue, 0); + if(err != 0) + { + // + // Bug in Freeze + // + throw new DBException(); + } + } + } + } + catch(com.sleepycat.db.DbException dx) + { + tx.abort(); + throw dx; + } + tx.commit(0); + + for(int i = 0; i < txSize; i++) + { + streamedObjectQueue.remove(0); + } + + if(_trace >= 2) + { + long now = System.currentTimeMillis(); + _communicator.getLogger().trace( + "Freeze::Evictor", + "saved " + txSize + " objects in " + (now - saveStart) + " ms"); + saveStart = now; + } + } + catch(com.sleepycat.db.DbDeadlockException deadlock) + { + tryAgain = true; + txSize = (txSize + 1)/2; + } + catch(com.sleepycat.db.DbException dx) + { + DBException ex = new DBException(); + ex.initCause(dx); + ex.message = _errorPrefix + "saving: " + dx.getMessage(); + throw ex; + } + } + } while(tryAgain); + + + synchronized(this) + { + + for(int i = 0; i < releaseAfterCommit.size(); i++) + { + EvictorElement element = (EvictorElement)releaseAfterCommit.get(i); + element.usageCount--; + } + releaseAfterCommit.clear(); + + if(saveNowThreadsSize > 0) + { + for(int i = 0; i < saveNowThreadsSize; i++) + { + _saveNowThreads.remove(0); + } + notifyAll(); + } + } + + _lastSave = System.currentTimeMillis(); } } - public void - save(Ice.Identity ident, Ice.Object servant) + private void + init(String envName, String dbName, boolean createDb) { - // - // NOTE: This operation is not mutex-protected, therefore it may - // only be invoked while the evictor is already locked. For - // example, it is safe to call this operation from a persistence - // strategy implementation, iff the persistence strategy is in - // the thread context of a locked evictor operation. - // - EvictorElement element = (EvictorElement)_evictorMap.get(ident); - assert(element != null); - - // - // Update statistics before saving. - // - long now = System.currentTimeMillis(); - long diff = now - (element.rec.stats.creationTime + element.rec.stats.lastSaveTime); - if(element.rec.stats.lastSaveTime == 0) - { - element.rec.stats.lastSaveTime = diff; - element.rec.stats.avgSaveTime = diff; - } - else - { - element.rec.stats.lastSaveTime = now - element.rec.stats.creationTime; - element.rec.stats.avgSaveTime = (long)(element.rec.stats.avgSaveTime * 0.95 + diff * 0.05); - } + _trace = _communicator.getProperties().getPropertyAsInt( + "Freeze.Trace.Evictor"); - _dict.fastPut(ident, element.rec); - } + _errorPrefix = "Freeze Evictor DbEnv(\"" + envName + "\") Db(\"" + + dbName + "\") :"; - EvictorI(DB db, PersistenceStrategy strategy) - { - _db = db; - _dict = new IdentityObjectRecordDict(db); - _strategy = strategy; - _trace = _db.getCommunicator().getProperties().getPropertyAsInt("Freeze.Trace.Evictor"); - } + String propertyPrefix = "Freeze.Evictor." + envName + '.' + dbName; + + // + // By default, we save every minute or when the size of the modified + // queue reaches 10. + // - protected void - finalize() - throws Throwable - { - if(!_deactivated) - { - _db.getCommunicator().getLogger().warning("evictor has not been deactivated"); - } + _saveSizeTrigger = _communicator.getProperties().getPropertyAsIntWithDefault( + propertyPrefix + ".SaveSizeTrigger", 10); - _strategy.destroy(); + _savePeriod = _communicator.getProperties().getPropertyAsIntWithDefault( + propertyPrefix + ".SavePeriod", 60 * 1000); + + try + { + int flags = com.sleepycat.db.Db.DB_AUTO_COMMIT; + if(createDb) + { + flags |= com.sleepycat.db.Db.DB_CREATE; + } + + _db = new com.sleepycat.db.Db(_dbEnv, 0); + _db.open(null, dbName, null, com.sleepycat.db.Db.DB_BTREE, + flags, 0); + + // + // TODO: FREEZE_DB_MODE + // + } + catch(java.io.FileNotFoundException dx) + { + DBNotFoundException ex = new DBNotFoundException(); + ex.initCause(dx); + ex.message = _errorPrefix + "Db.open: " + dx.getMessage(); + throw ex; + } + catch(com.sleepycat.db.DbException dx) + { + DBException ex = new DBException(); + ex.initCause(dx); + ex.message = _errorPrefix + "Db.open: " + dx.getMessage(); + throw ex; + } + + _lastSave = System.currentTimeMillis(); + + // + // Start saving thread + // + _thread = new Thread(this); + _thread.start(); } private void @@ -432,11 +1020,6 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, ObjectStore // assert(ident != null && element != null); - // - // Notify the persistence strategy about the evicted object. - // - _strategy.evictedObject(this, ident, element.rec.servant, element.strategyCookie); - // // Remove element from the evictor queue. // @@ -445,7 +1028,7 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, ObjectStore if(_trace >= 2) { - _db.getCommunicator().getLogger().trace( + _communicator.getLogger().trace( "Freeze::Evictor", "evicted \"" + Ice.Util.identityToString(ident) + "\" from the queue\n" + "number of elements in the queue: " + @@ -453,77 +1036,205 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, ObjectStore } } } - - // - // If we're deactivated and there are no more elements to - // evict, it's not necessary in Java to set _db to zero to - // break cyclic dependencies. - // } - private EvictorElement - add(Ice.Identity ident, ObjectRecord rec) + private boolean + dbHasObject(Ice.Identity ident) { - // - // Ignore the request if the Ice object is already in the queue. - // - EvictorElement element = (EvictorElement)_evictorMap.get(ident); - if(element != null) + for(;;) { - return element; - } - - // - // Add an Ice object with its servant to the evictor queue. - // - _evictorList.addFirst(ident); + try + { + byte[] key = IdentityObjectRecordDict.encodeKeyImpl(ident, _communicator); + com.sleepycat.db.Dbt dbKey = new com.sleepycat.db.Dbt(key); + + // + // Keep 0 length since we're not interested in the data + // + com.sleepycat.db.Dbt dbValue = new com.sleepycat.db.Dbt(); + dbValue.set_flags(com.sleepycat.db.Db.DB_DBT_USERMEM | + com.sleepycat.db.Db.DB_DBT_PARTIAL); + + int err = _db.get(null, dbKey, dbValue, 0); + + if(err == 0) + { + return true; + } + else if(err == com.sleepycat.db.Db.DB_NOTFOUND) + { + return false; + } + else + { + assert(false); + throw new DBException(); + } + } + catch(com.sleepycat.db.DbDeadlockException deadlock) + { + // + // Ignored, try again + // + } + catch(com.sleepycat.db.DbException dx) + { + DBException ex = new DBException(); + ex.initCause(dx); + ex.message = _errorPrefix + "Db.get: " + dx.getMessage(); + throw ex; + } + } + } - element = new EvictorElement(); - element.rec = rec; - element.position = _evictorList.iterator(); - element.usageCount = 0; - element.destroyed = false; - element.strategyCookie = _strategy.activatedObject(ident, rec.servant); + private ObjectRecord + getObject(Ice.Identity ident) + { + byte[] key = IdentityObjectRecordDict.encodeKeyImpl(ident, _communicator); + com.sleepycat.db.Dbt dbKey = new com.sleepycat.db.Dbt(key); + + com.sleepycat.db.Dbt dbValue = new com.sleepycat.db.Dbt(); - // - // Position the iterator "on" the element. - // - element.position.next(); + for(;;) + { + try + { + int err = _db.get(null, dbKey, dbValue, 0); + + if(err == 0) + { + return (ObjectRecord) IdentityObjectRecordDict.decodeValueImpl( + dbValue.get_data(), _communicator); + } + else if(err == com.sleepycat.db.Db.DB_NOTFOUND) + { + return null; + } + else + { + assert(false); + throw new DBException(); + } + } + catch(com.sleepycat.db.DbDeadlockException deadlock) + { + // + // Ignored, try again + // + } + catch(com.sleepycat.db.DbException dx) + { + DBException ex = new DBException(); + ex.initCause(dx); + ex.message = _errorPrefix + "Db.get: " + dx.getMessage(); + throw ex; + } + } + } - _evictorMap.put(ident, element); - return element; + private void + addToModifiedQueue(Ice.Identity ident, EvictorElement element) + { + element.usageCount++; + _modifiedQueue.add(ident); + + if(_saveSizeTrigger >= 0 && _modifiedQueue.size() >= _saveSizeTrigger) + { + notifyAll(); + } } + + private void + saveNowNoSync() + { + Thread myself = Thread.currentThread(); - private EvictorElement - remove(Ice.Identity ident) + _saveNowThreads.add(myself); + notifyAll(); + do + { + try + { + wait(); + } + catch(InterruptedException ex) + { + } + } while(_saveNowThreads.contains(myself)); + } + + private byte[] + writeObjectRecordToValue(long saveStart, ObjectRecord rec) { // - // If the Ice object is currently in the evictor, remove it. + // Update stats first // - EvictorElement element = (EvictorElement)_evictorMap.remove(ident); - if(element != null) + Statistics stats = rec.stats; + long diff = saveStart - (stats.creationTime + stats.lastSaveTime); + if(stats.lastSaveTime == 0) { - element.position.remove(); + stats.lastSaveTime = diff; + stats.avgSaveTime = diff; } - return element; + else + { + stats.lastSaveTime = saveStart - stats.creationTime; + stats.avgSaveTime = (long)(stats.avgSaveTime * 0.95 + diff * 0.05); + } + return IdentityObjectRecordDict.encodeValueImpl(rec, _communicator); } + class StreamedObject + { + byte[] key; + byte[] value; + byte status; + }; + + class EvictorElement extends Ice.LocalObjectImpl { + byte status; ObjectRecord rec; java.util.Iterator position; int usageCount; - boolean destroyed; - Ice.LocalObject strategyCookie; }; + + // + // Clean object; can become modified or destroyed + // + private static final byte clean = 0; + + // + // New objects; can become clean, dead or destroyed + // + private static final byte created = 1; + + // + // Modified object; can become clean or destroyed + // + private static final byte modified = 2; + + // + // Being saved. Can become dead or created + // + private static final byte destroyed = 3; + + // + // Exists only in the Evictor; for example the object was created + // and later destroyed (without a save in between), or it was + // destroyed on disk but is still in use. Can become created. + // + private static final byte dead = 4; // // Map of Ice.Identity to EvictorElement // private java.util.Map _evictorMap = new java.util.HashMap(); + private int _evictorSize = 10; // - // The C++ Evictor uses std::list<Ice::Identity> which allows + // The C++ Evictor uses std::list<EvictorMap::iterator> which allows // holding of iterators across list changes. Unfortunately, Java // iterators are invalidated as soon as the underlying collection // is changed, so it's not possible to use the same technique. @@ -532,12 +1243,32 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, ObjectStore // private Freeze.LinkedList _evictorList = new Freeze.LinkedList(); - private int _evictorSize = 10; + // + // The _modifiedQueue contains a queue of all modified objects + // Each element in the queue "owns" a usage count, to ensure the + // pointed element remains in the map. + // + private java.util.List _modifiedQueue = new java.util.ArrayList(); + private boolean _deactivated = false; - private IdentityObjectRecordDict _dict; - - private DB _db; - private PersistenceStrategy _strategy; + + private Ice.Communicator _communicator; + private SharedDbEnv _dbEnvHolder; + private com.sleepycat.db.DbEnv _dbEnv; + private com.sleepycat.db.Db _db; private ServantInitializer _initializer; private int _trace = 0; + + // + // Threads that have requested a "saveNow" and are waiting for + // its completion + // + private java.util.List _saveNowThreads = new java.util.ArrayList(); + + private int _saveSizeTrigger; + private long _savePeriod; + private long _lastSave; + + private Thread _thread; + private String _errorPrefix; } diff --git a/java/src/Freeze/EvictorIteratorI.java b/java/src/Freeze/EvictorIteratorI.java index fdf403be19b..90df6a6d976 100644 --- a/java/src/Freeze/EvictorIteratorI.java +++ b/java/src/Freeze/EvictorIteratorI.java @@ -16,55 +16,136 @@ package Freeze; class EvictorIteratorI extends Ice.LocalObjectImpl implements EvictorIterator { - EvictorIteratorI(java.util.Iterator iterator) - { - // - // Copy the identities from the map iterator, to allow - // this iterator to continue to function even if the - // database is accessed and the map iterator is invalidated. - // - while(iterator.hasNext()) - { - java.util.Map.Entry entry = (java.util.Map.Entry)iterator.next(); - _identities.add(entry.getKey()); - } - - // - // Close the iterator explicitly. We don't want to wait for - // the garbage collection to destroy the iterator since the - // iterator consumes resources (database locks for instance). - // - ((Freeze.Map.EntryIterator)iterator).close(); - - _iterator = _identities.iterator(); - } - public boolean hasNext() { - return _iterator != null && _iterator.hasNext(); + if(_dbc == null) + { + throw new IteratorDestroyedException(); + } + + if(_current != null) + { + return true; + } + else + { + com.sleepycat.db.Dbt dbKey = new com.sleepycat.db.Dbt(); + + // + // Keep 0 length since we're not interested in the data + // + com.sleepycat.db.Dbt dbValue = new com.sleepycat.db.Dbt(); + dbValue.set_flags(com.sleepycat.db.Db.DB_DBT_USERMEM | + com.sleepycat.db.Db.DB_DBT_PARTIAL); + + try + { + if(_dbc.get(dbKey, dbValue, com.sleepycat.db.Db.DB_NEXT) == 0) + { + _current = (Ice.Identity) IdentityObjectRecordDict.decodeKeyImpl(dbKey.get_data(), _communicator); + return true; + } + else + { + return false; + } + } + catch(com.sleepycat.db.DbDeadlockException dx) + { + DBDeadlockException ex = new DBDeadlockException(); + ex.initCause(dx); + ex.message = _errorPrefix + "Dbc.get: " + dx.getMessage(); + throw ex; + } + catch(com.sleepycat.db.DbException dx) + { + DBException ex = new DBException(); + ex.initCause(dx); + ex.message = _errorPrefix + "Dbc.get: " + dx.getMessage(); + throw ex; + } + } } public Ice.Identity next() { - if(_iterator != null) - { - return (Ice.Identity)_iterator.next(); - } - else - { - throw new Freeze.NoSuchElementException(); - } + if(hasNext()) + { + Ice.Identity result = _current; + _current = null; + return result; + } + else + { + throw new NoSuchElementException(); + } } public void destroy() { - _identities = null; - _iterator = null; + if(_dbc == null) + { + throw new IteratorDestroyedException(); + } + else + { + try + { + _dbc.close(); + } + catch(com.sleepycat.db.DbDeadlockException deadlock) + { + // + // Ignored + // + } + catch(com.sleepycat.db.DbException dx) + { + DBException ex = new DBException(); + ex.initCause(dx); + ex.message = _errorPrefix + "Db.cursor: " + dx.getMessage(); + throw ex; + } + + _dbc = null; + _current = null; + _communicator = null; + } + } + + EvictorIteratorI(com.sleepycat.db.Db db, Ice.Communicator communicator, String errorPrefix) + { + _communicator = communicator; + _errorPrefix = errorPrefix; + + try + { + _dbc = db.cursor(null, 0); + } + catch(com.sleepycat.db.DbException dx) + { + DBException ex = new DBException(); + ex.initCause(dx); + ex.message = _errorPrefix + "Db.cursor: " + dx.getMessage(); + throw ex; + } } - - private java.util.ArrayList _identities = new java.util.ArrayList(); - private java.util.Iterator _iterator; + + protected void + finalize() + { + if(_dbc != null) + { + destroy(); + } + } + + + private com.sleepycat.db.Dbc _dbc; + private Ice.Identity _current = null; + private Ice.Communicator _communicator; + private String _errorPrefix; } diff --git a/java/src/Freeze/IdleStrategyI.java b/java/src/Freeze/IdleStrategyI.java deleted file mode 100644 index 7f8e6d1036c..00000000000 --- a/java/src/Freeze/IdleStrategyI.java +++ /dev/null @@ -1,112 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003 -// ZeroC, Inc. -// Billerica, MA, USA -// -// All Rights Reserved. -// -// Ice is free software; you can redistribute it and/or modify it under -// the terms of the GNU General Public License version 2 as published by -// the Free Software Foundation. -// -// ********************************************************************** - -package Freeze; - -public final class IdleStrategyI extends Ice.LocalObjectImpl implements IdleStrategy -{ - public - IdleStrategyI() - { - } - - public Ice.LocalObject - activatedObject(Ice.Identity ident, Ice.Object servant) - { - return new Cookie(); - } - - public void - destroyedObject(Ice.Identity ident, Ice.LocalObject cookie) - { - // Nothing to do - } - - public void - evictedObject(ObjectStore store, Ice.Identity ident, Ice.Object servant, Ice.LocalObject cookie) - { - // - // The object must reach the idle state in order for it to be - // evicted, therefore the object should have already been saved - // by postOperation. - // - Cookie c = (Cookie)cookie; - assert(!c.mutated); - assert(c.mutatingCount == 0); - } - - public void - savedObject(ObjectStore store, Ice.Identity ident, Ice.Object servant, Ice.LocalObject cookie, int usageCount) - { - assert(usageCount > 0); - - if(usageCount == 1) - { - Cookie c = (Cookie)cookie; - c.mutated = false; - } - } - - public void - preOperation(ObjectStore store, Ice.Identity ident, Ice.Object servant, boolean mutating, Ice.LocalObject cookie) - { - Cookie c = (Cookie)cookie; - if(mutating) - { - ++c.mutatingCount; - c.mutated = true; - } - else if(c.mutatingCount == 0 && c.mutated) - { - // - // Only store the object's persistent state if the object is idle - // and it has been mutated. - // - store.save(ident, servant); - c.mutated = false; - } - } - - public void - postOperation(ObjectStore store, Ice.Identity ident, Ice.Object servant, boolean mutating, Ice.LocalObject cookie) - { - Cookie c = (Cookie)cookie; - if(mutating) - { - assert(c.mutatingCount >= 1); - --c.mutatingCount; - } - if(c.mutatingCount == 0 && c.mutated) - { - // - // Only store the object's persistent state if the object is idle - // and it has been mutated. - // - store.save(ident, servant); - c.mutated = false; - } - } - - public void - destroy() - { - // Nothing to do - } - - private static class Cookie extends Ice.LocalObjectImpl - { - int mutatingCount = 0; - boolean mutated = false; - } -} diff --git a/java/src/Freeze/Map.java b/java/src/Freeze/Map.java index 5ca1bd5560e..af0272e68f0 100644 --- a/java/src/Freeze/Map.java +++ b/java/src/Freeze/Map.java @@ -17,10 +17,62 @@ package Freeze; public abstract class Map extends java.util.AbstractMap { public - Map(DB db) + Map(Ice.Communicator communicator, String envName, String dbName, boolean createDb) { - _db = db; - _communicator = db.getCommunicator(); + _communicator = communicator; + _dbEnvHolder = SharedDbEnv.get(communicator, envName); + _dbEnv = _dbEnvHolder; + _dbName = dbName; + _errorPrefix = "Freeze DB DbEnv(\"" + envName + "\") Db(\"" + dbName + "\") :"; + + openDb(createDb); + } + + public + Map(Ice.Communicator communicator, com.sleepycat.db.DbEnv dbEnv, String dbName, boolean createDb) + { + _communicator = communicator; + _dbEnvHolder = null; + _dbEnv = dbEnv; + _dbName = dbName; + _errorPrefix = "Freeze DB DbEnv(\"External\") Db(\"" + dbName + "\") :"; + + openDb(createDb); + } + + public void + close() + { + if(_db != null) + { + try + { + _db.close(0); + } + catch(com.sleepycat.db.DbException e) + { + DBException ex = new DBException(); + ex.initCause(e); + ex.message = _errorPrefix + "Db.stat: " + e.getMessage(); + throw ex; + } + finally + { + _db = null; + } + } + + if(_dbEnvHolder != null) + { + try + { + _dbEnvHolder.close(); + } + finally + { + _dbEnvHolder = null; + } + } } // @@ -36,14 +88,12 @@ public abstract class Map extends java.util.AbstractMap public int size() { - // - // It's not necessary to close outstanding iterators. - // - // If it was it would be a problem - it doesn't change the Map - // - therefore open iterators should not be invalidated - // (according the Java spec). - // - // closeIterators(); + if(_db == null) + { + DBException ex = new DBException(); + ex.message = _errorPrefix + "\"" + _dbName + "\" has been closed"; + throw ex; + } // // The number of records cannot be cached and then adjusted by @@ -52,130 +102,178 @@ public abstract class Map extends java.util.AbstractMap // the size adjusted) and the transaction aborted then the // cached map size() would be incorrect. // - return (int)_db.getNumberOfRecords(); + + // + // TODO: DB_FAST_STAT doesn't seem to do what the + // documentation says... + // + try + { + com.sleepycat.db.DbBtreeStat s = (com.sleepycat.db.DbBtreeStat)_db.stat(0); + return s.bt_ndata; + } + catch(com.sleepycat.db.DbException e) + { + DBException ex = new DBException(); + ex.initCause(e); + ex.message = _errorPrefix + "Db.stat: " + e.getMessage(); + throw ex; + } } public boolean containsValue(Object value) { - // - // It's not necessary to close outstanding iterators. - // - // If it was it would be a problem - it doesn't change the Map - // - therefore open iterators should not be invalidated - // (according the Java spec). - // - // closeIterators(); - - EntryIterator p = (EntryIterator)entrySet().iterator(); - if(value == null) + for(;;) { - while(p.hasNext()) + EntryIterator p = null; + try { - Entry e = (Entry)p.next(); - if(e.getValue() == null) + p = (EntryIterator)entrySet().iterator(); + + if(value == null) { - return true; + while(p.hasNext()) + { + Entry e = (Entry)p.next(); + if(e.getValue() == null) + { + p.close(); + return true; + } + } + } + else + { + while(p.hasNext()) + { + Entry e = (Entry)p.next(); + if(value.equals(e.getValue())) + { + p.close(); + return true; + } + } } + return false; } - } - else - { - while(p.hasNext()) + catch(DBDeadlockException ex) + { + // + // Try again + // + } + finally { - Entry e = (Entry)p.next(); - if(value.equals(e.getValue())) + if(p != null) { - return true; + p.close(); } } } - p.close(); - - return false; } public boolean containsKey(Object key) { - // - // It's not necessary to close outstanding iterators. - // - // If it was it would be a problem - it doesn't change the Map - // - therefore open iterators should not be invalidated - // (according the Java spec). - // - //closeIterators(); + if(_db == null) + { + DBException ex = new DBException(); + ex.message = _errorPrefix + "\"" + _dbName + "\" has been closed"; + throw ex; + } byte[] k = encodeKey(key, _communicator); - return _db.contains(k); + + com.sleepycat.db.Dbt dbKey = new com.sleepycat.db.Dbt(k); + + com.sleepycat.db.Dbt dbValue = new com.sleepycat.db.Dbt(); + dbValue.set_flags(com.sleepycat.db.Db.DB_DBT_PARTIAL); + + if(_trace >= 1) + { + _communicator.getLogger().trace("DB", "checking key in database \"" + _dbName + "\""); + } + + for(;;) + { + try + { + int rc = _db.get(null, dbKey, dbValue, 0); + if(rc == com.sleepycat.db.Db.DB_NOTFOUND) + { + return false; + } + else + { + assert(rc == 0); + return true; + } + } + catch(com.sleepycat.db.DbDeadlockException e) + { + // + // Try again + // + } + catch(com.sleepycat.db.DbException e) + { + DBException ex = new DBException(); + ex.initCause(e); + ex.message = _errorPrefix + "Db.get: " + e.getMessage(); + throw ex; + } + } } public Object get(Object key) { - // - // It's not necessary to close outstanding iterators. - // - // If it was it would be a problem - it doesn't change the Map - // - therefore open iterators should not be invalidated - // (according the Java spec). - // - //closeIterators(); - byte[] k = encodeKey(key, _communicator); - try + com.sleepycat.db.Dbt dbKey = new com.sleepycat.db.Dbt(k); + byte[] v = getImpl(dbKey); + if(v == null) { - byte[] v = _db.get(k); - return decodeValue(v, _communicator); + return null; } - catch(DBNotFoundException e) + else { - return null; + return decodeValue(v, _communicator); } } public Object put(Object key, Object value) { - closeIterators(); - byte[] k = encodeKey(key, _communicator); - Object o; - - try + com.sleepycat.db.Dbt dbKey = new com.sleepycat.db.Dbt(k); + byte[] v = getImpl(dbKey); + Object o = null; + if(v != null) { - byte[] v = _db.get(k); o = decodeValue(v, _communicator); } - catch(DBNotFoundException e) - { - o = null; - } - byte[] v = encodeValue(value, _communicator); - _db.put(k, v); - + putImpl(dbKey, value); return o; } public Object remove(Object key) { - closeIterators(); - byte[] k = encodeKey(key, _communicator); - Object o; - try + com.sleepycat.db.Dbt dbKey = new com.sleepycat.db.Dbt(k); + byte[] v = getImpl(dbKey); + + if(v != null && removeImpl(dbKey)) { - byte[] v = _db.get(k); - o = decodeValue(v, _communicator); + return decodeValue(v, _communicator); } - catch(DBNotFoundException e) + else { - o = null; + DBNotFoundException ex = new DBNotFoundException(); + ex.message = _errorPrefix + "Db.del: DB_NOTFOUND"; + throw ex; } - _db.del(k); - return o; } // @@ -186,11 +284,9 @@ public abstract class Map extends java.util.AbstractMap public void fastPut(Object key, Object value) { - closeIterators(); - byte[] k = encodeKey(key, _communicator); - byte[] v = encodeValue(value, _communicator); - _db.put(k, v); + com.sleepycat.db.Dbt dbKey = new com.sleepycat.db.Dbt(k); + putImpl(dbKey, value); } // @@ -199,28 +295,44 @@ public abstract class Map extends java.util.AbstractMap public boolean fastRemove(Object key) { - closeIterators(); - byte[] k = encodeKey(key, _communicator); - try - { - _db.del(k); - } - catch(Freeze.DBNotFoundException e) - { - return false; - } - return true; + com.sleepycat.db.Dbt dbKey = new com.sleepycat.db.Dbt(k); + return removeImpl(dbKey); } public void clear() { - closeIterators(); + if(_db == null) + { + DBException ex = new DBException(); + ex.message = _errorPrefix + "\"" + _dbName + "\" has been closed"; + throw ex; + } - _db.clear(); + for(;;) + { + try + { + _db.truncate(null, com.sleepycat.db.Db.DB_AUTO_COMMIT); + break; + } + catch(com.sleepycat.db.DbDeadlockException e) + { + // + // Try again + // + } + catch(com.sleepycat.db.DbException e) + { + DBException ex = new DBException(); + ex.initCause(e); + ex.message = _errorPrefix + "Db.truncate: " + e.getMessage(); + throw ex; + } + } } - + public java.util.Set entrySet() { @@ -231,9 +343,7 @@ public abstract class Map extends java.util.AbstractMap public java.util.Iterator iterator() { - EntryIterator p = new EntryIterator(); - _iterators.add(new java.lang.ref.WeakReference(p)); - return p; + return new EntryIterator(); } public boolean @@ -246,8 +356,8 @@ public abstract class Map extends java.util.AbstractMap Map.Entry entry = (Map.Entry)o; Object value = entry.getValue(); - Entry p = getEntry(entry.getKey()); - return p != null && valEquals(p.getValue(), value); + byte[] v = getImpl(entry.getDbKey()); + return v != null && valEquals(decodeValue(v, _communicator), value); } public boolean @@ -260,13 +370,10 @@ public abstract class Map extends java.util.AbstractMap Map.Entry entry = (Map.Entry)o; Object value = entry.getValue(); - Entry p = getEntry(entry.getKey()); - if(p != null && valEquals(p.getValue(), value)) + byte[] v = getImpl(entry.getDbKey()); + if(v != null && valEquals(decodeValue(v, _communicator), value)) { - closeIterators(); - byte[] k = encodeKey(p.getKey(), _communicator); - _db.del(k); - return true; + return removeImpl(entry.getDbKey()); } return false; } @@ -288,69 +395,183 @@ public abstract class Map extends java.util.AbstractMap return _entrySet; } - // - // Because of the way that Berkeley DB cursors implement their - // locking it's necessary to ensure that all cursors are closed - // prior to doing a database operation otherwise self-deadlocks - // will occur. See "Berkeley DB Transactional Data Store locking - // conventions" section in the Berkeley DB reference guide for - // details. - // - private void - closeIterators() + protected void + finalize() { - closeIteratorsExcept(null); + close(); } - private void - closeIteratorsExcept(java.util.Iterator i) + private static boolean + valEquals(Object o1, Object o2) { - java.util.Iterator p = _iterators.iterator(); - while(p.hasNext()) + return (o1 == null ? o2 == null : o1.equals(o2)); + } + + private byte[] + getImpl(com.sleepycat.db.Dbt dbKey) + { + if(_db == null) + { + DBException ex = new DBException(); + ex.message = _errorPrefix + "\"" + _dbName + "\" has been closed"; + throw ex; + } + + com.sleepycat.db.Dbt dbValue = new com.sleepycat.db.Dbt(); + + if(_trace >= 1) { - java.lang.ref.WeakReference ref = (java.lang.ref.WeakReference)p.next(); - EntryIterator q = (EntryIterator)ref.get(); - if(q != null && q != i) + _communicator.getLogger().trace("DB", "reading value from database \"" + _dbName + "\""); + } + + for(;;) + { + try { - q.close(); + int rc = _db.get(null, dbKey, dbValue, 0); + if(rc == com.sleepycat.db.Db.DB_NOTFOUND) + { + return null; + } + else + { + return dbValue.get_data(); + } + } + catch(com.sleepycat.db.DbDeadlockException e) + { + // + // Try again + // + } + catch(com.sleepycat.db.DbException e) + { + DBException ex = new DBException(); + ex.initCause(e); + ex.message = _errorPrefix + "Db.get: " + e.getMessage(); + throw ex; } } + } - // - // This is more efficient than removing the list items element - // by element in the iteration loop. - // - _iterators.clear(); - if(i != null) + private void + putImpl(com.sleepycat.db.Dbt dbKey, Object value) + { + if(_db == null) { - _iterators.add(new java.lang.ref.WeakReference(i)); + DBException ex = new DBException(); + ex.message = _errorPrefix + "\"" + _dbName + "\" has been closed"; + throw ex; + } + + byte[] v = encodeValue(value, _communicator); + com.sleepycat.db.Dbt dbValue = new com.sleepycat.db.Dbt(v); + + if(_trace >= 1) + { + _communicator.getLogger().trace("DB", "writing value in database \"" + _dbName + "\""); + } + + for(;;) + { + try + { + _db.put(null, dbKey, dbValue, com.sleepycat.db.Db.DB_AUTO_COMMIT); + break; + } + catch(com.sleepycat.db.DbDeadlockException e) + { + // + // Try again + // + } + catch(com.sleepycat.db.DbException e) + { + DBException ex = new DBException(); + ex.initCause(e); + ex.message = _errorPrefix + "Db.put: " + e.getMessage(); + throw ex; + } } } - private Entry - getEntry(Object key) + private boolean + removeImpl(com.sleepycat.db.Dbt dbKey) { - // - // It's not necessary to close outstanding iterators. - // - // If it was it would be a problem - it doesn't change the Map - // - therefore open iterators should not be invalidated - // (according the Java spec). - // - // closeIterators(); + if(_db == null) + { + DBException ex = new DBException(); + ex.message = _errorPrefix + "\"" + _dbName + "\" has been closed"; + throw ex; + } - byte[] k = encodeKey(key, _communicator); - byte[] v = _db.get(k); + if(_trace >= 1) + { + _communicator.getLogger().trace("DB", "deleting value from database \"" + _dbName + "\""); + } - return new Entry(this, _communicator, key, v); + for(;;) + { + try + { + int rc = _db.del(null, dbKey, com.sleepycat.db.Db.DB_AUTO_COMMIT); + return (rc == 0); + } + catch(com.sleepycat.db.DbDeadlockException e) + { + // + // Try again + // + } + catch(com.sleepycat.db.DbException e) + { + DBException ex = new DBException(); + ex.initCause(e); + ex.message = _errorPrefix + "Db.del: " + e.getMessage(); + throw ex; + } + } } - private static boolean - valEquals(Object o1, Object o2) + private void + openDb(boolean createDb) { - return (o1 == null ? o2 == null : o1.equals(o2)); + _trace = _communicator.getProperties().getPropertyAsInt("Freeze.Trace.DB"); + + try + { + int flags = com.sleepycat.db.Db.DB_AUTO_COMMIT; + + if(createDb) + { + flags |= com.sleepycat.db.Db.DB_CREATE; + } + + _db = new com.sleepycat.db.Db(_dbEnv, 0); + _db.open(null, _dbName, null, com.sleepycat.db.Db.DB_BTREE, + flags, 0); + + // + // TODO: FREEZE_DB_MODE + // + } + catch(java.io.FileNotFoundException dx) + { + DBNotFoundException ex = new DBNotFoundException(); + ex.initCause(dx); + ex.message = _errorPrefix + "Db.open: " + dx.getMessage(); + throw ex; + } + catch(com.sleepycat.db.DbException dx) + { + DBException ex = new DBException(); + ex.initCause(dx); + ex.message = _errorPrefix + "Db.open: " + dx.getMessage(); + throw ex; + } } + /** * * The entry iterator class needs to be public to allow clients to @@ -362,76 +583,191 @@ public abstract class Map extends java.util.AbstractMap { EntryIterator() { - try - { - _cursor = _db.getCursor(); - _next = getEntry(); - } - catch(DBNotFoundException e) - { - // Database is empty. - } + if(_trace >= 3) + { + _communicator.getLogger().trace("DB", "starting transaction for cursor on database \"" + _dbName + "\""); + } + + try + { + // + // Start transaction + // + _tx = _dbEnv.txn_begin(null, 0); + + // + // Open cursor with this transaction + // + _cursor = _db.cursor(_tx, 0); + } + catch(com.sleepycat.db.DbDeadlockException dx) + { + dead(); + DBDeadlockException ex = new DBDeadlockException(); + ex.initCause(dx); + ex.message = _errorPrefix + "EntryIterator constructor: " + dx.getMessage(); + throw ex; + } + catch(com.sleepycat.db.DbException dx) + { + DBException ex = new DBException(); + ex.initCause(dx); + ex.message = _errorPrefix + "EntryIterator constructor: " + dx.getMessage(); + throw ex; + } } public boolean hasNext() { - return getNext(); + if(_current == null || _current == _lastReturned) + { + // + // Move _cursor, set _current + // + + com.sleepycat.db.Dbt dbKey = new com.sleepycat.db.Dbt(); + com.sleepycat.db.Dbt dbValue = new com.sleepycat.db.Dbt(); + + try + { + if(_cursor.get(dbKey, dbValue, com.sleepycat.db.Db.DB_NEXT) == 0) + { + _current = new Entry(this, Map.this, _communicator, dbKey, dbValue.get_data()); + return true; + } + else + { + close(); + return false; + } + } + catch(com.sleepycat.db.DbDeadlockException dx) + { + dead(); + DBDeadlockException ex = new DBDeadlockException(); + ex.initCause(dx); + ex.message = _errorPrefix + "Dbc.get: " + dx.getMessage(); + throw ex; + } + catch(com.sleepycat.db.DbException dx) + { + DBException ex = new DBException(); + ex.initCause(dx); + ex.message = _errorPrefix + "Dbc.get: " + dx.getMessage(); + throw ex; + } + } + else + { + return true; + } } - + public Object next() { - if(!getNext()) - { - throw new java.util.NoSuchElementException(); - } - assert(_next != null); - - if(_prev != null) - { - _prev.invalidateCursor(); - } - - _prev = _next; - _next = null; - return _prev; + if(hasNext()) + { + _lastReturned = _current; + return _lastReturned; + } + else + { + throw new java.util.NoSuchElementException(); + } } public void remove() { - if(_prev == null) - { - throw new IllegalStateException(); - } - - closeIteratorsExcept(this); - - // - // Clone the cursor so that error handling is simpler. - // - assert _cursor != null; - DBCursor clone = _cursor._clone(); - - try - { - clone.del(); - _prev.invalidateCursor(); - _prev = null; - _next = null; - } - finally - { - try - { - clone.close(); - } - catch(DBException ignore) - { - // Ignore - } - } + // + // Removes the last object returned by next() + // + if(_lastReturned == null) + { + throw new IllegalStateException(); + } + + if(_lastReturned == _current) + { + try + { + if(_cursor.del(0) == com.sleepycat.db.Db.DB_KEYEMPTY) + { + throw new IllegalStateException(); + } + } + catch(com.sleepycat.db.DbDeadlockException e) + { + dead(); + DBDeadlockException ex = new DBDeadlockException(); + ex.initCause(e); + ex.message = _errorPrefix + "Dbc.del: " + e.getMessage(); + throw ex; + } + catch(com.sleepycat.db.DbException e) + { + DBException ex = new DBException(); + ex.initCause(e); + ex.message = _errorPrefix + "Dbc.del: " + e.getMessage(); + throw ex; + } + } + else + { + // + // Duplicate the cursor and move the _lastReturned + // element to delete it (using the duplicate) + // + + com.sleepycat.db.Dbc clone = null; + + try + { + clone = _cursor.dup(com.sleepycat.db.Db.DB_POSITION); + + // + // No interested in data + // + com.sleepycat.db.Dbt dbValue = new com.sleepycat.db.Dbt(); + dbValue.set_flags(com.sleepycat.db.Db.DB_DBT_USERMEM | + com.sleepycat.db.Db.DB_DBT_PARTIAL); + + int rc = clone.get(_lastReturned.getDbKey(), dbValue, com.sleepycat.db.Db.DB_SET); + + if(rc == com.sleepycat.db.Db.DB_NOTFOUND) + { + throw new IllegalStateException(); + } + if(clone.del(0) == com.sleepycat.db.Db.DB_KEYEMPTY) + { + throw new IllegalStateException(); + } + } + catch(com.sleepycat.db.DbDeadlockException e) + { + dead(); + DBDeadlockException ex = new DBDeadlockException(); + ex.initCause(e); + ex.message = _errorPrefix + "EntryIterator.remove: " + e.getMessage(); + throw ex; + } + catch(com.sleepycat.db.DbException e) + { + DBException ex = new DBException(); + ex.initCause(e); + ex.message = _errorPrefix + "EntryIterator.remove: " + e.getMessage(); + throw ex; + } + finally + { + if(clone != null) + { + closeCursor(clone); + } + } + } } // @@ -440,86 +776,227 @@ public abstract class Map extends java.util.AbstractMap public void close() { - DBCursor copy = _cursor; - - // - // Clear the internal iterator state. - // - _cursor = null; - _next = null; - _prev = null; - - if(copy != null) - { - copy.close(); - } - } + if(_cursor != null) + { + com.sleepycat.db.Dbc cursor = _cursor; + _cursor = null; + closeCursor(cursor); + } + + if(_tx != null) + { + if(_trace >= 3) + { + _communicator.getLogger().trace("DB", "committing transaction for cursor on database \"" + _dbName + "\""); + } - protected void + try + { + _tx.commit(0); + } + catch(com.sleepycat.db.DbDeadlockException e) + { + DBDeadlockException ex = new DBDeadlockException(); + ex.initCause(e); + ex.message = _errorPrefix + "DbTxn.commit: " + e.getMessage(); + throw ex; + } + catch(com.sleepycat.db.DbException e) + { + DBException ex = new DBException(); + ex.initCause(e); + ex.message = _errorPrefix + "DbTxn.commit: " + e.getMessage(); + throw ex; + } + finally + { + _tx = null; + } + } + + } + + protected void finalize() { close(); } - private Entry - getEntry() - { - assert _cursor != null; - _cursor.curr(_keyHolder, _valueHolder); - return new Entry(Map.this, _cursor, _keyHolder.value, _valueHolder.value); - } + void + setValue(Map.Entry entry, Object value) + { + // + // Are we trying to update the current value? + // + if(_current == entry) + { + // + // Yes, update it directly + // + byte[] v = encodeValue(value, _communicator); + com.sleepycat.db.Dbt dbValue = new com.sleepycat.db.Dbt(v); + + try + { + _cursor.put(entry.getDbKey(), dbValue, com.sleepycat.db.Db.DB_CURRENT); + } + catch(com.sleepycat.db.DbDeadlockException e) + { + dead(); + DBDeadlockException ex = new DBDeadlockException(); + ex.initCause(e); + ex.message = _errorPrefix + "Dbc.put: " + e.getMessage(); + throw ex; + } + catch(com.sleepycat.db.DbException e) + { + DBException ex = new DBException(); + ex.initCause(e); + ex.message = _errorPrefix + "Dbc.put: " + e.getMessage(); + throw ex; + } + } + else + { + // + // Duplicate the cursor and move the entry + // element to update it (using the duplicate cursor) + // + + com.sleepycat.db.Dbc clone = null; - private boolean - getNext() - { - if(_next == null && _cursor != null) - { - if(_cursor.next()) - { - try - { - _next = getEntry(); - } - catch(DBNotFoundException ex) - { - // No element found. - } - } - } - return _next != null; - } + try + { + clone = _cursor.dup(com.sleepycat.db.Db.DB_POSITION); + + // + // Not interested in data + // + com.sleepycat.db.Dbt dummy = new com.sleepycat.db.Dbt(); + dummy.set_flags(com.sleepycat.db.Db.DB_DBT_USERMEM | + com.sleepycat.db.Db.DB_DBT_PARTIAL); + + int rc = clone.get(entry.getDbKey(), dummy, com.sleepycat.db.Db.DB_SET); - private DBCursor _cursor; - private Entry _next; - private Entry _prev; - private Freeze.KeyHolder _keyHolder = new Freeze.KeyHolder(); - private Freeze.ValueHolder _valueHolder = new Freeze.ValueHolder(); + if(rc == com.sleepycat.db.Db.DB_NOTFOUND) + { + DBNotFoundException ex = new DBNotFoundException(); + ex.message = _errorPrefix + "Dbc.get: DB_NOTFOUND"; + throw ex; + } + + byte[] v = encodeValue(value, _communicator); + com.sleepycat.db.Dbt dbValue = new com.sleepycat.db.Dbt(v); + clone.put(entry.getDbKey(), dbValue, com.sleepycat.db.Db.DB_CURRENT); + } + catch(com.sleepycat.db.DbDeadlockException e) + { + dead(); + DBDeadlockException ex = new DBDeadlockException(); + ex.initCause(e); + ex.message = _errorPrefix + "EntryIterator.setValue: " + e.getMessage(); + throw ex; + } + catch(com.sleepycat.db.DbException e) + { + DBException ex = new DBException(); + ex.initCause(e); + ex.message = _errorPrefix + "EntryIterator.setValue: " + e.getMessage(); + throw ex; + } + finally + { + if(clone != null) + { + closeCursor(clone); + } + } + } + } + + + private void + closeCursor(com.sleepycat.db.Dbc cursor) + { + try + { + cursor.close(); + } + catch(com.sleepycat.db.DbDeadlockException e) + { + dead(); + DBDeadlockException ex = new DBDeadlockException(); + ex.initCause(e); + ex.message = _errorPrefix + "Dbc.close: " + e.getMessage(); + throw ex; + } + catch(com.sleepycat.db.DbException e) + { + DBException ex = new DBException(); + ex.initCause(e); + ex.message = _errorPrefix + "Dbc.close: " + e.getMessage(); + throw ex; + } + } + + private void + dead() + { + if(_cursor != null) + { + com.sleepycat.db.Dbc cursor = _cursor; + _cursor = null; + closeCursor(cursor); + } + + if(_tx != null) + { + if(_trace >= 3) + { + _communicator.getLogger().trace("DB", "rolling back transaction for cursor on database \"" + _dbName + "\""); + } + + try + { + _tx.abort(); + } + catch(com.sleepycat.db.DbDeadlockException e) + { + DBDeadlockException ex = new DBDeadlockException(); + ex.initCause(e); + ex.message = _errorPrefix + "DbTxn.abort: " + e.getMessage(); + throw ex; + } + catch(com.sleepycat.db.DbException e) + { + DBException ex = new DBException(); + ex.initCause(e); + ex.message = _errorPrefix + "DbTxn.abort: " + e.getMessage(); + throw ex; + } + finally + { + _tx = null; + } + } + } + + private com.sleepycat.db.DbTxn _tx = null; + private com.sleepycat.db.Dbc _cursor = null; + private Entry _current = null; + private Entry _lastReturned = null; } static class Entry implements java.util.Map.Entry { public - Entry(Map map, DBCursor cursor, byte[] keyData, byte[] valueData) - { - _map = map; - _cursor = cursor; - _communicator = cursor.getCommunicator(); - _keyData = keyData; - _haveKey = false; - _valueData = valueData; - _haveValue = false; - } - - public - Entry(Map map, Ice.Communicator communicator, Object key, byte[] valueData) + Entry(Map.EntryIterator iterator, Map map, Ice.Communicator communicator, com.sleepycat.db.Dbt dbKey, byte[] valueBytes) { - _map = map; - _cursor = null; - _communicator = communicator; - _key = key; - _haveKey = true; - _valueData = valueData; - _haveValue = false; + _iterator = iterator; + _map = map; + _communicator = communicator; + _dbKey = dbKey; + _valueBytes = valueBytes; } public Object @@ -527,8 +1004,8 @@ public abstract class Map extends java.util.AbstractMap { if(!_haveKey) { - assert(_keyData != null); - _key = _map.decodeKey(_keyData, _communicator); + assert(_dbKey != null); + _key = _map.decodeKey(_dbKey.get_data(), _communicator); _haveKey = true; } return _key; @@ -539,9 +1016,13 @@ public abstract class Map extends java.util.AbstractMap { if(!_haveValue) { - assert(_valueData != null); - _value = _map.decodeValue(_valueData, _communicator); + assert(_valueBytes != null); + _value = _map.decodeValue(_valueBytes, _communicator); _haveValue = true; + // + // Not needed anymore + // + _valueBytes = null; } return _value; } @@ -549,17 +1030,9 @@ public abstract class Map extends java.util.AbstractMap public Object setValue(Object value) { - Object old = getValue(); - if(_cursor != null) - { - byte[] v = _map.encodeValue(value, _communicator); - _cursor.set(v); - } - else - { - _map.put(getKey(), value); // Invalidates iterators. - } - _value = value; + Object old = getValue(); + _iterator.setValue(this, value); + _value = value; _haveValue = true; return old; } @@ -588,11 +1061,10 @@ public abstract class Map extends java.util.AbstractMap return getKey() + "=" + getValue(); } - void - invalidateCursor() - { - _cursor = null; - } + com.sleepycat.db.Dbt getDbKey() + { + return _dbKey; + } private /*static*/ boolean eq(Object o1, Object o2) @@ -600,19 +1072,23 @@ public abstract class Map extends java.util.AbstractMap return (o1 == null ? o2 == null : o1.equals(o2)); } - private Map _map; - private DBCursor _cursor; - private Ice.Communicator _communicator; - private Object _key; - private byte[] _keyData; - private boolean _haveKey; - private Object _value; - private byte[] _valueData; - private boolean _haveValue; + private Map.EntryIterator _iterator = null; + private Map _map = null; + private Ice.Communicator _communicator = null; + private com.sleepycat.db.Dbt _dbKey = null; + private byte[] _valueBytes = null; + private Object _key = null; + private boolean _haveKey = false; + private Object _value = null; + private boolean _haveValue = false; } - private java.util.Set _entrySet; - private DB _db; - private Ice.Communicator _communicator; - private java.util.List _iterators = new java.util.LinkedList(); + private java.util.Set _entrySet = null; + private SharedDbEnv _dbEnvHolder = null; + private com.sleepycat.db.DbEnv _dbEnv = null; + private com.sleepycat.db.Db _db = null; + private String _dbName = null; + private Ice.Communicator _communicator = null; + private String _errorPrefix = null; + private int _trace = 0; } diff --git a/java/src/Freeze/SharedDbEnv.java b/java/src/Freeze/SharedDbEnv.java new file mode 100644 index 00000000000..0c94c1e3a7b --- /dev/null +++ b/java/src/Freeze/SharedDbEnv.java @@ -0,0 +1,368 @@ +// ********************************************************************** +// +// Copyright (c) 2003 +// ZeroC, Inc. +// Billerica, MA, USA +// +// All Rights Reserved. +// +// Ice is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License version 2 as published by +// the Free Software Foundation. +// +// ********************************************************************** + +package Freeze; + +class SharedDbEnv extends com.sleepycat.db.DbEnv implements com.sleepycat.db.DbErrcall, Runnable +{ + public static SharedDbEnv + get(Ice.Communicator communicator, String envName) + { + MapKey key = new MapKey(envName, communicator); + + synchronized(_map) + { + SharedDbEnv result = (SharedDbEnv) _map.get(key); + if(result == null) + { + try + { + result = new SharedDbEnv(key); + } + catch(com.sleepycat.db.DbException dx) + { + DBException ex = new DBException(); + ex.initCause(dx); + ex.message = errorPrefix(envName) + "creation: " + dx.getMessage(); + throw ex; + } + + Object previousValue = _map.put(key, result); + assert(previousValue == null); + } + else + { + result._refCount++; + } + return result; + } + } + + public String + getEnvName() + { + return _key.envName; + } + + public Ice.Communicator + getCommunicator() + { + return _key.communicator; + } + + public void + close() + { + synchronized(_map) + { + if(--_refCount == 0) + { + // + // Remove from map + // + Object value = _map.remove(_key); + assert(value == this); + + // + // Join thread + // + synchronized(this) + { + _done = true; + notify(); + } + + for(;;) + { + try + { + _thread.join(); + break; + } + catch(InterruptedException ex) + { + } + } + + if(_trace >= 1) + { + _key.communicator.getLogger().trace("DB", "closing database environment \"" + _key.envName + "\""); + } + + // + // Keep lock to prevent somebody else to re-open this DbEnv + // before it's closed. + // + try + { + super.close(0); + } + catch(com.sleepycat.db.DbException dx) + { + DBException ex = new DBException(); + ex.initCause(dx); + ex.message = errorPrefix(_key.envName) + "close: " + dx.getMessage(); + throw ex; + } + } + } + } + + + synchronized public void + deleteOldLogs() + { + try + { + String[] list = log_archive(com.sleepycat.db.Db.DB_ARCH_ABS); + + for(int i = 0; i < list.length; i++) + { + // + // Remove each file + // + java.io.File file = new java.io.File(list[i]); + boolean ok = file.delete(); + if(!ok) + { + _key.communicator.getLogger().warning( + "could not delete file \"" + list[i] + "\""); + } + } + } + catch(com.sleepycat.db.DbException dx) + { + DBException ex = new DBException(); + ex.initCause(dx); + ex.message = errorPrefix(_key.envName) + "log_archive: " + dx.getMessage(); + throw ex; + } + } + + synchronized public void + moveOldLogs() + { + // + // Not yet implemented + // + assert(false); + } + + public void + run() + { + for(;;) + { + synchronized(this) + { + while(!_done) + { + try + { + wait(_checkpointPeriod); + } + catch(InterruptedException ex) + { + continue; + } + // + // Loop + // + } + if(_done) + { + return; + } + } + + try + { + txn_checkpoint(_kbyte, 0, 0); + } + catch(com.sleepycat.db.DbException dx) + { + _key.communicator.getLogger().warning( + "checkpoint on DbEnv \"" + _key.envName + "\" raised DbException: " + + dx.getMessage()); + } + + if(_autoDelete) + { + try + { + deleteOldLogs(); + } + catch(DBException ex) + { + _key.communicator.getLogger().warning( + "checkpoint on DbEnv \"" + _key.envName + "\" raised DBException: " + + ex.getMessage()); + } + + } + } + } + + public void + errcall(String errorPrefix, String message) + { + _key.communicator.getLogger().error("Freeze database error in DbEnv \"" + _key.envName + "\" :" + message); + } + + protected void + finalize() + { + assert(_refCount == 0); + } + + private SharedDbEnv(MapKey key) throws com.sleepycat.db.DbException + { + super(0); + _key = key; + + Ice.Properties properties = key.communicator.getProperties(); + _trace = properties.getPropertyAsInt("Freeze.Trace.DB"); + + if(_trace >= 1) + { + _key.communicator.getLogger().trace("DB", "opening database environment \"" + _key.envName + "\""); + } + + String propertyPrefix = "Freeze." + _key.envName; + + set_errcall(this); + + // + // Deadlock detection + // + set_lk_detect(com.sleepycat.db.Db.DB_LOCK_MINLOCKS); + + // + // Async tx + // + set_flags(com.sleepycat.db.Db.DB_TXN_NOSYNC, true); + + int flags = com.sleepycat.db.Db.DB_INIT_LOCK | + com.sleepycat.db.Db.DB_INIT_LOG | + com.sleepycat.db.Db.DB_INIT_MPOOL | + com.sleepycat.db.Db.DB_INIT_TXN; + + if(properties.getPropertyAsInt( + propertyPrefix + ".DbRecoverFatal") != 0) + { + flags |= com.sleepycat.db.Db.DB_RECOVER_FATAL | + com.sleepycat.db.Db.DB_CREATE; + } + else + { + flags |= com.sleepycat.db.Db. DB_RECOVER | + com.sleepycat.db.Db.DB_CREATE; + } + + if(properties.getPropertyAsIntWithDefault( + propertyPrefix + ".DbPrivate", 1) != 0) + { + flags |= com.sleepycat.db.Db.DB_PRIVATE; + } + + String dbHome = properties.getPropertyWithDefault( + propertyPrefix + ".DbHome", _key.envName); + + // + // TODO: FREEZE_DB_MODE + // + + try + { + open(dbHome, flags, 0); + } + catch(java.io.FileNotFoundException dx) + { + DBNotFoundException ex = new DBNotFoundException(); + ex.initCause(dx); + ex.message = errorPrefix(_key.envName) + "open: " + dx.getMessage(); + throw ex; + } + + // + // Default checkpoint period is every 10 minutes + // + _checkpointPeriod = properties.getPropertyAsIntWithDefault( + propertyPrefix + ".CheckpointPeriod", 10) * 60 * 1000; + + _kbyte = properties.getPropertyAsInt( + propertyPrefix + ".PeriodicCheckpointMinSize"); + + _autoDelete = (properties.getPropertyAsIntWithDefault( + propertyPrefix + ".OldLogsAutoDelete", 1) != 0); + + _thread = new Thread(this); + _thread.start(); + + _refCount = 1; + } + + private static String + errorPrefix(String envName) + { + return "DbEnv(\"" + envName + "\"): "; + } + + private static class MapKey + { + final String envName; + final Ice.Communicator communicator; + + MapKey(String envName, Ice.Communicator communicator) + { + this.envName = envName; + this.communicator = communicator; + } + + public boolean + equals(Object o) + { + try + { + MapKey k = (MapKey)o; + return (communicator == k.communicator) && envName.equals(k.envName); + } + catch(ClassCastException ex) + { + communicator.getLogger().trace("DB", "equals cast failed"); + return false; + } + } + + public int hashCode() + { + return envName.hashCode() ^ communicator.hashCode(); + } + } + + private MapKey _key; + private int _refCount = 0; + private boolean _done = false; + private int _trace = 0; + private long _checkpointPeriod = 0; + private int _kbyte = 0; + private boolean _autoDelete = false; + private Thread _thread; + + // + // Hash map of (MapKey, SharedDbEnv) + // + private static java.util.Map _map = new java.util.HashMap(); +} + diff --git a/java/src/Freeze/Util.java b/java/src/Freeze/Util.java index 35bda9949ce..a1f46c3ac90 100644 --- a/java/src/Freeze/Util.java +++ b/java/src/Freeze/Util.java @@ -16,16 +16,17 @@ package Freeze; public class Util { - public static DBEnvironment - initialize(Ice.Communicator communicator, String name) + + public static Evictor + createEvictor(Ice.Communicator communicator, String envName, String dbName, boolean createDb) { - return new DBEnvironmentI(communicator, name, false); - } + return new EvictorI(communicator, envName, dbName, createDb); + } - public static DBEnvironment - initializeWithTxn(Ice.Communicator communicator, String name) + public static Evictor + createEvictor(Ice.Communicator communicator, com.sleepycat.db.DbEnv dbEnv, String dbName, boolean createDb) { - return new DBEnvironmentI(communicator, name, true); - } + return new EvictorI(communicator, dbEnv, dbName, createDb); + } } diff --git a/java/src/Ice/PropertiesI.java b/java/src/Ice/PropertiesI.java index 14a6fc61fcb..6929a31924e 100644 --- a/java/src/Ice/PropertiesI.java +++ b/java/src/Ice/PropertiesI.java @@ -523,7 +523,8 @@ final class PropertiesI extends LocalObjectImpl implements Properties private static final String _freezeProps[] = { "Trace.DB", - "Trace.Evictor" + "Trace.Evictor", + "Evictor.*" }; private static final class ValidProps diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java index ef8715d3025..1a93a70df4b 100644 --- a/java/src/IceBox/ServiceManagerI.java +++ b/java/src/IceBox/ServiceManagerI.java @@ -286,7 +286,7 @@ public final class ServiceManagerI extends _ServiceManagerDisp // IceBox::Service // Service s = (Service)info.service; - info.dbEnv = null; + info.envName = null; s.start(service, communicator, serviceArgs); } catch(ClassCastException e) @@ -299,10 +299,9 @@ public final class ServiceManagerI extends _ServiceManagerDisp // FreezeService fs = (FreezeService)info.service; - info.dbEnv = Freeze.Util.initialize(communicator, - properties.getProperty("IceBox.DBEnvName." + service)); + info.envName = properties.getProperty("IceBox.DBEnvName." + service); - fs.start(service, communicator, serviceArgs, info.dbEnv); + fs.start(service, communicator, serviceArgs, info.envName); } _services.put(service, info); } @@ -351,22 +350,6 @@ public final class ServiceManagerI extends _ServiceManagerDisp pw.flush(); _logger.warning("ServiceManager: exception in stop for service " + name + "\n" + sw.toString()); } - - if(info.dbEnv != null) - { - try - { - info.dbEnv.sync(); - } - catch(Exception e) - { - java.io.StringWriter sw = new java.io.StringWriter(); - java.io.PrintWriter pw = new java.io.PrintWriter(sw); - e.printStackTrace(pw); - pw.flush(); - _logger.warning("ServiceManager: exception in stop for service " + name + "\n" + sw.toString()); - } - } } // @@ -397,22 +380,6 @@ public final class ServiceManagerI extends _ServiceManagerDisp _logger.warning("ServiceManager: exception in stop for service " + name + "\n" + sw.toString()); } } - - if(info.dbEnv != null) - { - try - { - info.dbEnv.close(); - } - catch(Exception e) - { - java.io.StringWriter sw = new java.io.StringWriter(); - java.io.PrintWriter pw = new java.io.PrintWriter(sw); - e.printStackTrace(pw); - pw.flush(); - _logger.warning("ServiceManager: exception in stop for service " + name + "\n" + sw.toString()); - } - } if(info.communicator != null) { @@ -438,12 +405,11 @@ public final class ServiceManagerI extends _ServiceManagerDisp { public ServiceBase service; public Ice.Communicator communicator = null; - Freeze.DBEnvironment dbEnv; + String envName; } private Ice.Application _server; private Ice.Logger _logger; private String[] _argv; // Filtered server argument vector private java.util.HashMap _services = new java.util.HashMap(); - private java.util.HashMap _dbEnvs = new java.util.HashMap(); } diff --git a/java/test/Freeze/build.xml b/java/test/Freeze/build.xml index 52539f330da..2447c1069d6 100644 --- a/java/test/Freeze/build.xml +++ b/java/test/Freeze/build.xml @@ -17,7 +17,7 @@ the Free Software Foundation. <ant dir="cursor"/> <ant dir="dbmap"/> <ant dir="complex"/> - <ant dir="evictor"/> + <ant dir="evictor"/> </target> <target name="clean"> diff --git a/java/test/Freeze/complex/Client.java b/java/test/Freeze/complex/Client.java index df34f1a40b2..7e1dd4a308e 100644 --- a/java/test/Freeze/complex/Client.java +++ b/java/test/Freeze/complex/Client.java @@ -27,11 +27,11 @@ public class Client } } - private static int - validate(DB db) + private int + validate(String dbName) throws DBException { - Complex.ComplexDict m = new Complex.ComplexDict(db); + Complex.ComplexDict m = new Complex.ComplexDict(_communicator, _envName, dbName, true); try { @@ -64,11 +64,13 @@ public class Client test(false); } + m.close(); + return 0; } - private static int - populate(DB db) + private int + populate(String dbName) throws DBException { String[] expressions = @@ -80,7 +82,7 @@ public class Client "10+(10+(20+(8*(2*(3*2+4+5+6)))))" }; - Complex.ComplexDict m = new Complex.ComplexDict(db); + Complex.ComplexDict m = new Complex.ComplexDict(_communicator, _envName, dbName, true); try { @@ -104,6 +106,7 @@ public class Client test(false); } + m.close(); return 0; } @@ -115,40 +118,45 @@ public class Client System.out.println("--dbdir Location of the database directory."); } - private static int - run(String[] args, DB db) + private int + run(String[] args, String dbName) throws DBException { // // Register a factory for the node types. // - Ice.Communicator communicator = db.getCommunicator(); Ice.ObjectFactory factory = new Complex.ObjectFactoryI(); - communicator.addObjectFactory(factory, "::Complex::NumberNode"); - communicator.addObjectFactory(factory, "::Complex::AddNode"); - communicator.addObjectFactory(factory, "::Complex::MultiplyNode"); + _communicator.addObjectFactory(factory, "::Complex::NumberNode"); + _communicator.addObjectFactory(factory, "::Complex::AddNode"); + _communicator.addObjectFactory(factory, "::Complex::MultiplyNode"); if(args.length != 0 && args[0].equals("populate")) { - return populate(db); + return populate(dbName); } if(args.length != 0 && args[0].equals("validate")) { - return validate(db); + return validate(dbName); } usage(progName); return 0; } + private + Client(Ice.Communicator communicator, String envName) + { + _communicator = communicator; + _envName = envName; + } + + static public void main(String[] args) { int status; Ice.Communicator communicator = null; - DBEnvironment dbEnv = null; - DB db = null; - String dbEnvDir = "db"; + String envName = "db"; try { @@ -166,9 +174,9 @@ public class Client System.exit(1); } - dbEnvDir = args[i+1]; - dbEnvDir += "/"; - dbEnvDir += "db"; + envName = args[i+1]; + envName += "/"; + envName += "db"; // // Consume arguments @@ -191,9 +199,8 @@ public class Client holder.value = args; communicator = Ice.Util.initialize(holder); args = holder.value; - dbEnv = Freeze.Util.initialize(communicator, dbEnvDir); - db = dbEnv.openDB("test", true); - status = run(args, db); + Client client = new Client(communicator, envName); + status = client.run(args, "test"); } catch(Exception ex) { @@ -202,44 +209,6 @@ public class Client status = 1; } - if(db != null) - { - try - { - db.close(); - } - catch(DBException ex) - { - System.err.println(progName + ": " + ex + ": " + ex.message); - status = 1; - } - dbEnv = null; - } - - if(dbEnv != null) - { - try - { - dbEnv.close(); - } - catch(DBException ex) - { - System.err.println(progName + ": " + ex + ": " + ex.message); - status = 1; - } - catch(Ice.LocalException ex) - { - System.err.println(progName + ": " + ex); - status = 1; - } - catch(Exception ex) - { - System.err.println(progName + ": unknown exception: " + ex); - status = 1; - } - dbEnv = null; - } - if(communicator != null) { try @@ -255,4 +224,8 @@ public class Client System.exit(status); } + + private Ice.Communicator _communicator; + private String _envName; + } diff --git a/java/test/Freeze/complex/build.xml b/java/test/Freeze/complex/build.xml index dfdc70193db..9b12eb59f1e 100644 --- a/java/test/Freeze/complex/build.xml +++ b/java/test/Freeze/complex/build.xml @@ -60,6 +60,10 @@ the Free Software Foundation. <target name="clean"> <delete dir="${class.dir}"/> <delete dir="${generated.dir}"/> + <delete> + <fileset dir="db" includes="log.*"/> + <fileset dir="db" includes="test"/> + </delete> </target> </project> diff --git a/java/test/Freeze/cursor/build.xml b/java/test/Freeze/cursor/build.xml index 55c69b2b8ad..a9b4e96eeb0 100644 --- a/java/test/Freeze/cursor/build.xml +++ b/java/test/Freeze/cursor/build.xml @@ -32,7 +32,8 @@ the Free Software Foundation. classpath="${lib.dir}" debug="${debug}"/> </target> - <target name="all" depends="compile"/> + + <target name="all"/> <target name="clean"> <delete dir="${class.dir}"/> diff --git a/java/test/Freeze/dbmap/Client.java b/java/test/Freeze/dbmap/Client.java index 86e617b5bee..ec206d47e2b 100644 --- a/java/test/Freeze/dbmap/Client.java +++ b/java/test/Freeze/dbmap/Client.java @@ -32,6 +32,7 @@ public class Client Object o = p.next(); test(entrySet.contains(o)); } + ((Freeze.Map.EntryIterator)p).close(); } } catch(Exception ex) @@ -71,7 +72,7 @@ public class Client } private static int - run(String[] args, java.util.Map m, DB db) + run(String[] args, java.util.Map m) throws DBException { // @@ -208,8 +209,6 @@ public class Client } } - ((Freeze.Map.EntryIterator)p).close(); - test(m.size() == 23); test(m.get(new Byte((byte)'b')) == null); test(m.get(new Byte((byte)'n')) == null); @@ -262,8 +261,6 @@ public class Client } } - ((Freeze.Map.EntryIterator)p).close(); - test(m.size() == 26); test(m.get(new Byte((byte)'b')) != null); test(m.get(new Byte((byte)'n')) != null); @@ -287,21 +284,6 @@ public class Client System.out.println("ok"); } - /** - * - * TODO: BENOIT: Re-enable this test. The stress test is disabled for now. It exposes - * many self dead locks. I believe this is caused by how we setup the database environment, - * i.e.: with all the flags to enable Berkeley DB Transactional support. However since we - * don't use transactions in the code this leads to deadlocks. If we specify DB_INIT_TXN we - * should use transactions (http://www.sleepycat.com/docs/ref/transapp/env_open.html). - * - * There's also some details at http://www.sleepycat.com/docs/ref/lock/notxn.html. - * - * Two solutions: - * - * - use transactions. - * - use BerkeleyDB Concurrent Data Store product instead. - * { System.out.print(" testing concurrent access... "); System.out.flush(); @@ -313,14 +295,7 @@ public class Client // for(int i = 0; i < 10; ++i) { - if(m instanceof ByteIntMapXML) - { - l.add(new StressThread(new ByteIntMapXML(db))); - } - else - { - l.add(new StressThread(new ByteIntMapBinary(db))); - } + l.add(new StressThread(m)); } // @@ -354,7 +329,6 @@ public class Client System.out.println("ok"); } - */ return 0; } @@ -364,9 +338,8 @@ public class Client { int status; Ice.Communicator communicator = null; - DBEnvironment dbEnv = null; - String dbEnvDir = "db"; - DB xmlDB = null, binaryDB = null; + String envName = "db"; + try { @@ -376,100 +349,37 @@ public class Client args = holder.value; if(args.length > 0) { - dbEnvDir = args[0]; - dbEnvDir += "/"; - dbEnvDir += "db"; + envName = args[0]; + envName += "/"; + envName += "db"; } - dbEnv = Freeze.Util.initialize(communicator, dbEnvDir); - xmlDB = dbEnv.openDB("xml", true); - ByteIntMapXML xml = new ByteIntMapXML(xmlDB); + + ByteIntMapXML xml = new ByteIntMapXML(communicator, envName, "xml", true); System.out.println("testing XML encoding..."); - status = run(args, xml, xmlDB); + status = run(args, xml); + xml.close(); if(status == 0) { - binaryDB = dbEnv.openDB("binary", true); - ByteIntMapBinary binary = new ByteIntMapBinary(binaryDB); + ByteIntMapBinary binary = new ByteIntMapBinary(communicator, envName, "binary", true); System.out.println("testing binary encoding..."); - status = run(args, binary, binaryDB); + status = run(args, binary); + binary.close(); } } - catch(Exception ex) + catch(DBException ex) { - ex.printStackTrace(); - System.err.println(ex); + System.err.println(args[0] + ": " + ex + ": " + ex.message); status = 1; } - - if(xmlDB != null) - { - try - { - xmlDB.close(); - } - catch(DBException ex) - { - System.err.println(args[0] + ": " + ex + ": " + ex.message); - status = 1; - } - catch(Ice.LocalException ex) - { - System.err.println(args[0] + ": " + ex); - status = 1; - } - catch(Exception ex) - { - System.err.println(args[0] + ": unknown exception: " + ex); - status = 1; - } - xmlDB = null; - } - - if(binaryDB != null) - { - try - { - binaryDB.close(); - } - catch(DBException ex) - { - System.err.println(args[0] + ": " + ex + ": " + ex.message); - status = 1; - } - catch(Ice.LocalException ex) - { - System.err.println(args[0] + ": " + ex); - status = 1; - } - catch(Exception ex) - { - System.err.println(args[0] + ": unknown exception: " + ex); - status = 1; - } - binaryDB = null; - } - - if(dbEnv != null) + catch(Ice.LocalException ex) { - try - { - dbEnv.close(); - } - catch(DBException ex) - { - System.err.println(args[0] + ": " + ex + ": " + ex.message); - status = 1; - } - catch(Ice.LocalException ex) - { - System.err.println(args[0] + ": " + ex); - status = 1; - } - catch(Exception ex) - { - System.err.println(args[0] + ": unknown exception: " + ex); - status = 1; - } - dbEnv = null; + System.err.println(args[0] + ": " + ex); + status = 1; + } + catch(Exception ex) + { + System.err.println(args[0] + ": unknown exception: " + ex); + status = 1; } if(communicator != null) diff --git a/java/test/Freeze/dbmap/build.xml b/java/test/Freeze/dbmap/build.xml index 5bafaa122aa..30cd47ceed7 100644 --- a/java/test/Freeze/dbmap/build.xml +++ b/java/test/Freeze/dbmap/build.xml @@ -54,6 +54,10 @@ the Free Software Foundation. <target name="clean"> <delete dir="${class.dir}"/> <delete dir="${generated.dir}"/> + <delete> + <fileset dir="db" includes="log.*"/> + <fileset dir="db" includes="binary,xml"/> + </delete> </target> </project> diff --git a/java/test/Freeze/evictor/Client.java b/java/test/Freeze/evictor/Client.java index b9613759063..f7f4434eb55 100644 --- a/java/test/Freeze/evictor/Client.java +++ b/java/test/Freeze/evictor/Client.java @@ -44,343 +44,165 @@ public class Client test(base != null); Test.RemoteEvictorFactoryPrx factory = Test.RemoteEvictorFactoryPrxHelper.checkedCast(base); - // - // Test EvictionStrategy - // - { - System.out.print("testing EvictionStrategy... "); - System.out.flush(); - - final int size = 5; - - Test.RemoteEvictorPrx evictor = factory.createEvictor("EvictionStrategy", Test.Strategy.Eviction); - evictor.setSize(size); - - // - // Create the same number of servants as the evictor size - // (i.e., don't exceed queue size). Servants should be - // saved immediately. - // - Test.ServantPrx[] servants = new Test.ServantPrx[size]; - for(int i = 0; i < size; i++) - { - servants[i] = evictor.createServant(i, i); - test(evictor.getLastSavedValue() == i); - } - - // - // Evict and verify values. - // - evictor.setSize(0); - evictor.setSize(size); - evictor.clearLastSavedValue(); - for(int i = 0; i < size; i++) - { - test(servants[i].getValue() == i); - } - - // - // Mutate servants. - // - for(int i = 0; i < size; i++) - { + + System.out.print("testing Freeze Evictor... "); + System.out.flush(); + + final int size = 5; + + Test.RemoteEvictorPrx evictor = factory.createEvictor("Test"); + evictor.setSize(size); + + // + // Create some servants and verify they did not get saved + // + Test.ServantPrx[] servants = new Test.ServantPrx[size]; + for(int i = 0; i < size; i++) + { + servants[i] = evictor.createServant(i, i); + test(evictor.getLastSavedValue() == -1); + } + + // + // Save and verify + // + evictor.saveNow(); + test(evictor.getLastSavedValue() == size - 1); + + // + // Evict and verify values. + // + evictor.setSize(0); + evictor.setSize(size); + evictor.clearLastSavedValue(); + for(int i = 0; i < size; i++) + { + test(servants[i].getValue() == i); + } + + // + // Mutate servants. + // + for(int i = 0; i < size; i++) + { servants[i].setValue(i + 100); - } - - // - // Servants should not be saved yet. - // - test(evictor.getLastSavedValue() == -1); - for(int i = 0; i < size; i++) - { - test(servants[i].getValue() == i + 100); - } - - // - // Evict and verify values. - // - evictor.setSize(0); - evictor.setSize(size); - for(int i = 0; i < size; i++) - { - test(servants[i].getValue() == i + 100); - } - - // - // Destroy servants and verify ObjectNotExistException. - // - for(int i = 0; i < size; i++) - { - servants[i].destroy(); - try - { - servants[i].getValue(); - test(false); - } - catch(Ice.ObjectNotExistException ex) - { - // Expected - } - } - - // - // Allocate space for size+1 servants. - // - servants = new Test.ServantPrx[size + 1]; - - // - // Recreate servants. - // - for(int i = 0; i < size; i++) - { - servants[i] = evictor.createServant(i, i); - } - - // - // Deactivate and recreate evictor, to ensure that servants - // are restored properly after database close and reopen. - // - evictor.deactivate(); - evictor = factory.createEvictor("EvictionStrategy", Test.Strategy.Eviction); - evictor.setSize(size); - for(int i = 0; i < size; i++) - { - servants[i] = evictor.getServant(i); - test(servants[i].getValue() == i); - } - - // - // No servants should have been evicted yet. - // - test(evictor.getLastEvictedValue() == -1); - - // - // Create new servant - should cause eviction. - // - servants[size] = evictor.createServant(size, size); - test(evictor.getLastEvictedValue() == 0); - - // - // Restore the evicted servant, which evicts another - // servant, and so on. - // - for(int i = 0; i <= size; i++) - { - test(servants[i].getValue() == i); - test(evictor.getLastEvictedValue() == (i + 1) % (size + 1)); - } - - // - // Destroy new servant and verify eviction no longer occurs. - // - servants[size].destroy(); - evictor.clearLastEvictedValue(); - for(int i = 0; i < size; i++) - { - test(servants[i].getValue() == i); - } - test(evictor.getLastEvictedValue() == -1); + } + + // + // Servants should not be saved yet. + // + test(evictor.getLastSavedValue() == -1); + for(int i = 0; i < size; i++) + { + test(servants[i].getValue() == i + 100); + } + + evictor.saveNow(); + + // + // Test saving while busy + // + + AMI_Servant_setValueAsyncI setCB = new AMI_Servant_setValueAsyncI(); + for(int i = 0; i < size; i++) + { + evictor.clearLastSavedValue(); + // + // Start a mutating operation so that the object is not idle. + // + servants[i].setValueAsync_async(setCB, i + 300); - // - // Test explicit saves // - for(int i = 0; i < size; i++) + // Wait for setValueAsync to be dispatched. + // + try { - servants[i].saveValue(i + 1); - test(evictor.getLastSavedValue() == i + 1); + Thread.sleep(100); } + catch(InterruptedException ex) + { + } + // + // Object should not have been modified or saved yet. + // + test(servants[i].getValue() == i + 100); + test(evictor.getLastSavedValue() == -1); + // + // This operation modifies the object state but is not saved + // because the setValueAsync operation is still pending. + // + servants[i].setValue(i + 200); + test(servants[i].getValue() == i + 200); + test(evictor.getLastSavedValue() == -1); + + evictor.saveNow(); + test(evictor.getLastSavedValue() == i + 200); - // - // Clean up. - // - for(int i = 0; i < size; i++) - { - servants[i].destroy(); - } - - evictor.deactivate(); - System.out.println("ok"); - } - - // - // Test IdleStrategy - // - { - System.out.print("testing IdleStrategy... "); - System.out.flush(); - - final int size = 5; - - Test.RemoteEvictorPrx evictor = factory.createEvictor("IdleStrategy", Test.Strategy.Idle); - evictor.setSize(size); - - // - // Create the same number of servants as the evictor size - // (i.e., don't exceed queue size). Servants should be - // saved immediately. - // - Test.ServantPrx[] servants = new Test.ServantPrx[size]; - for(int i = 0; i < size; i++) - { - servants[i] = evictor.createServant(i, i); - test(evictor.getLastSavedValue() == i); - } - - // - // Evict and verify values. - // - evictor.setSize(0); - evictor.setSize(size); - for(int i = 0; i < size; i++) - { - test(servants[i].getValue() == i); - } - - // - // Mutate servants and verify they have been saved. - // - for(int i = 0; i < size; i++) - { - servants[i].setValue(i + 100); - test(evictor.getLastSavedValue() == i + 100); - } - - // - // Evict and verify values. - // - evictor.setSize(0); - evictor.setSize(size); - for(int i = 0; i < size; i++) - { - test(servants[i].getValue() == i + 100); - } - - // - // No servants should have been saved yet. - // - test(evictor.getLastSavedValue() == -1); - - // - // Test idle behavior. - // - AMI_Servant_setValueAsyncI setCB = new AMI_Servant_setValueAsyncI(); - for(int i = 0; i < size; i++) - { - // - // Start a mutating operation so that the object is not idle. - // - servants[i].setValueAsync_async(setCB, i + 300); - // - // Wait for setValueAsync to be dispatched. - // - try - { - Thread.sleep(100); - } - catch(InterruptedException ex) - { - } - // - // Object should not have been modified or saved yet. - // - test(servants[i].getValue() == i + 100); - test(evictor.getLastSavedValue() == -1); - // - // This operation modifies the object state but is not saved - // because the setValueAsync operation is still pending. - // - servants[i].setValue(i + 200); - test(servants[i].getValue() == i + 200); - test(evictor.getLastSavedValue() == -1); - // - // Force the response to setValueAsync, which should cause - // the object to be saved. - // - servants[i].releaseAsync(); - test(servants[i].getValue() == i + 300); - test(evictor.getLastSavedValue() == i + 300); - } - - // - // Destroy servants and verify ObjectNotExistException. - // - for(int i = 0; i < size; i++) - { - servants[i].destroy(); - try - { - servants[i].getValue(); - test(false); - } - catch(Ice.ObjectNotExistException ex) - { - // Expected - } - } - - // - // Allocate space for size+1 servants. - // - servants = new Test.ServantPrx[size + 1]; - - // - // Recreate servants. - // - for(int i = 0; i < size; i++) - { - servants[i] = evictor.createServant(i, i); - } - - // - // Deactivate and recreate evictor, to ensure that servants - // are restored properly after database close and reopen. - // - evictor.deactivate(); - evictor = factory.createEvictor("IdleStrategy", Test.Strategy.Idle); - evictor.setSize(size); - for(int i = 0; i < size; i++) - { - servants[i] = evictor.getServant(i); - test(servants[i].getValue() == i); - } - - // - // No servants should have been saved yet. - // - test(evictor.getLastSavedValue() == -1); - - // - // Create new servant - should cause eviction but no - // servants should be saved. - // - servants[size] = evictor.createServant(size, size); - test(evictor.getLastSavedValue() == size); - test(evictor.getLastEvictedValue() != -1); - - // - // Restore the evicted servant, which evicts another - // servant, and so on. - // - for(int i = 0; i <= size; i++) - { - test(servants[i].getValue() == i); - test(evictor.getLastEvictedValue() == (i + 1) % (size + 1)); - } - test(evictor.getLastSavedValue() == -1); - - // - // Clean up. - // - for(int i = 0; i <= size; i++) - { - servants[i].destroy(); - } - - evictor.deactivate(); - System.out.println("ok"); - } - + // + // Force the response to setValueAsync + // + servants[i].releaseAsync(); + test(servants[i].getValue() == i + 300); + test(evictor.getLastSavedValue() == i + 200); + evictor.saveNow(); + test(evictor.getLastSavedValue() == i + 300); + } + + // + // Destroy servants and verify ObjectNotExistException. + // + for(int i = 0; i < size; i++) + { + servants[i].destroy(); + try + { + servants[i].getValue(); + test(false); + } + catch(Ice.ObjectNotExistException ex) + { + // Expected + } + } + + // + // Allocate space for size+1 servants. + // + servants = new Test.ServantPrx[size + 1]; + + // + // Recreate servants. + // + for(int i = 0; i < size; i++) + { + servants[i] = evictor.createServant(i, i); + } + + // + // Deactivate and recreate evictor, to ensure that servants + // are restored properly after database close and reopen. + // + evictor.deactivate(); + evictor = factory.createEvictor("Test"); + evictor.setSize(size); + for(int i = 0; i < size; i++) + { + servants[i] = evictor.getServant(i); + test(servants[i].getValue() == i); + } + + // + // Clean up. + // + for(int i = 0; i < size; i++) + { + servants[i].destroy(); + } + + evictor.deactivate(); + System.out.println("ok"); + factory.shutdown(); return 0; diff --git a/java/test/Freeze/evictor/RemoteEvictorFactoryI.java b/java/test/Freeze/evictor/RemoteEvictorFactoryI.java index e8d9bc3abd3..7917a776146 100644 --- a/java/test/Freeze/evictor/RemoteEvictorFactoryI.java +++ b/java/test/Freeze/evictor/RemoteEvictorFactoryI.java @@ -14,10 +14,10 @@ public final class RemoteEvictorFactoryI extends Test._RemoteEvictorFactoryDisp { - RemoteEvictorFactoryI(Ice.ObjectAdapter adapter, Freeze.DBEnvironment dbEnv) + RemoteEvictorFactoryI(Ice.ObjectAdapter adapter, String envName) { _adapter = adapter; - _dbEnv = dbEnv; + _envName = envName; } static class Initializer extends Ice.LocalObjectImpl implements Freeze.ServantInitializer @@ -40,23 +40,11 @@ public final class RemoteEvictorFactoryI extends Test._RemoteEvictorFactoryDisp } public Test.RemoteEvictorPrx - createEvictor(String name, Test.Strategy s, Ice.Current current) + createEvictor(String name, Ice.Current current) { - Freeze.DB db = _dbEnv.openDB(name, true); + Freeze.Evictor evictor = Freeze.Util.createEvictor(_adapter.getCommunicator(), _envName, name, true); - Freeze.PersistenceStrategy delegate; - if(s == Test.Strategy.Eviction) - { - delegate = db.createEvictionStrategy(); - } - else - { - delegate = db.createIdleStrategy(); - } - StrategyI strategy = new StrategyI(delegate); - Freeze.Evictor evictor = db.createEvictor(strategy); - - RemoteEvictorI remoteEvictor = new RemoteEvictorI(_adapter, name, db, strategy, evictor); + RemoteEvictorI remoteEvictor = new RemoteEvictorI(_adapter, name, evictor); evictor.installServantInitializer(new Initializer(remoteEvictor, evictor)); return Test.RemoteEvictorPrxHelper.uncheckedCast(_adapter.add(remoteEvictor, Ice.Util.stringToIdentity(name))); } @@ -64,9 +52,9 @@ public final class RemoteEvictorFactoryI extends Test._RemoteEvictorFactoryDisp public void shutdown(Ice.Current current) { - _dbEnv.getCommunicator().shutdown(); + _adapter.getCommunicator().shutdown(); } private Ice.ObjectAdapter _adapter; - private Freeze.DBEnvironment _dbEnv; + private String _envName; } diff --git a/java/test/Freeze/evictor/RemoteEvictorI.java b/java/test/Freeze/evictor/RemoteEvictorI.java index 67a88df28e4..72264d54f37 100644 --- a/java/test/Freeze/evictor/RemoteEvictorI.java +++ b/java/test/Freeze/evictor/RemoteEvictorI.java @@ -14,12 +14,10 @@ public final class RemoteEvictorI extends Test._RemoteEvictorDisp { - RemoteEvictorI(Ice.ObjectAdapter adapter, String category, Freeze.DB db, StrategyI strategy, Freeze.Evictor evictor) + RemoteEvictorI(Ice.ObjectAdapter adapter, String category, Freeze.Evictor evictor) { _adapter = adapter; _category = category; - _db = db; - _strategy = strategy; _evictor = evictor; Ice.Communicator communicator = adapter.getCommunicator(); _evictorAdapter = communicator.createObjectAdapterWithEndpoints(Ice.Util.generateUUID(), "default"); @@ -58,7 +56,6 @@ public final class RemoteEvictorI extends Test._RemoteEvictorDisp getLastSavedValue(Ice.Current current) { int result = _lastSavedValue; - _lastSavedValue = -1; return result; } @@ -68,16 +65,10 @@ public final class RemoteEvictorI extends Test._RemoteEvictorDisp _lastSavedValue = -1; } - public int - getLastEvictedValue(Ice.Current current) - { - return _strategy.getLastEvictedValue(); - } - - public void - clearLastEvictedValue(Ice.Current current) + public + void saveNow(Ice.Current current) { - _strategy.clearLastEvictedValue(); + _evictor.saveNow(); } public void @@ -86,7 +77,6 @@ public final class RemoteEvictorI extends Test._RemoteEvictorDisp _evictorAdapter.deactivate(); _evictorAdapter.waitForDeactivate(); _adapter.remove(Ice.Util.stringToIdentity(_category)); - _db.close(); } void @@ -97,8 +87,6 @@ public final class RemoteEvictorI extends Test._RemoteEvictorDisp private Ice.ObjectAdapter _adapter; private String _category; - private Freeze.DB _db; - private StrategyI _strategy; private Freeze.Evictor _evictor; private Ice.ObjectAdapter _evictorAdapter; private int _lastSavedValue; diff --git a/java/test/Freeze/evictor/ServantI.java b/java/test/Freeze/evictor/ServantI.java index 44d3d84b9d5..80bd32120bd 100644 --- a/java/test/Freeze/evictor/ServantI.java +++ b/java/test/Freeze/evictor/ServantI.java @@ -51,13 +51,6 @@ public final class ServantI extends Test.Servant } public void - saveValue(int value, Ice.Current current) - { - this.value = value; - _evictor.saveObject(current.id); - } - - public void setValueAsync_async(Test.AMD_Servant_setValueAsync __cb, int value, Ice.Current current) { _setValueAsyncCB = __cb; diff --git a/java/test/Freeze/evictor/Server.java b/java/test/Freeze/evictor/Server.java index e38f6a6b18c..c1c29fa088f 100644 --- a/java/test/Freeze/evictor/Server.java +++ b/java/test/Freeze/evictor/Server.java @@ -30,13 +30,13 @@ public class Server } static int - run(String[] args, Ice.Communicator communicator, Freeze.DBEnvironment dbEnv) + run(String[] args, Ice.Communicator communicator, String envName) { communicator.getProperties().setProperty("Evictor.Endpoints", "default -p 12345 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("Evictor"); - RemoteEvictorFactoryI factory = new RemoteEvictorFactoryI(adapter, dbEnv); + RemoteEvictorFactoryI factory = new RemoteEvictorFactoryI(adapter, envName); adapter.add(factory, Ice.Util.stringToIdentity("factory")); Ice.ObjectFactory servantFactory = new ServantFactory(); @@ -54,8 +54,7 @@ public class Server { int status = 0; Ice.Communicator communicator = null; - Freeze.DBEnvironment dbEnv = null; - String dbEnvDir = "db"; + String envName = "db"; try { @@ -65,12 +64,10 @@ public class Server args = holder.value; if(args.length > 0) { - dbEnvDir = args[0]; - dbEnvDir += "/"; - dbEnvDir += "db"; + envName = args[0]; + envName += "/db"; } - dbEnv = Freeze.Util.initialize(communicator, dbEnvDir); - status = run(args, communicator, dbEnv); + status = run(args, communicator, envName); } catch(Ice.LocalException ex) { @@ -78,11 +75,6 @@ public class Server status = 1; } - if(dbEnv != null) - { - dbEnv.close(); - } - if(communicator != null) { try diff --git a/java/test/Freeze/evictor/StrategyI.java b/java/test/Freeze/evictor/StrategyI.java deleted file mode 100644 index 3083d1fc33a..00000000000 --- a/java/test/Freeze/evictor/StrategyI.java +++ /dev/null @@ -1,86 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003 -// ZeroC, Inc. -// Billerica, MA, USA -// -// All Rights Reserved. -// -// Ice is free software; you can redistribute it and/or modify it under -// the terms of the GNU General Public License version 2 as published by -// the Free Software Foundation. -// -// ********************************************************************** - -public final class StrategyI extends Ice.LocalObjectImpl implements Freeze.PersistenceStrategy -{ - public - StrategyI(Freeze.PersistenceStrategy delegate) - { - _delegate = delegate; - } - - public Ice.LocalObject - activatedObject(Ice.Identity ident, Ice.Object servant) - { - return _delegate.activatedObject(ident, servant); - } - - public void - destroyedObject(Ice.Identity ident, Ice.LocalObject cookie) - { - _delegate.destroyedObject(ident, cookie); - } - - public void - evictedObject(Freeze.ObjectStore store, Ice.Identity ident, Ice.Object servant, Ice.LocalObject cookie) - { - Test.Servant s = (Test.Servant)servant; - _lastEvictedValue = s.getValue(null); - - _delegate.evictedObject(store, ident, servant, cookie); - } - - public void - savedObject(Freeze.ObjectStore store, Ice.Identity ident, Ice.Object servant, Ice.LocalObject cookie, int usageCount) - { - _delegate.savedObject(store, ident, servant, cookie, usageCount); - } - - public void - preOperation(Freeze.ObjectStore store, Ice.Identity ident, Ice.Object servant, boolean mutating, - Ice.LocalObject cookie) - { - _delegate.preOperation(store, ident, servant, mutating, cookie); - } - - public void - postOperation(Freeze.ObjectStore store, Ice.Identity ident, Ice.Object servant, boolean mutating, - Ice.LocalObject cookie) - { - _delegate.postOperation(store, ident, servant, mutating, cookie); - } - - public void - destroy() - { - _delegate.destroy(); - } - - int - getLastEvictedValue() - { - int result = _lastEvictedValue; - _lastEvictedValue = -1; - return result; - } - - void - clearLastEvictedValue() - { - _lastEvictedValue = -1; - } - - private Freeze.PersistenceStrategy _delegate; - private int _lastEvictedValue = -1; -} diff --git a/java/test/Freeze/evictor/Test.ice b/java/test/Freeze/evictor/Test.ice index 4850f02fec0..e7ba8d797e6 100644 --- a/java/test/Freeze/evictor/Test.ice +++ b/java/test/Freeze/evictor/Test.ice @@ -21,12 +21,9 @@ module Test class Servant { nonmutating int getValue(); - void setValue(int value); - ["ami", "amd"] void setValueAsync(int value); - - void saveValue(int value); + ["ami", "amd"] void setValueAsync(int value); nonmutating void releaseAsync(); void destroy(); @@ -41,20 +38,13 @@ interface RemoteEvictor Servant* getServant(int id); nonmutating int getLastSavedValue(); void clearLastSavedValue(); - nonmutating int getLastEvictedValue(); - void clearLastEvictedValue(); + void saveNow(); void deactivate(); }; -enum Strategy -{ - Eviction, - Idle -}; - interface RemoteEvictorFactory { - RemoteEvictor* createEvictor(string name, Strategy s); + RemoteEvictor* createEvictor(string name); void shutdown(); }; diff --git a/java/test/Freeze/evictor/build.xml b/java/test/Freeze/evictor/build.xml index 5bfe855c4a7..bd0717fc53c 100644 --- a/java/test/Freeze/evictor/build.xml +++ b/java/test/Freeze/evictor/build.xml @@ -52,6 +52,10 @@ the Free Software Foundation. <target name="clean"> <delete dir="${generated.dir}"/> <delete dir="${class.dir}"/> + <delete> + <fileset dir="db" includes="log.*"/> + <fileset dir="db" includes="Test"/> + </delete> </target> </project> diff --git a/java/test/Freeze/evictor/config b/java/test/Freeze/evictor/config new file mode 100644 index 00000000000..f00c7ebae94 --- /dev/null +++ b/java/test/Freeze/evictor/config @@ -0,0 +1,10 @@ +# +# Disable automatic saves +# +Freeze.Evictor.db.Test.SaveSizeTrigger=-1 +Freeze.Evictor.db.Test.SavePeriod=0 +Freeze.Trace.DB=1 +Freeze.Trace.Evictor=1 + + + diff --git a/java/test/Freeze/evictor/run.py b/java/test/Freeze/evictor/run.py index dad7059a4e2..1a04746f4ae 100755 --- a/java/test/Freeze/evictor/run.py +++ b/java/test/Freeze/evictor/run.py @@ -29,8 +29,10 @@ name = os.path.join("Freeze", "evictor") testdir = os.path.join(toplevel, "test", name) os.environ["CLASSPATH"] = os.path.join(testdir, "classes") + TestUtil.sep + os.getenv("CLASSPATH", "") +testOptions = " --Ice.Config=" + testdir + "/config "; + dbdir = os.path.join(testdir, "db") TestUtil.cleanDbDir(dbdir) -TestUtil.clientServerTestWithOptions(" " + testdir, "") +TestUtil.clientServerTestWithOptions(" " + testdir, testOptions) sys.exit(0) diff --git a/java/test/IcePack/deployer/FreezeService.java b/java/test/IcePack/deployer/FreezeService.java index 658a19dbf40..2d61fc06a36 100644 --- a/java/test/IcePack/deployer/FreezeService.java +++ b/java/test/IcePack/deployer/FreezeService.java @@ -15,11 +15,9 @@ public class FreezeService extends Ice.LocalObjectImpl implements IceBox.FreezeService { public void - start(String name, Ice.Communicator communicator, String[] args, Freeze.DBEnvironment dbEnv) + start(String name, Ice.Communicator communicator, String[] args, String envName) throws IceBox.FailureException { - Freeze.DB db = dbEnv.openDB("testdb", true); - Ice.Properties properties = communicator.getProperties(); Ice.ObjectAdapter adapter = communicator.createObjectAdapter(name); diff --git a/java/test/IcePack/deployer/build.xml b/java/test/IcePack/deployer/build.xml index b8e5c337f26..51828a3840a 100644 --- a/java/test/IcePack/deployer/build.xml +++ b/java/test/IcePack/deployer/build.xml @@ -52,6 +52,12 @@ the Free Software Foundation. <target name="clean"> <delete dir="${generated.dir}"/> <delete dir="${class.dir}"/> + <delete> + <fileset dir="db/node/db" includes="log.*"/> + <fileset dir="db/node/db" includes="serveradapters,servers"/> + <fileset dir="db/registry" includes="log.*"/> + <fileset dir="db/registry" includes="adapter,adapterregistry,noderegistry,objectregistry,objectregistry-types,serverregistry"/> + </delete> </target> </project> diff --git a/java/test/IcePack/simple/build.xml b/java/test/IcePack/simple/build.xml index 8005dcf78fb..1a6485244b1 100644 --- a/java/test/IcePack/simple/build.xml +++ b/java/test/IcePack/simple/build.xml @@ -52,6 +52,12 @@ the Free Software Foundation. <target name="clean"> <delete dir="${generated.dir}"/> <delete dir="${class.dir}"/> + <delete> + <fileset dir="db/node/db" includes="log.*"/> + <fileset dir="db/node/db" includes="serveradapters,servers"/> + <fileset dir="db/registry" includes="log.*"/> + <fileset dir="db/registry" includes="adapter,adapterregistry,noderegistry,objectregistry,objectregistry-types,serverregistry"/> + </delete> </target> </project> |