From f753ea234e591aebd99aad45b1fbdabfa9ffa44e Mon Sep 17 00:00:00 2001
From: bontric <benjohnwie@gmail.com>
Date: Thu, 27 Sep 2018 16:07:33 +0200
Subject: [PATCH] add some logging
---
.../mailbox/sessions/FeedableSyncInputStream.java | 7 +++++++
.../mailbox/sessions/MailboxSyncRequestWriter.java | 12 ++++++++----
.../briarproject/bramble/sync/IncomingSession.java | 4 ++++
3 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/FeedableSyncInputStream.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/FeedableSyncInputStream.java
index 0aa4b778d..7c5249d0c 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/FeedableSyncInputStream.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/FeedableSyncInputStream.java
@@ -4,8 +4,11 @@ import java.io.ByteArrayOutputStream;
import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
+import java.util.logging.Logger;
public class FeedableSyncInputStream extends InputStream {
+ private static final Logger LOG =
+ Logger.getLogger(FeedableSyncInputStream.class.getName());
private ByteArrayOutputStream os = new ByteArrayOutputStream();
private boolean isEOF = false;
private byte[] activeBuffer = new byte[] {};
@@ -28,6 +31,7 @@ public class FeedableSyncInputStream extends InputStream {
}
private boolean hasBytes() {
+
// Check if active buffer has bytes left
if (activeBufferPointer < activeBuffer.length)
return true;
@@ -38,6 +42,7 @@ public class FeedableSyncInputStream extends InputStream {
// update active buffer if bytes from OS are available
activeBuffer = os.toByteArray();
+ LOG.info("consuming Buffer: " + activeBuffer.length);
os.reset();
activeBufferPointer = 0;
return true;
@@ -47,6 +52,8 @@ public class FeedableSyncInputStream extends InputStream {
if (isEOF)
throw new EOFException();
+ LOG.info("Feeding Buffer: " + buffer.length);
+
os.write(buffer);
this.notifyAll();
}
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxSyncRequestWriter.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxSyncRequestWriter.java
index f4cb424f4..a75bfa9c2 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxSyncRequestWriter.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/MailboxSyncRequestWriter.java
@@ -8,6 +8,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.logging.Logger;
class MailboxSyncRequestWriter extends OutputStream implements StreamWriter {
@@ -15,6 +16,9 @@ class MailboxSyncRequestWriter extends OutputStream implements StreamWriter {
private final ByteArrayOutputStream bufferOS = new ByteArrayOutputStream();
private boolean endOfStream = false;
+ private static final Logger LOG =
+ Logger.getLogger(MailboxSyncRequestWriter.class.getName());
+
public MailboxSyncRequestWriter(MailboxProtocol mailboxProtocol) {
this.mailboxProtocol = mailboxProtocol;
}
@@ -25,7 +29,7 @@ class MailboxSyncRequestWriter extends OutputStream implements StreamWriter {
}
@Override
- public synchronized void sendEndOfStream() throws IOException {
+ public void sendEndOfStream() throws IOException {
if (endOfStream)
throw new IOException("End of stream was already written");
@@ -38,12 +42,12 @@ class MailboxSyncRequestWriter extends OutputStream implements StreamWriter {
}
@Override
- public synchronized void write(int i) {
+ public void write(int i) {
bufferOS.write(i);
}
@Override
- public synchronized void flush() throws IOException {
+ public void flush() throws IOException {
if (endOfStream)
throw new IOException("End of stream already written");
@@ -56,7 +60,7 @@ class MailboxSyncRequestWriter extends OutputStream implements StreamWriter {
byte[] syncStream = bufferOS.toByteArray();
bufferOS.reset();
-
+ LOG.info("Flushing Buffer: " + syncStream.length);
MailboxRequestSync req = new MailboxRequestSync(syncStream);
try {
mailboxProtocol.writeRequest(req);
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/sync/IncomingSession.java b/bramble-core/src/main/java/org/briarproject/bramble/sync/IncomingSession.java
index bd2584e42..94aa4c4f9 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/sync/IncomingSession.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/sync/IncomingSession.java
@@ -71,23 +71,27 @@ class IncomingSession implements SyncSession, EventListener {
return;
}
if (recordReader.hasAck()) {
+ LOG.info("Received ACK");
Ack a = recordReader.readAck();
LOG.info("Owner ack " + a.getMessageIds().size() +
" offer of:");
for (MessageId id : a.getMessageIds()) LOG.info("\n" + id);
dbExecutor.execute(new ReceiveAck(a));
} else if (recordReader.hasMessage()) {
+ LOG.info("Received Message");
Message m = recordReader.readMessage();
LOG.info("Owner message received:" + m.getId() + " : " +
m.getGroupId());
dbExecutor.execute(new ReceiveMessage(m));
} else if (recordReader.hasOffer()) {
+ LOG.info("Received Offer");
Offer o = recordReader.readOffer();
LOG.info("Owner received " + o.getMessageIds().size() +
" offer of:");
for (MessageId id : o.getMessageIds()) LOG.info("\n" + id);
dbExecutor.execute(new ReceiveOffer(o));
} else if (recordReader.hasRequest()) {
+ LOG.info("Received Request");
Request r = recordReader.readRequest();
LOG.info("Owner received " + r.getMessageIds().size() +
" request:");
--
GitLab