Mercurial > hg > RemoteEditor > REPSessionManager

annotate rep/handler/Editor.java @ 435:2b034d12170e

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