Update of /cvsroot/freenet/freenet/src/freenet/transport
In directory sc8-pr-cvs1:/tmp/cvs-serv14667/src/freenet/transport
Modified Files:
AbstractSelectorLoop.java
Log Message:
Indenting
Made ASL.CloseThread strictly wait for notification before starting to close.
Made ResponseTimeEstimator.dumpLog() execute only if we are logging Logger.MINOR level.
Index: AbstractSelectorLoop.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/transport/AbstractSelectorLoop.java,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -w -r1.83 -r1.84
--- AbstractSelectorLoop.java 17 Oct 2003 01:43:29 -0000 1.83
+++ AbstractSelectorLoop.java 25 Oct 2003 10:44:45 -0000 1.84
@@ -636,16 +636,13 @@
//currentSet.addAll(sel.selectedKeys());
if(logDebug)
- Core.logger.log(this, "Keys ready before fixKeys: "+
- currentlyActive+"/"+
- sel.keys().size(),
Logger.DEBUG);
+ Core.logger.log(this, "Keys ready before fixKeys: " +
currentlyActive + "/" + sel.keys().size(), Logger.DEBUG);
fixKeys();
//if (currentlyActive != currentSet.size())
Core.logger.log(this, "read the freaking book! "+ currentlyActive +" != "+
currentSet.size() ,Logger.ERROR);
currentlyActive = currentSet.size();
if(logDebug)
- Core.logger.log(this, "Keys ready:
"+currentlyActive+"/"+
- sel.keys().size(),
Logger.DEBUG);
+ Core.logger.log(this, "Keys ready: " + currentlyActive
+ "/" + sel.keys().size(), Logger.DEBUG);
//if at this point no channels are active, it means
//we were just woken up or timed out.
@@ -690,14 +687,11 @@
System.runFinalization();
freenet.node.Main.dumpInterestingObjects();
try {
- Core.logger.log(this, "Ran emergency GC in "+
- getClass().getName(),
Logger.ERROR);
+ Core.logger.log(this, "Ran emergency GC in " +
getClass().getName(), Logger.ERROR);
} catch (Throwable any) {};
} catch(Throwable t){
try {
- Core.logger.log(this,
- "Caught throwable in
AbstractSelectorLoop!: "
- +t, t, Logger.ERROR);
+ Core.logger.log(this, "Caught throwable in
AbstractSelectorLoop!: " + t, t, Logger.ERROR);
t.printStackTrace();
} catch (Throwable x) {};
}
@@ -788,11 +782,12 @@
synchronized(closeQueue) {
while(closeQueue.isEmpty()) {
try {
- closeQueue.wait(500);
+ //closeQueue.wait(500);
+ closeQueue.wait();
//Wait until someone tells us to close.. dont start closing when we aren't told to
} catch (InterruptedException
e) {};
if(terminateCloseThread)
return;
}
- current =
(ClosePair)(closeQueue.removeFirst());
+ current =
(ClosePair)closeQueue.removeFirst();
}
if(current != null) {
Connection c = current.conn;
@@ -800,11 +795,9 @@
try {
c.close(true);
} catch (Throwable t) {
- Core.logger.log(this,
"Caught "+t+" closing "+
-
c, t, Logger.ERROR);
+ Core.logger.log(this,
"Caught " + t + " closing " + c, t, Logger.ERROR);
} finally {
-
Core.diagnostics.occurrenceContinuous("closePairLifetime",
-
System.currentTimeMillis()-current.timeStamp);
+
Core.diagnostics.occurrenceContinuous("closePairLifetime", System.currentTimeMillis()
- current.timeStamp);
}
//notify the callback
if (current.attachment !=null){
@@ -829,8 +822,7 @@
} catch (Throwable any) {};
} catch (Throwable t) {
try {
- String s = "Caught Throwable "+t+
- " in background close thread!";
+ String s = "Caught Throwable " + t + "
in background close thread!";
Core.logger.log(this, s, t,
Logger.ERROR);
// FIXME
// System.err, System.out may be files
on disk
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
