Mercurial > hg > RemoteEditor > REPSessionManager

annotate rep/handler/Editor.java @ 458:c22f6833d736

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