Author: toad
Date: 2008-05-22 22:36:14 +0000 (Thu, 22 May 2008)
New Revision: 20049
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
branches/db4o/freenet/src/freenet/node/Node.java
Log:
Not client/server, just one ObjectContainer
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
2008-05-22 22:10:15 UTC (rev 20048)
+++ branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
2008-05-22 22:36:14 UTC (rev 20049)
@@ -101,7 +101,7 @@
private String choosenPriorityScheduler;
public ClientRequestScheduler(boolean forInserts, boolean forSSKs,
RandomSource random, RequestStarter starter, Node node, NodeClientCore core,
SubConfig sc, String name) {
- this.selectorContainer = node.dbServer.openClient();
+ this.selectorContainer = node.db;
schedCore = ClientRequestSchedulerCore.create(node, forInserts,
forSSKs, selectorContainer, COOLDOWN_PERIOD);
schedTransient = new ClientRequestSchedulerNonPersistent(this);
persistentCooldownQueue = schedCore.persistentCooldownQueue;
Modified: branches/db4o/freenet/src/freenet/node/Node.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/Node.java 2008-05-22 22:10:15 UTC
(rev 20048)
+++ branches/db4o/freenet/src/freenet/node/Node.java 2008-05-22 22:36:14 UTC
(rev 20049)
@@ -229,7 +229,7 @@
* This is an internal server, specific parts of the code can create
* ObjectContainer's from it. Be careful to refresh objects on any
* long-lived container! */
- public final ObjectServer dbServer;
+ public final ObjectContainer db;
/** A fixed random number which identifies the top-level objects
belonging to
* this node, as opposed to any others that might be stored in the same
database
* (e.g. because of many-nodes-in-one-VM). */
@@ -718,7 +718,7 @@
/* FIXME: this may throw if e.g. we ran out of disk space last
time.
* We need to back it up and auto-recover. */
/* Client-server mode. Refresh objects if you have a long-lived
container! */
- dbServer = Db4o.openServer(new File(nodeDir,
"node.db4o").toString(), 0);
+ db = Db4o.openFile(new File(nodeDir, "node.db4o").toString());
System.err.println("Opened database");
@@ -894,12 +894,9 @@
darknetCrypto = new NodeCrypto(this, false, darknetConfig,
startupTime, enableARKs);
- ObjectContainer setupContainer = dbServer.openClient();
+ nodeDBHandle = darknetCrypto.getNodeHandle(db);
- nodeDBHandle = darknetCrypto.getNodeHandle(setupContainer);
-
- setupContainer.commit();
- setupContainer = null; // Don't reuse.
+ db.commit();
// Must be created after darknetCrypto
dnsr = new DNSRequester(this);
@@ -928,7 +925,7 @@
shutdownHook.addLateJob(new Thread() {
public void run() {
- dbServer.close();
+ db.close();
}
});
