Mercurial > hg > RemoteEditor > REPSessionManager

annotate rep/handler/Editor.java @ 448:ed97273477a0

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