I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

2006-05-04 jrandom

Browse Source 
* Short circuit a highly congested part of the stat logging unless its
      required (may or may not help with a synchronization issue reported by
      andreas)
This commit is contained in:
jrandom
2006-05-04 23:08:48 +00:00
committed by zzz
parent 46ac9292e8
commit 2a3974c71d
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/src/net/i2p/stat/BufferedStatLog.java
View File

@ -29,6 +29,8 @@ public class BufferedStatLog implements StatLog {
private String _lastFilters; private String _lastFilters;
private BufferedWriter _out; private BufferedWriter _out;
private String _outFile; private String _outFile;
/** short circuit for adding data, set to true if some filters are set, false if its empty (so we can skip the sync) */
private volatile boolean _filtersSpecified;
private static final int BUFFER_SIZE = 1024; private static final int BUFFER_SIZE = 1024;
private static final boolean DISABLE_LOGGING = false; private static final boolean DISABLE_LOGGING = false;
@ -44,6 +46,7 @@ public class BufferedStatLog implements StatLog {
_lastWrite = _events.length-1; _lastWrite = _events.length-1;
_statFilters = new ArrayList(10); _statFilters = new ArrayList(10);
_flushFrequency = 500; _flushFrequency = 500;
_filtersSpecified = false;
I2PThread writer = new I2PThread(new StatLogWriter(), "StatLogWriter"); I2PThread writer = new I2PThread(new StatLogWriter(), "StatLogWriter");
writer.setDaemon(true); writer.setDaemon(true);
writer.start(); writer.start();
@ -51,6 +54,7 @@ public class BufferedStatLog implements StatLog {
public void addData(String scope, String stat, long value, long duration) { public void addData(String scope, String stat, long value, long duration) {
if (DISABLE_LOGGING) return; if (DISABLE_LOGGING) return;
if (!shouldLog(stat)) return;
synchronized (_events) { synchronized (_events) {
_events[_eventNext].init(scope, stat, value, duration); _events[_eventNext].init(scope, stat, value, duration);
_eventNext = (_eventNext + 1) % _events.length; _eventNext = (_eventNext + 1) % _events.length;
@ -72,6 +76,7 @@ public class BufferedStatLog implements StatLog {
} }
private boolean shouldLog(String stat) { private boolean shouldLog(String stat) {
if (!_filtersSpecified) return false;
synchronized (_statFilters) { synchronized (_statFilters) {
return _statFilters.contains(stat) || _statFilters.contains("*"); return _statFilters.contains(stat) || _statFilters.contains("*");
} }
@ -88,11 +93,18 @@ public class BufferedStatLog implements StatLog {
_statFilters.clear(); _statFilters.clear();
while (tok.hasMoreTokens()) while (tok.hasMoreTokens())
_statFilters.add(tok.nextToken().trim()); _statFilters.add(tok.nextToken().trim());
if (_statFilters.size() > 0)
_filtersSpecified = true;
else
_filtersSpecified = false;
} }
} }
_lastFilters = val; _lastFilters = val;
} else { } else {
synchronized (_statFilters) { _statFilters.clear(); } synchronized (_statFilters) {
_statFilters.clear();
_filtersSpecified = false;
}
} }
String filename = _context.getProperty(StatManager.PROP_STAT_FILE); String filename = _context.getProperty(StatManager.PROP_STAT_FILE);
@ -146,7 +158,7 @@ public class BufferedStatLog implements StatLog {
updateFilters(); updateFilters();
int cur = start; int cur = start;
while (cur != end) { while (cur != end) {
if (shouldLog(_events[cur].getStat())) { //if (shouldLog(_events[cur].getStat())) {
String when = null; String when = null;
synchronized (_fmt) { synchronized (_fmt) {
when = _fmt.format(new Date(_events[cur].getTime())); when = _fmt.format(new Date(_events[cur].getTime()));
@ -164,7 +176,7 @@ public class BufferedStatLog implements StatLog {
_out.write(" "); _out.write(" ");
_out.write(Long.toString(_events[cur].getDuration())); _out.write(Long.toString(_events[cur].getDuration()));
_out.write("\n"); _out.write("\n");
} //}
cur = (cur + 1) % _events.length; cur = (cur + 1) % _events.length;
} }
_out.flush(); _out.flush();

7
history.txt
View File

@ -1,4 +1,9 @@
$Id: history.txt,v 1.467 2006/05/02 23:30:28 complication Exp $ $Id: history.txt,v 1.468 2006/05/03 06:13:29 complication Exp $
2006-05-04 jrandom
* Short circuit a highly congested part of the stat logging unless its
required (may or may not help with a synchronization issue reported by
andreas)
2006-05-03 Complication 2006-05-03 Complication
* Allow a single build attempt to proceed despite 1-minute overload * Allow a single build attempt to proceed despite 1-minute overload

4
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
* *
*/ */
public class RouterVersion { public class RouterVersion {
public final static String ID = "$Revision: 1.407 $ $Date: 2006/05/02 23:30:27 $"; public final static String ID = "$Revision: 1.408 $ $Date: 2006/05/03 06:13:29 $";
public final static String VERSION = "0.6.1.17"; public final static String VERSION = "0.6.1.17";
public final static long BUILD = 6; public final static long BUILD = 7;
public static void main(String args[]) { public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION + "-" + BUILD); System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
System.out.println("Router ID: " + RouterVersion.ID); System.out.println("Router ID: " + RouterVersion.ID);