Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-20 06:39:54 +01:00
Code Issues Projects Releases Wiki Activity

Moved DB accesses outside the lock.

Browse Source
This commit is contained in:
akwizgran
2011-10-14 20:07:37 +01:00
parent 8ece8f3243
commit 718bd8c540
1 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
components/net/sf/briar/transport/stream/StreamConnection.java
View File

@@ -113,26 +113,32 @@ abstract class StreamConnection implements Runnable, DatabaseListener {
notifyAll(); notifyAll();
} }
} else if(proto.hasRequest()) { } else if(proto.hasRequest()) {
Collection<MessageId> offered, seen, unseen;
Request r = proto.readRequest(); Request r = proto.readRequest();
synchronized(this) { synchronized(this) {
if(outgoingOffer == null)
throw new IOException("Unexpected request packet");
offered = outgoingOffer;
}
// Work out which messages were requested
BitSet b = r.getBitmap();
seen = new ArrayList<MessageId>();
unseen = new LinkedList<MessageId>();
int i = 0;
for(MessageId m : offered) {
if(b.get(i++)) unseen.add(m);
else seen.add(m);
}
synchronized(this) {
assert outgoingOffer != null;
if(requested != null && !requested.isEmpty())
throw new IOException("Unexpected request packet");
outgoingOffer = null;
requested = unseen;
writerFlags |= Flags.REQUEST_RECEIVED; writerFlags |= Flags.REQUEST_RECEIVED;
BitSet b = r.getBitmap();
// FIXME: Do we need to check the size of the BitSet?
if(outgoingOffer == null) throw new IOException();
if(requested != null) throw new IOException();
// Work out which messages were requested
requested = new LinkedList<MessageId>();
Collection<MessageId> seen = new ArrayList<MessageId>();
int i = 0;
for(MessageId m : outgoingOffer) {
if(b.get(i)) requested.add(m);
else seen.add(m);
i++;
}
// FIXME: Can this be done outside the lock?
db.setSeen(contactId, seen);
notifyAll(); notifyAll();
} }
db.setSeen(contactId, seen);
} else if(proto.hasSubscriptionUpdate()) { } else if(proto.hasSubscriptionUpdate()) {
SubscriptionUpdate s = proto.readSubscriptionUpdate(); SubscriptionUpdate s = proto.readSubscriptionUpdate();
db.receiveSubscriptionUpdate(contactId, s); db.receiveSubscriptionUpdate(contactId, s);
@@ -216,7 +222,7 @@ abstract class StreamConnection implements Runnable, DatabaseListener {
sendRequest(requestWriter); sendRequest(requestWriter);
} }
if((flags & Flags.REQUEST_RECEIVED) != 0) { if((flags & Flags.REQUEST_RECEIVED) != 0) {
throw new IOException(); throw new IOException("Unexpected request packet");
} }
break; break;
@@ -285,7 +291,7 @@ abstract class StreamConnection implements Runnable, DatabaseListener {
sendRequest(requestWriter); sendRequest(requestWriter);
} }
if((flags & Flags.REQUEST_RECEIVED) != 0) { if((flags & Flags.REQUEST_RECEIVED) != 0) {
throw new IOException(); throw new IOException("Unexpected request packet");
} }
// Send a batch if possible, otherwise an offer // Send a batch if possible, otherwise an offer
if(!sendBatch(batchWriter)) state = State.SEND_OFFER; if(!sendBatch(batchWriter)) state = State.SEND_OFFER;
@@ -308,21 +314,22 @@ abstract class StreamConnection implements Runnable, DatabaseListener {
} }
private boolean sendBatch(BatchWriter b) throws DbException, IOException { private boolean sendBatch(BatchWriter b) throws DbException, IOException {
Collection<MessageId> ids;
synchronized(this) { synchronized(this) {
assert outgoingOffer == null; assert outgoingOffer == null;
assert requested != null; assert requested != null;
// FIXME: Can this be done outside the lock? ids = requested;
boolean anyAdded = db.generateBatch(contactId, b, requested);
if(!anyAdded) requested = null;
return anyAdded;
} }
boolean anyAdded = db.generateBatch(contactId, b, ids);
if(!anyAdded) ids.clear();
return anyAdded;
} }
private boolean sendOffer(OfferWriter o) throws DbException, IOException { private boolean sendOffer(OfferWriter o) throws DbException, IOException {
Collection<MessageId> ids = db.generateOffer(contactId, o); Collection<MessageId> ids = db.generateOffer(contactId, o);
synchronized(this) { synchronized(this) {
assert outgoingOffer == null; assert outgoingOffer == null;
assert requested == null; assert requested == null || requested.isEmpty();
outgoingOffer = ids; outgoingOffer = ids;
} }
boolean anyOffered = !ids.isEmpty(); boolean anyOffered = !ids.isEmpty();