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

refactored the cleanup job

Browse Source 
logging
This commit is contained in:
jrandom
2004-05-20 10:53:31 +00:00
committed by zzz
parent 60e05e270a
commit bfd59e64ea
1 changed files with 45 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java
View File

@ -119,8 +119,8 @@ public class OutboundMessageRegistry {
m = (OutNetMessage)_pendingMessages.remove(expiration);
}
long diff = _context.clock().now() - before;
if (diff > 500)
_log.error("Took too long syncing on remove (" + diff + "ms");
if ( (diff > 500) && (_log.shouldLog(Log.WARN)) )
_log.warn("Took too long syncing on remove (" + diff + "ms");
if (m != null) {
if (_log.shouldLog(Log.DEBUG))
@ -186,12 +186,13 @@ public class OutboundMessageRegistry {
long sync1 = afterSync1 - beforeSync;
long done = afterDone - afterSync1;
String warn = delay + "ms (sync = " + sync1 + "ms, done = " + done + "ms)";
if (delay > 1000) {
if ( (delay > 1000) && (_log.shouldLog(Log.WARN)) ) {
_log.error("Synchronizing in the registry.register took too long! " + warn);
_context.messageHistory().messageProcessingError(msg.getMessage().getUniqueId(),
msg.getMessage().getClass().getName(),
"RegisterPending took too long: " + warn);
} else {
if (_log.shouldLog(Log.DEBUG))
_log.debug("Synchronizing in the registry.register was quick: " + warn);
}
}
@ -227,10 +228,11 @@ public class OutboundMessageRegistry {
} finally {
long delay = _context.clock().now() - beforeSync;
String warn = delay + "ms";
if (delay > 1000) {
_log.error("Synchronizing in the registry.unRegister took too long! " + warn);
if ( (delay > 1000) && (_log.shouldLog(Log.WARN)) ) {
_log.warn("Synchronizing in the registry.unRegister took too long! " + warn);
_context.messageHistory().messageProcessingError(msg.getMessage().getUniqueId(), msg.getMessage().getClass().getName(), "Unregister took too long: " + warn);
} else {
if (_log.shouldLog(Log.DEBUG))
_log.debug("Synchronizing in the registry.unRegister was quick: " + warn);
}
}
@ -269,42 +271,14 @@ public class OutboundMessageRegistry {
}
public String getName() { return "Cleanup any messages that timed out"; }
public void runJob() {
List toRemove = new ArrayList();
long now = CleanupPendingMessagesJob.this._context.clock().now();
Map messages = null;
synchronized (_pendingMessages) {
messages = (Map)_pendingMessages.clone();
}
long afterCreate = CleanupPendingMessagesJob.this._context.clock().now();
for (Iterator iter = messages.keySet().iterator(); iter.hasNext(); ) {
Long exp = (Long)iter.next();
OutNetMessage msg = (OutNetMessage)messages.get(exp);
if (msg.getExpiration() < now) {
toRemove.add(exp);
}
}
long findRemove = CleanupPendingMessagesJob.this._context.clock().now();
long removeTime = 0;
long loopTime = 0;
List removed = removeMessages();
RouterContext ctx = OutboundMessageRegistry.this._context;
for (Iterator iter = toRemove.iterator(); iter.hasNext(); ) {
long beforeRemove = ctx.clock().now();
Long exp = (Long)iter.next();
OutNetMessage msg = null;
synchronized (_pendingMessages) {
msg = (OutNetMessage)_pendingMessages.remove(exp);
}
long afterRemove = ctx.clock().now();
long diff = afterRemove - beforeRemove;
if (diff > 500)
_log.error("Synchronize during remove took too long " + diff + "ms");
removeTime += diff;
for (int i = 0; i < removed.size(); i++) {
OutNetMessage msg = (OutNetMessage)removed.get(i);
if (msg != null) {
ctx.messageHistory().replyTimedOut(msg);
@ -321,29 +295,40 @@ public class OutboundMessageRegistry {
+ " and not firing any job");
}
}
long doneLoop = ctx.clock().now();
long ldiff = doneLoop - beforeRemove;
if (ldiff > 500)
_log.error("Loop took too long [" + ldiff + "ms]");
loopTime += ldiff;
}
long cleanupDelay = ctx.clock().now() - now;
long findTime = findRemove - afterCreate;
long syncTime = afterCreate - now;
String warn = cleanupDelay + "ms (syncTime = " + syncTime + "ms, findTime ="
+ findTime + "ms, removeTime = " + removeTime + "ms, loopTime = "
+ loopTime + ")";
if (cleanupDelay > 1000) {
_log.error("Cleanup took too long! " + warn);
// yes, the following is a kludge, as its not specific to a particular message but to a whole series of messages
ctx.messageHistory().messageProcessingError(-1, OutboundMessageRegistry.CleanupPendingMessagesJob.class.getName(),
"Cleanup took too long: " + warn);
} else {
_log.debug("Cleanup was quick: " + warn);
}
requeue(CLEANUP_DELAY);
}
/**
* Remove any messages whose expirations are in the past
*
* @return list of OutNetMessage objects that have expired
*/
private List removeMessages() {
long now = OutboundMessageRegistry.this._context.clock().now();
List removedMessages = new ArrayList(8);
List expirationsToRemove = new ArrayList(8);
synchronized (_pendingMessages) {
for (Iterator iter = _pendingMessages.keySet().iterator(); iter.hasNext();) {
Long expiration = (Long)iter.next();
if (expiration.longValue() < now) {
expirationsToRemove.add(expiration);
} else {
// its sorted
break;
}
}
for (int i = 0; i < expirationsToRemove.size(); i++) {
Long expiration = (Long)expirationsToRemove.get(i);
OutNetMessage msg = (OutNetMessage)_pendingMessages.remove(expiration);
if (msg != null)
removedMessages.add(msg);
}
}
if (_log.shouldLog(Log.DEBUG))
_log.debug("Removed " + removedMessages.size() + " messages");
return removedMessages;
}
}
}