OutNetMessage: Speedup after profiling (ticket #707 - thx dg, kytv, zab)

This commit is contained in:
zzz
2012-09-04 13:50:24 +00:00
parent 5347d296dc
commit b98474880d

View File

@ -32,8 +32,6 @@ public class OutNetMessage {
private final RouterContext _context; private final RouterContext _context;
private RouterInfo _target; private RouterInfo _target;
private I2NPMessage _message; private I2NPMessage _message;
/** cached message class name, for use after we discard the message */
private String _messageType;
private int _messageTypeId; private int _messageTypeId;
/** cached message ID, for use after we discard the message */ /** cached message ID, for use after we discard the message */
private long _messageId; private long _messageId;
@ -148,7 +146,6 @@ public class OutNetMessage {
public void setMessage(I2NPMessage msg) { public void setMessage(I2NPMessage msg) {
_message = msg; _message = msg;
if (msg != null) { if (msg != null) {
_messageType = msg.getClass().getSimpleName();
_messageTypeId = msg.getType(); _messageTypeId = msg.getType();
_messageId = msg.getUniqueId(); _messageId = msg.getUniqueId();
_messageSize = _message.getMessageSize(); _messageSize = _message.getMessageSize();
@ -156,9 +153,13 @@ public class OutNetMessage {
} }
/** /**
* For debugging only.
* @return the simple class name * @return the simple class name
*/ */
public String getMessageType() { return _messageType; } public String getMessageType() {
I2NPMessage msg = _message;
return msg != null ? msg.getClass().getSimpleName() : "null";
}
public int getMessageTypeId() { return _messageTypeId; } public int getMessageTypeId() { return _messageTypeId; }
public long getMessageId() { return _messageId; } public long getMessageId() { return _messageId; }
@ -272,7 +273,7 @@ public class OutNetMessage {
_messageSize = _message.getMessageSize(); _messageSize = _message.getMessageSize();
if (_log.shouldLog(Log.DEBUG)) { if (_log.shouldLog(Log.DEBUG)) {
long timeToDiscard = _context.clock().now() - _created; long timeToDiscard = _context.clock().now() - _created;
_log.debug("Discard " + _messageSize + "byte " + _messageType + " message after " _log.debug("Discard " + _messageSize + "byte " + getMessageType() + " message after "
+ timeToDiscard); + timeToDiscard);
} }
_message = null; _message = null;
@ -308,7 +309,7 @@ public class OutNetMessage {
buf.append("*no message*"); buf.append("*no message*");
} else { } else {
buf.append("a ").append(_messageSize).append(" byte "); buf.append("a ").append(_messageSize).append(" byte ");
buf.append(_messageType); buf.append(getMessageType());
} }
buf.append(" expiring on ").append(new Date(_expiration)); buf.append(" expiring on ").append(new Date(_expiration));
if (_failedTransports != null) if (_failedTransports != null)