More Freeze tracing

6 files changed, 50 insertions, 23 deletions

diff --git a/java/demo/Freeze/phonebook/Collocated.java b/java/demo/Freeze/phonebook/Collocated.java
index 5289e4b68d0..78207aaf399 100644
--- a/java/demo/Freeze/phonebook/Collocated.java
+++ b/java/demo/Freeze/phonebook/Collocated.java
@@ -20,6 +20,12 @@ class PhoneBookCollocated extends Ice.Application
 	Ice.Properties properties = communicator().getProperties();
     
 	//
+	// Create and install a factory and initializer for contacts.
+	//
+	ContactFactory contactFactory = new ContactFactory();
+	communicator().addObjectFactory(contactFactory, "::Contact");
+
+	//
 	// Create the Name index
 	//
 	NameIndex index = new NameIndex("name");
@@ -35,7 +41,12 @@ class PhoneBookCollocated extends Ice.Application
 	{
 	    evictor.setSize(evictorSize);
 	}
-    
+
+	//
+	// Set the evictor in the contact factory
+	//
+	contactFactory.setEvictor(evictor);
+
 	//
 	// Create an Object Adapter, use the Evictor as Servant
 	// Locator.
@@ -46,16 +57,10 @@ class PhoneBookCollocated extends Ice.Application
 	//
 	// Create the phonebook, and add it to the Object Adapter.
 	//
-	PhoneBookI phoneBook = new PhoneBookI(evictor, index);
+	PhoneBookI phoneBook = new PhoneBookI(evictor, contactFactory, index);
 	adapter.add(phoneBook, Ice.Util.stringToIdentity("phonebook"));
     
 	//
-	// Create and install a factory and initializer for contacts.
-	//
-	Ice.ObjectFactory contactFactory = new ContactFactory(evictor);
-	communicator().addObjectFactory(contactFactory, "::Contact");
-    
-	//
 	// Everything ok, let's go.
 	//
 	int status = RunParser.runParser(appName(), args, communicator());
diff --git a/java/demo/Freeze/phonebook/ContactFactory.java b/java/demo/Freeze/phonebook/ContactFactory.java
index bce1212441a..e00b0427ce9 100644
--- a/java/demo/Freeze/phonebook/ContactFactory.java
+++ b/java/demo/Freeze/phonebook/ContactFactory.java
@@ -18,7 +18,7 @@ class ContactFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory
     create(String type)
     {
 	assert(type.equals("::Contact"));
-	return new ContactI(_evictor);
+	return new ContactI(this);
     }
 
     public void
@@ -26,10 +26,21 @@ class ContactFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory
     {
     }
 
-    ContactFactory(Freeze.Evictor evictor)
+    ContactFactory()
+    {
+    }
+
+    void
+    setEvictor(Freeze.Evictor evictor)
     {
 	_evictor = evictor;
     }
 
+    Freeze.Evictor
+    getEvictor()
+    {
+	return _evictor;
+    }
+
     private Freeze.Evictor _evictor;
 }
diff --git a/java/demo/Freeze/phonebook/ContactI.java b/java/demo/Freeze/phonebook/ContactI.java
index 748b251a35e..c1df512dc46 100644
--- a/java/demo/Freeze/phonebook/ContactI.java
+++ b/java/demo/Freeze/phonebook/ContactI.java
@@ -62,7 +62,7 @@ class ContactI extends Contact
     {
 	try
 	{
-	    _evictor.destroyObject(current.id);
+	    _factory.getEvictor().destroyObject(current.id);
 	}
 	catch(Freeze.DatabaseException ex)
 	{
@@ -72,9 +72,9 @@ class ContactI extends Contact
 	}
     }
 
-    ContactI(Freeze.Evictor evictor)
+    ContactI(ContactFactory factory)
     {
-	_evictor = evictor;
+	_factory = factory;
 	//
 	// It's possible to avoid this if there were two constructors
 	// - one for original creation of the Contact and one for
@@ -85,6 +85,6 @@ class ContactI extends Contact
 	phone = new String();
     }
 
-    private Freeze.Evictor _evictor;
+    private ContactFactory _factory;
  
 }
diff --git a/java/demo/Freeze/phonebook/PhoneBookI.java b/java/demo/Freeze/phonebook/PhoneBookI.java
index 3ca5e916ebd..b5e79bc4d41 100644
--- a/java/demo/Freeze/phonebook/PhoneBookI.java
+++ b/java/demo/Freeze/phonebook/PhoneBookI.java
@@ -28,7 +28,7 @@ class PhoneBookI extends _PhoneBookDisp
 	//
 	// Create a new Contact Servant.
 	//
-	ContactI contact = new ContactI(_evictor);
+	ContactI contact = new ContactI(_contactFactory);
     
 	//
 	// Create a new Ice Object in the evictor, using the new
@@ -79,12 +79,15 @@ class PhoneBookI extends _PhoneBookDisp
 	current.adapter.getCommunicator().shutdown();
     }
 
-    PhoneBookI(Freeze.Evictor evictor, NameIndex index)
+    PhoneBookI(Freeze.Evictor evictor, ContactFactory contactFactory, 
+	       NameIndex index)
     {
 	_evictor = evictor;
+	_contactFactory = contactFactory;
 	_index = index;
     }
     
     private Freeze.Evictor _evictor;
+    private ContactFactory _contactFactory;
     private NameIndex _index;
 }
diff --git a/java/demo/Freeze/phonebook/Server.java b/java/demo/Freeze/phonebook/Server.java
index bb105f4a0d3..b8658a87726 100644
--- a/java/demo/Freeze/phonebook/Server.java
+++ b/java/demo/Freeze/phonebook/Server.java
@@ -20,12 +20,19 @@ class PhoneBookServer extends Ice.Application
 	Ice.Properties properties = communicator().getProperties();
 
 	//
+	// Create and install a factory and initializer for contacts.
+	//
+	ContactFactory contactFactory = new ContactFactory();
+	communicator().addObjectFactory(contactFactory, "::Contact");
+
+	//
 	// Create the name index.
 	//
 	NameIndex index = new NameIndex("name");
 	Freeze.Index[] indices = new Freeze.Index[1];
 	indices[0] = index;
 
+
 	//
 	// Create an evictor for contacts.
 	//
@@ -37,6 +44,11 @@ class PhoneBookServer extends Ice.Application
 	}
     
 	//
+	// Set the evictor in the contact factory
+	//
+	contactFactory.setEvictor(evictor);
+
+	//
 	// Create an object adapter, use the evictor as servant
 	// locator.
 	//
@@ -46,14 +58,9 @@ class PhoneBookServer extends Ice.Application
 	//
 	// Create the phonebook, and add it to the object adapter.
 	//
-	PhoneBookI phoneBook = new PhoneBookI(evictor, index);
+	PhoneBookI phoneBook = new PhoneBookI(evictor, contactFactory, index);
 	adapter.add(phoneBook, Ice.Util.stringToIdentity("phonebook"));
     
-	//
-	// Create and install a factory and initializer for contacts.
-	//
-	Ice.ObjectFactory contactFactory = new ContactFactory(evictor);
-	communicator().addObjectFactory(contactFactory, "::Contact");
     
 	//
 	// Everything ok, let's go.
diff --git a/java/demo/Freeze/phonebook/config b/java/demo/Freeze/phonebook/config
index 6ee576770f4..dbb26ef2901 100644
--- a/java/demo/Freeze/phonebook/config
+++ b/java/demo/Freeze/phonebook/config
@@ -2,9 +2,10 @@ Ice.Warn.Connections=1
 #Ice.Trace.Network=3
 #Ice.Trace.Protocol=1
 
-#Freeze.Trace.Evictor=1
+Freeze.Trace.Evictor=1
 Freeze.Trace.DbEnv=1
 Freeze.Evictor.db.contacts.SavePeriod=10000
+Freeze.Evictor.db.contacts.PopulateEmptyIndices=1
 
 PhoneBook.Endpoints=default -p 10000
 PhoneBook.Proxy=phonebook:default -p 10000