Author: toad
Date: 2008-06-26 00:29:07 +0000 (Thu, 26 Jun 2008)
New Revision: 20729
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
branches/db4o/freenet/src/freenet/node/RequestScheduler.java
branches/db4o/freenet/src/freenet/node/SendableGet.java
branches/db4o/freenet/src/freenet/node/SimpleSendableInsert.java
Log:
Cruft removal
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
2008-06-26 00:23:02 UTC (rev 20728)
+++ branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
2008-06-26 00:29:07 UTC (rev 20729)
@@ -698,7 +698,7 @@
schedCore.removeFetchingKey(key);
}
- public void callFailure(final SendableGet get, final
LowLevelGetException e, final Object keyNum, int prio, String name, final
ChosenRequest req) {
+ public void callFailure(final SendableGet get, final
LowLevelGetException e, final Object keyNum, int prio, final ChosenRequest req)
{
jobRunner.queue(new DBJob() {
public void run(ObjectContainer container,
ClientContext context) {
@@ -710,7 +710,7 @@
}, NativeThread.NORM_PRIORITY, false);
}
- public void callFailure(final SendableInsert put, final
LowLevelPutException e, final Object keyNum, int prio, String name, final
ChosenRequest req) {
+ public void callFailure(final SendableInsert put, final
LowLevelPutException e, final Object keyNum, int prio, final ChosenRequest req)
{
jobRunner.queue(new DBJob() {
public void run(ObjectContainer container,
ClientContext context) {
@@ -722,7 +722,7 @@
}, NativeThread.NORM_PRIORITY, false);
}
- public void callSuccess(final SendableInsert put, final Object keyNum,
int prio, String name, final ChosenRequest req) {
+ public void callSuccess(final SendableInsert put, final Object keyNum,
int prio, final ChosenRequest req) {
jobRunner.queue(new DBJob() {
public void run(ObjectContainer container,
ClientContext context) {
Modified:
branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
2008-06-26 00:23:02 UTC (rev 20728)
+++ branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
2008-06-26 00:29:07 UTC (rev 20729)
@@ -352,12 +352,12 @@
return false;
}
} catch (LowLevelPutException e) {
- sched.callFailure((SendableInsert) this, e, req.token,
NativeThread.NORM_PRIORITY, "Insert failed", req);
+ sched.callFailure((SendableInsert) this, e, req.token,
NativeThread.NORM_PRIORITY, req);
if(logMINOR) Logger.minor(this, "Request failed:
"+this+" for "+e);
return true;
}
if(logMINOR) Logger.minor(this, "Request succeeded: "+this);
- sched.callSuccess(this, req.token, NativeThread.NORM_PRIORITY,
"Insert succeeded", req);
+ sched.callSuccess(this, req.token, NativeThread.NORM_PRIORITY,
req);
return true;
}
Modified: branches/db4o/freenet/src/freenet/node/RequestScheduler.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/RequestScheduler.java
2008-06-26 00:23:02 UTC (rev 20728)
+++ branches/db4o/freenet/src/freenet/node/RequestScheduler.java
2008-06-26 00:29:07 UTC (rev 20729)
@@ -59,15 +59,15 @@
/** Call onFailure() on the database thread, then delete the
PersistentChosenRequest. For a non-persistent request,
* just call onFailure() immediately. */
- public void callFailure(final SendableGet get, final
LowLevelGetException e, final Object keyNum, int prio, String name,
ChosenRequest req);
+ public void callFailure(final SendableGet get, final
LowLevelGetException e, final Object keyNum, int prio, ChosenRequest req);
/** Call onFailure() on the database thread, then delete the
PersistentChosenRequest. For a non-persistent request,
* just call onFailure() immediately. */
- public void callFailure(final SendableInsert put, final
LowLevelPutException e, final Object keyNum, int prio, String name,
ChosenRequest req);
+ public void callFailure(final SendableInsert put, final
LowLevelPutException e, final Object keyNum, int prio, ChosenRequest req);
/** Call onSuccess() on the database thread, then delete the
PersistentChosenRequest. For a non-persistent request,
* just call onFailure() immediately. */
- public void callSuccess(final SendableInsert put, final Object keyNum,
int prio, String name, ChosenRequest req);
+ public void callSuccess(final SendableInsert put, final Object keyNum,
int prio, ChosenRequest req);
public FECQueue getFECQueue();
Modified: branches/db4o/freenet/src/freenet/node/SendableGet.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/SendableGet.java 2008-06-26
00:23:02 UTC (rev 20728)
+++ branches/db4o/freenet/src/freenet/node/SendableGet.java 2008-06-26
00:29:07 UTC (rev 20729)
@@ -76,25 +76,25 @@
if(isCancelled()) {
if(logMINOR) Logger.minor(this, "Cancelled: "+this);
// callbacks must initially run at HIGH_PRIORITY so
they are executed before we remove the key from the currently running list
- sched.callFailure(this, new
LowLevelGetException(LowLevelGetException.CANCELLED), null,
NativeThread.HIGH_PRIORITY, "onFailure(cancelled)", req);
+ sched.callFailure(this, new
LowLevelGetException(LowLevelGetException.CANCELLED), null,
NativeThread.HIGH_PRIORITY, req);
return false;
}
try {
try {
core.realGetKey(key, ctx.localRequestOnly,
ctx.cacheLocalRequests, ctx.ignoreStore);
} catch (final LowLevelGetException e) {
- sched.callFailure(this, e, keyNum,
NativeThread.HIGH_PRIORITY, "onFailure", req);
+ sched.callFailure(this, e, keyNum,
NativeThread.HIGH_PRIORITY, req);
return true;
} catch (Throwable t) {
Logger.error(this, "Caught "+t, t);
- sched.callFailure(this, new
LowLevelGetException(LowLevelGetException.INTERNAL_ERROR), keyNum,
NativeThread.HIGH_PRIORITY, "onFailure(caught throwable)", req);
+ sched.callFailure(this, new
LowLevelGetException(LowLevelGetException.INTERNAL_ERROR), keyNum,
NativeThread.HIGH_PRIORITY, req);
return true;
}
// Don't call onSuccess(), it will be called for us by
backdoor coalescing.
sched.succeeded(this, req);
} catch (Throwable t) {
Logger.error(this, "Caught "+t, t);
- sched.callFailure(this, new
LowLevelGetException(LowLevelGetException.INTERNAL_ERROR), keyNum,
NativeThread.HIGH_PRIORITY, "onFailure(caught throwable)", req);
+ sched.callFailure(this, new
LowLevelGetException(LowLevelGetException.INTERNAL_ERROR), keyNum,
NativeThread.HIGH_PRIORITY, req);
return true;
}
return true;
@@ -145,7 +145,7 @@
}
public void internalError(final Object keyNum, final Throwable t, final
RequestScheduler sched, ObjectContainer container, ClientContext context) {
- sched.callFailure(this, new
LowLevelGetException(LowLevelGetException.INTERNAL_ERROR, t.getMessage(), t),
keyNum, NativeThread.MAX_PRIORITY, "Internal error", null);
+ sched.callFailure(this, new
LowLevelGetException(LowLevelGetException.INTERNAL_ERROR, t.getMessage(), t),
keyNum, NativeThread.MAX_PRIORITY, null);
}
/**
Modified: branches/db4o/freenet/src/freenet/node/SimpleSendableInsert.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/SimpleSendableInsert.java
2008-06-26 00:23:02 UTC (rev 20728)
+++ branches/db4o/freenet/src/freenet/node/SimpleSendableInsert.java
2008-06-26 00:29:07 UTC (rev 20729)
@@ -77,14 +77,14 @@
if(logMINOR) Logger.minor(this, "Starting request:
"+this);
core.realPut(block, shouldCache());
} catch (LowLevelPutException e) {
- sched.callFailure(this, e, req.token,
NativeThread.NORM_PRIORITY, "SSI callback: failure", req);
+ sched.callFailure(this, e, req.token,
NativeThread.NORM_PRIORITY, req);
if(logMINOR) Logger.minor(this, "Request failed:
"+this+" for "+e);
return true;
} finally {
finished = true;
}
if(logMINOR) Logger.minor(this, "Request succeeded: "+this);
- sched.callSuccess(this, req.token, NativeThread.NORM_PRIORITY,
"SSI callback: success", req);
+ sched.callSuccess(this, req.token, NativeThread.NORM_PRIORITY,
req);
return true;
}
