Mercurial > hg > RemoteEditor > REPSessionManager
annotate rep/handler/Editor.java @ 494:6b718b6b789c
new merge fix
| author | one |
|---|---|
| date | Sat, 23 Oct 2010 19:32:16 +0900 |
| parents | 24297c2d9422 |
| children | bd76f7e39247 |
| 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> sentMergedList; | |
| 30 private TreeSet<REPCommand> sortedEditCmds; | |
| 31 boolean mergeAgain; | |
| 32 public REPLogger logger = SessionManager.logger; | |
| 487 | 33 private boolean blocking = false; |
| 34 private boolean merging = false; | |
| 486 | 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 mergeAgain = false; | |
| 64 sentMergedList = new LinkedList<REPCommand>(); | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
65 } |
| 387 | 66 |
| 427 | 67 /* |
| 68 * Merge Protocol | |
| 445 | 69 (0) Editor へのコマンドは、ack 以外は直接 Editor へ送られてしまう。(next.send(cmd)) |
| 70 Editor から返ってくるコマンドをtranslatorが処理する。 | |
| 427 | 71 (1) Editor CommandをSession Ring 上に流し、それが戻って来るまでに、他のEditorから |
| 72 受け取った Editor Command をキューに入れておく。 | |
| 482 | 73 sentList 外に送り出したEditor Command |
| 74 MergingSentList Mergeするlist 。Mergeのやり直し用。 | |
| 75 Slow/Early | |
| 427 | 76 (2) 戻って来たタイミングで、キュー上のEditor Commandを、eid とCommandの |
| 482 | 77 順序を基にソートする。(self merge (Early)) |
| 427 | 78 (3) 他のEditorにソートのタイミングを与えるために、Editor Command の |
| 79 ack を、もう一周させる。 | |
| 80 (4) 他のEditorのCommandを受け取ってから、ack が来るまでのCommandをキューに | |
| 482 | 81 入れておき、ack が来たら、eid とCommandの順序を基にソートする。(other merge (Slow)) |
| 82 Direct | |
| 83 (5) 他のEditor Command が来た時点で、すぐにmergeする | |
| 84 (6) 自分のEditor Command が来て、 | |
| 85 未確定の他のEditor Command があれば、それを確定(sentList/unMergedListから削除) | |
| 86 自分のEditor Command はsentListに追加 (unMergedListには既に入っている) | |
| 87 (7) Ackが来たら、そのEditor Command まで確定 | |
| 427 | 88 |
| 89 Editor には、ソートした編集結果になるように、それまで行なった編集をUndo | |
| 90 して、ソートした編集結果を適用する。Undo が無駄な動作をしないように最適化する。 | |
| 482 | 91 */ |
| 92 | |
| 93 /* | |
| 427 | 94 handle() |
| 95 セッションの処理 | |
| 96 manage() | |
| 97 編集コマンドは translate() へ | |
| 98 一周して来た編集コマンドのACKは廃棄 (merge queue から削除) | |
| 99 一周して来た自分のコマンドならself merge | |
| 100 他のエディタの編集コマンドのACK->other merge | |
| 101 それ以外は、そのまま実行、merge queue へ格納 | |
| 102 merge は checkReturnedCommand() から | |
| 103 startMerge() へ | |
| 104 まず、接続されている Editor に START_MERGE を送る | |
| 105 邪魔されないように、他のcommand は block する | |
| 106 manager() | |
| 107 START_MERGE_ACK が来たら、translator.mergeAck() で教えて、 | |
| 108 merge()-> | |
| 109 translator.checkOwnCommand() へ | |
| 110 ここで、sort されて、Merge Command をEditorへ送信 | |
| 111 checkEndMerge()から | |
| 112 endMerge() が呼ばれる。 | |
| 113 自分のエディタにEND_MERGE で Merge終了を通知 | |
| 114 自分のコマンドは、ACKに変えて送信 (3) | |
| 115 それ以外は、そのまま送信 (一周させる) | |
| 116 | |
| 117 */ | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
118 |
| 468 | 119 |
| 397 | 120 public void translate(REPCommand command){ |
| 121 switch(command.cmd) { | |
| 122 case REPCMD_INSERT_ACK: | |
| 123 case REPCMD_DELETE_ACK: | |
| 124 if (command.eid==eid) { | |
| 482 | 125 if (mergeMode==MergeMode.Slow) { |
| 462 | 126 checkReturnedCommand(command); |
| 127 checkQuit(); | |
| 128 return; | |
| 484 | 129 } |
| 397 | 130 // Second Phase が終わって同期が終了。 |
| 442 | 131 // SessionManager.logger.writeLog("Complete "+command); |
| 452 | 132 checkAck(command); |
| 410 | 133 checkQuit(); |
| 397 | 134 return; |
| 135 } | |
| 485 | 136 if (mergeMode==MergeMode.Direct) { |
| 137 checkAck(command); | |
| 138 truncateUnMergedCmds(command); | |
| 486 | 139 ServerMainLoop.logger.writeLog("Editor"+eid+": send ackCommand "+command+report()); |
| 485 | 140 next.send(command); |
| 141 checkQuit(); | |
| 142 } else | |
| 143 checkReturnedCommand(command); | |
| 397 | 144 return; |
| 400 | 145 case REPCMD_INSERT_USER: |
| 146 command.cmd = REP.REPCMD_INSERT; | |
| 147 userEditorCommand(command); | |
| 148 return; | |
| 149 case REPCMD_DELETE_USER: | |
| 406 | 150 command.cmd = REP.REPCMD_DELETE; |
| 400 | 151 userEditorCommand(command); |
| 152 return; | |
| 401 | 153 case REPCMD_INSERT: |
| 154 case REPCMD_DELETE: | |
| 465 | 155 case REPCMD_MERGE_MARK: |
| 401 | 156 if (command.eid == REP.MERGE_EID.id){ |
| 157 //マージコマンドが返ってきた | |
| 468 | 158 if(checkMergeConflict(command)){ |
| 401 | 159 //マージ中にエディタからの割り込みがあった場合 |
| 483 | 160 getMergeAgain(); |
| 401 | 161 } |
| 162 checkEndMerge(); | |
| 163 return; | |
| 457 | 164 } |
| 165 if (command.eid == eid){ | |
| 401 | 166 // 編集コマンドが一周して来た |
| 482 | 167 if (mergeMode==MergeMode.Slow) { |
| 462 | 168 checkAck(command); |
| 169 sendAck(command); | |
| 485 | 170 } else if (mergeMode==MergeMode.Direct) { |
| 171 truncateUnMergedCmds(command); | |
| 172 checkAck(command); | |
| 173 sendAck(command); | |
| 462 | 174 } else { |
| 175 checkReturnedCommand(command); | |
| 176 } | |
| 400 | 177 return; |
| 178 } | |
| 401 | 179 |
| 180 //他のエディタからの編集コマンド | |
| 468 | 181 transReceiveCmd(next,command); |
| 486 | 182 if (mergeMode==MergeMode.Direct) { |
| 183 sendEditorCommand(command); | |
| 490 | 184 // Own commands may enter after here. To distinguish put mark here |
| 486 | 185 sentList.addLast(mergeMark ); |
| 483 | 186 startMerge(command); |
| 486 | 187 } else |
| 483 | 188 sendEditorCommand(command); |
| 400 | 189 return; |
| 401 | 190 default: |
| 191 assert(false); | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
192 } |
| 400 | 193 } |
| 194 | |
| 195 private void userEditorCommand(REPCommand command) { | |
| 196 //エディタからの新たな編集コマンド | |
| 197 if (next==this) return; // singleton case | |
| 468 | 198 transSendCmd(command); |
| 400 | 199 sendEditorCommand(command); |
| 489 | 200 if (mergeMode==MergeMode.Direct) { |
| 201 ServerMainLoop.logger.writeLog("Editor"+eid+": User Command Before "+command+report()); | |
| 490 | 202 truncateSentList(command,true); |
| 489 | 203 ServerMainLoop.logger.writeLog("Editor"+eid+": User Command After "+command+report()); |
| 204 } | |
|
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) { | |
| 487 | 248 if (blocking || isMerging() || waitingCommandInMerge.size()>0) { |
| 460 | 249 waitingCommandInMerge.addLast(command); |
| 250 ServerMainLoop.logger.writeLog("Editor eid:"+eid+" waitingCommandInMerge = "+waitingCommandInMerge); | |
| 251 return; | |
| 252 } | |
| 253 if (isMergeCommand(command)) { | |
| 487 | 254 blocking = true; |
| 460 | 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 } | |
| 487 | 271 if (blocking || 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)) { | |
| 487 | 277 blocking = true; |
| 460 | 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); |
| 490 | 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からの |
| 490 | 331 // 入力を止めて、merge にそなえるのは、ここでは間に合わないので、 |
| 332 // send() で行っている。USER Command は、止められないが、問題ない。 | |
| 333 // merge は、eidtor 側からACKが来てから始まる。 | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
334 } |
| 483 | 335 |
| 463 | 336 /** |
| 337 * sentList と ack を見比べて、正しい順序で来たかどうかを調べる。途中参加したEditorの場合は、Ackは | |
| 338 * 無視して良い。 | |
| 339 * @param command | |
| 340 * @return | |
| 341 */ | |
| 457 | 342 private boolean checkAck(REPCommand command) { |
| 466 | 343 REPCommand prev = null; |
| 344 try { | |
| 487 | 345 if(mergeMode!=MergeMode.Direct && isMerging()) throw new Exception(); |
| 346 if(ackList.size()==0) throw new Exception(); | |
| 466 | 347 prev=ackList.remove(0); |
| 348 if (prev==null || prev.seq != command.seq || prev.eid!=command.eid) throw new Exception(); | |
| 349 } catch (Exception n) { | |
| 457 | 350 // should be more robust to allow communication failure |
| 351 String err = "Editor eid="+eid+" checkReturnedCommand() : command = " + command + " prev="+ | |
| 466 | 352 (prev==null?"null":prev)+" ackList="; |
| 464 | 353 err += ackList; |
| 487 | 354 err += "merging="+isMerging(); |
| 457 | 355 ServerMainLoop.logger.writeLog(err); |
| 356 assert(false); | |
| 357 } | |
| 358 return true; | |
| 359 } | |
| 360 | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
361 |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
362 @Override |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
363 public void setQuit2(REPCommand cmd) { |
| 462 | 364 quit_2 = cmd; |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
365 checkQuit(); |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
366 // 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
|
367 // command |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
368 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
369 |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
370 @Override |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
371 public void setEID(int eid) { |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
372 this.eid = eid; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
373 } |
|
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 public String toString(){ |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
376 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
|
377 } |
|
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 void checkEndMerge() { |
| 488 | 380 if (blocking) { |
| 468 | 381 if (isMerging()) return; |
| 396 | 382 endMerge(); |
| 487 | 383 blocking = false; |
| 387 | 384 } |
| 462 | 385 if (quit_2!=null) checkQuit(); |
|
382
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 |
| 442 | 388 |
| 396 | 389 private void endMerge() { |
| 390 REPCommand mergeEnd = new REPCommand(REP.SMCMD_END_MERGE,sid,eid,seq(),0,""); | |
| 450 | 391 sendToEditor(mergeEnd); |
| 483 | 392 if (mergeMode==MergeMode.Direct) { |
| 490 | 393 REPCommand last = sentList.size()==0?null:sentList.getLast(); |
| 394 ServerMainLoop.logger.writeLog("Editor"+eid+": EndMerge Before"+report()); | |
| 486 | 395 if (last!=null && last.eid==eid && last.sid==sid) |
| 490 | 396 truncateSentList(last,false); |
| 397 sentList.remove(mergeMark); | |
| 483 | 398 preMergeCommand = null; |
| 489 | 399 ServerMainLoop.logger.writeLog("Editor"+eid+": EndMerge "+report()); |
| 483 | 400 return ; |
| 401 } | |
| 402 sortedEditCmds = null; | |
| 452 | 403 checkAck(preMergeCommand); |
| 397 | 404 if (preMergeCommand.eid==eid) { |
| 482 | 405 if (mergeMode==MergeMode.Early) { |
| 462 | 406 sendAck(preMergeCommand); |
| 463 | 407 } |
| 397 | 408 } else { |
| 468 | 409 ServerMainLoop.logger.writeLog("Editor"+eid+": send preMergeCommand "+preMergeCommand); |
| 397 | 410 next.send(preMergeCommand); |
| 411 } | |
| 465 | 412 // sentList.clear(); |
| 397 | 413 preMergeCommand = null; |
| 396 | 414 } |
| 415 | |
| 484 | 416 /** |
| 417 * User Editor Command Fix the command order of | |
| 418 * other editor commands except own command | |
| 419 * truncate sentList and unMergedCmds. | |
| 490 | 420 * mode==false Don't truncate unMergedCmds after merge mark |
| 484 | 421 */ |
| 490 | 422 private void truncateSentList(REPCommand commit, boolean mode) { |
| 494 | 423 if (blocking) return; // merging is not enough |
| 484 | 424 LinkedList<REPCommand>s = new LinkedList<REPCommand>(); |
| 425 for(REPCommand command:sentList) { | |
| 426 if (command.eid!=eid) { | |
| 427 s.clear(); | |
| 428 continue; | |
| 483 | 429 } |
| 484 | 430 s.addLast(command); |
| 483 | 431 } |
| 484 | 432 sentList = s; |
| 433 } | |
| 434 | |
| 435 /** | |
| 436 * Returned command fixed command order. Remove from | |
| 437 * sentList and unMergedCmds | |
| 438 * @param commit | |
| 439 */ | |
| 440 public void truncateUnMergedCmds(REPCommand commit) { | |
| 487 | 441 assert(!merging); |
| 484 | 442 boolean flag = false; |
| 443 LinkedList<REPCommand>s = new LinkedList<REPCommand>(); | |
| 444 for(REPCommand command:sentList) { | |
| 487 | 445 if (command.isSameSeq(commit)) { |
| 446 flag = true; continue; | |
| 447 } | |
| 484 | 448 if (flag) s.addLast(command); |
| 449 } | |
| 450 if (flag) sentList = s; | |
| 483 | 451 } |
| 452 | |
| 489 | 453 /** |
| 454 * Send ack command after receiving self command | |
| 455 * @param command | |
| 456 */ | |
| 462 | 457 private void sendAck(REPCommand command) { |
| 458 REPCommand keep = new REPCommand(command); | |
| 459 // First Phase End, send ACK | |
| 460 switch(keep.cmd) { | |
| 461 case REPCMD_INSERT: keep.cmd = REP.REPCMD_INSERT_ACK;break; | |
| 462 case REPCMD_DELETE: keep.cmd = REP.REPCMD_DELETE_ACK;break; | |
| 463 default: assert(false); | |
| 464 } | |
| 464 | 465 ackList.addLast(keep); |
| 463 | 466 ServerMainLoop.logger.writeLog("Editor"+eid+": sendAck sentList = "+sentList); |
| 464 | 467 assert(ackList.size()<limit); |
| 463 | 468 keep.string = ""; |
| 462 | 469 next.send(keep); |
| 470 } | |
| 471 | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
472 private boolean checkQuit() { |
| 488 | 473 if (quit_2!=null && ackList.size()==0 &&!isMerging() && waitingCommandInMerge.size()==0) { |
| 474 if (emptySentList() ){ | |
| 462 | 475 sendToEditor(quit_2); |
| 476 quit_2 = null; | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
477 return true; |
| 488 | 478 } |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
479 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
480 return false; |
|
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 |
| 488 | 483 private boolean emptySentList() { |
| 484 return sentList.size()==0||(sentList.size()==1 && sentList.getFirst().cmd==REP.REPCMD_MERGE_MARK); | |
| 485 } | |
| 486 | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
487 @Override |
| 387 | 488 public boolean manage(REPCommand command) { |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
489 |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
490 |
| 387 | 491 switch(command.cmd){ |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
492 // Editor Command |
| 396 | 493 |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
494 case REPCMD_DELETE: |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
495 case REPCMD_INSERT: |
| 400 | 496 case REPCMD_DELETE_USER: |
| 497 case REPCMD_INSERT_USER: | |
| 396 | 498 case REPCMD_DELETE_ACK: |
| 499 case REPCMD_INSERT_ACK: | |
| 465 | 500 case REPCMD_MERGE_MARK: |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
501 { |
| 387 | 502 translate(command); |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
503 break; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
504 } |
|
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 case SMCMD_START_MERGE_ACK: |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
507 { |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
508 // マージの処理と次のエディタへコマンドを送信する処理 |
| 468 | 509 mergeAck(); |
| 483 | 510 if (!merge(preMergeCommand)) { |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
511 // nothing to do, send END_MERGE |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
512 checkEndMerge(); |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
513 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
514 break; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
515 } |
| 386 | 516 |
| 517 case SMCMD_SYNC: | |
| 518 if (isMaster()) | |
| 450 | 519 sendToEditor(command); |
| 386 | 520 else |
| 387 | 521 next.send(command); |
| 386 | 522 |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
523 case SMCMD_QUIT: |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
524 { |
| 387 | 525 next.send(command); |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
526 break; |
|
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 case SMCMD_QUIT_2: |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
529 { |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
530 // QUIT_2 is returned. |
| 387 | 531 if (command.eid!=eid) { |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
532 // 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
|
533 // by QUIT_2_ACK |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
534 manager.remove(this); |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
535 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
536 // 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
|
537 // merge is processed. |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
538 // this does not work in distributed case. |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
539 if (next.isDirect()) |
| 387 | 540 next.setQuit2(command); |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
541 else |
| 387 | 542 next.send(command); |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
543 break; |
|
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 case SMCMD_QUIT_2_ACK: |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
546 { |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
547 manager.remove(this); |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
548 break; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
549 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
550 default: |
| 396 | 551 assert false; |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
552 return false; |
|
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 return true; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
555 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
556 |
| 442 | 557 |
| 450 | 558 private boolean isMergeCommand(REPCommand command) { |
| 485 | 559 if (mergeMode==MergeMode.Direct) |
| 560 return (command.eid!=eid&&command.cmd==REP.REPCMD_INSERT || command.cmd==REP.REPCMD_DELETE); | |
| 450 | 561 switch(command.cmd) { |
| 562 case REPCMD_INSERT: case REPCMD_DELETE: | |
| 482 | 563 return mergeMode==MergeMode.Slow?false:command.eid==eid; |
| 450 | 564 case REPCMD_INSERT_ACK: case REPCMD_DELETE_ACK: |
| 482 | 565 return mergeMode==MergeMode.Slow?true:command.eid!=eid; |
| 450 | 566 } |
| 567 return false; | |
| 568 } | |
| 569 | |
| 570 public void sendToEditor(REPCommand command) { | |
| 460 | 571 writeQueue.add(command); |
| 450 | 572 } |
| 573 | |
| 442 | 574 @Override |
| 387 | 575 public void handle(REPCommand command, REPSelectionKey<REPCommand> key) throws IOException { |
| 576 if (command.cmd==REP.SMCMD_JOIN||command.cmd==REP.SMCMD_PUT) { | |
| 404 | 577 // assert false; |
| 427 | 578 // 一つのエディタ上に複数のセッションが作られた場合。 |
| 387 | 579 // 若干問題があるらしい |
| 580 next = new Forwarder(manager,next.channel); | |
| 581 REPNode first = new FirstConnector(manager,channel); | |
| 582 first.handle(command, key); | |
| 583 key.attach(new Dispatcher(manager,channel)); | |
| 584 return; | |
| 585 } | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
586 if (manager.sessionManage(this, command)) return; |
| 471 | 587 // 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
|
588 manage(command); |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
589 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
590 |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
591 @Override |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
592 public void cancel(REPSocketChannel<REPCommand> socketChannel) { |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
593 manager.remove(socketChannel); |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
594 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
595 |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
596 public boolean isMaster() { |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
597 return mode==REP.SMCMD_PUT; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
598 } |
| 386 | 599 |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
600 |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
601 /* Handle special case first, usually these cases |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
602 * 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
|
603 * it is forwarded here. |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
604 */ |
| 385 | 605 public void forwardedCommandManage(REPCommand command) { |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
606 if (command.cmd==REP.SMCMD_QUIT_2) { |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
607 // 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
|
608 // 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
|
609 // state. Only this session manager knows it. |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
610 setQuit2(command); |
| 401 | 611 return; |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
612 } |
| 385 | 613 send(command); |
| 614 } | |
| 615 | |
| 468 | 616 /** |
| 617 * New command from an editor | |
| 618 * The command is sent to the next editor | |
| 619 * @param cmd | |
| 620 * @return translated command. | |
| 621 */ | |
| 622 public REPCommand transSendCmd(REPCommand cmd){ | |
| 623 assert(cmd.eid==eid); | |
| 624 | |
| 625 //マージ中にユーザから割り込みがあった場合 | |
| 626 if(isMerging()){ | |
| 490 | 627 logger.writeLog("mergeAgain"+eid+":"+cmd); |
| 468 | 628 mergeAgain = true; |
| 629 } | |
| 630 | |
| 631 return cmd; | |
| 632 } | |
| 633 | |
| 634 /** | |
| 635 * My command is returned from the session ring, and START_MERGE_ACK | |
| 636 * is returned. At this | |
| 637 * stage my writeQueue is empty, our editor is waiting for me. | |
| 638 * Start merge process. | |
| 639 * @param cmd | |
| 640 */ | |
| 483 | 641 public boolean merge(REPCommand prev){ |
| 492 | 642 logger.writeLog("beforeMerge"+eid+":"+sentList); |
| 468 | 643 LinkedList<REPCommand> output = new LinkedList<REPCommand>(); |
| 644 LinkedList<REPCommand> newSentList = new LinkedList<REPCommand>(); | |
| 645 // merge queue上にあるコマンドを全部undoコマンドするのと同時に | |
| 646 // sort したコマンド列を生成する | |
| 492 | 647 for( REPCommand cmd0 : sentList) { |
| 489 | 648 if (cmd0.cmd==REP.REPCMD_INSERT || cmd0.cmd==REP.REPCMD_DELETE) |
| 493 | 649 output.addLast( createUndo(cmd0) ); |
| 468 | 650 } |
| 651 | |
| 652 sortedEditCmds = new TreeSet<REPCommand>(new REPCommandComparator(1)); | |
| 483 | 653 logger.writeLog("sentList"+eid+":"+sentList); |
| 486 | 654 boolean flag = true; |
| 483 | 655 for( REPCommand cmd0 : sentList ) { |
| 487 | 656 if (cmd0.cmd==REP.REPCMD_MERGE_MARK) { |
| 657 flag = false; | |
| 658 } | |
| 659 if (cmd0.cmd==REP.REPCMD_INSERT || cmd0.cmd==REP.REPCMD_DELETE) { | |
| 660 if (flag) sortedEditCmds.add(cmd0); | |
| 661 else newSentList.add(cmd0); | |
| 486 | 662 } |
| 487 | 663 } |
| 664 output.addLast(mergeMark); | |
| 494 | 665 LinkedList<REPCommand> ns = new LinkedList<REPCommand>(); |
| 487 | 666 output.addAll(sortedEditCmds); |
| 494 | 667 ns.addAll(sortedEditCmds); |
| 668 ns.addLast(mergeMark); | |
| 487 | 669 output.addAll(newSentList); |
| 494 | 670 ns.addAll(newSentList); |
| 671 sentList = ns; | |
| 672 logger.writeLog("sortedMerge"+eid+":"+sortedEditCmds+newSentList); | |
| 487 | 673 // unMerged command のdeleteのundo string は、この時点で使えない。 |
| 674 // Editor 側から送り返して来たものを使う必要がある。 | |
| 675 logger.writeLog("outputMerge"+eid+":"+output); | |
| 676 return optimizedSend(this,output); | |
| 677 } | |
| 678 | |
| 679 public boolean mergeEarly(REPCommand prev){ | |
| 492 | 680 logger.writeLog("beforeMerge"+eid+":"+sentList); |
| 487 | 681 LinkedList<REPCommand> output = new LinkedList<REPCommand>(); |
| 682 LinkedList<REPCommand> newSentList = new LinkedList<REPCommand>(); | |
| 683 // merge queue上にあるコマンドを全部undoコマンドするのと同時に | |
| 684 // sort したコマンド列を生成する | |
| 492 | 685 for( REPCommand cmd0 : sentList) { |
| 493 | 686 output.addLast( createUndo(cmd0) ); |
| 487 | 687 } |
| 688 | |
| 689 sortedEditCmds = new TreeSet<REPCommand>(new REPCommandComparator(1)); | |
| 690 logger.writeLog("sentList"+eid+":"+sentList); | |
| 691 boolean flag = true; | |
| 692 for( REPCommand cmd0 : sentList ) { | |
| 468 | 693 if (cmd0.cmd==REP.REPCMD_INSERT || cmd0.cmd==REP.REPCMD_DELETE) { |
| 486 | 694 if (flag) sortedEditCmds.add(cmd0); |
| 695 else newSentList.add(cmd0); | |
| 468 | 696 } |
| 697 } | |
| 469 | 698 output.addAll(sortedEditCmds); |
| 487 | 699 output.addLast(mergeMark); |
| 468 | 700 logger.writeLog("sortedMerge"+eid+":"+sortedEditCmds); |
| 492 | 701 // sentList の command.string は、 |
| 468 | 702 // Editor 側から送り返して来たものを使う必要がある。 |
| 487 | 703 sentList = newSentList; |
| 468 | 704 logger.writeLog("outputMerge"+eid+":"+output); |
| 483 | 705 return optimizedSend(this,output); |
| 468 | 706 } |
| 707 | |
| 708 /** | |
| 709 * Sent optimized merged command list | |
| 710 * @param editor | |
| 711 * @param output | |
| 712 * @return if any sent commands output | |
| 713 */ | |
| 714 public boolean optimizedSend(REPNode editor, LinkedList<REPCommand> output) { | |
| 715 /* | |
| 492 | 716 * Optimized send の場合は、command.original を意識する必要がある |
| 468 | 717 */ |
| 718 sentMergedList.clear(); | |
| 719 List<REPCommand> output1 = optimizer.optimize(output); | |
| 720 if (output1.size()==0) { | |
| 486 | 721 merging = false; |
| 468 | 722 return false; |
| 723 } | |
| 724 for(REPCommand c:output1) { | |
| 725 REPCommand m = new REPCommand(c); | |
| 726 m.setEID(REP.MERGE_EID.id); | |
| 727 m.setSEQID(editor.seq()); | |
| 492 | 728 m.original = c; |
| 468 | 729 sentMergedList.addLast(m); |
| 730 editor.sendToEditor(m); | |
| 731 } | |
| 732 logger.writeLog("OptimizedOutputMerge"+eid+":"+sentMergedList); | |
| 733 return true; | |
| 734 } | |
| 735 | |
| 736 private REPCommand createUndo(REPCommand cmd){ | |
| 737 REPCommand retCmd = new REPCommand(cmd); | |
| 492 | 738 retCmd.original = cmd; |
| 468 | 739 if (cmd.cmd==REP.REPCMD_INSERT) { |
| 740 retCmd.cmd=REP.REPCMD_DELETE; | |
| 741 retCmd.string=""; | |
| 742 } | |
| 743 else if (cmd.cmd==REP.REPCMD_DELETE) retCmd.cmd=REP.REPCMD_INSERT; | |
| 744 return retCmd; | |
| 745 } | |
| 746 | |
| 747 class REPCommandComparator implements Comparator<REPCommand>{ | |
| 748 int base; | |
| 749 REPCommandComparator(int base) { | |
| 750 this.base = base; | |
| 751 } | |
| 752 public int compare(REPCommand o1, REPCommand o2) { | |
| 753 int eid1 = o1.eid-base; if (eid1<0) eid1 += Integer.MAX_VALUE; | |
| 754 int eid2 = o2.eid-base; if (eid2<0) eid2 += Integer.MAX_VALUE; | |
| 755 if ( eid1<eid2 ) return -1; | |
| 756 if ( eid1>eid2 ) return 1; | |
| 757 if ( o1.seq<o2.seq ) return -1; | |
| 758 if ( o1.seq>o2.seq ) return 1; | |
| 759 // assert(false); // this can happen in MergedAgain case | |
| 760 return 0; | |
| 761 } | |
| 762 } | |
| 763 | |
| 764 /** | |
| 765 * Translate Command that was received from SeMa. | |
| 766 * @param cmd the command to be translated. | |
| 767 * @return translated command. | |
| 768 */ | |
| 769 public void transReceiveCmd(REPNode nextEditor,REPCommand cmd){ | |
| 770 assert (cmd.eid != eid); | |
| 771 } | |
| 772 | |
| 773 public void setEid(int _eid){ | |
| 774 eid = _eid; | |
| 775 } | |
| 776 | |
| 777 public boolean checkMergeConflict(REPCommand command) { | |
| 778 REPCommand prev = sentMergedList.getFirst(); | |
| 779 if (prev.seq==command.seq) { | |
| 780 // logger.writeLog("Input eid="+eid+"SentMergedList = "+sentMergedList); | |
| 781 sentMergedList.removeFirst(); | |
| 492 | 782 if (prev.original!=null && command.string!=null && !command.string.equals("")) { |
| 783 prev.original.string = command.string; | |
| 784 } | |
| 468 | 785 } |
| 786 // previous merge command may be returned | |
| 787 | |
| 788 if(sentMergedList.size()==0 && !mergeAgain) { | |
| 486 | 789 merging=false; |
| 468 | 790 } |
| 791 return mergeAgain; | |
| 792 } | |
| 793 | |
| 483 | 794 public void getMergeAgain() { |
| 468 | 795 if (sentMergedList.size()>0) return; // wait for previous merge completion |
| 487 | 796 if (mergeMode==MergeMode.Direct) { |
| 797 logger.writeLog("MergeAgain "+eid); | |
| 488 | 798 mergeAgain = false; |
| 487 | 799 merge(preMergeCommand); |
| 800 return; | |
| 801 } | |
| 468 | 802 |
| 803 LinkedList<REPCommand> returnCommand = new LinkedList<REPCommand>(); | |
| 492 | 804 for(REPCommand command : sentList) { |
| 468 | 805 if (command.cmd==REP.REPCMD_INSERT||command.cmd==REP.REPCMD_DELETE) |
| 493 | 806 returnCommand.addLast(createUndo(command)); |
| 468 | 807 } |
| 808 returnCommand.addAll(sortedEditCmds); | |
| 483 | 809 returnCommand.addLast(new REPCommand(REP.REPCMD_MERGE_MARK,0, sid, REP.MERGE_EID.id, seq(), "")); |
| 810 returnCommand.addAll(sentList); | |
| 468 | 811 logger.writeLog("MergeAgain "+eid+" ret="+returnCommand.size()); |
| 812 mergeAgain = false; | |
| 483 | 813 optimizedSend(this, returnCommand); |
| 468 | 814 } |
| 815 // | |
| 816 // public boolean isFinished() { | |
| 817 // if(unMergedCmds.size() > 0) return false; | |
| 818 // if(sentMergedList.size() > 0) return false; | |
| 819 // return true; | |
| 820 // } | |
| 821 | |
| 822 public boolean isMerging() { | |
| 486 | 823 return merging; |
| 468 | 824 } |
| 825 | |
| 826 /** | |
| 827 * receive SMCMD_START_MERGE_ACK | |
| 828 */ | |
| 829 public void mergeAck() { | |
| 492 | 830 logger.writeLog("Editor"+eid+": START MERGE "+ sentList); |
| 490 | 831 // これ以降のUser command の割り込みはmergeのやり直しが必要 |
| 486 | 832 merging = true; |
| 468 | 833 } |
| 834 | |
| 485 | 835 /** |
| 836 * Dead lock reporter | |
| 837 */ | |
| 838 public String report() { | |
| 839 String s = ""; | |
| 486 | 840 s += "\n sentList:"+sentList; |
| 485 | 841 s += "\n ackList:"+ackList; |
| 486 | 842 s += "\n mergeMode=:"+merging; |
| 485 | 843 return s; |
| 844 } | |
| 399 | 845 |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
846 } |