Mercurial > hg > RemoteEditor > REPSessionManager
changeset 332:36faf76a087c
*** empty log message ***
| author | kono |
|---|---|
| date | Sun, 12 Oct 2008 10:22:44 +0900 |
| parents | f9fa876d3539 |
| children | 99d8f73bc64e |
| files | rep/Editor.java rep/SessionManager.java rep/translator/TranslatorImpl.java test/sematest/TestSessionManager.java |
| diffstat | 4 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/rep/Editor.java Sun Oct 12 09:43:17 2008 +0900 +++ b/rep/Editor.java Sun Oct 12 10:22:44 2008 +0900 @@ -35,6 +35,7 @@ public void translate(REPCommand command){ if(command.eid == next.getEID()){ + if(next==this) return; // singleton case ((Editor) next).checkReturnedCommand(command); } else if(command.eid == eid){ //エディタからの新たな編集コマンド
--- a/rep/SessionManager.java Sun Oct 12 09:43:17 2008 +0900 +++ b/rep/SessionManager.java Sun Oct 12 10:22:44 2008 +0900 @@ -58,7 +58,7 @@ private static int receive_port; private static int parent_port; static final int DEFAULT_PORT = 8766; - private static final int packetLimit = 100; + private static final int packetLimit = 200; public static void main(String[] args) throws InterruptedException, IOException {
--- a/rep/translator/TranslatorImpl.java Sun Oct 12 09:43:17 2008 +0900 +++ b/rep/translator/TranslatorImpl.java Sun Oct 12 10:22:44 2008 +0900 @@ -14,9 +14,7 @@ public class TranslatorImpl implements Translator{ public int eid; - /* - * queue が5つもいるって、あまりに馬鹿げてる。 - */ + public REPCommandOptimizer optimizer; private LinkedList<REPCommand> unMergedCmds; public LinkedList<REPCommand> sentMergedList;
--- a/test/sematest/TestSessionManager.java Sun Oct 12 09:43:17 2008 +0900 +++ b/test/sematest/TestSessionManager.java Sun Oct 12 10:22:44 2008 +0900 @@ -29,8 +29,8 @@ * Editor or slave session manager must be started by * master session managers using syncExec. */ - int editorPort[] = {masterPort,masterPort}; - boolean editorMaster[] = {true,false,false}; + int editorPort[] = {masterPort,masterPort,masterPort}; + boolean editorMaster[] = {true,false,false,false}; SessionManagerEvent ev1[] = { new SessionManagerEvent() { // executed before first select(); @@ -107,6 +107,7 @@ * isSimulation=false socket based communication mode */ REPServerSocketChannel.isSimulation = true; + // At least 3 TestEditors are required. TestSessionManager test = new TestSessionManager(1, 0, 3); logger.setLogLevel(5); test.startTest();