diff --git a/htroot/WatchCrawler_p.java b/htroot/WatchCrawler_p.java index db822e42b..501eb304e 100644 --- a/htroot/WatchCrawler_p.java +++ b/htroot/WatchCrawler_p.java @@ -386,12 +386,12 @@ public class WatchCrawler_p { private static void setPerformance(plasmaSwitchboard sb, serverObjects post) { String crawlingPerformance = post.get("crawlingPerformance","custom"); long LCbusySleep = Integer.parseInt(sb.getConfig(plasmaSwitchboard.CRAWLJOB_LOCAL_CRAWL_BUSYSLEEP, "100")); - int wantedPPM = (int) (60000L / LCbusySleep); + int wantedPPM = (LCbusySleep == 0) ? 6000 : (int) (60000L / LCbusySleep); try { - wantedPPM = Integer.parseInt(post.get("customPPM",Integer.toString(wantedPPM))); + wantedPPM = Integer.parseInt(post.get("customPPM", Integer.toString(wantedPPM))); } catch (NumberFormatException e) {} if (crawlingPerformance.equals("minimum")) wantedPPM = 10; - if (crawlingPerformance.equals("maximum")) wantedPPM = 1000; + if (crawlingPerformance.equals("maximum")) wantedPPM = 6000; sb.setPerformance(wantedPPM); } diff --git a/htroot/rssTerminal.html b/htroot/rssTerminal.html index 72cbe0f60..22e785b9e 100755 --- a/htroot/rssTerminal.html +++ b/htroot/rssTerminal.html @@ -122,7 +122,7 @@ function idlepingExec() { } function load() { - getRSS("/xml/feed.rss?count=50&set=" + set + "&requestCount=" + requestCount + "&time=" + (new Date()).getTime()); + getRSS("/xml/feed.rss?count=80&set=" + set + "&requestCount=" + requestCount + "&time=" + (new Date()).getTime()); requestCount++; } diff --git a/source/de/anomic/kelondro/kelondroRowCollection.java b/source/de/anomic/kelondro/kelondroRowCollection.java index 94523cfce..6e949d5dc 100644 --- a/source/de/anomic/kelondro/kelondroRowCollection.java +++ b/source/de/anomic/kelondro/kelondroRowCollection.java @@ -326,11 +326,13 @@ public class kelondroRowCollection { assert (!(serverLog.allZero(a, astart, alength))) : "a = " + serverLog.arrayList(a, astart, alength); assert (alength > 0); assert (astart + alength <= a.length); + /* if (bugappearance(a, astart, alength)) { serverLog.logWarning("RowCollection", "wrong a = " + serverLog.arrayList(a, astart, alength)); //return false; // TODO: this is temporary; remote peers may still submit bad entries } - assert (!(bugappearance(a, astart, alength))) : "a = " + serverLog.arrayList(a, astart, alength); + */ + //assert (!(bugappearance(a, astart, alength))) : "a = " + serverLog.arrayList(a, astart, alength); int l = Math.min(rowdef.objectsize, Math.min(alength, a.length - astart)); ensureSize(chunkcount + 1); System.arraycopy(a, astart, chunkcache, rowdef.objectsize * chunkcount, l); @@ -338,7 +340,7 @@ public class kelondroRowCollection { this.lastTimeWrote = System.currentTimeMillis(); return true; } - + /* private static boolean bugappearance(byte[] a, int astart, int alength) { // check strange appearances of '@[B', which is not a b64-value or any other hash fragment if (astart + 3 > alength) return false; @@ -350,7 +352,8 @@ public class kelondroRowCollection { } return false; } - + */ + public synchronized final void addAllUnique(kelondroRowCollection c) { if (c == null) return; assert(rowdef.objectsize == c.rowdef.objectsize); @@ -806,8 +809,8 @@ public class kelondroRowCollection { if (i == j) return 0; assert (this.rowdef.primaryKeyIndex == 0) : "this.sortColumn = " + this.rowdef.primaryKeyIndex; int colstart = (this.rowdef.primaryKeyIndex < 0) ? 0 : this.rowdef.colstart[this.rowdef.primaryKeyIndex]; - assert (!bugappearance(chunkcache, i * this.rowdef.objectsize + colstart, this.rowdef.primaryKeyLength)); - assert (!bugappearance(chunkcache, j * this.rowdef.objectsize + colstart, this.rowdef.primaryKeyLength)); + //assert (!bugappearance(chunkcache, i * this.rowdef.objectsize + colstart, this.rowdef.primaryKeyLength)); + //assert (!bugappearance(chunkcache, j * this.rowdef.objectsize + colstart, this.rowdef.primaryKeyLength)); int c = this.rowdef.objectOrder.compare( chunkcache, i * this.rowdef.objectsize + colstart, @@ -824,7 +827,7 @@ public class kelondroRowCollection { assert (this.rowdef.objectOrder instanceof kelondroBase64Order); assert (this.rowdef.primaryKeyIndex == 0) : "this.sortColumn = " + this.rowdef.primaryKeyIndex; int colstart = (this.rowdef.primaryKeyIndex < 0) ? 0 : this.rowdef.colstart[this.rowdef.primaryKeyIndex]; - assert (!bugappearance(chunkcache, i * this.rowdef.objectsize + colstart, this.rowdef.primaryKeyLength)); + //assert (!bugappearance(chunkcache, i * this.rowdef.objectsize + colstart, this.rowdef.primaryKeyLength)); return ((kelondroBase64Order) this.rowdef.objectOrder).compilePivot(chunkcache, i * this.rowdef.objectsize + colstart, this.rowdef.primaryKeyLength); } @@ -842,7 +845,7 @@ public class kelondroRowCollection { assert (this.rowdef.objectOrder instanceof kelondroBase64Order); assert (this.rowdef.primaryKeyIndex == 0) : "this.sortColumn = " + this.rowdef.primaryKeyIndex; int colstart = (this.rowdef.primaryKeyIndex < 0) ? 0 : this.rowdef.colstart[this.rowdef.primaryKeyIndex]; - assert (!bugappearance(chunkcache, j * this.rowdef.objectsize + colstart, this.rowdef.primaryKeyLength)); + //assert (!bugappearance(chunkcache, j * this.rowdef.objectsize + colstart, this.rowdef.primaryKeyLength)); int c = ((kelondroBase64Order) this.rowdef.objectOrder).comparePivot( compiledPivot, chunkcache, diff --git a/source/de/anomic/plasma/plasmaSwitchboard.java b/source/de/anomic/plasma/plasmaSwitchboard.java index 51750c8f5..202f75121 100644 --- a/source/de/anomic/plasma/plasmaSwitchboard.java +++ b/source/de/anomic/plasma/plasmaSwitchboard.java @@ -2438,7 +2438,7 @@ public final class plasmaSwitchboard extends serverAbstractSwitch= 1000) wantedPPM = 1000; + if (wantedPPM >= 6000) wantedPPM = 6000; int newBusySleep = 60000 / wantedPPM; // for wantedPPM = 10: 6000; for wantedPPM = 1000: 60 serverBusyThread thread;