# HG changeset patch # User kent # Date 1219984829 -32400 # Node ID eb89a73976fa6438f6bfd1ef5af56317dc64e273 # Parent e5a7aad3fbc0496e021ccefb257be01996cf7ab1 *** empty log message *** diff -r e5a7aad3fbc0 -r eb89a73976fa rep/SessionManagerList.java --- a/rep/SessionManagerList.java Fri Aug 29 13:35:49 2008 +0900 +++ b/rep/SessionManagerList.java Fri Aug 29 13:40:29 2008 +0900 @@ -1,6 +1,5 @@ package rep; -import java.nio.channels.SocketChannel; import java.util.LinkedList; import java.util.List; @@ -19,30 +18,13 @@ public void sendUpdate(int sessionID, String string) { for(REPSocketChannel channel : list){ - REPPacketSend send = new REPPacketSend(channel); - send.send(new REPCommand(REP.SMCMD_UPDATE, 0, mySMID, 0, 0, string.length(), string)); + channel.write(new REPCommand(REP.SMCMD_UPDATE, 0, mySMID, 0, 0, string.length(), string)); } } public void sendJoin(REPCommand command) { for(REPSocketChannel channel : list){ - REPPacketSend send = new REPPacketSend(channel); - send.send(command); - } - } - - public void sendUpdateUp(REPCommand command){ - REPPacketSend send = new REPPacketSend(master); - command.setCMD(REP.SMCMD_UPDATE_UP); - send.send(command); - } - - public void sendUpdateDown(REPCommand command){ - command.setCMD(REP.SMCMD_UPDATE_DOWN); - for(REPSocketChannel channel : list){ - if(channel == master) continue; - REPPacketSend send = new REPPacketSend(channel); - send.send(command); + channel.write(command); } } @@ -55,8 +37,7 @@ command.setString(encoder.sessionListToXML()); for(REPSocketChannel channel : list){ - REPPacketSend send = new REPPacketSend(channel); - send.send(command); + channel.write(command); } } @@ -65,23 +46,20 @@ } public void sendToMaster(REPCommand repCmd) { - REPPacketSend send = new REPPacketSend(master); - send.send(repCmd); + master.write(repCmd); } public void sendToSlave(REPCommand repCmd) { for(REPSocketChannel channel : list){ if(channel.equals(master)) continue; - REPPacketSend send = new REPPacketSend(channel); - send.send(repCmd); + channel.write(repCmd); } } public void sendExcept(REPSocketChannel channel2, REPCommand command) { for(REPSocketChannel channel : list){ if(channel.equals(channel2)) continue; - REPPacketSend send = new REPPacketSend(channel); - send.send(command); + channel.write(command); } } diff -r e5a7aad3fbc0 -r eb89a73976fa rep/channel/REPPack.java --- a/rep/channel/REPPack.java Fri Aug 29 13:35:49 2008 +0900 +++ b/rep/channel/REPPack.java Fri Aug 29 13:40:29 2008 +0900 @@ -6,6 +6,4 @@ public abstract ByteBuffer packUConv(P command); - public abstract void send(P command); - } \ No newline at end of file diff -r e5a7aad3fbc0 -r eb89a73976fa rep/channel/REPServerSocketChannel.java --- a/rep/channel/REPServerSocketChannel.java Fri Aug 29 13:35:49 2008 +0900 +++ b/rep/channel/REPServerSocketChannel.java Fri Aug 29 13:40:29 2008 +0900 @@ -59,17 +59,20 @@ ss.configureBlocking(block); } + + public SelectionKey register(REPSelector sel, int ops, Object att) throws ClosedChannelException { + assert(!isSimulation); + REPSelector selector = sel; + if(sel!=null) + return selector.register(ss, ops, att); + else + return null; + } + @Override public SocketChannel accept() throws IOException { // TODO Auto-generated method stub return null; } - - - public SelectionKey register(REPSelector sel, int ops, Object att) throws ClosedChannelException { - assert(!isSimulation); - REPSelector selector = sel; - return selector.register(ss, ops, att); - } }