Mercurial > hg > RemoteEditor > REPSessionManager
annotate rep/handler/Editor.java @ 486:877aacde8651
new merge on going...
| author | one |
|---|---|
| date | Thu, 21 Oct 2010 20:30:52 +0900 |
| parents | cc262a519b8a |
| children | 455df381449a |
| 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; |
| 468 | 4 import java.util.Comparator; |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
5 import java.util.LinkedList; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
6 import java.util.List; |
| 468 | 7 import java.util.TreeSet; |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
8 |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
9 import rep.REP; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
10 import rep.REPCommand; |
| 384 | 11 import rep.ServerMainLoop; |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
12 import rep.SessionManager; |
| 468 | 13 import rep.channel.REPLogger; |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
14 import rep.channel.REPSelectionKey; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
15 import rep.channel.REPSocketChannel; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
16 import rep.optimizers.*; |
|
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 public class Editor extends Forwarder { |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
19 |
| 387 | 20 // REPCommands we are going to send to the next editor |
| 439 | 21 private LinkedList<REPCommand> sentList = new LinkedList<REPCommand>(); |
| 464 | 22 // Expected acknowledge list |
| 23 private LinkedList<REPCommand> ackList = new LinkedList<REPCommand>(); | |
| 460 | 24 public LinkedList<REPCommand> waitingCommandInMerge= new LinkedList<REPCommand>(); |
| 462 | 25 private REPCommand quit_2=null; |
| 442 | 26 private REPCommand preMergeCommand; |
| 468 | 27 |
| 28 public REPCommandOptimizer optimizer; | |
| 29 private LinkedList<REPCommand> unMergedCmds; | |
| 30 private LinkedList<REPCommand> sentMergedList; | |
| 31 private TreeSet<REPCommand> sortedEditCmds; | |
| 32 boolean mergeAgain; | |
| 33 public REPLogger logger = SessionManager.logger; | |
| 486 | 34 boolean merging = false; |
| 35 private LinkedList<REPCommand> writeQueue = new LinkedList<REPCommand>(); | |
| 36 private REPCommand mergeMark =new REPCommand(REP.REPCMD_MERGE_MARK,0,0, REP.MERGE_EID.id, 0, ""); | |
| 468 | 37 |
| 482 | 38 public enum MergeMode { |
| 39 NoMerge, // no merge | |
| 40 Slow, // merge at Ack | |
| 41 Early, // merge at returned command and Ack | |
| 42 Direct // merge at incoming command | |
| 43 } | |
| 486 | 44 public static MergeMode mergeMode = MergeMode.Direct; |
| 445 | 45 static final boolean doOptimize = false; |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
46 |
| 385 | 47 public Editor(SessionManager manager,int editorNo){ |
| 387 | 48 // no translator case |
| 49 super(manager, null); | |
| 50 } | |
| 51 | |
| 468 | 52 public Editor(int eid, REPCommandOptimizer optimizer) { |
| 53 super(null, null); | |
| 54 this.optimizer = optimizer; | |
| 55 } | |
| 56 | |
| 387 | 57 public Editor(int editorNo, SessionManager manager,REPSocketChannel<REPCommand> channel){ |
| 58 super(editorNo,manager,channel); | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
59 eid = editorNo; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
60 if (doOptimize) optimizer = new DeleteInsertOptimizer(); //タカノがつくったおぷてぃまいざ |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
61 else optimizer = new NullOptimizer(); //なにもしないけどOptimizer. |
| 468 | 62 |
| 63 unMergedCmds = new LinkedList<REPCommand>(); | |
| 64 mergeAgain = false; | |
| 65 sentMergedList = new LinkedList<REPCommand>(); | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
66 } |
| 387 | 67 |
| 427 | 68 /* |
| 69 * Merge Protocol | |
| 445 | 70 (0) Editor へのコマンドは、ack 以外は直接 Editor へ送られてしまう。(next.send(cmd)) |
| 71 Editor から返ってくるコマンドをtranslatorが処理する。 | |
| 427 | 72 (1) Editor CommandをSession Ring 上に流し、それが戻って来るまでに、他のEditorから |
| 73 受け取った Editor Command をキューに入れておく。 | |
| 482 | 74 sentList 外に送り出したEditor Command |
| 75 unMergedList 接続されたEditorのundo list (reverse order) | |
| 76 MergingSentList Mergeするlist 。Mergeのやり直し用。 | |
| 77 Slow/Early | |
| 427 | 78 (2) 戻って来たタイミングで、キュー上のEditor Commandを、eid とCommandの |
| 482 | 79 順序を基にソートする。(self merge (Early)) |
| 427 | 80 (3) 他のEditorにソートのタイミングを与えるために、Editor Command の |
| 81 ack を、もう一周させる。 | |
| 82 (4) 他のEditorのCommandを受け取ってから、ack が来るまでのCommandをキューに | |
| 482 | 83 入れておき、ack が来たら、eid とCommandの順序を基にソートする。(other merge (Slow)) |
| 84 Direct | |
| 85 (5) 他のEditor Command が来た時点で、すぐにmergeする | |
| 86 (6) 自分のEditor Command が来て、 | |
| 87 未確定の他のEditor Command があれば、それを確定(sentList/unMergedListから削除) | |
| 88 自分のEditor Command はsentListに追加 (unMergedListには既に入っている) | |
| 89 (7) Ackが来たら、そのEditor Command まで確定 | |
| 427 | 90 |
| 91 Editor には、ソートした編集結果になるように、それまで行なった編集をUndo | |
| 92 して、ソートした編集結果を適用する。Undo が無駄な動作をしないように最適化する。 | |
| 482 | 93 */ |
| 94 | |
| 95 /* | |
| 427 | 96 handle() |
| 97 セッションの処理 | |
| 98 manage() | |
| 99 編集コマンドは translate() へ | |
| 100 一周して来た編集コマンドのACKは廃棄 (merge queue から削除) | |
| 101 一周して来た自分のコマンドならself merge | |
| 102 他のエディタの編集コマンドのACK->other merge | |
| 103 それ以外は、そのまま実行、merge queue へ格納 | |
| 104 merge は checkReturnedCommand() から | |
| 105 startMerge() へ | |
| 106 まず、接続されている Editor に START_MERGE を送る | |
| 107 邪魔されないように、他のcommand は block する | |
| 108 manager() | |
| 109 START_MERGE_ACK が来たら、translator.mergeAck() で教えて、 | |
| 110 merge()-> | |
| 111 translator.checkOwnCommand() へ | |
| 112 ここで、sort されて、Merge Command をEditorへ送信 | |
| 113 checkEndMerge()から | |
| 114 endMerge() が呼ばれる。 | |
| 115 自分のエディタにEND_MERGE で Merge終了を通知 | |
| 116 自分のコマンドは、ACKに変えて送信 (3) | |
| 117 それ以外は、そのまま送信 (一周させる) | |
| 118 | |
| 119 */ | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
120 |
| 468 | 121 |
| 397 | 122 public void translate(REPCommand command){ |
| 123 switch(command.cmd) { | |
| 124 case REPCMD_INSERT_ACK: | |
| 125 case REPCMD_DELETE_ACK: | |
| 126 if (command.eid==eid) { | |
| 482 | 127 if (mergeMode==MergeMode.Slow) { |
| 462 | 128 checkReturnedCommand(command); |
| 129 checkQuit(); | |
| 130 return; | |
| 484 | 131 } |
| 397 | 132 // Second Phase が終わって同期が終了。 |
| 442 | 133 // SessionManager.logger.writeLog("Complete "+command); |
| 452 | 134 checkAck(command); |
| 410 | 135 checkQuit(); |
| 397 | 136 return; |
| 137 } | |
| 485 | 138 if (mergeMode==MergeMode.Direct) { |
| 139 checkAck(command); | |
| 140 truncateUnMergedCmds(command); | |
| 486 | 141 ServerMainLoop.logger.writeLog("Editor"+eid+": send ackCommand "+command+report()); |
| 485 | 142 next.send(command); |
| 143 checkQuit(); | |
| 144 } else | |
| 145 checkReturnedCommand(command); | |
| 397 | 146 return; |
| 400 | 147 case REPCMD_INSERT_USER: |
| 148 command.cmd = REP.REPCMD_INSERT; | |
| 149 userEditorCommand(command); | |
| 150 return; | |
| 151 case REPCMD_DELETE_USER: | |
| 406 | 152 command.cmd = REP.REPCMD_DELETE; |
| 400 | 153 userEditorCommand(command); |
| 154 return; | |
| 401 | 155 case REPCMD_INSERT: |
| 156 case REPCMD_DELETE: | |
| 465 | 157 case REPCMD_MERGE_MARK: |
| 401 | 158 if (command.eid == REP.MERGE_EID.id){ |
| 159 //マージコマンドが返ってきた | |
| 468 | 160 if(checkMergeConflict(command)){ |
| 401 | 161 //マージ中にエディタからの割り込みがあった場合 |
| 483 | 162 getMergeAgain(); |
| 401 | 163 } |
| 164 checkEndMerge(); | |
| 165 return; | |
| 457 | 166 } |
| 167 if (command.eid == eid){ | |
| 401 | 168 // 編集コマンドが一周して来た |
| 482 | 169 if (mergeMode==MergeMode.Slow) { |
| 462 | 170 checkAck(command); |
| 171 sendAck(command); | |
| 485 | 172 } else if (mergeMode==MergeMode.Direct) { |
| 173 truncateUnMergedCmds(command); | |
| 174 checkAck(command); | |
| 175 sendAck(command); | |
| 462 | 176 } else { |
| 177 checkReturnedCommand(command); | |
| 178 } | |
| 400 | 179 return; |
| 180 } | |
| 401 | 181 |
| 182 //他のエディタからの編集コマンド | |
| 468 | 183 transReceiveCmd(next,command); |
| 486 | 184 if (mergeMode==MergeMode.Direct) { |
| 185 sendEditorCommand(command); | |
| 186 sentList.addLast(mergeMark ); | |
| 483 | 187 startMerge(command); |
| 486 | 188 } else |
| 483 | 189 sendEditorCommand(command); |
| 400 | 190 return; |
| 401 | 191 default: |
| 192 assert(false); | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
193 } |
| 400 | 194 } |
| 195 | |
| 196 private void userEditorCommand(REPCommand command) { | |
| 197 //エディタからの新たな編集コマンド | |
| 486 | 198 if (mergeMode==MergeMode.Direct) { |
| 483 | 199 truncateSentList(command); |
| 486 | 200 ServerMainLoop.logger.writeLog("Editor"+eid+": User Command "+command+report()); |
| 201 } | |
| 400 | 202 if (next==this) return; // singleton case |
| 468 | 203 transSendCmd(command); |
| 400 | 204 sendEditorCommand(command); |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
205 return; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
206 } |
| 398 | 207 |
| 404 | 208 // private void checkDouble(List<REPCommand> sentList) { |
| 209 // if (sentList.size()==0) return; | |
| 210 // int count = 0; | |
| 211 // REPCommand f = sentList.get(0); | |
| 212 // for(REPCommand c:sentList) { | |
| 213 // if (c.eid==f.eid&&c.seq==f.seq) { | |
| 214 // count++; | |
| 215 // } | |
| 216 // } | |
| 217 // assert(count==1); | |
| 218 // if (true) return; | |
| 219 // count = 0; | |
| 220 // for(PacketSet c:waitingCommandInMerge) { | |
| 221 // for(REPCommand g:sentList) { | |
| 222 // if (c.command.eid==g.eid&&c.command.seq==g.seq) { | |
| 223 // count++; | |
| 224 // } | |
| 225 // } | |
| 226 // } | |
| 227 // assert(count==0); | |
| 228 // } | |
| 399 | 229 |
| 483 | 230 |
| 231 /** | |
| 460 | 232 * Sending to Editor and waiting Queue |
| 233 * +--------+ | |
| 234 * send() --> write() -> | Editor | -> handle() -> manager() | |
| 235 * +--------+ | |
| 236 * waitingQueue | |
| 237 * writeQueue | |
| 238 * | |
| 239 * send() は、他のEditor Node から呼ばれる | |
| 240 * write() は、内部で優先的に送信するのに用いる | |
| 241 * writeQueue は、waitingQueue よりも常に先に実行される必要がある | |
| 242 | |
| 243 * Manageの送信キューはここでは使わない | |
| 244 * send() manage | |
| 245 */ | |
| 246 @Override | |
| 247 public void send(REPCommand command) { | |
| 248 if (merging || isMerging() || waitingCommandInMerge.size()>0) { | |
| 249 waitingCommandInMerge.addLast(command); | |
| 250 ServerMainLoop.logger.writeLog("Editor eid:"+eid+" waitingCommandInMerge = "+waitingCommandInMerge); | |
| 251 return; | |
| 252 } | |
| 253 if (isMergeCommand(command)) { | |
| 254 merging = true; | |
| 255 ServerMainLoop.logger.writeLog("Editor"+eid+": merging=true (send)"+command); | |
| 256 } | |
| 257 writeQueue.add(command); | |
| 398 | 258 } |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
259 |
| 460 | 260 /** |
| 261 * Check waiting command in merge | |
| 262 * periodically called from manager | |
| 263 */ | |
| 264 public void checkWaitingCommandInMerge() { | |
| 265 if (writeQueue.size()>0) { | |
| 266 REPCommand command =writeQueue.pollFirst(); | |
| 267 ServerMainLoop.logger.writeLog("Editor"+eid+": write comand="+command); | |
| 268 super.write(command); | |
| 269 return; | |
| 270 } | |
| 468 | 271 if (merging || isMerging()) return; |
| 460 | 272 if (waitingCommandInMerge.size()>0) { |
| 273 REPCommand command = waitingCommandInMerge.pollFirst(); | |
| 274 ServerMainLoop.logger.writeLog("Editor"+eid+": send waiting comand="+command); | |
| 275 super.write(command); | |
| 276 if (isMergeCommand(command)) { | |
| 277 merging = true; | |
| 278 } | |
| 279 } | |
| 399 | 280 } |
| 431 | 281 /** |
| 282 * 他のエディタへのコマンドの送信 | |
| 283 * @param command | |
| 284 * | |
| 285 * sendList にキープする必要がある。 | |
| 286 */ | |
| 397 | 287 private void sendEditorCommand(REPCommand command) { |
| 288 REPCommand keep = new REPCommand(command); | |
| 289 sentList.add(keep); | |
| 464 | 290 ackList.add(keep); |
| 407 | 291 //ServerMainLoop.logger.writeLog("Editor eid:"+eid+" sentList = "+sentList); |
| 464 | 292 assert(ackList.size()<limit); |
| 431 | 293 if (command.cmd==REP.REPCMD_DELETE) { |
| 294 // delete のundo用の文字列は、外に出す意味はない | |
| 295 command.string=null; | |
| 296 } | |
| 397 | 297 next.send(command); |
| 298 } | |
| 299 | |
| 391 | 300 /** |
| 301 * 一周して来たcommandの処理。 | |
| 404 | 302 * |
| 303 * INSERT/DELETEを受け取った時に、sentListに登録 | |
| 304 * INSERT_ACK/DELETE_ACKが来たら一周。そこで、Mergeする。 | |
| 305 * | |
| 306 * 自分が出したINSERT/DELETEが戻って来たら、ACKに変更して、Merge。 | |
| 307 * | |
| 308 * 途中から参加した場合、自分が受けとってないcommandのACKが先に来ることが | |
| 309 * ある。それは、無視して良い。 | |
| 391 | 310 * @param command |
| 311 */ | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
312 void checkReturnedCommand(REPCommand command) { |
| 483 | 313 startMerge(command); |
| 314 } | |
| 315 | |
| 316 void startMerge(REPCommand command) { | |
| 451 | 317 ServerMainLoop.logger.writeLog("Editor"+eid+": startMerge "+command); |
| 397 | 318 preMergeCommand = new REPCommand(command); |
| 391 | 319 // merge は必須だが、EditorのCommand実装をテストするには邪魔なので、off に出来るようにする。 |
| 482 | 320 if (mergeMode==MergeMode.NoMerge) { |
| 410 | 321 checkQuit(); |
| 396 | 322 endMerge(); |
| 391 | 323 return; |
| 324 } | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
325 // START_MERGE を送る |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
326 // 送らないで良い場合もある? |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
327 REPCommand cmd = new REPCommand(REP.SMCMD_START_MERGE,command.sid,REP.SM_EID.id,seq(),0,""); |
| 450 | 328 sendToEditor(cmd); |
| 387 | 329 merging = true; |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
330 // Session Manager 側で、このeditorへの他のeditorからの |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
331 // 入力を止めて、merge にそなえる。merge は、eidtor 側から |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
332 // ACKが来てから始まる。 |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
333 } |
| 483 | 334 |
| 463 | 335 /** |
| 336 * sentList と ack を見比べて、正しい順序で来たかどうかを調べる。途中参加したEditorの場合は、Ackは | |
| 337 * 無視して良い。 | |
| 338 * @param command | |
| 339 * @return | |
| 340 */ | |
| 457 | 341 private boolean checkAck(REPCommand command) { |
| 466 | 342 REPCommand prev = null; |
| 343 try { | |
| 344 if(isMerging() || ackList.size()==0) throw new Exception(); | |
| 345 prev=ackList.remove(0); | |
| 346 if (prev==null || prev.seq != command.seq || prev.eid!=command.eid) throw new Exception(); | |
| 347 } catch (Exception n) { | |
| 457 | 348 // should be more robust to allow communication failure |
| 349 String err = "Editor eid="+eid+" checkReturnedCommand() : command = " + command + " prev="+ | |
| 466 | 350 (prev==null?"null":prev)+" ackList="; |
| 464 | 351 err += ackList; |
| 457 | 352 ServerMainLoop.logger.writeLog(err); |
| 353 assert(false); | |
| 354 } | |
| 355 return true; | |
| 356 } | |
| 357 | |
|
382
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 @Override |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
360 public void setQuit2(REPCommand cmd) { |
| 462 | 361 quit_2 = cmd; |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
362 checkQuit(); |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
363 // 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
|
364 // command |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
365 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
366 |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
367 @Override |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
368 public void setEID(int eid) { |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
369 this.eid = eid; |
|
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 |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
372 public String toString(){ |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
373 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
|
374 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
375 |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
376 void checkEndMerge() { |
| 387 | 377 if (merging) { |
| 468 | 378 if (isMerging()) return; |
| 396 | 379 endMerge(); |
| 387 | 380 merging = false; |
| 381 } | |
| 462 | 382 if (quit_2!=null) checkQuit(); |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
383 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
384 |
| 442 | 385 |
| 396 | 386 private void endMerge() { |
| 387 REPCommand mergeEnd = new REPCommand(REP.SMCMD_END_MERGE,sid,eid,seq(),0,""); | |
| 450 | 388 sendToEditor(mergeEnd); |
| 483 | 389 if (mergeMode==MergeMode.Direct) { |
| 486 | 390 REPCommand last = sentList.getLast(); |
| 391 if (last!=null && last.eid==eid && last.sid==sid) | |
| 392 truncateSentList(last); | |
| 483 | 393 preMergeCommand = null; |
| 394 return ; | |
| 395 } | |
| 396 sortedEditCmds = null; | |
| 452 | 397 checkAck(preMergeCommand); |
| 397 | 398 if (preMergeCommand.eid==eid) { |
| 482 | 399 if (mergeMode==MergeMode.Early) { |
| 462 | 400 sendAck(preMergeCommand); |
| 463 | 401 } |
| 397 | 402 } else { |
| 468 | 403 ServerMainLoop.logger.writeLog("Editor"+eid+": send preMergeCommand "+preMergeCommand); |
| 397 | 404 next.send(preMergeCommand); |
| 405 } | |
| 465 | 406 // sentList.clear(); |
| 397 | 407 preMergeCommand = null; |
| 396 | 408 } |
| 409 | |
| 484 | 410 /** |
| 411 * User Editor Command Fix the command order of | |
| 412 * other editor commands except own command | |
| 413 * truncate sentList and unMergedCmds. | |
| 414 */ | |
| 415 private void truncateSentList(REPCommand commit) { | |
| 486 | 416 if (merging) { |
| 417 preMergeCommand = commit; | |
| 418 return; | |
| 419 } | |
| 483 | 420 LinkedList<REPCommand>u = new LinkedList<REPCommand>(); |
| 421 for(REPCommand command:unMergedCmds) { | |
| 486 | 422 if (command.cmd==REP.REPCMD_MERGE_MARK) continue; |
| 484 | 423 if (command.eid!=eid) break; |
| 424 u.addLast(command); | |
| 425 } | |
| 426 unMergedCmds = u; | |
| 427 LinkedList<REPCommand>s = new LinkedList<REPCommand>(); | |
| 428 for(REPCommand command:sentList) { | |
| 429 if (command.eid!=eid) { | |
| 430 s.clear(); | |
| 431 continue; | |
| 483 | 432 } |
| 484 | 433 s.addLast(command); |
| 483 | 434 } |
| 484 | 435 sentList = s; |
| 436 } | |
| 437 | |
| 438 /** | |
| 439 * Returned command fixed command order. Remove from | |
| 440 * sentList and unMergedCmds | |
| 441 * @param commit | |
| 442 */ | |
| 443 public void truncateUnMergedCmds(REPCommand commit) { | |
| 486 | 444 // assert(!merging); merging でもすり抜ける場合がある |
| 484 | 445 LinkedList<REPCommand>u = new LinkedList<REPCommand>(); |
| 446 for(REPCommand command:unMergedCmds) { | |
| 486 | 447 if (command.cmd==REP.REPCMD_MERGE_MARK) continue; |
| 484 | 448 if (command.isSameSeq(commit)) break; |
| 449 u.addLast(command); | |
| 450 } | |
| 483 | 451 unMergedCmds = u; |
| 484 | 452 boolean flag = false; |
| 453 LinkedList<REPCommand>s = new LinkedList<REPCommand>(); | |
| 454 for(REPCommand command:sentList) { | |
| 455 if (command.isSameSeq(commit)) flag = true; | |
| 456 if (flag) s.addLast(command); | |
| 457 } | |
| 458 if (flag) sentList = s; | |
| 483 | 459 } |
| 460 | |
| 462 | 461 private void sendAck(REPCommand command) { |
| 462 REPCommand keep = new REPCommand(command); | |
| 463 // First Phase End, send ACK | |
| 464 switch(keep.cmd) { | |
| 465 case REPCMD_INSERT: keep.cmd = REP.REPCMD_INSERT_ACK;break; | |
| 466 case REPCMD_DELETE: keep.cmd = REP.REPCMD_DELETE_ACK;break; | |
| 467 default: assert(false); | |
| 468 } | |
| 464 | 469 ackList.addLast(keep); |
| 463 | 470 ServerMainLoop.logger.writeLog("Editor"+eid+": sendAck sentList = "+sentList); |
| 464 | 471 assert(ackList.size()<limit); |
| 463 | 472 keep.string = ""; |
| 462 | 473 next.send(keep); |
| 474 } | |
| 475 | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
476 private boolean checkQuit() { |
| 468 | 477 if (quit_2!=null && ackList.size()==0 && sentList.size()==0&&!isMerging() && waitingCommandInMerge.size()==0) { |
| 462 | 478 sendToEditor(quit_2); |
| 479 quit_2 = null; | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
480 return true; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
481 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
482 return false; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
483 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
484 |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
485 @Override |
| 387 | 486 public boolean manage(REPCommand command) { |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
487 |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
488 |
| 387 | 489 switch(command.cmd){ |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
490 // Editor Command |
| 396 | 491 |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
492 case REPCMD_DELETE: |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
493 case REPCMD_INSERT: |
| 400 | 494 case REPCMD_DELETE_USER: |
| 495 case REPCMD_INSERT_USER: | |
| 396 | 496 case REPCMD_DELETE_ACK: |
| 497 case REPCMD_INSERT_ACK: | |
| 465 | 498 case REPCMD_MERGE_MARK: |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
499 { |
| 387 | 500 translate(command); |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
501 break; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
502 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
503 |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
504 case SMCMD_START_MERGE_ACK: |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
505 { |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
506 // マージの処理と次のエディタへコマンドを送信する処理 |
| 468 | 507 mergeAck(); |
| 483 | 508 if (!merge(preMergeCommand)) { |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
509 // nothing to do, send END_MERGE |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
510 checkEndMerge(); |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
511 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
512 break; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
513 } |
| 386 | 514 |
| 515 case SMCMD_SYNC: | |
| 516 if (isMaster()) | |
| 450 | 517 sendToEditor(command); |
| 386 | 518 else |
| 387 | 519 next.send(command); |
| 386 | 520 |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
521 case SMCMD_QUIT: |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
522 { |
| 387 | 523 next.send(command); |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
524 break; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
525 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
526 case SMCMD_QUIT_2: |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
527 { |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
528 // QUIT_2 is returned. |
| 387 | 529 if (command.eid!=eid) { |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
530 // 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
|
531 // by QUIT_2_ACK |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
532 manager.remove(this); |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
533 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
534 // 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
|
535 // merge is processed. |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
536 // this does not work in distributed case. |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
537 if (next.isDirect()) |
| 387 | 538 next.setQuit2(command); |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
539 else |
| 387 | 540 next.send(command); |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
541 break; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
542 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
543 case SMCMD_QUIT_2_ACK: |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
544 { |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
545 manager.remove(this); |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
546 break; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
547 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
548 default: |
| 396 | 549 assert false; |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
550 return false; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
551 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
552 return true; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
553 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
554 |
| 442 | 555 |
| 450 | 556 private boolean isMergeCommand(REPCommand command) { |
| 485 | 557 if (mergeMode==MergeMode.Direct) |
| 558 return (command.eid!=eid&&command.cmd==REP.REPCMD_INSERT || command.cmd==REP.REPCMD_DELETE); | |
| 450 | 559 switch(command.cmd) { |
| 560 case REPCMD_INSERT: case REPCMD_DELETE: | |
| 482 | 561 return mergeMode==MergeMode.Slow?false:command.eid==eid; |
| 450 | 562 case REPCMD_INSERT_ACK: case REPCMD_DELETE_ACK: |
| 482 | 563 return mergeMode==MergeMode.Slow?true:command.eid!=eid; |
| 450 | 564 } |
| 565 return false; | |
| 566 } | |
| 567 | |
| 568 public void sendToEditor(REPCommand command) { | |
| 460 | 569 writeQueue.add(command); |
| 450 | 570 } |
| 571 | |
| 442 | 572 @Override |
| 387 | 573 public void handle(REPCommand command, REPSelectionKey<REPCommand> key) throws IOException { |
| 574 if (command.cmd==REP.SMCMD_JOIN||command.cmd==REP.SMCMD_PUT) { | |
| 404 | 575 // assert false; |
| 427 | 576 // 一つのエディタ上に複数のセッションが作られた場合。 |
| 387 | 577 // 若干問題があるらしい |
| 578 next = new Forwarder(manager,next.channel); | |
| 579 REPNode first = new FirstConnector(manager,channel); | |
| 580 first.handle(command, key); | |
| 581 key.attach(new Dispatcher(manager,channel)); | |
| 582 return; | |
| 583 } | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
584 if (manager.sessionManage(this, command)) return; |
| 471 | 585 // ServerMainLoop.logger.writeLog("Editor"+eid+": handle command="+command); |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
586 manage(command); |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
587 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
588 |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
589 @Override |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
590 public void cancel(REPSocketChannel<REPCommand> socketChannel) { |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
591 manager.remove(socketChannel); |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
592 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
593 |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
594 public boolean isMaster() { |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
595 return mode==REP.SMCMD_PUT; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
596 } |
| 386 | 597 |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
598 |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
599 /* Handle special case first, usually these cases |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
600 * 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
|
601 * it is forwarded here. |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
602 */ |
| 385 | 603 public void forwardedCommandManage(REPCommand command) { |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
604 if (command.cmd==REP.SMCMD_QUIT_2) { |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
605 // 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
|
606 // 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
|
607 // state. Only this session manager knows it. |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
608 setQuit2(command); |
| 401 | 609 return; |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
610 } |
| 385 | 611 send(command); |
| 612 } | |
| 613 | |
| 468 | 614 /** |
| 615 * New command from an editor | |
| 616 * The command is sent to the next editor | |
| 617 * @param cmd | |
| 618 * @return translated command. | |
| 619 */ | |
| 620 public REPCommand transSendCmd(REPCommand cmd){ | |
| 621 assert(cmd.eid==eid); | |
| 622 unMergedCmds.addLast(cmd); | |
| 623 | |
| 624 //マージ中にユーザから割り込みがあった場合 | |
| 625 if(isMerging()){ | |
| 626 mergeAgain = true; | |
| 627 } | |
| 628 | |
| 629 return cmd; | |
| 630 } | |
| 631 | |
| 632 /** | |
| 633 * My command is returned from the session ring, and START_MERGE_ACK | |
| 634 * is returned. At this | |
| 635 * stage my writeQueue is empty, our editor is waiting for me. | |
| 636 * Start merge process. | |
| 637 * @param cmd | |
| 638 */ | |
| 483 | 639 public boolean merge(REPCommand prev){ |
| 468 | 640 logger.writeLog("beforeMerge"+eid+":"+unMergedCmds); |
| 641 LinkedList<REPCommand> output = new LinkedList<REPCommand>(); | |
| 642 LinkedList<REPCommand> newSentList = new LinkedList<REPCommand>(); | |
| 643 // merge queue上にあるコマンドを全部undoコマンドするのと同時に | |
| 644 // sort したコマンド列を生成する | |
| 645 for( REPCommand cmd0 : unMergedCmds) { | |
| 646 output.addLast( createUndo(cmd0) ); | |
| 647 } | |
| 648 | |
| 649 sortedEditCmds = new TreeSet<REPCommand>(new REPCommandComparator(1)); | |
| 483 | 650 logger.writeLog("sentList"+eid+":"+sentList); |
| 486 | 651 boolean flag = true; |
| 483 | 652 for( REPCommand cmd0 : sentList ) { |
| 486 | 653 if (mergeMode==MergeMode.Direct) { |
| 654 if (cmd0.cmd==REP.REPCMD_MERGE_MARK) { | |
| 655 flag = false; | |
| 656 } | |
| 657 } | |
| 468 | 658 if (cmd0.cmd==REP.REPCMD_INSERT || cmd0.cmd==REP.REPCMD_DELETE) { |
| 486 | 659 if (flag) sortedEditCmds.add(cmd0); |
| 660 else newSentList.add(cmd0); | |
| 468 | 661 } |
| 662 } | |
| 469 | 663 output.addAll(sortedEditCmds); |
| 486 | 664 if (mergeMode==MergeMode.Direct) { |
| 665 output.addAll(newSentList); | |
| 666 output.remove(mergeMark); | |
| 667 sentList.remove(mergeMark); | |
| 668 } else | |
| 669 output.addLast(mergeMark); | |
| 468 | 670 logger.writeLog("sortedMerge"+eid+":"+sortedEditCmds); |
| 671 // unMerged command のdeleteのundo string は、この時点で使えない。 | |
| 672 // Editor 側から送り返して来たものを使う必要がある。 | |
| 673 unMergedCmds.clear(); | |
| 486 | 674 if (mergeMode!=MergeMode.Direct) |
| 675 sentList = newSentList; | |
| 468 | 676 logger.writeLog("outputMerge"+eid+":"+output); |
| 483 | 677 return optimizedSend(this,output); |
| 468 | 678 } |
| 679 | |
| 680 /** | |
| 681 * Sent optimized merged command list | |
| 682 * @param editor | |
| 683 * @param output | |
| 684 * @return if any sent commands output | |
| 685 */ | |
| 686 public boolean optimizedSend(REPNode editor, LinkedList<REPCommand> output) { | |
| 687 /* | |
| 688 * Optimized send の場合は、unMergedCommand のつじつまを合わせる必要がある。 | |
| 689 */ | |
| 690 sentMergedList.clear(); | |
| 691 List<REPCommand> output1 = optimizer.optimize(output); | |
| 692 if (output1.size()==0) { | |
| 486 | 693 merging = false; |
| 468 | 694 return false; |
| 695 } | |
| 696 for(REPCommand c:output1) { | |
| 697 REPCommand m = new REPCommand(c); | |
| 698 m.setEID(REP.MERGE_EID.id); | |
| 699 m.setSEQID(editor.seq()); | |
| 700 sentMergedList.addLast(m); | |
| 701 editor.sendToEditor(m); | |
| 702 } | |
| 703 logger.writeLog("OptimizedOutputMerge"+eid+":"+sentMergedList); | |
| 486 | 704 merging = true; |
| 468 | 705 return true; |
| 706 } | |
| 707 | |
| 708 private REPCommand createUndo(REPCommand cmd){ | |
| 709 REPCommand retCmd = new REPCommand(cmd); | |
| 710 if (cmd.cmd==REP.REPCMD_INSERT) { | |
| 711 retCmd.cmd=REP.REPCMD_DELETE; | |
| 712 retCmd.string=""; | |
| 713 } | |
| 714 else if (cmd.cmd==REP.REPCMD_DELETE) retCmd.cmd=REP.REPCMD_INSERT; | |
| 715 return retCmd; | |
| 716 } | |
| 717 | |
| 718 class REPCommandComparator implements Comparator<REPCommand>{ | |
| 719 int base; | |
| 720 REPCommandComparator(int base) { | |
| 721 this.base = base; | |
| 722 } | |
| 723 public int compare(REPCommand o1, REPCommand o2) { | |
| 724 int eid1 = o1.eid-base; if (eid1<0) eid1 += Integer.MAX_VALUE; | |
| 725 int eid2 = o2.eid-base; if (eid2<0) eid2 += Integer.MAX_VALUE; | |
| 726 if ( eid1<eid2 ) return -1; | |
| 727 if ( eid1>eid2 ) return 1; | |
| 728 if ( o1.seq<o2.seq ) return -1; | |
| 729 if ( o1.seq>o2.seq ) return 1; | |
| 730 // assert(false); // this can happen in MergedAgain case | |
| 731 return 0; | |
| 732 } | |
| 733 } | |
| 734 | |
| 735 /** | |
| 736 * Translate Command that was received from SeMa. | |
| 737 * @param cmd the command to be translated. | |
| 738 * @return translated command. | |
| 739 */ | |
| 740 public void transReceiveCmd(REPNode nextEditor,REPCommand cmd){ | |
| 741 assert (cmd.eid != eid); | |
| 471 | 742 unMergedCmds.addFirst(new REPCommand(cmd)); |
| 468 | 743 } |
| 744 | |
| 745 public void setEid(int _eid){ | |
| 746 eid = _eid; | |
| 747 } | |
| 748 | |
| 749 public boolean checkMergeConflict(REPCommand command) { | |
| 471 | 750 unMergedCmds.addFirst(new REPCommand(command)); |
| 468 | 751 |
| 752 REPCommand prev = sentMergedList.getFirst(); | |
| 753 if (prev.seq==command.seq) { | |
| 754 // logger.writeLog("Input eid="+eid+"SentMergedList = "+sentMergedList); | |
| 755 sentMergedList.removeFirst(); | |
| 756 } | |
| 757 // previous merge command may be returned | |
| 758 | |
| 759 if(sentMergedList.size()==0 && !mergeAgain) { | |
| 486 | 760 merging=false; |
| 468 | 761 } |
| 762 return mergeAgain; | |
| 763 } | |
| 764 | |
| 483 | 765 public void getMergeAgain() { |
| 468 | 766 if (sentMergedList.size()>0) return; // wait for previous merge completion |
| 767 | |
| 768 LinkedList<REPCommand> returnCommand = new LinkedList<REPCommand>(); | |
| 769 for(REPCommand command : unMergedCmds) { | |
| 770 if (command.cmd==REP.REPCMD_INSERT||command.cmd==REP.REPCMD_DELETE) | |
| 771 returnCommand.add(createUndo(command)); | |
| 772 } | |
| 773 returnCommand.addAll(sortedEditCmds); | |
| 483 | 774 returnCommand.addLast(new REPCommand(REP.REPCMD_MERGE_MARK,0, sid, REP.MERGE_EID.id, seq(), "")); |
| 775 returnCommand.addAll(sentList); | |
| 468 | 776 unMergedCmds.clear(); |
| 777 logger.writeLog("MergeAgain "+eid+" ret="+returnCommand.size()); | |
| 778 mergeAgain = false; | |
| 483 | 779 optimizedSend(this, returnCommand); |
| 468 | 780 } |
| 781 // | |
| 782 // public boolean isFinished() { | |
| 783 // if(unMergedCmds.size() > 0) return false; | |
| 784 // if(sentMergedList.size() > 0) return false; | |
| 785 // return true; | |
| 786 // } | |
| 787 | |
| 788 public boolean isMerging() { | |
| 486 | 789 return merging; |
| 468 | 790 } |
| 791 | |
| 792 /** | |
| 793 * receive SMCMD_START_MERGE_ACK | |
| 794 */ | |
| 795 public void mergeAck() { | |
| 796 logger.writeLog("Editor"+eid+": START MERGE "+ | |
| 797 ((unMergedCmds.size()>0)?" and top of unMergedCmds = "+ unMergedCmds.getLast():"")); | |
| 486 | 798 merging = true; |
| 468 | 799 } |
| 800 | |
| 485 | 801 /** |
| 802 * Dead lock reporter | |
| 803 */ | |
| 804 public String report() { | |
| 805 String s = ""; | |
| 486 | 806 s += "\n sentList:"+sentList; |
| 485 | 807 s += "\n ackList:"+ackList; |
| 808 s += "\n unMergedList:"+unMergedCmds; | |
| 486 | 809 s += "\n mergeMode=:"+merging; |
| 485 | 810 return s; |
| 811 } | |
| 399 | 812 |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
813 } |