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

Converted some static inner classes into anonymous inner classes, yielding

Browse Source 
improvement in locality of code and reduction in LOC.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6556 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2011-03-30 00:32:47 +00:00
parent b759128425
commit c55279a211
1 changed files with 68 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/threerings/crowd/chat/server/ChatChannelManager.java
+56 -109
View File
@@ -91,9 +91,19 @@ public abstract class ChatChannelManager
* participant.
*/
@AnyThread
public void bodyAddedToChannel (ChatChannel channel, int bodyId)
public void bodyAddedToChannel (ChatChannel channel, final int bodyId)
{
_peerMan.invokeNodeAction(new ParticipantChanged(channel, bodyId, true));
_peerMan.invokeNodeAction(new ChannelAction(channel) {
@Override protected void execute () {
ChannelInfo info = _channelMan._channels.get(_channel);
if (info != null) {
info.participants.add(bodyId);
} else if (_channelMan._resolving.containsKey(_channel)) {
log.warning("Oh for fuck's sake, distributed systems are complicated",
"channel", _channel);
}
}
});
}
/**
@@ -102,19 +112,38 @@ public abstract class ChatChannelManager
* participant.
*/
@AnyThread
public void bodyRemovedFromChannel (ChatChannel channel, int bodyId)
public void bodyRemovedFromChannel (ChatChannel channel, final int bodyId)
{
_peerMan.invokeNodeAction(new ParticipantChanged(channel, bodyId, false));
_peerMan.invokeNodeAction(new ChannelAction(channel) {
@Override protected void execute () {
ChannelInfo info = _channelMan._channels.get(_channel);
if (info != null) {
info.participants.remove(bodyId);
} else if (_channelMan._resolving.containsKey(_channel)) {
log.warning("Oh for fuck's sake, distributed systems are complicated",
"channel", _channel);
}
}
});
}
/**
* Collects all chat messages heard by the given user on all peers.
*/
@AnyThread
public void collectChatHistory (Name user, final ResultListener<ChatHistoryResult> lner)
public void collectChatHistory (final Name user, final ResultListener<ChatHistoryResult> lner)
{
NodeRequestsListener<List<ChatHistory.Entry>> listener =
new NodeRequestsListener<List<ChatHistory.Entry>>() {
_peerMan.invokeNodeRequest(new NodeRequest() {
@Override public boolean isApplicable (NodeObject nodeobj) {
return true; // poll all nodes
}
@Override protected void execute (InvocationService.ResultListener listener) {
// find all the UserMessages for the given user and send them back
listener.requestProcessed(Lists.newArrayList(Iterables.filter(
_chatHistory.get(user), IS_USER_MESSAGE)));
}
protected @Inject ChatHistory _chatHistory;
}, new NodeRequestsListener<List<ChatHistory.Entry>>() {
public void requestsProcessed (NodeRequestsResult<List<ChatHistory.Entry>> rRes) {
ChatHistoryResult chRes = new ChatHistoryResult();
chRes.failedNodes = rRes.getNodeErrors().keySet();
@@ -126,8 +155,7 @@ public abstract class ChatChannelManager
public void requestFailed (String cause) {
lner.requestFailed(new InvocationException(cause));
}
};
_peerMan.invokeNodeRequest(new ChatCollectionRequest(user), listener);
});
}
// from interface ChannelSpeakProvider
@@ -150,7 +178,11 @@ public abstract class ChatChannelManager
}
// forward the speak request to the server that hosts the channel in question
_peerMan.invokeNodeAction(new ForwardChannelSpeak(channel, umsg), new Runnable() {
_peerMan.invokeNodeAction(new ChannelAction(channel) {
@Override protected void execute () {
_channelMan.dispatchSpeak(_channel, umsg);
}
}, new Runnable() {
public void run () {
_resolving.put(channel, Lists.newArrayList(umsg));
resolveAndDispatch(channel);
@@ -185,17 +217,21 @@ public abstract class ChatChannelManager
finishResolveAndDispatch(channel);
}
public void fail (String peerName) {
List<UserMessage> msgs = _resolving.remove(channel);
final List<UserMessage> msgs = _resolving.remove(channel);
if (peerName == null) {
log.warning("Failed to resolve chat channel due to lock failure",
"channel", channel);
} else {
// some other peer resolved this channel first, so forward any queued messages
// directly to that node
for (UserMessage msg : msgs) {
_peerMan.invokeNodeAction(peerName, new ForwardChannelSpeak(channel, msg));
_peerMan.invokeNodeAction(peerName, new ChannelAction(channel) {
@Override protected void execute () {
for (final UserMessage msg : msgs) {
_channelMan.dispatchSpeak(_channel, msg);
}
}
});
}
}
});
}
@@ -245,7 +281,7 @@ public abstract class ChatChannelManager
* server does not have the information it needs to validate the speaker and must leave that to
* us, the channel hosting server.
*/
protected void dispatchSpeak (ChatChannel channel, UserMessage message)
protected void dispatchSpeak (ChatChannel channel, final UserMessage message)
{
final ChannelInfo info = _channels.get(channel);
if (info == null) {
@@ -280,8 +316,12 @@ public abstract class ChatChannelManager
}
for (Map.Entry<String,int[]> entry : partMap.entrySet()) {
_peerMan.invokeNodeAction(
entry.getKey(), new DispatchChannelSpeak(channel, message, entry.getValue()));
final int[] bodyIds = entry.getValue();
_peerMan.invokeNodeAction(entry.getKey(), new ChannelAction(channel) {
@Override protected void execute () {
_channelMan.deliverSpeak(_channel, message, bodyIds);
}
});
}
}
@@ -361,8 +401,6 @@ public abstract class ChatChannelManager
public ChannelAction (ChatChannel channel) {
_channel = channel;
}
public ChannelAction () {
}
@Override public boolean isApplicable (NodeObject nodeobj) {
return ((CrowdNodeObject)nodeobj).hostedChannels.contains(_channel);
}
@@ -370,62 +408,6 @@ public abstract class ChatChannelManager
@Inject protected transient ChatChannelManager _channelMan;
}
/** Informs the server hosting a channel that a body has been added to or removed from the
* channel's participants set. */
protected static class ParticipantChanged extends ChannelAction
{
public ParticipantChanged (ChatChannel channel, int bodyId, boolean added) {
super(channel);
_bodyId = bodyId;
_added = added;
}
public ParticipantChanged () {
}
@Override protected void execute () {
ChannelInfo info = _channelMan._channels.get(_channel);
if (info != null) {
if (_added) {
info.participants.add(_bodyId);
} else {
info.participants.remove(_bodyId);
}
} else if (_channelMan._resolving.containsKey(_channel)) {
log.warning("Oh for fuck's sake, distributed systems are complicated",
"channel", _channel);
}
}
protected int _bodyId;
protected boolean _added;
}
protected static class ChatCollectionRequest extends NodeRequest
{
public ChatCollectionRequest (Name user)
{
_user = user;
}
public ChatCollectionRequest ()
{
}
@Override public boolean isApplicable (NodeObject nodeobj)
{
// poll all nodes
return true;
}
@Override protected void execute (InvocationService.ResultListener listener)
{
// find all the UserMessages for the given user and send them back
listener.requestProcessed(Lists.newArrayList(Iterables.filter(
_chatHistory.get(_user), IS_USER_MESSAGE)));
}
protected Name _user;
@Inject ChatHistory _chatHistory;
}
protected static final Predicate<ChatHistory.Entry> IS_USER_MESSAGE =
new Predicate<ChatHistory.Entry>() {
public boolean apply (ChatHistory.Entry entry) {
@@ -440,41 +422,6 @@ public abstract class ChatChannelManager
}
};
/** Forwards a channel speak request from the server hosting the message originator to the
* server that is hosting the channel. */
protected static class ForwardChannelSpeak extends ChannelAction
{
public ForwardChannelSpeak (ChatChannel channel, UserMessage message) {
super(channel);
_message = message;
}
public ForwardChannelSpeak () {
}
@Override protected void execute () {
_channelMan.dispatchSpeak(_channel, _message);
}
protected UserMessage _message;
}
/** Forwards a chat channel message to the server to which some subset of the channel
* participants are connected so that it can dispatch the message on their body objects. */
protected static class DispatchChannelSpeak extends ForwardChannelSpeak
{
public DispatchChannelSpeak (ChatChannel channel, UserMessage message, int[] bodyIds) {
super(channel, message);
_bodyIds = bodyIds;
}
public DispatchChannelSpeak () {
}
@Override public boolean isApplicable (NodeObject nodeobj) {
return true; // not used
}
@Override protected void execute () {
_channelMan.deliverSpeak(_channel, _message, _bodyIds);
}
protected int[] _bodyIds;
}
/** Contains metadata for a particular channel. */
protected static class ChannelInfo
{