2004-12-03 jrandom

* Toss in a small pool of threads (3) to execute the events queued up with
      the SimpleTimer, as we do currently see the occational event
      notification spiking up to a second or so.
    * Implement a SAM client API in java, useful for event based streaming (or
      for testing the SAM bridge)
    * Added support to shut down the SAM bridge on OOM (useful if the SAM
      bridge is being run outside of the router).
    * Include the SAM test code in the sam.jar
    * Remove an irrelevent warning message from SAM, which was caused by
      perfectly normal operation due to a session being closed.
    * Removed some unnecessary synchronization in the streaming lib's
      PacketQueue
    * More quickly clean up the memory used by the streaming lib by
      immediately killing each packet's resend job as soon as it is ACKed (or
      cancelled), so that there are no longer any valid pointers to the
      (potentially 32KB) packet.
    * Fixed the timestamps dumped to stdout when debugging the PacketHandler.
    * Drop packets that would expand our inbound window beyond our maximum
      buffer size (default 32 messages)
    * Always read the ACK/NACK data from the verified packets received, even
      if we are going to drop them
    * Always adjust the window when there are messages ACKed, though do not
      change its size except as before.
    * Streamlined some synchronization in the router's I2CP handling
    * Streamlined some memory allocation in the SAM bridge
    * Default the streaming lib to disconnect on inactivity, rather than send
      an empty message.
this still doesnt get the BT to where it needs to be, or fix the timeout problem,
but i dont like having so many commits outstanding and these updates are sound

core/java/src/net/i2p/client/I2PSessionImpl2.java

@@ -108,6 +108,8 @@ class I2PSessionImpl2 extends I2PSessionImpl {
 
     private boolean sendBestEffort(Destination dest, byte payload[], SessionKey keyUsed, Set tagsSent)
                     throws I2PSessionException {
+        long begin = _context.clock().now();
+        
         SessionKey key = _context.sessionKeyManager().getCurrentKey(dest.getPublicKey());
         if (key == null) key = _context.sessionKeyManager().createSession(dest.getPublicKey());
         SessionTag tag = _context.sessionKeyManager().consumeNextAvailableTag(dest.getPublicKey(), key);
@@ -180,9 +182,17 @@ class I2PSessionImpl2 extends I2PSessionImpl {
                        + " sync took " + (inSendingSync-beforeSendingSync) 
                        + " add took " + (afterSendingSync-inSendingSync));
         _producer.sendMessage(this, dest, nonce, payload, tag, key, sentTags, newKey);
+        
+        // since this is 'best effort', all we're waiting for is a status update 
+        // saying that the router received it - in theory, that should come back
+        // immediately, but in practice can take up to a second (though usually
+        // much quicker).  setting this to false will short-circuit that delay
+        boolean actuallyWait = true;
+        
         long beforeWaitFor = _context.clock().now();
-        state.waitFor(MessageStatusMessage.STATUS_SEND_ACCEPTED, 
-                      _context.clock().now() + getTimeout());
+        if (actuallyWait)
+            state.waitFor(MessageStatusMessage.STATUS_SEND_ACCEPTED, 
+                          _context.clock().now() + getTimeout());
         long afterWaitFor = _context.clock().now();
         long inRemovingSync = 0;
         synchronized (_sendingStates) {
@@ -190,7 +200,7 @@ class I2PSessionImpl2 extends I2PSessionImpl {
             _sendingStates.remove(state);
         }
         long afterRemovingSync = _context.clock().now();
-        boolean found = state.received(MessageStatusMessage.STATUS_SEND_ACCEPTED);
+        boolean found = !actuallyWait || state.received(MessageStatusMessage.STATUS_SEND_ACCEPTED);
         if (_log.shouldLog(Log.DEBUG))
             _log.debug(getPrefix() + "After waitFor sending state " + state.getMessageId()
                        + " / " + state.getNonce() + " found = " + found);
@@ -200,6 +210,13 @@ class I2PSessionImpl2 extends I2PSessionImpl {
             _log.warn("wtf, took " + timeToSend + "ms to send the message?!", new Exception("baz"));
         }
         
+        if ( (afterRemovingSync - begin > 500) && (_log.shouldLog(Log.WARN) ) ) {
+            _log.warn("Took " + (afterRemovingSync-begin) + "ms to sendBestEffort, "
+                      + (afterSendingSync-begin) + "ms to prepare, "
+                      + (beforeWaitFor-afterSendingSync) + "ms to send, "
+                      + (afterRemovingSync-beforeWaitFor) + "ms waiting for reply");
+        }
+        
         if (found) {
             if (_log.shouldLog(Log.INFO))
                 _log.info(getPrefix() + "Message sent after " + state.getElapsed() + "ms with "

core/java/src/net/i2p/client/MessagePayloadMessageHandler.java

@@ -16,6 +16,7 @@ import net.i2p.data.i2cp.I2CPMessage;
 import net.i2p.data.i2cp.MessageId;
 import net.i2p.data.i2cp.MessagePayloadMessage;
 import net.i2p.data.i2cp.ReceiveMessageEndMessage;
+import net.i2p.util.Log;
 
 /**
  * Handle I2CP MessagePayloadMessages from the router delivering the contents
@@ -30,7 +31,8 @@ class MessagePayloadMessageHandler extends HandlerImpl {
     }
 
     public void handleMessage(I2CPMessage message, I2PSessionImpl session) {
-        _log.debug("Handle message " + message);
+        if (_log.shouldLog(Log.DEBUG))
+            _log.debug("Handle message " + message);
         try {
             MessagePayloadMessage msg = (MessagePayloadMessage) message;
             MessageId id = msg.getMessageId();
@@ -55,9 +57,8 @@ class MessagePayloadMessageHandler extends HandlerImpl {
         Payload payload = msg.getPayload();
         byte[] data = _context.elGamalAESEngine().decrypt(payload.getEncryptedData(), session.getDecryptionKey());
         if (data == null) {
-            _log
-                .error("Error decrypting the payload to public key "
-                       + session.getMyDestination().getPublicKey().toBase64() + "\nPayload: " + payload.calculateHash());
+            if (_log.shouldLog(Log.ERROR))
+                _log.error("Error decrypting the payload");
             throw new DataFormatException("Unable to decrypt the payload");
         }
         payload.setUnencryptedData(data);