Update of /cvsroot/freenet/freenet/src/freenet/transport
In directory sc8-pr-cvs1:/tmp/cvs-serv1482/src/freenet/transport
Modified Files:
Tag: ngrouting
AbstractSelectorLoop.java ReadSelectorLoop.java
WriteSelectorLoop.java
Log Message:
7050: Fix a race in ConnectionOpener that was probably the source of the RNFs. Sort
the routing table display in nodestatus. Add a parameter to route() to indicate
whether the request is an insert. Get rid of now redundant pWildLegitDNF in NGRT.
Change routing termination again esp w.r.t. inserts. Don't null routes, we need it for
the StoreData. Catch anything thrown by process() when running maintqueue in RSL.
Indenting. Logging.
Index: AbstractSelectorLoop.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/transport/AbstractSelectorLoop.java,v
retrieving revision 1.57.2.11
retrieving revision 1.57.2.12
diff -u -r1.57.2.11 -r1.57.2.12
--- AbstractSelectorLoop.java 29 Aug 2003 19:05:10 -0000 1.57.2.11
+++ AbstractSelectorLoop.java 30 Aug 2003 19:49:53 -0000 1.57.2.12
@@ -641,8 +641,8 @@
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 {
Index: ReadSelectorLoop.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/transport/ReadSelectorLoop.java,v
retrieving revision 1.45.2.3
retrieving revision 1.45.2.4
diff -u -r1.45.2.3 -r1.45.2.4
--- ReadSelectorLoop.java 7 Aug 2003 01:50:51 -0000 1.45.2.3
+++ ReadSelectorLoop.java 30 Aug 2003 19:49:53 -0000 1.45.2.4
@@ -110,7 +110,24 @@
synchronized(maintenanceQueue) {
current = (NIOReader)maintenanceQueue.removeFirst();
}
- current.process(null);
+ try {
+ current.process(null);
+ } catch (OutOfMemoryError e) {
+ System.gc();
+ System.runFinalization();
+ System.gc();
+ System.runFinalization();
+ freenet.node.Main.dumpInterestingObjects();
+ try {
+ Core.logger.log(this, "Ran emergency GC in "+
+
getClass().getName(), Logger.ERROR);
+ } catch (Throwable any) {};
+ } catch (Throwable t) {
+ System.err.println("Caught "+t+" running maintenance
queue");
+ t.printStackTrace(System.err);
+ Core.logger.log(this, "Caught "+t+" running
maintenance queue",
+ t, Logger.ERROR);
+ }
}
throttleBeforeSelect();
Index: WriteSelectorLoop.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/transport/WriteSelectorLoop.java,v
retrieving revision 1.34.2.4
retrieving revision 1.34.2.5
diff -u -r1.34.2.4 -r1.34.2.5
--- WriteSelectorLoop.java 20 Aug 2003 18:09:22 -0000 1.34.2.4
+++ WriteSelectorLoop.java 30 Aug 2003 19:49:53 -0000 1.34.2.5
@@ -174,7 +174,7 @@
public final String toString() {
return SendJob.this.getClass().getName()+":
"+data+","+destination+
- ","+client+","+position+","+id;
+ ","+client+","+position+","+id+",prio="+priority;
}
public final void closed() {
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
