Mercurial > hg > RemoteEditor > REPSessionManager
annotate rep/handler/Editor.java @ 482:200166a494e9
mergeMode
| author | one |
|---|---|
| date | Sat, 16 Oct 2010 20:24:11 +0900 |
| parents | d2762d669617 |
| children | c792a1ebc0ff |
| 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; | |
| 34 boolean merge_mode = false; | |
| 35 | |
| 482 | 36 public enum MergeMode { |
| 37 NoMerge, // no merge | |
| 38 Slow, // merge at Ack | |
| 39 Early, // merge at returned command and Ack | |
| 40 Direct // merge at incoming command | |
| 41 } | |
| 387 | 42 private boolean merging; |
| 445 | 43 static final boolean doOptimize = false; |
| 460 | 44 private LinkedList<REPCommand> writeQueue = new LinkedList<REPCommand>(); |
| 482 | 45 static MergeMode mergeMode = MergeMode.Direct; |
|
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; | |
| 131 } | |
| 397 | 132 // Second Phase が終わって同期が終了。 |
| 442 | 133 // SessionManager.logger.writeLog("Complete "+command); |
| 452 | 134 checkAck(command); |
| 410 | 135 checkQuit(); |
| 397 | 136 return; |
| 137 } | |
| 138 checkReturnedCommand(command); | |
| 139 return; | |
| 400 | 140 case REPCMD_INSERT_USER: |
| 141 command.cmd = REP.REPCMD_INSERT; | |
| 142 userEditorCommand(command); | |
| 143 return; | |
| 144 case REPCMD_DELETE_USER: | |
| 406 | 145 command.cmd = REP.REPCMD_DELETE; |
| 400 | 146 userEditorCommand(command); |
| 147 return; | |
| 401 | 148 case REPCMD_INSERT: |
| 149 case REPCMD_DELETE: | |
| 465 | 150 case REPCMD_MERGE_MARK: |
| 401 | 151 if (command.eid == REP.MERGE_EID.id){ |
| 152 //マージコマンドが返ってきた | |
| 468 | 153 if(checkMergeConflict(command)){ |
| 401 | 154 //マージ中にエディタからの割り込みがあった場合 |
| 468 | 155 getMergeAgain(this); |
| 401 | 156 } |
| 157 checkEndMerge(); | |
| 158 return; | |
| 457 | 159 } |
| 160 if (command.eid == eid){ | |
| 401 | 161 // 編集コマンドが一周して来た |
| 482 | 162 if (mergeMode==MergeMode.Slow) { |
| 462 | 163 checkAck(command); |
| 164 sendAck(command); | |
| 165 } else { | |
| 166 checkReturnedCommand(command); | |
| 167 } | |
| 400 | 168 return; |
| 169 } | |
| 401 | 170 |
| 171 //他のエディタからの編集コマンド | |
| 468 | 172 transReceiveCmd(next,command); |
| 431 | 173 |
| 401 | 174 sendEditorCommand(command); |
| 400 | 175 return; |
| 401 | 176 default: |
| 177 assert(false); | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
178 } |
| 400 | 179 } |
| 180 | |
| 181 private void userEditorCommand(REPCommand command) { | |
| 182 //エディタからの新たな編集コマンド | |
| 183 if (next==this) return; // singleton case | |
| 468 | 184 transSendCmd(command); |
| 400 | 185 sendEditorCommand(command); |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
186 return; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
187 } |
| 398 | 188 |
| 404 | 189 // private void checkDouble(List<REPCommand> sentList) { |
| 190 // if (sentList.size()==0) return; | |
| 191 // int count = 0; | |
| 192 // REPCommand f = sentList.get(0); | |
| 193 // for(REPCommand c:sentList) { | |
| 194 // if (c.eid==f.eid&&c.seq==f.seq) { | |
| 195 // count++; | |
| 196 // } | |
| 197 // } | |
| 198 // assert(count==1); | |
| 199 // if (true) return; | |
| 200 // count = 0; | |
| 201 // for(PacketSet c:waitingCommandInMerge) { | |
| 202 // for(REPCommand g:sentList) { | |
| 203 // if (c.command.eid==g.eid&&c.command.seq==g.seq) { | |
| 204 // count++; | |
| 205 // } | |
| 206 // } | |
| 207 // } | |
| 208 // assert(count==0); | |
| 209 // } | |
| 399 | 210 |
| 460 | 211 /** |
| 212 * Sending to Editor and waiting Queue | |
| 213 * +--------+ | |
| 214 * send() --> write() -> | Editor | -> handle() -> manager() | |
| 215 * +--------+ | |
| 216 * waitingQueue | |
| 217 * writeQueue | |
| 218 * | |
| 219 * send() は、他のEditor Node から呼ばれる | |
| 220 * write() は、内部で優先的に送信するのに用いる | |
| 221 * writeQueue は、waitingQueue よりも常に先に実行される必要がある | |
| 222 | |
| 223 * Manageの送信キューはここでは使わない | |
| 224 * send() manage | |
| 225 */ | |
| 226 @Override | |
| 227 public void send(REPCommand command) { | |
| 228 if (merging || isMerging() || waitingCommandInMerge.size()>0) { | |
| 229 waitingCommandInMerge.addLast(command); | |
| 230 ServerMainLoop.logger.writeLog("Editor eid:"+eid+" waitingCommandInMerge = "+waitingCommandInMerge); | |
| 231 return; | |
| 232 } | |
| 233 if (isMergeCommand(command)) { | |
| 234 merging = true; | |
| 235 ServerMainLoop.logger.writeLog("Editor"+eid+": merging=true (send)"+command); | |
| 236 } | |
| 237 writeQueue.add(command); | |
| 398 | 238 } |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
239 |
| 460 | 240 /** |
| 241 * Check waiting command in merge | |
| 242 * periodically called from manager | |
| 243 */ | |
| 244 public void checkWaitingCommandInMerge() { | |
| 245 if (writeQueue.size()>0) { | |
| 246 REPCommand command =writeQueue.pollFirst(); | |
| 247 ServerMainLoop.logger.writeLog("Editor"+eid+": write comand="+command); | |
| 248 super.write(command); | |
| 249 return; | |
| 250 } | |
| 468 | 251 if (merging || isMerging()) return; |
| 460 | 252 if (waitingCommandInMerge.size()>0) { |
| 253 REPCommand command = waitingCommandInMerge.pollFirst(); | |
| 254 ServerMainLoop.logger.writeLog("Editor"+eid+": send waiting comand="+command); | |
| 255 super.write(command); | |
| 256 if (isMergeCommand(command)) { | |
| 257 merging = true; | |
| 258 } | |
| 259 } | |
| 399 | 260 } |
| 431 | 261 /** |
| 262 * 他のエディタへのコマンドの送信 | |
| 263 * @param command | |
| 264 * | |
| 265 * sendList にキープする必要がある。 | |
| 266 */ | |
| 397 | 267 private void sendEditorCommand(REPCommand command) { |
| 268 REPCommand keep = new REPCommand(command); | |
| 269 sentList.add(keep); | |
| 464 | 270 ackList.add(keep); |
| 407 | 271 //ServerMainLoop.logger.writeLog("Editor eid:"+eid+" sentList = "+sentList); |
| 464 | 272 assert(ackList.size()<limit); |
| 431 | 273 if (command.cmd==REP.REPCMD_DELETE) { |
| 274 // delete のundo用の文字列は、外に出す意味はない | |
| 275 command.string=null; | |
| 276 } | |
| 397 | 277 next.send(command); |
| 278 } | |
| 279 | |
| 431 | 280 public List<REPCommand> getSentList() { |
| 281 return sentList; | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
282 } |
| 465 | 283 |
| 284 public void setSentList(LinkedList<REPCommand> list) { | |
| 285 sentList = list; | |
| 286 } | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
287 |
| 391 | 288 /** |
| 289 * 一周して来たcommandの処理。 | |
| 404 | 290 * |
| 291 * INSERT/DELETEを受け取った時に、sentListに登録 | |
| 292 * INSERT_ACK/DELETE_ACKが来たら一周。そこで、Mergeする。 | |
| 293 * | |
| 294 * 自分が出したINSERT/DELETEが戻って来たら、ACKに変更して、Merge。 | |
| 295 * | |
| 296 * 途中から参加した場合、自分が受けとってないcommandのACKが先に来ることが | |
| 297 * ある。それは、無視して良い。 | |
| 391 | 298 * @param command |
| 299 */ | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
300 void checkReturnedCommand(REPCommand command) { |
| 451 | 301 ServerMainLoop.logger.writeLog("Editor"+eid+": startMerge "+command); |
| 397 | 302 preMergeCommand = new REPCommand(command); |
| 391 | 303 // merge は必須だが、EditorのCommand実装をテストするには邪魔なので、off に出来るようにする。 |
| 482 | 304 if (mergeMode==MergeMode.NoMerge) { |
| 410 | 305 checkQuit(); |
| 396 | 306 endMerge(); |
| 391 | 307 return; |
| 308 } | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
309 // START_MERGE を送る |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
310 // 送らないで良い場合もある? |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
311 REPCommand cmd = new REPCommand(REP.SMCMD_START_MERGE,command.sid,REP.SM_EID.id,seq(),0,""); |
| 450 | 312 sendToEditor(cmd); |
| 387 | 313 merging = true; |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
314 // Session Manager 側で、このeditorへの他のeditorからの |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
315 // 入力を止めて、merge にそなえる。merge は、eidtor 側から |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
316 // ACKが来てから始まる。 |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
317 } |
| 457 | 318 |
| 463 | 319 /** |
| 320 * sentList と ack を見比べて、正しい順序で来たかどうかを調べる。途中参加したEditorの場合は、Ackは | |
| 321 * 無視して良い。 | |
| 322 * @param command | |
| 323 * @return | |
| 324 */ | |
| 457 | 325 private boolean checkAck(REPCommand command) { |
| 466 | 326 REPCommand prev = null; |
| 327 try { | |
| 328 if(isMerging() || ackList.size()==0) throw new Exception(); | |
| 329 prev=ackList.remove(0); | |
| 330 if (prev==null || prev.seq != command.seq || prev.eid!=command.eid) throw new Exception(); | |
| 331 } catch (Exception n) { | |
| 457 | 332 // should be more robust to allow communication failure |
| 333 String err = "Editor eid="+eid+" checkReturnedCommand() : command = " + command + " prev="+ | |
| 466 | 334 (prev==null?"null":prev)+" ackList="; |
| 464 | 335 err += ackList; |
| 457 | 336 ServerMainLoop.logger.writeLog(err); |
| 337 assert(false); | |
| 338 } | |
| 339 return true; | |
| 340 } | |
| 341 | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
342 |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
343 @Override |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
344 public void setQuit2(REPCommand cmd) { |
| 462 | 345 quit_2 = cmd; |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
346 checkQuit(); |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
347 // 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
|
348 // command |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
349 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
350 |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
351 @Override |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
352 public void setEID(int eid) { |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
353 this.eid = eid; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
354 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
355 |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
356 public String toString(){ |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
357 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
|
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 void checkEndMerge() { |
| 387 | 361 if (merging) { |
| 468 | 362 if (isMerging()) return; |
| 396 | 363 endMerge(); |
| 387 | 364 merging = false; |
| 365 } | |
| 462 | 366 if (quit_2!=null) checkQuit(); |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
367 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
368 |
| 442 | 369 |
| 396 | 370 private void endMerge() { |
| 468 | 371 sortedEditCmds = null; |
| 372 LinkedList<REPCommand>u = new LinkedList<REPCommand>(); | |
| 373 boolean flag=true; | |
| 374 for(REPCommand command:unMergedCmds) { | |
| 375 if (command.cmd==REP.REPCMD_MERGE_MARK) { | |
| 376 flag = false; | |
| 377 } | |
| 378 if (flag) u.addLast(command); | |
| 379 } | |
| 380 unMergedCmds = u; | |
| 381 | |
| 396 | 382 REPCommand mergeEnd = new REPCommand(REP.SMCMD_END_MERGE,sid,eid,seq(),0,""); |
| 450 | 383 sendToEditor(mergeEnd); |
| 452 | 384 checkAck(preMergeCommand); |
| 397 | 385 if (preMergeCommand.eid==eid) { |
| 482 | 386 if (mergeMode==MergeMode.Early) { |
| 462 | 387 sendAck(preMergeCommand); |
| 463 | 388 } |
| 397 | 389 } else { |
| 468 | 390 ServerMainLoop.logger.writeLog("Editor"+eid+": send preMergeCommand "+preMergeCommand); |
| 397 | 391 next.send(preMergeCommand); |
| 392 } | |
| 465 | 393 // sentList.clear(); |
| 397 | 394 preMergeCommand = null; |
| 396 | 395 } |
| 396 | |
| 462 | 397 private void sendAck(REPCommand command) { |
| 398 REPCommand keep = new REPCommand(command); | |
| 399 // First Phase End, send ACK | |
| 400 switch(keep.cmd) { | |
| 401 case REPCMD_INSERT: keep.cmd = REP.REPCMD_INSERT_ACK;break; | |
| 402 case REPCMD_DELETE: keep.cmd = REP.REPCMD_DELETE_ACK;break; | |
| 403 default: assert(false); | |
| 404 } | |
| 464 | 405 ackList.addLast(keep); |
| 463 | 406 ServerMainLoop.logger.writeLog("Editor"+eid+": sendAck sentList = "+sentList); |
| 464 | 407 assert(ackList.size()<limit); |
| 463 | 408 keep.string = ""; |
| 462 | 409 next.send(keep); |
| 410 } | |
| 411 | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
412 private boolean checkQuit() { |
| 468 | 413 if (quit_2!=null && ackList.size()==0 && sentList.size()==0&&!isMerging() && waitingCommandInMerge.size()==0) { |
| 462 | 414 sendToEditor(quit_2); |
| 415 quit_2 = null; | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
416 return true; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
417 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
418 return false; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
419 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
420 |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
421 @Override |
| 387 | 422 public boolean manage(REPCommand command) { |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
423 |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
424 |
| 387 | 425 switch(command.cmd){ |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
426 // Editor Command |
| 396 | 427 |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
428 case REPCMD_DELETE: |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
429 case REPCMD_INSERT: |
| 400 | 430 case REPCMD_DELETE_USER: |
| 431 case REPCMD_INSERT_USER: | |
| 396 | 432 case REPCMD_DELETE_ACK: |
| 433 case REPCMD_INSERT_ACK: | |
| 465 | 434 case REPCMD_MERGE_MARK: |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
435 { |
| 387 | 436 translate(command); |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
437 break; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
438 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
439 |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
440 case SMCMD_START_MERGE_ACK: |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
441 { |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
442 // マージの処理と次のエディタへコマンドを送信する処理 |
| 468 | 443 mergeAck(); |
| 444 if (!merge(this, preMergeCommand)) { | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
445 // nothing to do, send END_MERGE |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
446 checkEndMerge(); |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
447 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
448 break; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
449 } |
| 386 | 450 |
| 451 case SMCMD_SYNC: | |
| 452 if (isMaster()) | |
| 450 | 453 sendToEditor(command); |
| 386 | 454 else |
| 387 | 455 next.send(command); |
| 386 | 456 |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
457 case SMCMD_QUIT: |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
458 { |
| 387 | 459 next.send(command); |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
460 break; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
461 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
462 case SMCMD_QUIT_2: |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
463 { |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
464 // QUIT_2 is returned. |
| 387 | 465 if (command.eid!=eid) { |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
466 // 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
|
467 // by QUIT_2_ACK |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
468 manager.remove(this); |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
469 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
470 // 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
|
471 // merge is processed. |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
472 // this does not work in distributed case. |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
473 if (next.isDirect()) |
| 387 | 474 next.setQuit2(command); |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
475 else |
| 387 | 476 next.send(command); |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
477 break; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
478 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
479 case SMCMD_QUIT_2_ACK: |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
480 { |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
481 manager.remove(this); |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
482 break; |
|
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 default: |
| 396 | 485 assert false; |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
486 return false; |
|
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 return true; |
|
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 |
| 442 | 491 |
| 450 | 492 private boolean isMergeCommand(REPCommand command) { |
| 493 switch(command.cmd) { | |
| 494 case REPCMD_INSERT: case REPCMD_DELETE: | |
| 482 | 495 return mergeMode==MergeMode.Slow?false:command.eid==eid; |
| 450 | 496 case REPCMD_INSERT_ACK: case REPCMD_DELETE_ACK: |
| 482 | 497 return mergeMode==MergeMode.Slow?true:command.eid!=eid; |
| 450 | 498 } |
| 499 return false; | |
| 500 } | |
| 501 | |
| 502 public void sendToEditor(REPCommand command) { | |
| 460 | 503 writeQueue.add(command); |
| 450 | 504 } |
| 505 | |
| 442 | 506 @Override |
| 387 | 507 public void handle(REPCommand command, REPSelectionKey<REPCommand> key) throws IOException { |
| 508 if (command.cmd==REP.SMCMD_JOIN||command.cmd==REP.SMCMD_PUT) { | |
| 404 | 509 // assert false; |
| 427 | 510 // 一つのエディタ上に複数のセッションが作られた場合。 |
| 387 | 511 // 若干問題があるらしい |
| 512 next = new Forwarder(manager,next.channel); | |
| 513 REPNode first = new FirstConnector(manager,channel); | |
| 514 first.handle(command, key); | |
| 515 key.attach(new Dispatcher(manager,channel)); | |
| 516 return; | |
| 517 } | |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
518 if (manager.sessionManage(this, command)) return; |
| 471 | 519 // 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
|
520 manage(command); |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
521 } |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
522 |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
523 @Override |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
524 public void cancel(REPSocketChannel<REPCommand> socketChannel) { |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
525 manager.remove(socketChannel); |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
526 } |
|
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 public boolean isMaster() { |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
529 return mode==REP.SMCMD_PUT; |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
530 } |
| 386 | 531 |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
532 |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
533 /* Handle special case first, usually these cases |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
534 * 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
|
535 * it is forwarded here. |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
536 */ |
| 385 | 537 public void forwardedCommandManage(REPCommand command) { |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
538 if (command.cmd==REP.SMCMD_QUIT_2) { |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
539 // 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
|
540 // 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
|
541 // state. Only this session manager knows it. |
|
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
542 setQuit2(command); |
| 401 | 543 return; |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
544 } |
| 385 | 545 send(command); |
| 546 } | |
| 547 | |
| 468 | 548 /** |
| 549 * New command from an editor | |
| 550 * The command is sent to the next editor | |
| 551 * @param cmd | |
| 552 * @return translated command. | |
| 553 */ | |
| 554 public REPCommand transSendCmd(REPCommand cmd){ | |
| 555 assert(cmd.eid==eid); | |
| 556 unMergedCmds.addLast(cmd); | |
| 557 | |
| 558 //マージ中にユーザから割り込みがあった場合 | |
| 559 if(isMerging()){ | |
| 560 mergeAgain = true; | |
| 561 } | |
| 562 | |
| 563 return cmd; | |
| 564 } | |
| 565 | |
| 566 /** | |
| 567 * My command is returned from the session ring, and START_MERGE_ACK | |
| 568 * is returned. At this | |
| 569 * stage my writeQueue is empty, our editor is waiting for me. | |
| 570 * Start merge process. | |
| 571 * @param cmd | |
| 572 */ | |
| 573 public boolean merge(Editor editor, REPCommand prev){ | |
| 574 logger.writeLog("beforeMerge"+eid+":"+unMergedCmds); | |
| 575 LinkedList<REPCommand> output = new LinkedList<REPCommand>(); | |
| 576 LinkedList<REPCommand> newSentList = new LinkedList<REPCommand>(); | |
| 577 // merge queue上にあるコマンドを全部undoコマンドするのと同時に | |
| 578 // sort したコマンド列を生成する | |
| 579 for( REPCommand cmd0 : unMergedCmds) { | |
| 580 output.addLast( createUndo(cmd0) ); | |
| 581 } | |
| 582 | |
| 583 sortedEditCmds = new TreeSet<REPCommand>(new REPCommandComparator(1)); | |
| 584 logger.writeLog("sentList"+eid+":"+editor.getSentList()); | |
| 585 for( REPCommand cmd0 : editor.getSentList()) { | |
| 586 if (cmd0.cmd==REP.REPCMD_INSERT || cmd0.cmd==REP.REPCMD_DELETE) { | |
| 587 sortedEditCmds.add(cmd0); | |
| 588 } | |
| 589 } | |
| 469 | 590 output.addAll(sortedEditCmds); |
| 591 output.addLast(new REPCommand(REP.REPCMD_MERGE_MARK,0, editor.getSID(), REP.MERGE_EID.id, editor.seq(), "")); | |
| 468 | 592 logger.writeLog("sortedMerge"+eid+":"+sortedEditCmds); |
| 593 // unMerged command のdeleteのundo string は、この時点で使えない。 | |
| 594 // Editor 側から送り返して来たものを使う必要がある。 | |
| 595 unMergedCmds.clear(); | |
| 596 logger.writeLog("outputMerge"+eid+":"+output); | |
| 597 editor.setSentList(newSentList); | |
| 598 return optimizedSend(editor,output); | |
| 599 } | |
| 600 | |
| 601 /** | |
| 602 * Sent optimized merged command list | |
| 603 * @param editor | |
| 604 * @param output | |
| 605 * @return if any sent commands output | |
| 606 */ | |
| 607 public boolean optimizedSend(REPNode editor, LinkedList<REPCommand> output) { | |
| 608 /* | |
| 609 * Optimized send の場合は、unMergedCommand のつじつまを合わせる必要がある。 | |
| 610 */ | |
| 611 sentMergedList.clear(); | |
| 612 List<REPCommand> output1 = optimizer.optimize(output); | |
| 613 if (output1.size()==0) { | |
| 614 merge_mode = false; | |
| 615 return false; | |
| 616 } | |
| 617 for(REPCommand c:output1) { | |
| 618 REPCommand m = new REPCommand(c); | |
| 619 m.setEID(REP.MERGE_EID.id); | |
| 620 m.setSEQID(editor.seq()); | |
| 621 sentMergedList.addLast(m); | |
| 622 editor.sendToEditor(m); | |
| 623 } | |
| 624 logger.writeLog("OptimizedOutputMerge"+eid+":"+sentMergedList); | |
| 625 merge_mode = true; | |
| 626 return true; | |
| 627 } | |
| 628 | |
| 629 private REPCommand createUndo(REPCommand cmd){ | |
| 630 REPCommand retCmd = new REPCommand(cmd); | |
| 631 if (cmd.cmd==REP.REPCMD_INSERT) { | |
| 632 retCmd.cmd=REP.REPCMD_DELETE; | |
| 633 retCmd.string=""; | |
| 634 } | |
| 635 else if (cmd.cmd==REP.REPCMD_DELETE) retCmd.cmd=REP.REPCMD_INSERT; | |
| 636 return retCmd; | |
| 637 } | |
| 638 | |
| 639 class REPCommandComparator implements Comparator<REPCommand>{ | |
| 640 int base; | |
| 641 REPCommandComparator(int base) { | |
| 642 this.base = base; | |
| 643 } | |
| 644 public int compare(REPCommand o1, REPCommand o2) { | |
| 645 int eid1 = o1.eid-base; if (eid1<0) eid1 += Integer.MAX_VALUE; | |
| 646 int eid2 = o2.eid-base; if (eid2<0) eid2 += Integer.MAX_VALUE; | |
| 647 if ( eid1<eid2 ) return -1; | |
| 648 if ( eid1>eid2 ) return 1; | |
| 649 if ( o1.seq<o2.seq ) return -1; | |
| 650 if ( o1.seq>o2.seq ) return 1; | |
| 651 // assert(false); // this can happen in MergedAgain case | |
| 652 return 0; | |
| 653 } | |
| 654 } | |
| 655 | |
| 656 /** | |
| 657 * Translate Command that was received from SeMa. | |
| 658 * @param cmd the command to be translated. | |
| 659 * @return translated command. | |
| 660 */ | |
| 661 public void transReceiveCmd(REPNode nextEditor,REPCommand cmd){ | |
| 662 assert (cmd.eid != eid); | |
| 471 | 663 unMergedCmds.addFirst(new REPCommand(cmd)); |
| 468 | 664 } |
| 665 | |
| 666 public void setEid(int _eid){ | |
| 667 eid = _eid; | |
| 668 } | |
| 669 | |
| 670 public boolean checkMergeConflict(REPCommand command) { | |
| 471 | 671 unMergedCmds.addFirst(new REPCommand(command)); |
| 468 | 672 |
| 673 REPCommand prev = sentMergedList.getFirst(); | |
| 674 if (prev.seq==command.seq) { | |
| 675 // logger.writeLog("Input eid="+eid+"SentMergedList = "+sentMergedList); | |
| 676 sentMergedList.removeFirst(); | |
| 677 } | |
| 678 // previous merge command may be returned | |
| 679 | |
| 680 if(sentMergedList.size()==0 && !mergeAgain) { | |
| 681 merge_mode=false; | |
| 682 } | |
| 683 return mergeAgain; | |
| 684 } | |
| 685 | |
| 686 public void getMergeAgain(Editor editor) { | |
| 687 if (sentMergedList.size()>0) return; // wait for previous merge completion | |
| 688 | |
| 689 LinkedList<REPCommand> returnCommand = new LinkedList<REPCommand>(); | |
| 690 for(REPCommand command : unMergedCmds) { | |
| 691 if (command.cmd==REP.REPCMD_INSERT||command.cmd==REP.REPCMD_DELETE) | |
| 692 returnCommand.add(createUndo(command)); | |
| 693 } | |
| 694 returnCommand.addAll(sortedEditCmds); | |
| 695 returnCommand.addLast(new REPCommand(REP.REPCMD_MERGE_MARK,0, editor.getSID(), REP.MERGE_EID.id, editor.seq(), "")); | |
| 696 returnCommand.addAll(editor.getSentList()); | |
| 697 unMergedCmds.clear(); | |
| 698 logger.writeLog("MergeAgain "+eid+" ret="+returnCommand.size()); | |
| 699 mergeAgain = false; | |
| 700 optimizedSend(editor, returnCommand); | |
| 701 } | |
| 702 // | |
| 703 // public boolean isFinished() { | |
| 704 // if(unMergedCmds.size() > 0) return false; | |
| 705 // if(sentMergedList.size() > 0) return false; | |
| 706 // return true; | |
| 707 // } | |
| 708 | |
| 709 public boolean isMerging() { | |
| 710 return merge_mode; | |
| 711 } | |
| 712 | |
| 713 /** | |
| 714 * receive SMCMD_START_MERGE_ACK | |
| 715 */ | |
| 716 public void mergeAck() { | |
| 717 logger.writeLog("Editor"+eid+": START MERGE "+ | |
| 718 ((unMergedCmds.size()>0)?" and top of unMergedCmds = "+ unMergedCmds.getLast():"")); | |
| 719 merge_mode = true; | |
| 720 } | |
| 721 | |
| 399 | 722 |
|
382
4b87f89b3afd
REP Session Manager (Java version)
one@firefly.cr.ie.u-ryukyu.ac.jp
parents:
diff
changeset
|
723 } |