annotate test/sematest/TestEditor.java @ 465:c83af820eb62

merge mark
author one
date Sat, 02 Oct 2010 08:32:26 +0900
parents 22a741c1fa2d
children d2762d669617
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
193
311847db7429 *** empty log message ***
pin
parents:
diff changeset
1 package test.sematest;
311847db7429 *** empty log message ***
pin
parents:
diff changeset
2
311847db7429 *** empty log message ***
pin
parents:
diff changeset
3 import java.io.IOException;
311847db7429 *** empty log message ***
pin
parents:
diff changeset
4 import java.net.InetSocketAddress;
285
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
5 import java.nio.channels.SelectionKey;
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
6 import java.util.LinkedList;
193
311847db7429 *** empty log message ***
pin
parents:
diff changeset
7
311847db7429 *** empty log message ***
pin
parents:
diff changeset
8 import rep.REP;
311847db7429 *** empty log message ***
pin
parents:
diff changeset
9 import rep.REPCommand;
311847db7429 *** empty log message ***
pin
parents:
diff changeset
10 import rep.REPCommandPacker;
407
de4ef4313adc looks like working...
one
parents: 406
diff changeset
11 import rep.SessionManager;
193
311847db7429 *** empty log message ***
pin
parents:
diff changeset
12 import rep.channel.REPLogger;
308
c5be84d53c7f *** empty log message ***
kono
parents: 304
diff changeset
13 import rep.channel.REPSelectionKey;
285
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
14 import rep.channel.REPSelector;
193
311847db7429 *** empty log message ***
pin
parents:
diff changeset
15 import rep.channel.REPSocketChannel;
284
90965a3bd4f3 editor simulator
kono
parents: 193
diff changeset
16 import test.Text;
193
311847db7429 *** empty log message ***
pin
parents:
diff changeset
17
311847db7429 *** empty log message ***
pin
parents:
diff changeset
18
297
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
19 /**
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
20 * @author kono
411
795ef563f2a0 add commnets
one
parents: 410
diff changeset
21 * Basic Remote Editor client implementation
297
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
22 * should support multi-session
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
23 * currently multi-session requires new channel, that is
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
24 * only one session for this editor.
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
25 */
193
311847db7429 *** empty log message ***
pin
parents:
diff changeset
26 public class TestEditor extends Thread{
284
90965a3bd4f3 editor simulator
kono
parents: 193
diff changeset
27 private InetSocketAddress semaIP;
193
311847db7429 *** empty log message ***
pin
parents:
diff changeset
28 private REPLogger ns;
284
90965a3bd4f3 editor simulator
kono
parents: 193
diff changeset
29 private int seq = 0;
90965a3bd4f3 editor simulator
kono
parents: 193
diff changeset
30 public Text text;
285
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
31 public LinkedList<REPCommand> cmds;
286
30c993e89286 TestEditor
kono
parents: 285
diff changeset
32 private int eid = 0;
30c993e89286 TestEditor
kono
parents: 285
diff changeset
33 private int sid = 0;
285
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
34 REPSocketChannel<REPCommand> channel;
315
20fb70068089 *** empty log message ***
kono
parents: 313
diff changeset
35 REPCommand nop = new REPCommand(REP.REPCMD_NOP, 0, 0, 0, 0, "");
285
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
36 boolean running = true;
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
37 long timeout = 1;
297
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
38 private String name;
298
cf9328e66d25 *** empty log message ***
kono
parents: 297
diff changeset
39 private boolean inputLock=false;
cf9328e66d25 *** empty log message ***
kono
parents: 297
diff changeset
40 public boolean detached=false;
cf9328e66d25 *** empty log message ***
kono
parents: 297
diff changeset
41 public boolean master=false;
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
42 REPCommand quit=null;
303
41f05c8ff02b *** empty log message ***
kono
parents: 302
diff changeset
43 private int syncCounter=0;
421
f8916a96a373 (no commit message)
one
parents: 413
diff changeset
44 private boolean hasInputLock=true;
334
4fae49280699 Test pattern for Inter-Session Manager communication
kono
parents: 333
diff changeset
45 private int port;
342
4b056e46ba83 *** empty log message ***
kono
parents: 341
diff changeset
46 private REPSelector<REPCommand> selector;
421
f8916a96a373 (no commit message)
one
parents: 413
diff changeset
47 private boolean syncEnable=false;
284
90965a3bd4f3 editor simulator
kono
parents: 193
diff changeset
48
303
41f05c8ff02b *** empty log message ***
kono
parents: 302
diff changeset
49
284
90965a3bd4f3 editor simulator
kono
parents: 193
diff changeset
50 public TestEditor(String name, String _host,int _port, boolean master){
193
311847db7429 *** empty log message ***
pin
parents:
diff changeset
51 super(name);
303
41f05c8ff02b *** empty log message ***
kono
parents: 302
diff changeset
52 LinkedList<REPCommand>cmdList = new LinkedList<REPCommand>();
41f05c8ff02b *** empty log message ***
kono
parents: 302
diff changeset
53 String[] txts = {
421
f8916a96a373 (no commit message)
one
parents: 413
diff changeset
54 //"aaa", "bbb", // "ccc", "ddd", "eee",
303
41f05c8ff02b *** empty log message ***
kono
parents: 302
diff changeset
55 };
334
4fae49280699 Test pattern for Inter-Session Manager communication
kono
parents: 333
diff changeset
56 port = _port;
193
311847db7429 *** empty log message ***
pin
parents:
diff changeset
57 semaIP = new InetSocketAddress(_host, _port);
311847db7429 *** empty log message ***
pin
parents:
diff changeset
58 ns = REPLogger.singleton();
427
622a8e15ff40 Merge Worked ?
one
parents: 424
diff changeset
59 // ns.setLogLevel(10);
297
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
60 this.name = name;
303
41f05c8ff02b *** empty log message ***
kono
parents: 302
diff changeset
61 cmds = cmdList;
285
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
62 if (master) {
298
cf9328e66d25 *** empty log message ***
kono
parents: 297
diff changeset
63 this.master=true;
303
41f05c8ff02b *** empty log message ***
kono
parents: 302
diff changeset
64 text = new Text(txts);
298
cf9328e66d25 *** empty log message ***
kono
parents: 297
diff changeset
65 cmds.add(new REPCommand(REP.SMCMD_PUT,0,0,0,0,name+"-file"));
407
de4ef4313adc looks like working...
one
parents: 406
diff changeset
66 cmds.add(new REPCommand(REP.REPCMD_INSERT_USER,0,0,0,0,"m0"));
421
f8916a96a373 (no commit message)
one
parents: 413
diff changeset
67 cmds.add(new REPCommand(REP.REPCMD_INSERT_USER,0,0,0,0,"m1"));
410
2724cf17e9f3 single mode quit
one
parents: 407
diff changeset
68 cmds.add(new REPCommand(REP.SMCMD_QUIT,0,0,0,0,""));
285
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
69 } else {
284
90965a3bd4f3 editor simulator
kono
parents: 193
diff changeset
70 text = new Text(new String[0]);
298
cf9328e66d25 *** empty log message ***
kono
parents: 297
diff changeset
71 cmds.add(new REPCommand(REP.SMCMD_JOIN,0,0,0,0,name));
400
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
72 cmds.add(new REPCommand(REP.REPCMD_INSERT_USER,0,0,0,0,"c0"));
421
f8916a96a373 (no commit message)
one
parents: 413
diff changeset
73 cmds.add(new REPCommand(REP.REPCMD_INSERT_USER,0,0,0,0,"c1"));
303
41f05c8ff02b *** empty log message ***
kono
parents: 302
diff changeset
74 }
41f05c8ff02b *** empty log message ***
kono
parents: 302
diff changeset
75 }
41f05c8ff02b *** empty log message ***
kono
parents: 302
diff changeset
76
41f05c8ff02b *** empty log message ***
kono
parents: 302
diff changeset
77 public TestEditor(String name, String _host,int _port, boolean master,
41f05c8ff02b *** empty log message ***
kono
parents: 302
diff changeset
78 String[] txts,LinkedList<REPCommand> cmdList){
41f05c8ff02b *** empty log message ***
kono
parents: 302
diff changeset
79 super(name);
334
4fae49280699 Test pattern for Inter-Session Manager communication
kono
parents: 333
diff changeset
80 port = _port;
303
41f05c8ff02b *** empty log message ***
kono
parents: 302
diff changeset
81 semaIP = new InetSocketAddress(_host, _port);
41f05c8ff02b *** empty log message ***
kono
parents: 302
diff changeset
82 ns = REPLogger.singleton();
41f05c8ff02b *** empty log message ***
kono
parents: 302
diff changeset
83 this.name = name;
41f05c8ff02b *** empty log message ***
kono
parents: 302
diff changeset
84 cmds = cmdList;
41f05c8ff02b *** empty log message ***
kono
parents: 302
diff changeset
85 if (master) {
41f05c8ff02b *** empty log message ***
kono
parents: 302
diff changeset
86 this.master=true;
41f05c8ff02b *** empty log message ***
kono
parents: 302
diff changeset
87 text = new Text(txts);
386
bba62c4ac323 sync-option
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 342
diff changeset
88 } else {
bba62c4ac323 sync-option
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 342
diff changeset
89 text = new Text(new String[0]);
285
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
90 }
193
311847db7429 *** empty log message ***
pin
parents:
diff changeset
91 }
311847db7429 *** empty log message ***
pin
parents:
diff changeset
92
311847db7429 *** empty log message ***
pin
parents:
diff changeset
93 public void run(){
302
4ee012f19855 *** empty log message ***
kono
parents: 300
diff changeset
94 /*
4ee012f19855 *** empty log message ***
kono
parents: 300
diff changeset
95 * Create Socket and connect to the session manager
4ee012f19855 *** empty log message ***
kono
parents: 300
diff changeset
96 */
193
311847db7429 *** empty log message ***
pin
parents:
diff changeset
97 try {
311847db7429 *** empty log message ***
pin
parents:
diff changeset
98 channel = REPSocketChannel.<REPCommand>create(new REPCommandPacker());
285
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
99 } catch (IOException e) { return; }
193
311847db7429 *** empty log message ***
pin
parents:
diff changeset
100
297
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
101 ns.writeLog("try to connect to SessionManager whose ip is "+semaIP+" "+name, 1);
285
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
102 try {
193
311847db7429 *** empty log message ***
pin
parents:
diff changeset
103 while (!channel.connect(semaIP)){
311847db7429 *** empty log message ***
pin
parents:
diff changeset
104 ns.writeLog("SeMa not listen to socket yet, wait", 1);
311847db7429 *** empty log message ***
pin
parents:
diff changeset
105 }
285
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
106 } catch (IOException e) { return; }
297
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
107 ns.writeLog("successes to connect "+name);
285
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
108 /*
302
4ee012f19855 *** empty log message ***
kono
parents: 300
diff changeset
109 * Start editor main loop
285
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
110 * public REPCommand(REP cmd,int sid,int eid, int seq, int lineno, String string)
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
111 */
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
112 try {
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
113 mainloop();
193
311847db7429 *** empty log message ***
pin
parents:
diff changeset
114 } catch (IOException e) {
311847db7429 *** empty log message ***
pin
parents:
diff changeset
115 }
311847db7429 *** empty log message ***
pin
parents:
diff changeset
116 }
284
90965a3bd4f3 editor simulator
kono
parents: 193
diff changeset
117
302
4ee012f19855 *** empty log message ***
kono
parents: 300
diff changeset
118 /*
4ee012f19855 *** empty log message ***
kono
parents: 300
diff changeset
119 * Editor main loop with input lock
4ee012f19855 *** empty log message ***
kono
parents: 300
diff changeset
120 */
285
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
121 private void mainloop() throws IOException {
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
122
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
123 channel.configureBlocking(false);
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
124 REPSelector<REPCommand> selector = REPSelector.create();
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
125 channel.register(selector, SelectionKey.OP_READ);
342
4b056e46ba83 *** empty log message ***
kono
parents: 341
diff changeset
126 this.selector = selector;
285
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
127 while(running) {
298
cf9328e66d25 *** empty log message ***
kono
parents: 297
diff changeset
128 if (inputLock) {
cf9328e66d25 *** empty log message ***
kono
parents: 297
diff changeset
129 // No user input during merge mode (optional)
424
1e58479b4170 TestEditor selectionKeys fix.
one
parents: 421
diff changeset
130 selector.select(0);
298
cf9328e66d25 *** empty log message ***
kono
parents: 297
diff changeset
131 } else if (selector.select(timeout)<=0) {
cf9328e66d25 *** empty log message ***
kono
parents: 297
diff changeset
132 if (syncCounter>0) {
302
4ee012f19855 *** empty log message ***
kono
parents: 300
diff changeset
133 syncText(); // send the master editor buffer to clients.
298
cf9328e66d25 *** empty log message ***
kono
parents: 297
diff changeset
134 }
288
d93b062eadaa *** empty log message ***
kono
parents: 286
diff changeset
135 userInput();
308
c5be84d53c7f *** empty log message ***
kono
parents: 304
diff changeset
136 }
c5be84d53c7f *** empty log message ***
kono
parents: 304
diff changeset
137 // selector(timeout) returns 0, but it may contain readable channel..
c5be84d53c7f *** empty log message ***
kono
parents: 304
diff changeset
138 for(REPSelectionKey<REPCommand> key : selector.selectedKeys1()) {
c5be84d53c7f *** empty log message ***
kono
parents: 304
diff changeset
139 REPSocketChannel<REPCommand> ch = key.channel1();
c5be84d53c7f *** empty log message ***
kono
parents: 304
diff changeset
140 handle(ch.read());
285
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
141 }
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
142 }
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
143 }
284
90965a3bd4f3 editor simulator
kono
parents: 193
diff changeset
144
300
8f6b7a1890b2 *** empty log message ***
kono
parents: 299
diff changeset
145 private void syncText() {
302
4ee012f19855 *** empty log message ***
kono
parents: 300
diff changeset
146 /*
4ee012f19855 *** empty log message ***
kono
parents: 300
diff changeset
147 * Send delete/insert one at a time to synchronize
4ee012f19855 *** empty log message ***
kono
parents: 300
diff changeset
148 * all clients. SYNC is requested by the session manager.
4ee012f19855 *** empty log message ***
kono
parents: 300
diff changeset
149 */
300
8f6b7a1890b2 *** empty log message ***
kono
parents: 299
diff changeset
150 if (syncCounter>text.size()) {
407
de4ef4313adc looks like working...
one
parents: 406
diff changeset
151 SessionManager.logger.writeLog("Sync Completed.");
300
8f6b7a1890b2 *** empty log message ***
kono
parents: 299
diff changeset
152 syncCounter=0;
8f6b7a1890b2 *** empty log message ***
kono
parents: 299
diff changeset
153 } else {
411
795ef563f2a0 add commnets
one
parents: 410
diff changeset
154 if (inputLock) return;
300
8f6b7a1890b2 *** empty log message ***
kono
parents: 299
diff changeset
155 int i=syncCounter-1;
400
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
156 REPCommand del = new REPCommand(REP.REPCMD_DELETE_USER,sid,eid,0,i, text.get(i));
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
157 REPCommand ins = new REPCommand(REP.REPCMD_INSERT_USER,sid,eid,0,i, text.get(i));
315
20fb70068089 *** empty log message ***
kono
parents: 313
diff changeset
158 sendCommand(del);
20fb70068089 *** empty log message ***
kono
parents: 313
diff changeset
159 sendCommand(ins);
300
8f6b7a1890b2 *** empty log message ***
kono
parents: 299
diff changeset
160 syncCounter++;
8f6b7a1890b2 *** empty log message ***
kono
parents: 299
diff changeset
161 }
8f6b7a1890b2 *** empty log message ***
kono
parents: 299
diff changeset
162 }
8f6b7a1890b2 *** empty log message ***
kono
parents: 299
diff changeset
163
302
4ee012f19855 *** empty log message ***
kono
parents: 300
diff changeset
164 /*
4ee012f19855 *** empty log message ***
kono
parents: 300
diff changeset
165 * Simulate User Input
4ee012f19855 *** empty log message ***
kono
parents: 300
diff changeset
166 */
288
d93b062eadaa *** empty log message ***
kono
parents: 286
diff changeset
167 private void userInput() {
d93b062eadaa *** empty log message ***
kono
parents: 286
diff changeset
168 REPCommand cmd = cmds.poll();
d93b062eadaa *** empty log message ***
kono
parents: 286
diff changeset
169 if (cmd!=null) {
297
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
170 switch(cmd.cmd) {
400
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
171 case REPCMD_INSERT_USER:
297
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
172 text.insert(cmd.lineno, cmd.string);
315
20fb70068089 *** empty log message ***
kono
parents: 313
diff changeset
173 sendCommand(cmd);
297
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
174 break;
400
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
175 case REPCMD_DELETE_USER:
297
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
176 String del = text.delete(cmd.lineno);
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
177 cmd.setString(del);
315
20fb70068089 *** empty log message ***
kono
parents: 313
diff changeset
178 sendCommand(cmd);
297
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
179 break;
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
180 case SMCMD_QUIT:
302
4ee012f19855 *** empty log message ***
kono
parents: 300
diff changeset
181 /*
4ee012f19855 *** empty log message ***
kono
parents: 300
diff changeset
182 * start termination phase 1 by the master editor.
4ee012f19855 *** empty log message ***
kono
parents: 300
diff changeset
183 * after this command do not send any user input.
4ee012f19855 *** empty log message ***
kono
parents: 300
diff changeset
184 * clients simply disconnect from the session manager.
4ee012f19855 *** empty log message ***
kono
parents: 300
diff changeset
185 */
297
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
186 cmds.clear();
413
1cdbdeedc5b7 TestEditor stops syncText after QUIT.
one
parents: 411
diff changeset
187 cmd.eid = -1;
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
188 quit = cmd;
297
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
189 break;
299
d13dad30fd24 *** empty log message ***
kono
parents: 298
diff changeset
190 case SMCMD_JOIN:
d13dad30fd24 *** empty log message ***
kono
parents: 298
diff changeset
191 case SMCMD_PUT:
315
20fb70068089 *** empty log message ***
kono
parents: 313
diff changeset
192 sendCommand(cmd);
302
4ee012f19855 *** empty log message ***
kono
parents: 300
diff changeset
193 /*
4ee012f19855 *** empty log message ***
kono
parents: 300
diff changeset
194 * To prevent confusion, stop user input until the ack
4ee012f19855 *** empty log message ***
kono
parents: 300
diff changeset
195 */
300
8f6b7a1890b2 *** empty log message ***
kono
parents: 299
diff changeset
196 inputLock = true; // wait until ACK
299
d13dad30fd24 *** empty log message ***
kono
parents: 298
diff changeset
197 break;
297
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
198 default:
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
199 assert(false);
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
200 }
288
d93b062eadaa *** empty log message ***
kono
parents: 286
diff changeset
201 } else {
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
202 if(syncCounter==0) {
386
bba62c4ac323 sync-option
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 342
diff changeset
203 // no more command to send, and we don't have syncCounter
bba62c4ac323 sync-option
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 342
diff changeset
204 timeout = 0;
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
205 if (quit!=null) {
413
1cdbdeedc5b7 TestEditor stops syncText after QUIT.
one
parents: 411
diff changeset
206 if (quit.eid==-1)
1cdbdeedc5b7 TestEditor stops syncText after QUIT.
one
parents: 411
diff changeset
207 sendCommand(quit);
1cdbdeedc5b7 TestEditor stops syncText after QUIT.
one
parents: 411
diff changeset
208 else
1cdbdeedc5b7 TestEditor stops syncText after QUIT.
one
parents: 411
diff changeset
209 forwardCommand(quit);
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
210 quit=null;
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
211 }
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
212 }
288
d93b062eadaa *** empty log message ***
kono
parents: 286
diff changeset
213 }
d93b062eadaa *** empty log message ***
kono
parents: 286
diff changeset
214 }
d93b062eadaa *** empty log message ***
kono
parents: 286
diff changeset
215
285
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
216
315
20fb70068089 *** empty log message ***
kono
parents: 313
diff changeset
217 private void sendCommand(REPCommand cmd1) {
313
0585fd2410b8 Single Insert Command worked.
kono
parents: 308
diff changeset
218 REPCommand cmd = new REPCommand(cmd1);
315
20fb70068089 *** empty log message ***
kono
parents: 313
diff changeset
219 cmd.setSEQID(seq++);
285
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
220 cmd.setEID(eid);
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
221 cmd.setSID(sid);
297
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
222 ns.writeLog(name +" send "+cmd);
285
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
223 channel.write(cmd);
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
224 }
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
225
315
20fb70068089 *** empty log message ***
kono
parents: 313
diff changeset
226 private void forwardCommand(REPCommand cmd1) {
20fb70068089 *** empty log message ***
kono
parents: 313
diff changeset
227 REPCommand cmd = new REPCommand(cmd1);
445
22a741c1fa2d fix unMergedCmds in endMerge
one
parents: 442
diff changeset
228 ns.writeLog(name +" forward "+cmd);
315
20fb70068089 *** empty log message ***
kono
parents: 313
diff changeset
229 channel.write(cmd);
20fb70068089 *** empty log message ***
kono
parents: 313
diff changeset
230 }
20fb70068089 *** empty log message ***
kono
parents: 313
diff changeset
231
285
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
232 private void handle(REPCommand cmd) {
308
c5be84d53c7f *** empty log message ***
kono
parents: 304
diff changeset
233 if (cmd==null) return;
407
de4ef4313adc looks like working...
one
parents: 406
diff changeset
234 ns.writeLog(name +": read "+cmd + " textsize="+text.size());
285
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
235 switch(cmd.cmd) {
297
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
236 case REPCMD_INSERT :
405
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
237 if (cmd.eid!=eid) {
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
238 text.insert(cmd.lineno, cmd.string);
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
239 }
315
20fb70068089 *** empty log message ***
kono
parents: 313
diff changeset
240 forwardCommand(cmd);
297
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
241 break;
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
242 case REPCMD_DELETE :
405
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
243 if (cmd.eid!=eid) {
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
244 String del="";
407
de4ef4313adc looks like working...
one
parents: 406
diff changeset
245 if(cmd.lineno<text.size()) {
405
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
246 del = text.delete(cmd.lineno);
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
247 }
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
248 cmd.setString(del);
333
99d8f73bc64e *** empty log message ***
kono
parents: 328
diff changeset
249 }
315
20fb70068089 *** empty log message ***
kono
parents: 313
diff changeset
250 forwardCommand(cmd);
297
9c553308b918 *** empty log message ***
kono
parents: 288
diff changeset
251 break;
405
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
252 case REPCMD_NOP :
465
c83af820eb62 merge mark
one
parents: 445
diff changeset
253 case REPCMD_MERGE_MARK :
405
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
254 case REPCMD_INSERT_ACK :
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
255 case REPCMD_DELETE_ACK :
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
256 forwardCommand(cmd);
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
257 break;
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
258 case REPCMD_CLOSE :
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
259 case REPCMD_CLOSE_2 :
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
260 assert(false);
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
261 break;
313
0585fd2410b8 Single Insert Command worked.
kono
parents: 308
diff changeset
262
405
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
263 case SMCMD_JOIN_ACK :
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
264 sid = cmd.sid;
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
265 eid = cmd.eid;
431
1bb59652d89c fixing merge...
one
parents: 427
diff changeset
266 setName(name+eid);
1bb59652d89c fixing merge...
one
parents: 427
diff changeset
267 name += "(sid="+sid+")";
405
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
268 inputLock = false;
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
269 break;
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
270 case SMCMD_PUT_ACK :
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
271 sid = cmd.sid;
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
272 eid = cmd.eid;
431
1bb59652d89c fixing merge...
one
parents: 427
diff changeset
273 setName(name+eid);
1bb59652d89c fixing merge...
one
parents: 427
diff changeset
274 name += "(sid="+sid+")";
405
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
275 inputLock = false;
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
276 break;
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
277 case SMCMD_QUIT :
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
278 if (cmd.eid!=eid)
413
1cdbdeedc5b7 TestEditor stops syncText after QUIT.
one
parents: 411
diff changeset
279 quit = cmd;
1cdbdeedc5b7 TestEditor stops syncText after QUIT.
one
parents: 411
diff changeset
280 else // eid=-1 means do not forward but send it.
1cdbdeedc5b7 TestEditor stops syncText after QUIT.
one
parents: 411
diff changeset
281 quit = new REPCommand(REP.SMCMD_QUIT_2,
1cdbdeedc5b7 TestEditor stops syncText after QUIT.
one
parents: 411
diff changeset
282 sid, -1, seq, 0, "");
1cdbdeedc5b7 TestEditor stops syncText after QUIT.
one
parents: 411
diff changeset
283 timeout=1;
405
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
284 // stop input processing after this command
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
285 cmds.clear();
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
286 break;
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
287 case SMCMD_START_MERGE :
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
288 // lock user input during merge (optional)
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
289 inputLock = hasInputLock;
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
290 cmd.cmd = REP.SMCMD_START_MERGE_ACK;
427
622a8e15ff40 Merge Worked ?
one
parents: 424
diff changeset
291 ns.writeLog("BeforeMerge "+text);
405
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
292 sendCommand(cmd);
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
293 break;
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
294 case SMCMD_END_MERGE :
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
295 inputLock = false;
427
622a8e15ff40 Merge Worked ?
one
parents: 424
diff changeset
296 ns.writeLog("AfterMerge "+text);
405
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
297 break;
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
298 case SMCMD_QUIT_2 :
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
299 if (cmd.eid!=eid) {
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
300 forwardCommand(cmd);
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
301 } else {
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
302 cmd.cmd = REP.SMCMD_QUIT_2_ACK;
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
303 sendCommand(cmd);
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
304 }
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
305 running = false;
421
f8916a96a373 (no commit message)
one
parents: 413
diff changeset
306 dumpText();
405
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
307 break;
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
308 case SMCMD_SYNC:
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
309 // start contents sync with newly joined editor
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
310 cmd.cmd = REP.SMCMD_SYNC_ACK;
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
311 forwardCommand(cmd);
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
312 //if (cmd.eid==eid) {
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
313 if (master && syncEnable ) {
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
314 syncCounter = 1;
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
315 timeout = 1;
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
316 }
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
317 break;
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
318 default:
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
319 assert(false);
0b1d52ffb803 TestEditor fix
one
parents: 401
diff changeset
320 break;
285
b468f24c3e09 TestEditor
kono
parents: 284
diff changeset
321 }
284
90965a3bd4f3 editor simulator
kono
parents: 193
diff changeset
322 }
313
0585fd2410b8 Single Insert Command worked.
kono
parents: 308
diff changeset
323
334
4fae49280699 Test pattern for Inter-Session Manager communication
kono
parents: 333
diff changeset
324
421
f8916a96a373 (no commit message)
one
parents: 413
diff changeset
325 private void dumpText() {
f8916a96a373 (no commit message)
one
parents: 413
diff changeset
326 ns.writeLog("Final "+text);
f8916a96a373 (no commit message)
one
parents: 413
diff changeset
327 }
f8916a96a373 (no commit message)
one
parents: 413
diff changeset
328
334
4fae49280699 Test pattern for Inter-Session Manager communication
kono
parents: 333
diff changeset
329 public int getPort() {
4fae49280699 Test pattern for Inter-Session Manager communication
kono
parents: 333
diff changeset
330 return port;
4fae49280699 Test pattern for Inter-Session Manager communication
kono
parents: 333
diff changeset
331 }
342
4b056e46ba83 *** empty log message ***
kono
parents: 341
diff changeset
332
4b056e46ba83 *** empty log message ***
kono
parents: 341
diff changeset
333 public synchronized void setCommand(LinkedList<REPCommand> cmds) {
4b056e46ba83 *** empty log message ***
kono
parents: 341
diff changeset
334 this.cmds = cmds;
4b056e46ba83 *** empty log message ***
kono
parents: 341
diff changeset
335 timeout=1;
4b056e46ba83 *** empty log message ***
kono
parents: 341
diff changeset
336 if(selector!=null) selector.wakeup();
4b056e46ba83 *** empty log message ***
kono
parents: 341
diff changeset
337 }
193
311847db7429 *** empty log message ***
pin
parents:
diff changeset
338 }