Mercurial > hg > RemoteEditor > REPSessionManager

annotate rep/handler/Editor.java @ 451:fa7d9ec2008e

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