AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the number of subscribers to determine how many responses to expect.

Browse Source 
Take the lock immediately if there are no subscribers.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4576 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Andrzej Kapolka
2007-02-14 02:30:37 +00:00
parent 9c03e16434
commit 51fed0676e
2 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/presents/peer/server/PeerManager.java
+13 -3
View File
@@ -296,7 +296,12 @@ public class PeerManager
queryLock(lock, new ResultListener<String>() {
public void requestCompleted (String result) {
if (result == null) {
_locks.put(lock, new LockHandler(lock, true, listener));
if (_nodeobj.getSubscriberCount() == 0) {
_nodeobj.addToLocks(lock);
listener.requestCompleted(_nodeName);
} else {
_locks.put(lock, new LockHandler(lock, true, listener));
}
} else {
listener.requestCompleted(result);
}
@@ -318,7 +323,12 @@ public class PeerManager
queryLock(lock, new ResultListener<String>() {
public void requestCompleted (String result) {
if (_nodeName.equals(result)) {
_locks.put(lock, new LockHandler(lock, false, listener));
if (_nodeobj.getSubscriberCount() == 0) {
_nodeobj.removeFromLocks(lock);
listener.requestCompleted(null);
} else {
_locks.put(lock, new LockHandler(lock, false, listener));
}
} else {
if (result != null) {
log.warning("Tried to release lock held by another peer [lock=" +
@@ -796,7 +806,7 @@ public class PeerManager
}
// find out exactly how many responses we need
_remaining = _peers.size();
_remaining = _nodeobj.getSubscriberCount();
// schedule a timeout to act if something goes wrong
(_timeout = new Interval(PresentsServer.omgr) {