Mercurial > hg > RemoteEditor > REPSessionManager

annotate rep/handler/Editor.java @ 460:ef70109af810

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
self writeQueue and waitingQueue
author one
date Fri, 24 Sep 2010 17:05:19 +0900
parents 66c4f6b29baf
children e7eeb8be0de1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
1 package rep.handler;
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
2
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
3 import java.io.IOException;
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
4 import java.util.LinkedList;
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
5 import java.util.List;
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
6
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
7 import rep.PacketSet;
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
8 import rep.REP;
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
9 import rep.REPCommand;
384
bcdf5476b8e4 restructured-version
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 383
diff changeset
10 import rep.ServerMainLoop;
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
11 import rep.SessionManager;
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
12 import rep.channel.REPSelectionKey;
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
13 import rep.channel.REPSocketChannel;
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
14 import rep.optimizers.*;
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
15
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
16 public class Editor extends Forwarder {
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
17
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
18 private Translator translator;
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
19 // REPCommands we are going to send to the next editor
439
5cbe1731f40c fix checkAck in Editor.java
one
parents: 436
diff changeset
20 private LinkedList<REPCommand> sentList = new LinkedList<REPCommand>();
460
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
21 public LinkedList<REPCommand> waitingCommandInMerge= new LinkedList<REPCommand>();
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
22 private REPCommand quit2=null;
442
3819dec4641e command waiting during merge
one
parents: 439
diff changeset
23 private REPCommand preMergeCommand;
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
24 private boolean merging;
449
89a326696c54 mergeMark in sentList
one
parents: 448
diff changeset
25 private REPCommand mergeMark = new REPCommand(REP.SMCMD_START_MERGE, 0,0, 0, 0, "");
391
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
26 public static boolean noMergeMode=false;
445
22a741c1fa2d fix unMergedCmds in endMerge
one
parents: 444
diff changeset
27 static final boolean doOptimize = false;
460
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
28 private Forwarder toEditor;
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
29 private LinkedList<REPCommand> writeQueue = new LinkedList<REPCommand>();
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
30
385
1fca50ce3508 first-working-version
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 384
diff changeset
31 public Editor(SessionManager manager,int editorNo){
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
32 // no translator case
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
33 super(manager, null);
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
34 }
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
35
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
36 public Editor(int editorNo, SessionManager manager,REPSocketChannel<REPCommand> channel){
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
37 super(editorNo,manager,channel);
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
38 eid = editorNo;
449
89a326696c54 mergeMark in sentList
one
parents: 448
diff changeset
39 sentList.add(mergeMark); // merge mark
453
7005658aa52a add special forwarder for editor (not yet worked)
one
parents: 452
diff changeset
40 toEditor = new Forwarder(eid, manager, channel); // no wait forwarder for my editor
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
41 REPCommandOptimizer optimizer;
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
42 if (doOptimize) optimizer = new DeleteInsertOptimizer(); //タカノがつくったおぷてぃまいざ
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
43 else optimizer = new NullOptimizer(); //なにもしないけどOptimizer.
383
6d48db302b07 r20081022
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 382
diff changeset
44 translator = new Translator(eid,optimizer);
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
45 }
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
46
427
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
47 /*
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
48 * Merge Protocol
445
22a741c1fa2d fix unMergedCmds in endMerge
one
parents: 444
diff changeset
49 (0) Editor へのコマンドは、ack 以外は直接　Editor へ送られてしまう。(next.send(cmd))
22a741c1fa2d fix unMergedCmds in endMerge
one
parents: 444
diff changeset
50 Editor から返ってくるコマンドをtranslatorが処理する。
427
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
51 (1) Editor CommandをSession Ring 上に流し、それが戻って来るまでに、他のEditorから
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
52 受け取った Editor Command をキューに入れておく。
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
53 (2) 戻って来たタイミングで、キュー上のEditor Commandを、eid とCommandの
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
54 順序を基にソートする。(self merge)
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
55 (3) 他のEditorにソートのタイミングを与えるために、Editor Command の
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
56 ack を、もう一周させる。
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
57 (4) 他のEditorのCommandを受け取ってから、ack が来るまでのCommandをキューに
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
58 入れておき、ack が来たら、eid とCommandの順序を基にソートする。(other merge)
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
59
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
60 Editor には、ソートした編集結果になるように、それまで行なった編集をUndo
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
61 して、ソートした編集結果を適用する。Undo が無駄な動作をしないように最適化する。
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
62
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
63 handle()
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
64 セッションの処理
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
65 manage()
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
66 編集コマンドは translate() へ
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
67 一周して来た編集コマンドのACKは廃棄　(merge queue から削除)
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
68 　　　一周して来た自分のコマンドならself merge
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
69 他のエディタの編集コマンドのACK->other merge
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
70 それ以外は、そのまま実行、merge queue へ格納
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
71 　　　merge は checkReturnedCommand() から
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
72 　　　　　　startMerge() へ
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
73 まず、接続されている Editor に START_MERGE を送る
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
74 邪魔されないように、他のcommand は　block　する
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
75 manager()
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
76 　　　START_MERGE_ACK が来たら、translator.mergeAck() で教えて、
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
77 merge()->
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
78 translator.checkOwnCommand() へ　
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
79 ここで、sort されて、Merge Command をEditorへ送信
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
80 checkEndMerge()から
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
81 endMerge() が呼ばれる。
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
82 自分のエディタにEND_MERGE で　Merge終了を通知
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
83 自分のコマンドは、ACKに変えて送信 (3)
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
84 それ以外は、そのまま送信 (一周させる)
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
85
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
86 */
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
87
397
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
88 public void translate(REPCommand command){
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
89 switch(command.cmd) {
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
90 case REPCMD_INSERT_ACK:
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
91 case REPCMD_DELETE_ACK:
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
92 if (command.eid==eid) {
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
93 // Second Phase が終わって同期が終了。
442
3819dec4641e command waiting during merge
one
parents: 439
diff changeset
94 // SessionManager.logger.writeLog("Complete "+command);
452
d0d2449000f5 checkAck
one
parents: 451
diff changeset
95 checkAck(command);
410
2724cf17e9f3 single mode quit
one
parents: 407
diff changeset
96 checkQuit();
397
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
97 return;
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
98 }
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
99 checkReturnedCommand(command);
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
100 return;
400
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
101 case REPCMD_INSERT_USER:
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
102 command.cmd = REP.REPCMD_INSERT;
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
103 userEditorCommand(command);
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
104 return;
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
105 case REPCMD_DELETE_USER:
406
8009dd7b2013 command execution when commandInMergeQueue>0
one
parents: 404
diff changeset
106 command.cmd = REP.REPCMD_DELETE;
400
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
107 userEditorCommand(command);
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
108 return;
401
2cf5392b2a9f add INSERT_USER, DELETE_USER
one
parents: 400
diff changeset
109 case REPCMD_INSERT:
2cf5392b2a9f add INSERT_USER, DELETE_USER
one
parents: 400
diff changeset
110 case REPCMD_DELETE:
2cf5392b2a9f add INSERT_USER, DELETE_USER
one
parents: 400
diff changeset
111 if (command.eid == REP.MERGE_EID.id){
2cf5392b2a9f add INSERT_USER, DELETE_USER
one
parents: 400
diff changeset
112 //マージコマンドが返ってきた
2cf5392b2a9f add INSERT_USER, DELETE_USER
one
parents: 400
diff changeset
113 if(translator.checkMergeConflict(command)){
2cf5392b2a9f add INSERT_USER, DELETE_USER
one
parents: 400
diff changeset
114 //マージ中にエディタからの割り込みがあった場合
2cf5392b2a9f add INSERT_USER, DELETE_USER
one
parents: 400
diff changeset
115 translator.getMergeAgain(this);
2cf5392b2a9f add INSERT_USER, DELETE_USER
one
parents: 400
diff changeset
116 }
2cf5392b2a9f add INSERT_USER, DELETE_USER
one
parents: 400
diff changeset
117 checkEndMerge();
2cf5392b2a9f add INSERT_USER, DELETE_USER
one
parents: 400
diff changeset
118 return;
457
cf61ba25950b merging flag handling fix
one
parents: 455
diff changeset
119 }
cf61ba25950b merging flag handling fix
one
parents: 455
diff changeset
120 if (command.eid == eid){
401
2cf5392b2a9f add INSERT_USER, DELETE_USER
one
parents: 400
diff changeset
121 // 編集コマンドが一周して来た
2cf5392b2a9f add INSERT_USER, DELETE_USER
one
parents: 400
diff changeset
122 checkReturnedCommand(command);
400
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
123 return;
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
124 }
401
2cf5392b2a9f add INSERT_USER, DELETE_USER
one
parents: 400
diff changeset
125
2cf5392b2a9f add INSERT_USER, DELETE_USER
one
parents: 400
diff changeset
126 //他のエディタからの編集コマンド
2cf5392b2a9f add INSERT_USER, DELETE_USER
one
parents: 400
diff changeset
127 translator.transReceiveCmd(next,command);
431
1bb59652d89c fixing merge...
one
parents: 427
diff changeset
128
401
2cf5392b2a9f add INSERT_USER, DELETE_USER
one
parents: 400
diff changeset
129 sendEditorCommand(command);
400
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
130 return;
401
2cf5392b2a9f add INSERT_USER, DELETE_USER
one
parents: 400
diff changeset
131 default:
2cf5392b2a9f add INSERT_USER, DELETE_USER
one
parents: 400
diff changeset
132 assert(false);
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
133 }
400
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
134 }
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
135
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
136 private void userEditorCommand(REPCommand command) {
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
137 //エディタからの新たな編集コマンド
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
138 if (next==this) return; // singleton case
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
139 translator.transSendCmd(command);
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
140 sendEditorCommand(command);
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
141 return;
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
142 }
398
7de83b6a34e7 not yet fixed....
one
parents: 397
diff changeset
143
404
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
144 // private void checkDouble(List<REPCommand> sentList) {
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
145 // if (sentList.size()==0) return;
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
146 // int count = 0;
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
147 // REPCommand f = sentList.get(0);
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
148 // for(REPCommand c:sentList) {
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
149 // if (c.eid==f.eid&&c.seq==f.seq) {
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
150 // count++;
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
151 // }
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
152 // }
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
153 // assert(count==1);
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
154 // if (true) return;
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
155 // count = 0;
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
156 // for(PacketSet c:waitingCommandInMerge) {
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
157 // for(REPCommand g:sentList) {
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
158 // if (c.command.eid==g.eid&&c.command.seq==g.seq) {
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
159 // count++;
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
160 // }
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
161 // }
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
162 // }
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
163 // assert(count==0);
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
164 // }
399
19705f4b8015 waitingCommandInMerge
one
parents: 398
diff changeset
165
460
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
166 /**
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
167 * Sending to Editor and waiting Queue
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
168 * +--------+
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
169 * send() --> write() -> | Editor | -> handle() -> manager()
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
170 * +--------+
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
171 * waitingQueue
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
172 * writeQueue
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
173 *
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
174 * send() は、他のEditor Node から呼ばれる
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
175 * write() は、内部で優先的に送信するのに用いる
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
176 * 　　　　writeQueue は、waitingQueue よりも常に先に実行される必要がある
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
177
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
178 * Manageの送信キューはここでは使わない
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
179 * send() manage
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
180 */
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
181 @Override
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
182 public void send(REPCommand command) {
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
183 if (merging || isMerging() || waitingCommandInMerge.size()>0) {
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
184 waitingCommandInMerge.addLast(command);
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
185 ServerMainLoop.logger.writeLog("Editor eid:"+eid+" waitingCommandInMerge = "+waitingCommandInMerge);
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
186 return;
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
187 }
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
188 if (isMergeCommand(command)) {
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
189 merging = true;
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
190 ServerMainLoop.logger.writeLog("Editor"+eid+": merging=true (send)"+command);
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
191 }
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
192 writeQueue.add(command);
398
7de83b6a34e7 not yet fixed....
one
parents: 397
diff changeset
193 }
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
194
460
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
195 /**
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
196 * Check waiting command in merge
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
197 * periodically called from manager
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
198 */
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
199 public void checkWaitingCommandInMerge() {
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
200 if (writeQueue.size()>0) {
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
201 REPCommand command =writeQueue.pollFirst();
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
202 ServerMainLoop.logger.writeLog("Editor"+eid+": write comand="+command);
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
203 super.write(command);
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
204 return;
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
205 }
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
206 if (translator==null || merging || isMerging()) return;
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
207 if (waitingCommandInMerge.size()>0) {
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
208 REPCommand command = waitingCommandInMerge.pollFirst();
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
209 ServerMainLoop.logger.writeLog("Editor"+eid+": send waiting comand="+command);
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
210 super.write(command);
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
211 if (isMergeCommand(command)) {
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
212 merging = true;
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
213 }
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
214 }
399
19705f4b8015 waitingCommandInMerge
one
parents: 398
diff changeset
215 }
431
1bb59652d89c fixing merge...
one
parents: 427
diff changeset
216 /**
1bb59652d89c fixing merge...
one
parents: 427
diff changeset
217 * 他のエディタへのコマンドの送信
1bb59652d89c fixing merge...
one
parents: 427
diff changeset
218 * @param command
1bb59652d89c fixing merge...
one
parents: 427
diff changeset
219 *
1bb59652d89c fixing merge...
one
parents: 427
diff changeset
220 * sendList にキープする必要がある。
1bb59652d89c fixing merge...
one
parents: 427
diff changeset
221 */
397
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
222 private void sendEditorCommand(REPCommand command) {
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
223 REPCommand keep = new REPCommand(command);
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
224 sentList.add(keep);
407
de4ef4313adc looks like working...
one
parents: 406
diff changeset
225 //ServerMainLoop.logger.writeLog("Editor eid:"+eid+" sentList = "+sentList);
397
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
226 assert(sentList.size()<limit);
431
1bb59652d89c fixing merge...
one
parents: 427
diff changeset
227 if (command.cmd==REP.REPCMD_DELETE) {
1bb59652d89c fixing merge...
one
parents: 427
diff changeset
228 // delete のundo用の文字列は、外に出す意味はない
1bb59652d89c fixing merge...
one
parents: 427
diff changeset
229 command.string=null;
1bb59652d89c fixing merge...
one
parents: 427
diff changeset
230 }
397
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
231 next.send(command);
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
232 }
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
233
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
234 boolean merge(REPCommand command) {
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
235 //マージして送信
435
2b034d12170e early sent list shortning. not yet worked.
one
parents: 434
diff changeset
236 return translator.catchOwnCommand(this, command);
431
1bb59652d89c fixing merge...
one
parents: 427
diff changeset
237 }
1bb59652d89c fixing merge...
one
parents: 427
diff changeset
238
1bb59652d89c fixing merge...
one
parents: 427
diff changeset
239 @Override
1bb59652d89c fixing merge...
one
parents: 427
diff changeset
240 public List<REPCommand> getSentList() {
1bb59652d89c fixing merge...
one
parents: 427
diff changeset
241 return sentList;
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
242 }
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
243
391
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
244 /**
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
245 * 一周して来たcommandの処理。
404
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
246 *
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
247 * 　　INSERT/DELETEを受け取った時に、sentListに登録
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
248 * INSERT_ACK/DELETE_ACKが来たら一周。そこで、Mergeする。
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
249 *
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
250 * 自分が出したINSERT/DELETEが戻って来たら、ACKに変更して、Merge。
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
251 *
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
252 * 途中から参加した場合、自分が受けとってないcommandのACKが先に来ることが
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
253 * ある。それは、無視して良い。
391
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
254 * @param command
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
255 */
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
256 void checkReturnedCommand(REPCommand command) {
439
5cbe1731f40c fix checkAck in Editor.java
one
parents: 436
diff changeset
257 startMerge(command);
406
8009dd7b2013 command execution when commandInMergeQueue>0
one
parents: 404
diff changeset
258 return;
8009dd7b2013 command execution when commandInMergeQueue>0
one
parents: 404
diff changeset
259 }
8009dd7b2013 command execution when commandInMergeQueue>0
one
parents: 404
diff changeset
260
395
a2efdec5cbfc insert_ack/delete_ack protocol all written.
one
parents: 394
diff changeset
261 private void startMerge(REPCommand command) {
451
fa7d9ec2008e too much blocking
one
parents: 450
diff changeset
262 ServerMainLoop.logger.writeLog("Editor"+eid+": startMerge "+command);
397
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
263 preMergeCommand = new REPCommand(command);
391
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
264 // merge は必須だが、EditorのCommand実装をテストするには邪魔なので、off に出来るようにする。
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
265 if (noMergeMode) {
410
2724cf17e9f3 single mode quit
one
parents: 407
diff changeset
266 checkQuit();
396
dc616339b00a half done. returned command conflict.
one
parents: 395
diff changeset
267 endMerge();
391
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
268 return;
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
269 }
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
270 // START_MERGE を送る
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
271 // 送らないで良い場合もある?
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
272 REPCommand cmd = new REPCommand(REP.SMCMD_START_MERGE,command.sid,REP.SM_EID.id,seq(),0,"");
450
21cb16b7f3df block message in Editor.write()
one
parents: 449
diff changeset
273 sendToEditor(cmd);
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
274 merging = true;
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
275 // Session Manager 側で、このeditorへの他のeditorからの
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
276 // 入力を止めて、merge にそなえる。merge は、eidtor 側から
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
277 // ACKが来てから始まる。
427
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
278 translator.startMerge(command);
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
279 }
457
cf61ba25950b merging flag handling fix
one
parents: 455
diff changeset
280
cf61ba25950b merging flag handling fix
one
parents: 455
diff changeset
281 private boolean checkAck(REPCommand command) {
cf61ba25950b merging flag handling fix
one
parents: 455
diff changeset
282 assert(!isMerging());
cf61ba25950b merging flag handling fix
one
parents: 455
diff changeset
283 REPCommand prev;
cf61ba25950b merging flag handling fix
one
parents: 455
diff changeset
284 if (sentList.getFirst()==mergeMark) prev=sentList.remove(1); else prev=sentList.remove(0);
cf61ba25950b merging flag handling fix
one
parents: 455
diff changeset
285 if (prev==null || prev.seq != command.seq || prev.eid!=command.eid) {
cf61ba25950b merging flag handling fix
one
parents: 455
diff changeset
286 // should be more robust to allow communication failure
cf61ba25950b merging flag handling fix
one
parents: 455
diff changeset
287 String err = "Editor eid="+eid+" checkReturnedCommand() : command = " + command + " prev="+
cf61ba25950b merging flag handling fix
one
parents: 455
diff changeset
288 (prev==null?"null":prev)+" sentList=";
cf61ba25950b merging flag handling fix
one
parents: 455
diff changeset
289 err += sentList;
cf61ba25950b merging flag handling fix
one
parents: 455
diff changeset
290 ServerMainLoop.logger.writeLog(err);
cf61ba25950b merging flag handling fix
one
parents: 455
diff changeset
291 assert(false);
cf61ba25950b merging flag handling fix
one
parents: 455
diff changeset
292 }
cf61ba25950b merging flag handling fix
one
parents: 455
diff changeset
293 return true;
cf61ba25950b merging flag handling fix
one
parents: 455
diff changeset
294 }
cf61ba25950b merging flag handling fix
one
parents: 455
diff changeset
295
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
296
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
297 @Override
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
298 public void setQuit2(REPCommand cmd) {
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
299 quit2 = cmd;
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
300 checkQuit();
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
301 // do not send quit2 until we received all pending
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
302 // command
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
303 }
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
304
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
305 @Override
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
306 public void setEID(int eid) {
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
307 this.eid = eid;
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
308 if (translator!=null)
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
309 translator.setEid(eid);
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
310 }
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
311
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
312 public String toString(){
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
313 return ("Editor eid="+eid+" sid="+sid+" " + host + ":" + file);
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
314 }
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
315
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
316 public boolean isMerging() {
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
317 return translator.isMerging();
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
318 }
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
319
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
320
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
321 void checkEndMerge() {
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
322 if (merging) {
434
0e72945867bb merge on going...
one
parents: 431
diff changeset
323 if (translator.isMerging()) return;
396
dc616339b00a half done. returned command conflict.
one
parents: 395
diff changeset
324 endMerge();
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
325 merging = false;
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
326 }
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
327 if (quit2!=null) checkQuit();
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
328 }
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
329
442
3819dec4641e command waiting during merge
one
parents: 439
diff changeset
330
396
dc616339b00a half done. returned command conflict.
one
parents: 395
diff changeset
331 private void endMerge() {
445
22a741c1fa2d fix unMergedCmds in endMerge
one
parents: 444
diff changeset
332 translator.endMerge();
396
dc616339b00a half done. returned command conflict.
one
parents: 395
diff changeset
333 REPCommand mergeEnd = new REPCommand(REP.SMCMD_END_MERGE,sid,eid,seq(),0,"");
450
21cb16b7f3df block message in Editor.write()
one
parents: 449
diff changeset
334 sendToEditor(mergeEnd);
452
d0d2449000f5 checkAck
one
parents: 451
diff changeset
335 checkAck(preMergeCommand);
397
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
336 if (preMergeCommand.eid==eid) {
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
337 // First Phase End, send ACK
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
338 REPCommand keep = new REPCommand(preMergeCommand);
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
339 switch(keep.cmd) {
398
7de83b6a34e7 not yet fixed....
one
parents: 397
diff changeset
340 case REPCMD_INSERT: keep.cmd = REP.REPCMD_INSERT_ACK;break;
7de83b6a34e7 not yet fixed....
one
parents: 397
diff changeset
341 case REPCMD_DELETE: keep.cmd = REP.REPCMD_DELETE_ACK;break;
406
8009dd7b2013 command execution when commandInMergeQueue>0
one
parents: 404
diff changeset
342 default: assert(false);
397
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
343 }
449
89a326696c54 mergeMark in sentList
one
parents: 448
diff changeset
344 sentList.addLast(preMergeCommand);
407
de4ef4313adc looks like working...
one
parents: 406
diff changeset
345 //ServerMainLoop.logger.writeLog("Editor eid:"+eid+" sentList = "+sentList);
397
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
346 assert(sentList.size()<limit);
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
347 next.send(keep);
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
348 } else {
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
349 next.send(preMergeCommand);
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
350 }
449
89a326696c54 mergeMark in sentList
one
parents: 448
diff changeset
351 sentList.remove(mergeMark);
89a326696c54 mergeMark in sentList
one
parents: 448
diff changeset
352 sentList.addLast(mergeMark);
397
149c9a53fc37 half done ACK protocol
one
parents: 396
diff changeset
353 preMergeCommand = null;
396
dc616339b00a half done. returned command conflict.
one
parents: 395
diff changeset
354 }
dc616339b00a half done. returned command conflict.
one
parents: 395
diff changeset
355
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
356 private boolean checkQuit() {
460
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
357 if (quit2!=null && sentList.size()==1&&!isMerging() && waitingCommandInMerge.size()==0) {
450
21cb16b7f3df block message in Editor.write()
one
parents: 449
diff changeset
358 sendToEditor(quit2);
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
359 quit2 = null;
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
360 return true;
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
361 }
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
362 return false;
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
363 }
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
364
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
365 @Override
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
366 public boolean manage(REPCommand command) {
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
367
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
368
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
369 switch(command.cmd){
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
370 // Editor Command
396
dc616339b00a half done. returned command conflict.
one
parents: 395
diff changeset
371
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
372 case REPCMD_DELETE:
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
373 case REPCMD_INSERT:
400
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
374 case REPCMD_DELETE_USER:
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
375 case REPCMD_INSERT_USER:
396
dc616339b00a half done. returned command conflict.
one
parents: 395
diff changeset
376 case REPCMD_DELETE_ACK:
dc616339b00a half done. returned command conflict.
one
parents: 395
diff changeset
377 case REPCMD_INSERT_ACK:
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
378 {
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
379 translate(command);
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
380 break;
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
381 }
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
383 case SMCMD_START_MERGE_ACK:
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
384 {
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
385 // マージの処理と次のエディタへコマンドを送信する処理
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
386 translator.mergeAck();
434
0e72945867bb merge on going...
one
parents: 431
diff changeset
387 if (!merge(preMergeCommand)) {
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
388 // nothing to do, send END_MERGE
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
389 checkEndMerge();
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
390 }
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
391 break;
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
392 }
386
bba62c4ac323 sync-option
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 385
diff changeset
393
bba62c4ac323 sync-option
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 385
diff changeset
394 case SMCMD_SYNC:
bba62c4ac323 sync-option
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 385
diff changeset
395 if (isMaster())
450
21cb16b7f3df block message in Editor.write()
one
parents: 449
diff changeset
396 sendToEditor(command);
386
bba62c4ac323 sync-option
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 385
diff changeset
397 else
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
398 next.send(command);
386
bba62c4ac323 sync-option
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 385
diff changeset
399
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
400 case SMCMD_QUIT:
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
401 {
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
402 next.send(command);
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
403 break;
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
404 }
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
405 case SMCMD_QUIT_2:
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
406 {
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
407 // QUIT_2 is returned.
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
408 if (command.eid!=eid) {
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
409 // stop this editor unless this is the start, starter will stopped
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
410 // by QUIT_2_ACK
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
411 manager.remove(this);
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
412 }
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
413 // don't send quit_2 directly to the editor until all pending
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
414 // merge is processed.
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
415 // this does not work in distributed case.
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
416 if (next.isDirect())
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
417 next.setQuit2(command);
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
418 else
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
419 next.send(command);
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
420 break;
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
421 }
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
422 case SMCMD_QUIT_2_ACK:
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
423 {
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
424 manager.remove(this);
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
425 break;
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
426 }
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
427 default:
396
dc616339b00a half done. returned command conflict.
one
parents: 395
diff changeset
428 assert false;
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
429 return false;
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
430 }
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
431 return true;
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
432 }
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
433
442
3819dec4641e command waiting during merge
one
parents: 439
diff changeset
434
450
21cb16b7f3df block message in Editor.write()
one
parents: 449
diff changeset
435 private boolean isMergeCommand(REPCommand command) {
21cb16b7f3df block message in Editor.write()
one
parents: 449
diff changeset
436 switch(command.cmd) {
21cb16b7f3df block message in Editor.write()
one
parents: 449
diff changeset
437 case REPCMD_INSERT: case REPCMD_DELETE:
21cb16b7f3df block message in Editor.write()
one
parents: 449
diff changeset
438 return command.eid==eid;
21cb16b7f3df block message in Editor.write()
one
parents: 449
diff changeset
439 case REPCMD_INSERT_ACK: case REPCMD_DELETE_ACK:
21cb16b7f3df block message in Editor.write()
one
parents: 449
diff changeset
440 return command.eid!=eid;
21cb16b7f3df block message in Editor.write()
one
parents: 449
diff changeset
441 }
21cb16b7f3df block message in Editor.write()
one
parents: 449
diff changeset
442 return false;
21cb16b7f3df block message in Editor.write()
one
parents: 449
diff changeset
443 }
21cb16b7f3df block message in Editor.write()
one
parents: 449
diff changeset
444
21cb16b7f3df block message in Editor.write()
one
parents: 449
diff changeset
445 public void sendToEditor(REPCommand command) {
460
ef70109af810 self writeQueue and waitingQueue
one
parents: 459
diff changeset
446 writeQueue.add(command);
450
21cb16b7f3df block message in Editor.write()
one
parents: 449
diff changeset
447 }
21cb16b7f3df block message in Editor.write()
one
parents: 449
diff changeset
448
442
3819dec4641e command waiting during merge
one
parents: 439
diff changeset
449 @Override
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
450 public void handle(REPCommand command, REPSelectionKey<REPCommand> key) throws IOException {
442
3819dec4641e command waiting during merge
one
parents: 439
diff changeset
451 //ServerMainLoop.logger.writeLog("Manager "+manager.getId()+" read : command = " + command
3819dec4641e command waiting during merge
one
parents: 439
diff changeset
452 // +" from "+manager.editorList.editorByChannel(channel));
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
453 if (command.cmd==REP.SMCMD_JOIN||command.cmd==REP.SMCMD_PUT) {
404
4bb04d5a9bbf minor fix
one
parents: 401
diff changeset
454 // assert false;
427
622a8e15ff40 Merge Worked ?
one
parents: 411
diff changeset
455 // 一つのエディタ上に複数のセッションが作られた場合。
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
456 // 若干問題があるらしい
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
457 next = new Forwarder(manager,next.channel);
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
458 REPNode first = new FirstConnector(manager,channel);
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
459 first.handle(command, key);
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
460 key.attach(new Dispatcher(manager,channel));
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
461 return;
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
462 }
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
463 if (manager.sessionManage(this, command)) return;
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
464 manage(command);
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
465 }
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
466
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
467 @Override
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
468 public void cancel(REPSocketChannel<REPCommand> socketChannel) {
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
469 manager.remove(socketChannel);
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
470 }
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
471
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
472 public boolean isMaster() {
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
473 return mode==REP.SMCMD_PUT;
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
474 }
386
bba62c4ac323 sync-option
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 385
diff changeset
475
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
476
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
477 /* Handle special case first, usually these cases
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
478 * are handled in the next Editor in a session manager, but
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
479 * it is forwarded here.
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
480 */
385
1fca50ce3508 first-working-version
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 384
diff changeset
481 public void forwardedCommandManage(REPCommand command) {
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
482 if (command.cmd==REP.SMCMD_QUIT_2) {
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
483 // we have to wait next editor's finishing before sending this.
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
484 // this is odd, but the editor itself does not know it's merging
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
485 // state. Only this session manager knows it.
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
486 setQuit2(command);
401
2cf5392b2a9f add INSERT_USER, DELETE_USER
one
parents: 400
diff changeset
487 return;
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
488 }
385
1fca50ce3508 first-working-version
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 384
diff changeset
489 send(command);
1fca50ce3508 first-working-version
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 384
diff changeset
490 }
1fca50ce3508 first-working-version
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 384
diff changeset
491
399
19705f4b8015 waitingCommandInMerge
one
parents: 398
diff changeset
492
382
4b87f89b3afd REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff changeset
493 }