[freenet-CVS] freenet/src/freenet/node/rt NGRoutingTable.java,1.1.2.17, 1.1.2.18 StoredRoutingTable.java, 1.1.2.5, 1.1.2.6

[Matthew Toseland]

Update of /cvsroot/freenet/freenet/src/freenet/node/rt
In directory sc8-pr-cvs1:/tmp/cvs-serv23419/src/freenet/node/rt

Modified Files:
      Tag: ngrouting
        NGRoutingTable.java StoredRoutingTable.java 
Log Message:
logging. but mostly, fix a MAJOR thinko in discard sort ordering.


Index: NGRoutingTable.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/Attic/NGRoutingTable.java,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -r1.1.2.17 -r1.1.2.18
--- NGRoutingTable.java 26 Aug 2003 21:31:48 -0000      1.1.2.17
+++ NGRoutingTable.java 26 Aug 2003 23:08:21 -0000      1.1.2.18
@@ -281,18 +281,23 @@
                final long lastSuccess;
                final long lastAccess;
                
+               public String toString() {
+                       return "NGRT.MyDiscardValue: lastSuccess="+lastSuccess+
+                               ", lastAccess="+lastAccess;
+               }
+               
                MyDiscardValue(long success, long access) {
                        lastSuccess = success;
                        lastAccess = access;
                }
                
-               // Higher value = more recent = more useful
                public int compareTo(Object c) {
                        MyDiscardValue o = (MyDiscardValue)c;
-                       if(o.lastSuccess < lastSuccess) return 1;
-                       if(o.lastSuccess > lastSuccess) return -1;
-                       if(o.lastAccess < lastAccess) return 1;
-                       if(o.lastAccess > lastAccess) return -1;
+                       // Upside down, like Ticker, because this is on a Heap
+                       if(lastSuccess < o.lastSuccess) return 1;
+                       if(lastSuccess > o.lastSuccess) return -1;
+                       if(lastAccess < o.lastAccess) return 1;
+                       if(lastAccess > o.lastAccess) return -1;
                        return 0;
                }
                

Index: StoredRoutingTable.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/StoredRoutingTable.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- StoredRoutingTable.java     20 Aug 2003 18:09:21 -0000      1.1.2.5
+++ StoredRoutingTable.java     26 Aug 2003 23:08:21 -0000      1.1.2.6
@@ -105,8 +105,11 @@
                        Core.logger.log(this, "discard("+onum+") locked RT for 
"+length,
                                                        
length>500?Core.logger.MINOR:Core.logger.DEBUG);
                        DiscardSort d;
-                       while (num-- > 0 && null != (d = (DiscardSort) heap.pop()))
+                       while (num-- > 0 && null != (d = (DiscardSort) heap.pop())) {
                                remove(d.mem, d.ident);
+                               if(Core.logger.shouldLog(Logger.DEBUG))
+                                       Core.logger.log(this, "Removing "+d, 
Logger.DEBUG);
+                       }
                        Core.logger.log(this, "Discarded "+onum+" references",
                                                        Core.logger.DEBUG);
                }
@@ -118,6 +121,9 @@
         final Comparable cmp;
         final Identity ident;
                final RoutingMemory mem;
+               public String toString() {
+                       return "DiscardSort: "+mem+","+ident+","+cmp;
+               }
         DiscardSort(Comparable cmp, RoutingMemory mem) {
             this.cmp = cmp;
                        this.mem = mem;

_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs