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

Added DatabaseComponent.setSeen() for handling requests.

Browse Source 
Also moved IO out of the lock in receiveOffer().
This commit is contained in:
akwizgran
2011-09-23 16:06:14 +01:00
parent ba1c61810d
commit b470afb4ef
3 changed files with 73 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
components/net/sf/briar/db/DatabaseComponentImpl.java
View File

@@ -963,6 +963,8 @@ DatabaseCleaner.Callback {
public void receiveOffer(ContactId c, Offer o, RequestWriter r)
throws DbException, IOException {
Collection<MessageId> offered;
BitSet request;
contactLock.readLock().lock();
try {
if(!containsContact(c)) throw new NoSuchContactException();
@@ -972,10 +974,10 @@ DatabaseCleaner.Callback {
try {
subscriptionLock.readLock().lock();
try {
Collection<MessageId> offered = o.getMessageIds();
BitSet request = new BitSet(offered.size());
T txn = db.startTransaction();
try {
offered = o.getMessageIds();
request = new BitSet(offered.size());
Iterator<MessageId> it = offered.iterator();
for(int i = 0; it.hasNext(); i++) {
// If the message is not in the database, or if
@@ -989,7 +991,6 @@ DatabaseCleaner.Callback {
db.abortTransaction(txn);
throw e;
}
r.writeRequest(request, offered.size());
} finally {
subscriptionLock.readLock().unlock();
}
@@ -1002,6 +1003,7 @@ DatabaseCleaner.Callback {
} finally {
contactLock.readLock().unlock();
}
r.writeRequest(request, offered.size());
}
public void receiveSubscriptionUpdate(ContactId c, SubscriptionUpdate s)
@@ -1147,6 +1149,41 @@ DatabaseCleaner.Callback {
}
}
public void setSeen(ContactId c, Collection<MessageId> seen)
throws DbException {
contactLock.readLock().lock();
try {
if(!containsContact(c)) throw new NoSuchContactException();
messageLock.readLock().lock();
try {
messageStatusLock.writeLock().lock();
try {
subscriptionLock.readLock().lock();
try {
T txn = db.startTransaction();
try {
for(MessageId m : seen) {
db.setStatus(txn, c, m, Status.SEEN);
}
db.commitTransaction(txn);
} catch(DbException e) {
db.abortTransaction(txn);
throw e;
}
} finally {
subscriptionLock.readLock().unlock();
}
} finally {
messageStatusLock.writeLock().unlock();
}
} finally {
messageLock.readLock().unlock();
}
} finally {
contactLock.readLock().unlock();
}
}
/**
* Updates the sendability of all messages written by the given author, and
* the ancestors of those messages if necessary.