annotate Todo @ 449:89a326696c54

mergeMark in sentList
author one
date Wed, 22 Sep 2010 22:11:58 +0900
parents 22a741c1fa2d
children 21cb16b7f3df
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
449
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
1 Wed Sep 22 19:59:26 JST 2010
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
2
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
3 NOPを廻す方式とAckを廻す方式は、
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
4
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
5 E_{10} N_{11} E_{23} E_{01} E_{02} N_{11}
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
6
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
7 E_{10} E_{23} E_{01} E_{02} Eack_{10}
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
8
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
9 の対応だから、方法としては同じ。
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
10
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
11 sort だけど、
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
12
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
13 e3 e1 e2 e3 e1 e2 e3 e1 e2 e3 e1 e2 e3
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
14 |---1---|----4---|--------|
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
15 |----2---|--------|--------|
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
16 |----3---|--------|--------|
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
17
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
18 1 では c1 のack で c1 c2 c3 の順序にmerge。c1 c2 c3 は確定。
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
19 なので、2,3 ではソートは必要ない? じゃぁ、Self merge だけ
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
20 すれば良いってこと? じゃぁ、その他の Ack の意味は?
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
21 さすがにそれはないです。
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
22
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
23 sort するリスト は、merge の時にclearして良いらしい。
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
24 と言うことは unMerge もclearして良い。
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
25 sentList にMarkを入れるか。
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
26
89a326696c54 mergeMark in sentList
one
parents: 445
diff changeset
27
445
22a741c1fa2d fix unMergedCmds in endMerge
one
parents: 442
diff changeset
28 Fri Sep 17 16:31:04 JST 2010
22a741c1fa2d fix unMergedCmds in endMerge
one
parents: 442
diff changeset
29
22a741c1fa2d fix unMergedCmds in endMerge
one
parents: 442
diff changeset
30 あぁ、そうか。二つ続けてeditor commandを送ると、二つ続けて Merge することに
22a741c1fa2d fix unMergedCmds in endMerge
one
parents: 442
diff changeset
31 なる。Timeout みたいなので防げないこともないが、今は何もしない。
22a741c1fa2d fix unMergedCmds in endMerge
one
parents: 442
diff changeset
32
22a741c1fa2d fix unMergedCmds in endMerge
one
parents: 442
diff changeset
33 Optimizer が全然動いてないようだ。まぁ、それは良いが...
22a741c1fa2d fix unMergedCmds in endMerge
one
parents: 442
diff changeset
34
22a741c1fa2d fix unMergedCmds in endMerge
one
parents: 442
diff changeset
35 Undo は正しく行なわれているが、続いて起きる merge で余計なコマンドが入っている
22a741c1fa2d fix unMergedCmds in endMerge
one
parents: 442
diff changeset
36 ようだ。
22a741c1fa2d fix unMergedCmds in endMerge
one
parents: 442
diff changeset
37
22a741c1fa2d fix unMergedCmds in endMerge
one
parents: 442
diff changeset
38 EndMergeで、unMergedCmds を正しくなるように直してみる。少しは近くなったか?
22a741c1fa2d fix unMergedCmds in endMerge
one
parents: 442
diff changeset
39
438
146d91b61b36 minor fix
one
parents: 436
diff changeset
40 Sat Sep 11 16:45:40 JST 2010
146d91b61b36 minor fix
one
parents: 436
diff changeset
41
146d91b61b36 minor fix
one
parents: 436
diff changeset
42 これ、やっぱり難しすぎ。getMergeAgain で、sentMergedList が空でない場合がある。
146d91b61b36 minor fix
one
parents: 436
diff changeset
43
441
15888d516f10 wait for pervious merge completion in getMargedAgain
one
parents: 438
diff changeset
44 Termination するようにはなった。しかし、Merge はダメなようだ。
15888d516f10 wait for pervious merge completion in getMargedAgain
one
parents: 438
diff changeset
45
15888d516f10 wait for pervious merge completion in getMargedAgain
one
parents: 438
diff changeset
46 mergeAgain した時に、前のmerge command がeditorから返されることがあって、
15888d516f10 wait for pervious merge completion in getMargedAgain
one
parents: 438
diff changeset
47 それは、全部、読む必要がある。
15888d516f10 wait for pervious merge completion in getMargedAgain
one
parents: 438
diff changeset
48
442
3819dec4641e command waiting during merge
one
parents: 441
diff changeset
49 Merge 中のcommandがblockされてない。
3819dec4641e command waiting during merge
one
parents: 441
diff changeset
50
3819dec4641e command waiting during merge
one
parents: 441
diff changeset
51 next.send(command) すると、直接、次のeditorに送られてしまうので、
3819dec4641e command waiting during merge
one
parents: 441
diff changeset
52 merge 中に止められない。
3819dec4641e command waiting during merge
one
parents: 441
diff changeset
53
436
5e3532db2e07 fix enQ
one
parents: 434
diff changeset
54 Sat Jan 16 18:06:37 JST 2010
5e3532db2e07 fix enQ
one
parents: 434
diff changeset
55
5e3532db2e07 fix enQ
one
parents: 434
diff changeset
56 sentList 全部削除だと quit2 が早めに出されてしまうので、
5e3532db2e07 fix enQ
one
parents: 434
diff changeset
57 ちゃんと終了しない。
5e3532db2e07 fix enQ
one
parents: 434
diff changeset
58
434
0e72945867bb merge on going...
one
parents: 432
diff changeset
59 Tue Jan 12 01:20:12 JST 2010
0e72945867bb merge on going...
one
parents: 432
diff changeset
60
0e72945867bb merge on going...
one
parents: 432
diff changeset
61 sentList の先頭を削除するのは、Merge が終った後。一周した部分は、
0e72945867bb merge on going...
one
parents: 432
diff changeset
62 確定するはずなので全部削除で良い。その後、来た、Ack などは無視して良い。
0e72945867bb merge on going...
one
parents: 432
diff changeset
63
0e72945867bb merge on going...
one
parents: 432
diff changeset
64 quit を早く処理してしまう場合があるらしい。
0e72945867bb merge on going...
one
parents: 432
diff changeset
65
0e72945867bb merge on going...
one
parents: 432
diff changeset
66 だいぶ近くなって来た気がする。
0e72945867bb merge on going...
one
parents: 432
diff changeset
67
0e72945867bb merge on going...
one
parents: 432
diff changeset
68 Sat Jan 9 15:36:35 JST 2010
0e72945867bb merge on going...
one
parents: 432
diff changeset
69
0e72945867bb merge on going...
one
parents: 432
diff changeset
70 やっぱり全部ソートしちゃいけないのかな...
0e72945867bb merge on going...
one
parents: 432
diff changeset
71
0e72945867bb merge on going...
one
parents: 432
diff changeset
72 Merge のtriggerになるコマンドは、sentList の先頭
0e72945867bb merge on going...
one
parents: 432
diff changeset
73 sort してはいけないものとは?
0e72945867bb merge on going...
one
parents: 432
diff changeset
74
0e72945867bb merge on going...
one
parents: 432
diff changeset
75 unMergedList は、Editor に送ったコマンド全部
0e72945867bb merge on going...
one
parents: 432
diff changeset
76 sentList は、外部のエディタに送り出したもの全部
0e72945867bb merge on going...
one
parents: 432
diff changeset
77
0e72945867bb merge on going...
one
parents: 432
diff changeset
78 そっか、やっぱり、current command が外されちゃっているのはまずいらしい。
0e72945867bb merge on going...
one
parents: 432
diff changeset
79 あと、sort の順序も良くない。
0e72945867bb merge on going...
one
parents: 432
diff changeset
80
0e72945867bb merge on going...
one
parents: 432
diff changeset
81 一回、sort したものは、外して良いっぽい。(ACKが来たものまでは確定)
0e72945867bb merge on going...
one
parents: 432
diff changeset
82
0e72945867bb merge on going...
one
parents: 432
diff changeset
83
431
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
84 Sat Jan 2 20:52:17 JST 2010
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
85
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
86 uMergeList のDELETE command のdeleted text が正しくない...
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
87 なので、最初の一回は良いのだが二回目ででたらめになってしまう。
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
88 これは、考えてなかった。
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
89 Translator.checkMergeConflict
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
90 が受け取っているので、それを uMergeList にすれば良いのだが...
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
91
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
92 ちょっと、やっかいなプログラムになるかも。
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
93
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
94 unMergeList はMerge 後、削除 ( まだ merge してない list )
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
95 sentList はいじれない ( 自分が他のエディタに送信した list)
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
96
438
146d91b61b36 minor fix
one
parents: 436
diff changeset
97 sentMergedList ( 送信した merge command )
431
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
98 mergeAgainList ( merge 中に自分のeditorに割り込まれた分 )
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
99
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
100 確かに、mergeAgainList とかなんか、quueue が多すぎ。
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
101
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
102
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
103 sort なんだけど...
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
104
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
105 e0 e1 e2 e0 e1 e2 e0 e1 e2 e0 e1 e2 e0
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
106 |-------|--------|--------|
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
107 |--------|--------|--------|
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
108 |--------|--------|--------|
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
109
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
110 となる。なので、単純な editor id の順序では、まずいのでは?
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
111 (自分の以外はack) ack の eid からの剰余で廻せば良いはず。
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
112
432
46199cf0046e (no commit message)
one
parents: 431
diff changeset
113 mergeでeditorから返ってきたのを unMerge に入れるべき。でな
46199cf0046e (no commit message)
one
parents: 431
diff changeset
114 いと undo が狂う。Merge は unMergeをundoし sentList から構
46199cf0046e (no commit message)
one
parents: 431
diff changeset
115 成する。
46199cf0046e (no commit message)
one
parents: 431
diff changeset
116
431
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
117
429
c2e4759eddcb (no commit message)
one
parents: 428
diff changeset
118 Sat Jan 2 03:27:47 JST 2010
c2e4759eddcb (no commit message)
one
parents: 428
diff changeset
119
c2e4759eddcb (no commit message)
one
parents: 428
diff changeset
120 うーん、まだ、だめですね。
c2e4759eddcb (no commit message)
one
parents: 428
diff changeset
121
430
03ab374605a6 Test program termination.
one
parents: 429
diff changeset
122 Session Manager の quit protocol って入れてない気がする...
03ab374605a6 Test program termination.
one
parents: 429
diff changeset
123 切れた場合の対処も入れないといけないんだよな。
03ab374605a6 Test program termination.
one
parents: 429
diff changeset
124
427
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
125 Sat Jan 2 00:02:41 JST 2010
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
126
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
127 Todo:
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
128 writeLog に level/flag を付けるか?
431
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
129 Done:
1bb59652d89c fixing merge...
one
parents: 430
diff changeset
130 既に付いてました。
427
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
131
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
132 Selector.select() のフラグは意味がない。その後、必ず、
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
133 selectedKeys() を調べる必要がある。これは、Simulator
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
134 と実ソケットの動作が異なる部分。Warning とか出せないものか?
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
135
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
136 確かに、Merge 変かも。unMerged を undo するのは良いが、
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
137 sort するのは、unMerged であって、undo を付加したものではないはず。
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
138
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
139 いや、それは正しく出来ている。output に先にundoを入れて、
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
140 cmd には、そのまま残している。(順序は sort されるので関係ない)
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
141
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
142 でも、sortedCmds1 に add する時に、Comparator で順序付けされて
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
143 しまう。getPrecedence() は必要な列の切出しに使う。
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
144
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
145 Self Merge case
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
146 E_{00} E_{12} E_{01} E_{23} E_{02} (E_{00})
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
147 Other Merge case
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
148 E_{10} E_{11} E_{23} E_{01} E_{02} (Eack_{10})
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
149
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
150 ack が間に入ることはない(merge で消されるから)
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
151 original command の存在しない ack もない。
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
152 (あったら、エラー。無視して良い)
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
153 ack の来ない original command は sequence エラーとなるなず。
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
154 (あるいは time out)
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
155
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
156 ということは、getPrecedence せずに、うむを言わせず
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
157 全部 sort すれば良いってこと? ってことは実は、E_{12}
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
158 が来た段階で追い越せるかどうかはわかる?
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
159
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
160 Ack を受け取ったら、それは、必ず先頭にあるはず。
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
161
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
162 E_{00} E_{10} E_{11} E_{23} E_{01} E_{02} (Eack_{10})
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
163
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
164 とかはない。ack は追い越せないから。この間の入力は確定で、
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
165 優先順位にしたがって順序付しsortする。次は、
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
166
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
167 E_{10} E_{11} E_{23} E_{01} E_{02} (Eack_{10})
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
168 E_{11} E_{23} E_{01} E_{02} E_{12} (Eack_{11})
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
169
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
170 で、これは、E_{12} までをsort すれば良い。ということは、
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
171 取れるのは最初の一個だけってこと。
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
172
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
173 nop の場合は、command が着いた直後に出力されるけど、
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
174 ack の場合は、それは出力されないで、もう一周する
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
175 ack が流される。ack は、一つ前のエディタが出力した
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
176 nop に相当する。
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
177
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
178 この方法だと、編集コマンドの干渉を気にする必要はない。それは、
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
179 最適化フェーズで自動的に排除される。(はず) ということは、
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
180 getPrecedece の方で sort してやって、今の lineno の比較は
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
181 無意味なので排除ということですね。
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
182
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
183 2方向をスター型/木型に順々に処理する方法でも良いのか。
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
184
428
b5f1bcc8a156 document
one
parents: 427
diff changeset
185 ということは、unMergedCmds と sendList って、おなじものってこと?
427
622a8e15ff40 Merge Worked ?
one
parents: 421
diff changeset
186
421
f8916a96a373 (no commit message)
one
parents: 411
diff changeset
187 Wed Nov 26 15:15:16 JST 2008
f8916a96a373 (no commit message)
one
parents: 411
diff changeset
188
f8916a96a373 (no commit message)
one
parents: 411
diff changeset
189 Ring 構造なので、一部のeidtorで止まると全体が止まってしまう。
f8916a96a373 (no commit message)
one
parents: 411
diff changeset
190 (非同期なのでeditorが止まることはない) これは、そういう設計
f8916a96a373 (no commit message)
one
parents: 411
diff changeset
191 なので仕方がないんだが応答しないEditor/SesisionManagerを
f8916a96a373 (no commit message)
one
parents: 411
diff changeset
192 切り離す機構は必要だろう。
f8916a96a373 (no commit message)
one
parents: 411
diff changeset
193
f8916a96a373 (no commit message)
one
parents: 411
diff changeset
194 このTodo list のmaintenanceをEclipse側で出来ないの? Perl Script でも
f8916a96a373 (no commit message)
one
parents: 411
diff changeset
195 でも良いけど。
f8916a96a373 (no commit message)
one
parents: 411
diff changeset
196
411
795ef563f2a0 add commnets
one
parents: 407
diff changeset
197 Wed Nov 26 08:44:29 JST 2008
795ef563f2a0 add commnets
one
parents: 407
diff changeset
198
795ef563f2a0 add commnets
one
parents: 407
diff changeset
199 Todo:
795ef563f2a0 add commnets
one
parents: 407
diff changeset
200 QUITで、まだ、処理があるのにEditorが止まってしまう状況が
795ef563f2a0 add commnets
one
parents: 407
diff changeset
201 あるらしい。
795ef563f2a0 add commnets
one
parents: 407
diff changeset
202
421
f8916a96a373 (no commit message)
one
parents: 411
diff changeset
203 Done:
f8916a96a373 (no commit message)
one
parents: 411
diff changeset
204 syncText 中にquitが来ていたかららしい。
f8916a96a373 (no commit message)
one
parents: 411
diff changeset
205
407
de4ef4313adc looks like working...
one
parents: 406
diff changeset
206 Tue Nov 25 09:13:42 JST 2008
de4ef4313adc looks like working...
one
parents: 406
diff changeset
207
de4ef4313adc looks like working...
one
parents: 406
diff changeset
208 Todo:
de4ef4313adc looks like working...
one
parents: 406
diff changeset
209 だいたい動いたが、たまに爆発するバグが残っているらしい。
de4ef4313adc looks like working...
one
parents: 406
diff changeset
210 どうも、optimizerのbugっぽいな... いや、違いますね。
de4ef4313adc looks like working...
one
parents: 406
diff changeset
211 getMergeAgainの問題らしいが、直接の原因は良くわからない。
de4ef4313adc looks like working...
one
parents: 406
diff changeset
212
411
795ef563f2a0 add commnets
one
parents: 407
diff changeset
213 Done:
795ef563f2a0 add commnets
one
parents: 407
diff changeset
214 なんと、Text.javaのdeleteの条件判断が間違ってました。
795ef563f2a0 add commnets
one
parents: 407
diff changeset
215
399
19705f4b8015 waitingCommandInMerge
one
parents: 397
diff changeset
216 Mon Nov 24 22:51:45 JST 2008
19705f4b8015 waitingCommandInMerge
one
parents: 397
diff changeset
217
19705f4b8015 waitingCommandInMerge
one
parents: 397
diff changeset
218 watingCommandInMerge のqueueを一旦0にしてから、manageを
19705f4b8015 waitingCommandInMerge
one
parents: 397
diff changeset
219 呼ぶと、queueが既にあるのに、lockが外れた状態になってしまう。
19705f4b8015 waitingCommandInMerge
one
parents: 397
diff changeset
220
400
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
221 watingCommandInMerge にforwardedCommandManageから入れちゃうと、
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
222 User Editor Command と 一周して来てからのCommandを区別できない...
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
223
404
4bb04d5a9bbf minor fix
one
parents: 400
diff changeset
224 INSERT_USER/DELETE_USERを入れて回避。Editor側の変更も必要になるが、
4bb04d5a9bbf minor fix
one
parents: 400
diff changeset
225 まぁ、仕方がない。
400
29f01a7ce71f INSERT_USER,DELETE_USER to distinguish user input
one
parents: 399
diff changeset
226
405
0b1d52ffb803 TestEditor fix
one
parents: 404
diff changeset
227 Editor側で、自分が出したINSERT/DELETE commandは無視する必要がある。
0b1d52ffb803 TestEditor fix
one
parents: 404
diff changeset
228 ついでに、Editor側でINSERT_ACK/DELETE_ACKに書き換える方が良いらしい。
0b1d52ffb803 TestEditor fix
one
parents: 404
diff changeset
229
407
de4ef4313adc looks like working...
one
parents: 406
diff changeset
230 Todo:
406
8009dd7b2013 command execution when commandInMergeQueue>0
one
parents: 405
diff changeset
231 INSERT_ACK/DELETE_ACKが出ない場合があるらしい。と言うか、最初の
8009dd7b2013 command execution when commandInMergeQueue>0
one
parents: 405
diff changeset
232 一回しか出ていない。
8009dd7b2013 command execution when commandInMergeQueue>0
one
parents: 405
diff changeset
233
407
de4ef4313adc looks like working...
one
parents: 406
diff changeset
234 Done:
de4ef4313adc looks like working...
one
parents: 406
diff changeset
235 commandInMerge の扱いが変だった。
de4ef4313adc looks like working...
one
parents: 406
diff changeset
236
397
149c9a53fc37 half done ACK protocol
one
parents: 393
diff changeset
237 Wed Nov 19 19:21:47 JST 2008
149c9a53fc37 half done ACK protocol
one
parents: 393
diff changeset
238
149c9a53fc37 half done ACK protocol
one
parents: 393
diff changeset
239 ACK base に書き換えるのは良いが、途中でjoinして
149c9a53fc37 half done ACK protocol
one
parents: 393
diff changeset
240 きたeditorが、ACKだけを受け取った時には無視する必要が
149c9a53fc37 half done ACK protocol
one
parents: 393
diff changeset
241 ある。
149c9a53fc37 half done ACK protocol
one
parents: 393
diff changeset
242
393
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
243 Fri Oct 31 20:34:35 JST 2008
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
244
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
245 Note:
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
246
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
247 そもそも、NOPを付け加えるのがtrafficを増やしている。一周で
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
248 は、状態が確定しないので、INSERT/INSERT_ACKで、それぞれ一周、
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
249 計二周廻してやればいい。
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
250 一週目で、そのコマンドを merge waiting queue にいれる
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
251 二週目のAckコマンドを merge waiting queue と照合して、MERGE_STARTする
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
252 で、良いんじゃないか? もちろん、editorにfowardして、戻って来た
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
253 時点で判定する。
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
254 Ackが戻って来た時点で、MERGE_STARTとみなして良い。
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
255 何もなければ、MERGE_ENDを送り、コマンドがあれば、id=-2を送り、
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
256 最後にMERGE_ENDを送る
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
257 なので、MERGE_STARTも必要ない。これで、NOPを付け加えるのと、動作は
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
258 同等になる。
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
259
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
260 ACK command はeditorでは実行しない。
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
261
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
262 ついでに、packet に source editor ID も付けるんじゃないか?
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
263
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
264 Tue Oct 28 09:50:23 JST 2008
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
265 Todo: (kono)
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
266 取り敢えず、動いたみたい。テスト用に、JavaなEditor + 複数のSession Manager
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
267 + Auto Selector があると良いらしい。
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
268
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
269 Sun Oct 26 17:36:40 JST 2008
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
270 Todo: (kono)
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
271 GUI のEditorの方が、どれがどれだか、さっぱりわからない。
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
272 せめて、sessionを持っているかとか出ないとだめっぽい。
393
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
273
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
274 Todo: (kono)
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
275 なんか、NO_NAMEってのが最初に出るらしい。なんだ?
393
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
276 Done: vim のsession 管理バッファがまだ残っていたようです。
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
277 復活させてもいいかな〜
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
278
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
279 Todo: (kono)
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
280 NOPが廻り続けるという症状があるらしい。
421
f8916a96a373 (no commit message)
one
parents: 411
diff changeset
281 Done: nop procotol は削除
393
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
282
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
283 Todo: (kono)
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
284 Optimizer が、まだ、たこならしい。
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
285
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
286 Sun Oct 26 14:33:51 JST 2008
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
287 Todo: (kono)
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
288 quit/close 処理が間違っているらしい。
421
f8916a96a373 (no commit message)
one
parents: 411
diff changeset
289 Done: quit は直しました
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
290
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
291 Sat Oct 25 10:52:05 JST 2008
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
292 Todo: (kono)
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
293 Editorからのmutli-sessoin の扱い、TestEditor でのmulti-session
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
294 の実装。REPNode.handle の中でreadしちゃうと、handle 間での処理
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
295 の引き渡しが出来ない。handlerの切替えにkeyは必要。
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
296
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
297 一つのeditorの中で、同じsessionに複数selectすると、コマンドを
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
298 判定出来なくなる。今でも、新しくchannelを開けるなら複数セッション
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
299 をselectすることは可能。channelで識別しているので。
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
300 新しいeditorが作られてしまうので、ダメなケースの判定は、直接接続し
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
301 ているSMでしか出来ない。と言うことは、selectのcancelのprotocolが
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
302 必要らしい。それは、結構、面倒。command に source editor id を
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
303 付けてやれば良いのだが...
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
304
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
305 Todo: (kono)
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
306 text editor のバッファが増えるバグがあるらしい。
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
307 Done: たぶん、quit/quit2が動いてない。close の処理のがまずいせい。
393
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
308 merge にbugがったので、そのせいかも。
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
309
386
bba62c4ac323 sync-option
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 385
diff changeset
310 Fri Oct 24 19:00:50 JST 2008
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
311 Note:
386
bba62c4ac323 sync-option
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 385
diff changeset
312 XML に editor がselectされているかどうかのflagがあった方が良い。
bba62c4ac323 sync-option
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 385
diff changeset
313 現状では、update はなんにも役に立たない。
bba62c4ac323 sync-option
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 385
diff changeset
314
bba62c4ac323 sync-option
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 385
diff changeset
315 Thu Oct 23 10:31:58 JST 2008
bba62c4ac323 sync-option
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 385
diff changeset
316
bba62c4ac323 sync-option
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 385
diff changeset
317 Todo: (kono)
bba62c4ac323 sync-option
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 385
diff changeset
318 UPDATE/UPDATE_ACKが出ない。
bba62c4ac323 sync-option
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 385
diff changeset
319 Done: Fri Oct 24 19:00:50 JST 2008
bba62c4ac323 sync-option
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 385
diff changeset
320
385
1fca50ce3508 first-working-version
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 375
diff changeset
321 Wed Oct 22 19:53:59 JST 2008
1fca50ce3508 first-working-version
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 375
diff changeset
322
1fca50ce3508 first-working-version
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 375
diff changeset
323 Todo: (kono)
1fca50ce3508 first-working-version
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 375
diff changeset
324 やっぱり、END_MERGEが繰り返し出るバグがあるらしい。
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
325 Done: Thu Oct 23 10:12:27 JST 2008 merge confilict 時にmode setを
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
326 忘れてました。
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
327 結局、flag を入れて対症療法しました。
385
1fca50ce3508 first-working-version
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 375
diff changeset
328
373
ab4405cd3351 looks like we are done. Wait for further test.
kono
parents: 370
diff changeset
329 Wed Oct 22 02:31:27 JST 2008
ab4405cd3351 looks like we are done. Wait for further test.
kono
parents: 370
diff changeset
330
ab4405cd3351 looks like we are done. Wait for further test.
kono
parents: 370
diff changeset
331 Todo: (kono)
ab4405cd3351 looks like we are done. Wait for further test.
kono
parents: 370
diff changeset
332 editorの中で、next.getEID() とか next.setQuit2() とかやっているのは、
ab4405cd3351 looks like we are done. Wait for further test.
kono
parents: 370
diff changeset
333 ditributed の場合は、うまく動かない。だまって、forward されるはず
ab4405cd3351 looks like we are done. Wait for further test.
kono
parents: 370
diff changeset
334 だが... やっぱり、dummy editor ではなくて、専用のものを作らないと
ab4405cd3351 looks like we are done. Wait for further test.
kono
parents: 370
diff changeset
335 だめ?
374
2b00e10394fd *** empty log message ***
kono
parents: 373
diff changeset
336 Done: Wed Oct 22 02:56:30 JST 2008
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
337 ちょっとあれだが、next がdirecgtでない場合を判断して、向こうの
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
338 forwarder側で処理するのが簡単らしい。
375
34642bc65c21 *** empty log message ***
kono
parents: 374
diff changeset
339
34642bc65c21 *** empty log message ***
kono
parents: 374
diff changeset
340 Todo: (kono)
34642bc65c21 *** empty log message ***
kono
parents: 374
diff changeset
341 Select後のupdateを流してないので、他の人が、そのsessionがselectされたのを
34642bc65c21 *** empty log message ***
kono
parents: 374
diff changeset
342 知り得ない。なので、複数のjoin_ackがありえる。
387
6f356d160e58 IPv6 any address
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 386
diff changeset
343 Done: Sun Oct 26 17:39:05 JST 2008
373
ab4405cd3351 looks like we are done. Wait for further test.
kono
parents: 370
diff changeset
344
370
46c95d8885ad fix put_ack in single server test.
kono
parents: 364
diff changeset
345 Mon Oct 20 16:38:39 JST 2008
46c95d8885ad fix put_ack in single server test.
kono
parents: 364
diff changeset
346
46c95d8885ad fix put_ack in single server test.
kono
parents: 364
diff changeset
347 Todo: (kono)
46c95d8885ad fix put_ack in single server test.
kono
parents: 364
diff changeset
348 routing で put の時には、上に上がるだけで良いのだが、下に行くときには、
46c95d8885ad fix put_ack in single server test.
kono
parents: 364
diff changeset
349 routing table を持って行く必要がある。ということは、session list を
46c95d8885ad fix put_ack in single server test.
kono
parents: 364
diff changeset
350 つける必要があるということだね。でも、tree だから、
46c95d8885ad fix put_ack in single server test.
kono
parents: 364
diff changeset
351 自分の直下んあるもの以外は、上に送る
46c95d8885ad fix put_ack in single server test.
kono
parents: 364
diff changeset
352 で良いのか...
375
34642bc65c21 *** empty log message ***
kono
parents: 374
diff changeset
353 Done: Wed Oct 22 02:56:30 JST 2008
370
46c95d8885ad fix put_ack in single server test.
kono
parents: 364
diff changeset
354
46c95d8885ad fix put_ack in single server test.
kono
parents: 364
diff changeset
355 Todo: (kono)
46c95d8885ad fix put_ack in single server test.
kono
parents: 364
diff changeset
356 put/put_ack は、udpateを兼ねる必要があるらしい。そうでないと、session list
46c95d8885ad fix put_ack in single server test.
kono
parents: 364
diff changeset
357 が広まらない。
375
34642bc65c21 *** empty log message ***
kono
parents: 374
diff changeset
358 Done: Wed Oct 22 02:56:30 JST 2008
370
46c95d8885ad fix put_ack in single server test.
kono
parents: 364
diff changeset
359 session list 中のlocalでないeditorをselectするした場合は、sessionManager
46c95d8885ad fix put_ack in single server test.
kono
parents: 364
diff changeset
360 の方に再送してやれば良い。
375
34642bc65c21 *** empty log message ***
kono
parents: 374
diff changeset
361 Done: Wed Oct 22 02:56:30 JST 2008
34642bc65c21 *** empty log message ***
kono
parents: 374
diff changeset
362 SELECT0 を作成
34642bc65c21 *** empty log message ***
kono
parents: 374
diff changeset
363
364
c965ef2b5fd6 *** empty log message ***
kono
parents: 362
diff changeset
364 Mon Oct 20 10:22:02 JST 2008
c965ef2b5fd6 *** empty log message ***
kono
parents: 362
diff changeset
365
370
46c95d8885ad fix put_ack in single server test.
kono
parents: 364
diff changeset
366 Todo: (kono)
364
c965ef2b5fd6 *** empty log message ***
kono
parents: 362
diff changeset
367 Inter-session での、editor の削除、master でないeditorのclose/quit。
421
f8916a96a373 (no commit message)
one
parents: 411
diff changeset
368 Done: Wed Nov 26 15:19:07 JST 2008
f8916a96a373 (no commit message)
one
parents: 411
diff changeset
369 動いているらしい
364
c965ef2b5fd6 *** empty log message ***
kono
parents: 362
diff changeset
370
361
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
371 Sun Oct 19 21:23:27 JST 2008
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
372
364
c965ef2b5fd6 *** empty log message ***
kono
parents: 362
diff changeset
373 Todo: IPv6 対応 (kono)
c965ef2b5fd6 *** empty log message ***
kono
parents: 362
diff changeset
374 getAddress で取れたアドレスには、すべて、select/connect する
c965ef2b5fd6 *** empty log message ***
kono
parents: 362
diff changeset
375 必要がある。localhost な hostname よりも大域的なhostnameを
c965ef2b5fd6 *** empty log message ***
kono
parents: 362
diff changeset
376 優先した方が良い。
393
18cacd0b3ccf update tags
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 387
diff changeset
377 Done: server 側は対応。server側のconnect がまだ。
364
c965ef2b5fd6 *** empty log message ***
kono
parents: 362
diff changeset
378
361
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
379 Todo: dispatch先のEditorの作成 (kono)
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
380
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
381 Session は select 時に、channelを持つeditorが登録される。
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
382 外から来た場合は、新しくeditor を作って、それをsession
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
383 に登録する必要がある。SessionManagerの入口のforwarderを
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
384 session に登録してしまうと、Sessionが一つの時にしか動かない。
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
385
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
386 put_ack は、putの時にすぐに出してしまって構わない。select_ack
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
387 が廻るので、その時にput_ackを出しても良いが...
362
f0bd158dace6 *** empty log message ***
kono
parents: 361
diff changeset
388 Done: Sun Oct 19 23:10:52 JST 2008
361
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
389
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
390 Todo: (kono)
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
391 複数のsessionのテストを作成する
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
392
358
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
393 Sat Oct 18 20:03:10 JST 2008
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
394
361
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
395 Todo: Routing Table (kono)
358
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
396
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
397 Routing Table (Session, Editor)を作るには、上下双方向の通信が必要。
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
398 SessionID を master が作ると、一旦、multi cast した後、もう一度、
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
399 上に上げる必要がある。Select の時には、editor から上に上がるので、
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
400 その時に構築すれば良い。SessionManagerIDと組み合わせれば、eid/sid
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
401 ともに、下から構築出来る。
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
402
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
403 自分が出したjoin/put/sm_joinに対するackかどうかを見るために、
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
404 SessionManagerID は、どうせ必要。この方法だと、routing table
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
405 もSessionManagerIDに対してだけ構築すれば良い。とは、ならない。
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
406 Session は、複数のSessionManagerにまたがるので。
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
407
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
408 join_ack が来た時には、そのeditorのrouting tableは完成している、
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
409 あるいは、select が完成させるjoin_ackに追い付くことはない。
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
410 put_ack も同様。
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
411
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
412 select は、editorへのpathを探しながら、session routing table
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
413 を構築する。もっとも高位のsession managerへのrouting table
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
414 は、これで作成される。ここからjoinしたeditorまでのpathは、
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
415 そのeditor単一のpathだが、routing table に登録される。
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
416 select は、session ringに到達した時点で update を流す。
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
417 update は、木をさかのぼりrouting tableを構築する。
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
418 これで上方向のroutingは確定する。update_ackにより、
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
419 下方向のsesionn routing tableが確定する。
361
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
420 Done: Sun Oct 19 21:29:08 JST 2008
358
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
421
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
422 Wed Oct 15 13:33:58 JST 2008
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
423
361
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
424 Todo: (kono)
358
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
425
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
426 Session List を渡すタイミング
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
427
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
428 SM_JOIN_ACK (必須...)
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
429 SM_JOIN では、Session List は0なはず。
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
430 JOIN,PUT は、multi-cast されるので、その時に登録すれば良い。
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
431 その時に、Session List を送っても良いが...
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
432 SELECTは、joinするeditorからしか出ない。Session List は必要ない。
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
433 SELECT_ACK は、UPDATEが出るので必要ない
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
434 UPDATE,UPDATE_ACK には、Session List が付く
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
435 GATHER,GATHER_ACK には、Session List が付く
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
436
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
437 Session List では、editor,session に対するroutingも作成する、必要
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
438 な情報を含む必要がある。
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
439 eid, EditorName, FileName, sid, SessionManagerName
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
440 SessionManagerName が入っていれば、editor, session が
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
441 Session Listが来た方向にいるということになる。
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
442
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
443 SessionManagerName は、network 上でuniqueな必要がある。
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
444 sm_join した時に、そのchannelの名前が大域的に確定する。
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
445 sm_join は複数行なわれないから、名前が変わることはない。
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
446 sm_join された側の名前も、接続されて初めて確定する。
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
447 複数 sm_join されることはあるが、その場合は最初のもの
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
448 を使う。ということは、localにsm_join された後、大域的
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
449 に接続される場合があるってことか。ってことは、やっぱり、
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
450 session manager id を配布するべきだってことね。で、
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
451 SMの名前はあくまでも補助的に使う。
361
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
452 Done: Sun Oct 19 21:29:08 JST 2008
358
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
453
361
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
454 Todo: (kono)
358
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
455 UPDATEの情報によって削除も行なう。delete entry が必要。
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
456
361
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
457 Todo: (kono)
358
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
458 Routing Table
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
459 <eid, channel>
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
460 <sid, channel>
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
461 null は、local。channel==parent なら、自分の下にはいない。
361
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
462 Done: Sun Oct 19 21:29:08 JST 2008
358
034acadc0cdc *** empty log message ***
kono
parents: 345
diff changeset
463
345
a092a8fe9d97 *** empty log message ***
kono
parents: 344
diff changeset
464 Tue Oct 14 06:02:37 JST 2008
a092a8fe9d97 *** empty log message ***
kono
parents: 344
diff changeset
465
a092a8fe9d97 *** empty log message ***
kono
parents: 344
diff changeset
466 Todo: (kono)
a092a8fe9d97 *** empty log message ***
kono
parents: 344
diff changeset
467 取りあえず、sm_join()からか。次は、join(),put()。そして、
361
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
468 update()。select()。
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
469 Done: Sun Oct 19 21:29:08 JST 2008
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
470
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
471 Todo: (kono)
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
472 最後に、gather()。
345
a092a8fe9d97 *** empty log message ***
kono
parents: 344
diff changeset
473
a092a8fe9d97 *** empty log message ***
kono
parents: 344
diff changeset
474 Todo: (kono)
a092a8fe9d97 *** empty log message ***
kono
parents: 344
diff changeset
475 Select用に、routing tableが必要らしい。session ringへの
a092a8fe9d97 *** empty log message ***
kono
parents: 344
diff changeset
476 方向を表すtableを、put, update, update_ack時に作成する。
362
f0bd158dace6 *** empty log message ***
kono
parents: 361
diff changeset
477 Done: Sun Oct 19 21:29:08 JST 2008
345
a092a8fe9d97 *** empty log message ***
kono
parents: 344
diff changeset
478
343
21ad256c25c2 *** empty log message ***
kono
parents: 341
diff changeset
479 Mon Oct 13 12:34:39 JST 2008
21ad256c25c2 *** empty log message ***
kono
parents: 341
diff changeset
480
344
d07414ff79d3 *** empty log message ***
kono
parents: 343
diff changeset
481 Todo: (kono)
d07414ff79d3 *** empty log message ***
kono
parents: 343
diff changeset
482 sm_join時のloop の検出。sm_joinを受け取った時には、sm接続にloopが
d07414ff79d3 *** empty log message ***
kono
parents: 343
diff changeset
483 あるかどうかを調べる必要がある。これのテストも必要。
345
a092a8fe9d97 *** empty log message ***
kono
parents: 344
diff changeset
484 host_aからのsm_joinを受け取ったら、sm_join(host_a)を親に送る。
a092a8fe9d97 *** empty log message ***
kono
parents: 344
diff changeset
485 host_aがsm_join(host_a)を受け取ったら、それはloop。親がsm_join
a092a8fe9d97 *** empty log message ***
kono
parents: 344
diff changeset
486 を受け取れば、そこからsm_join_ackを流して終了。
361
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
487 Done: Sun Oct 19 21:29:08 JST 2008
344
d07414ff79d3 *** empty log message ***
kono
parents: 343
diff changeset
488
343
21ad256c25c2 *** empty log message ***
kono
parents: 341
diff changeset
489 Note: (kono)
344
d07414ff79d3 *** empty log message ***
kono
parents: 343
diff changeset
490 複数のsession managerにsm_joinする場合もある。その場合は、
d07414ff79d3 *** empty log message ***
kono
parents: 343
diff changeset
491 親に代わりにsm_joinしてもらう? 親がreachableだとは限りませんが。
d07414ff79d3 *** empty log message ***
kono
parents: 343
diff changeset
492 禁止してもいいけど...
d07414ff79d3 *** empty log message ***
kono
parents: 343
diff changeset
493
d07414ff79d3 *** empty log message ***
kono
parents: 343
diff changeset
494 sessionを持っているsm同士がsm_joinするとsidを付け直す必要が
d07414ff79d3 *** empty log message ***
kono
parents: 343
diff changeset
495 ある。これは大変だなぁ。これも禁止? join/select待ちは許される。
d07414ff79d3 *** empty log message ***
kono
parents: 343
diff changeset
496 まぁ、新しくsmを上げれば良いだけなんだが、内部的になんとか出来ないの?
d07414ff79d3 *** empty log message ***
kono
parents: 343
diff changeset
497 面倒なので、取りあえず禁止で良いです。もしかして、updateって、
d07414ff79d3 *** empty log message ***
kono
parents: 343
diff changeset
498 それよう?
d07414ff79d3 *** empty log message ***
kono
parents: 343
diff changeset
499
d07414ff79d3 *** empty log message ***
kono
parents: 343
diff changeset
500 sidのnatという手はあるのか。かなり複雑だけど。それだと複数の親が
d07414ff79d3 *** empty log message ***
kono
parents: 343
diff changeset
501 いてもだいじょうぶか? ちゃんと書き換え出来るなら動くっぽい。あとで
345
a092a8fe9d97 *** empty log message ***
kono
parents: 344
diff changeset
502 入れることも可能か。
a092a8fe9d97 *** empty log message ***
kono
parents: 344
diff changeset
503
a092a8fe9d97 *** empty log message ***
kono
parents: 344
diff changeset
504 selectが以外に難しい。sessionとjoinして来たeditorを見つけない
a092a8fe9d97 *** empty log message ***
kono
parents: 344
diff changeset
505 といけない。しかも、最短距離で。見つけるだけなら簡単だが... 取りあえず、
a092a8fe9d97 *** empty log message ***
kono
parents: 344
diff changeset
506 select は、join したsession managerでしか出来ないということに
a092a8fe9d97 *** empty log message ***
kono
parents: 344
diff changeset
507 する。そうでないと、joinしたeditorを探す必要があり、全部を見るか、
a092a8fe9d97 *** empty log message ***
kono
parents: 344
diff changeset
508 routing tableを作る必要がある。後者でも良いが。
344
d07414ff79d3 *** empty log message ***
kono
parents: 343
diff changeset
509
d07414ff79d3 *** empty log message ***
kono
parents: 343
diff changeset
510 Note: (kono)
d07414ff79d3 *** empty log message ***
kono
parents: 343
diff changeset
511 Session間の通信は、木を作って、自分の親に送り、親がack/updateをmulti cast
d07414ff79d3 *** empty log message ***
kono
parents: 343
diff changeset
512 すれば良い。sm_join した時に、どちらが親になるかはどうやって決める? 繋げた先が
d07414ff79d3 *** empty log message ***
kono
parents: 343
diff changeset
513 親ってのが簡単。親がいないのがmasterとなる。親が死んだら自分が親。親が死んで、
d07414ff79d3 *** empty log message ***
kono
parents: 343
diff changeset
514 sessionがmasterを失った時は? loop の検出も必要。
343
21ad256c25c2 *** empty log message ***
kono
parents: 341
diff changeset
515 再接続は可能? 可能だが、再put/join/selectする必要がある。
21ad256c25c2 *** empty log message ***
kono
parents: 341
diff changeset
516 put は、親まで上がってsidを決定しなければならない、その後、put_ackを出せる。
21ad256c25c2 *** empty log message ***
kono
parents: 341
diff changeset
517 joinは、localでの処理で問題ないが、join_ackはselectが終わってから出る必要がある。
21ad256c25c2 *** empty log message ***
kono
parents: 341
diff changeset
518 selectは session owner に行き着く必要がある。session がconnectionを
21ad256c25c2 *** empty log message ***
kono
parents: 341
diff changeset
519 持っているとは限らない。親がselectする方が自然か?
344
d07414ff79d3 *** empty log message ***
kono
parents: 343
diff changeset
520 put_ack/join_ack/select_ackは、updateを見てでの処理で良い? 対象イベント
d07414ff79d3 *** empty log message ***
kono
parents: 343
diff changeset
521 が明示されていた方が楽だが...
d07414ff79d3 *** empty log message ***
kono
parents: 343
diff changeset
522 この方法だと、session managerはidは持っていないが、木構造の中でuniqeな
d07414ff79d3 *** empty log message ***
kono
parents: 343
diff changeset
523 位置を持つ。
343
21ad256c25c2 *** empty log message ***
kono
parents: 341
diff changeset
524 (前の資料があれば良いのに...)
21ad256c25c2 *** empty log message ***
kono
parents: 341
diff changeset
525
341
a9a740e685fa remove session using QUIT_2_ACK
kono
parents: 340
diff changeset
526 Mon Oct 13 02:57:45 JST 2008
a9a740e685fa remove session using QUIT_2_ACK
kono
parents: 340
diff changeset
527 Todo: (kono)
a9a740e685fa remove session using QUIT_2_ACK
kono
parents: 340
diff changeset
528 InterManagerのquit中のsessionへのjoinの扱い。(putは来ないがjoinはありえる)。
a9a740e685fa remove session using QUIT_2_ACK
kono
parents: 340
diff changeset
529 UPDATEで、sessionをlockしてからquitするか?
a9a740e685fa remove session using QUIT_2_ACK
kono
parents: 340
diff changeset
530 TestGUIで、selectする前にEditor0がquitしちゃう場合もある。
a9a740e685fa remove session using QUIT_2_ACK
kono
parents: 340
diff changeset
531
343
21ad256c25c2 *** empty log message ***
kono
parents: 341
diff changeset
532 Todo: (kono)
21ad256c25c2 *** empty log message ***
kono
parents: 341
diff changeset
533 SessionManager間のプロトコルの図が、どこにもない。あんなに苦労して考えたのに。
21ad256c25c2 *** empty log message ***
kono
parents: 341
diff changeset
534 また、自分で書けってか。
21ad256c25c2 *** empty log message ***
kono
parents: 341
diff changeset
535  SessionManager SM_JOINと、masterの決定
21ad256c25c2 *** empty log message ***
kono
parents: 341
diff changeset
536  put/selectの生成、masterによるsession id の決定
21ad256c25c2 *** empty log message ***
kono
parents: 341
diff changeset
537 updateによるsessionの共有
345
a092a8fe9d97 *** empty log message ***
kono
parents: 344
diff changeset
538 Done:Mon Oct 13 19:02:42 JST 2008 (kono)
343
21ad256c25c2 *** empty log message ***
kono
parents: 341
diff changeset
539
338
bcb4ea4ff208 *** empty log message ***
kono
parents: 334
diff changeset
540 Sun Oct 12 19:12:20 JST 2008
bcb4ea4ff208 *** empty log message ***
kono
parents: 334
diff changeset
541
bcb4ea4ff208 *** empty log message ***
kono
parents: 334
diff changeset
542 Todo: (kono)
bcb4ea4ff208 *** empty log message ***
kono
parents: 334
diff changeset
543 DELETE時のundoのための文字列は、SM/Editor間でだけ必要。Editorから戻って来た
bcb4ea4ff208 *** empty log message ***
kono
parents: 334
diff changeset
544 コマンドをSM側で最新にする必要がある。外に出す時には使わないので消して良い。
339
bb9e202af4d8 *** empty log message ***
kono
parents: 338
diff changeset
545 Done: 戻って来た時に、unMergedListに入れているらしい
bb9e202af4d8 *** empty log message ***
kono
parents: 338
diff changeset
546
bb9e202af4d8 *** empty log message ***
kono
parents: 338
diff changeset
547 Todo: (kono)
341
a9a740e685fa remove session using QUIT_2_ACK
kono
parents: 340
diff changeset
548 new String(hoge)。Javaの文字列は変更不可能なので、こんな
339
bb9e202af4d8 *** empty log message ***
kono
parents: 338
diff changeset
549 ことをする意味はない。
bb9e202af4d8 *** empty log message ***
kono
parents: 338
diff changeset
550 Done:
338
bcb4ea4ff208 *** empty log message ***
kono
parents: 334
diff changeset
551
bcb4ea4ff208 *** empty log message ***
kono
parents: 334
diff changeset
552 Todo: (kono)
bcb4ea4ff208 *** empty log message ***
kono
parents: 334
diff changeset
553 PUT の時に、master session managerまで行って、session番号を確定する
bcb4ea4ff208 *** empty log message ***
kono
parents: 334
diff changeset
554 必要がある。それまでは、PUT_ACKを出してはならない。
361
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
555 Done: Sun Oct 19 21:29:08 JST 2008
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
556 session manager IDを使ってuniqueにしたので、不要になった。
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
557 即座に PUT_ACKを出して構わない。
338
bcb4ea4ff208 *** empty log message ***
kono
parents: 334
diff changeset
558
bcb4ea4ff208 *** empty log message ***
kono
parents: 334
diff changeset
559 Todo: (kono)
bcb4ea4ff208 *** empty log message ***
kono
parents: 334
diff changeset
560 SM_JOIN時にmaster session managerを決定するプロトコルを実装する必要が
bcb4ea4ff208 *** empty log message ***
kono
parents: 334
diff changeset
561 ある。たぶん、UPDATEだと思うが...
361
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
562 Done: Sun Oct 19 21:29:08 JST 2008
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
563 木の根をmasterとして、変更しない。
338
bcb4ea4ff208 *** empty log message ***
kono
parents: 334
diff changeset
564
bcb4ea4ff208 *** empty log message ***
kono
parents: 334
diff changeset
565 Todo: (kono)
bcb4ea4ff208 *** empty log message ***
kono
parents: 334
diff changeset
566 外から、きたSession Listを、ただしく自分に反映する。
361
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
567 Done: Sun Oct 19 21:29:08 JST 2008
338
bcb4ea4ff208 *** empty log message ***
kono
parents: 334
diff changeset
568
bcb4ea4ff208 *** empty log message ***
kono
parents: 334
diff changeset
569 Todo: (kono)
bcb4ea4ff208 *** empty log message ***
kono
parents: 334
diff changeset
570 test.ServerSample.java はあるが、ClientSample.java がない。
bcb4ea4ff208 *** empty log message ***
kono
parents: 334
diff changeset
571
341
a9a740e685fa remove session using QUIT_2_ACK
kono
parents: 340
diff changeset
572 Todo: (kono)
a9a740e685fa remove session using QUIT_2_ACK
kono
parents: 340
diff changeset
573 SYNC出すコードをまだ入れてない。
a9a740e685fa remove session using QUIT_2_ACK
kono
parents: 340
diff changeset
574
334
4fae49280699 Test pattern for Inter-Session Manager communication
kono
parents: 330
diff changeset
575 Sun Oct 12 10:33:36 JST 2008
4fae49280699 Test pattern for Inter-Session Manager communication
kono
parents: 330
diff changeset
576
4fae49280699 Test pattern for Inter-Session Manager communication
kono
parents: 330
diff changeset
577 Todo:
4fae49280699 Test pattern for Inter-Session Manager communication
kono
parents: 330
diff changeset
578 END_MERGEが繰り返し出てしまう(kono)
361
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
579 Done: Sun Oct 19 21:29:08 JST 2008
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
580 直ったかな?
334
4fae49280699 Test pattern for Inter-Session Manager communication
kono
parents: 330
diff changeset
581
330
ddfc786811b9 *** empty log message ***
kono
parents: 323
diff changeset
582 Sat Oct 11 22:28:49 JST 2008
ddfc786811b9 *** empty log message ***
kono
parents: 323
diff changeset
583
ddfc786811b9 *** empty log message ***
kono
parents: 323
diff changeset
584 Todo:
ddfc786811b9 *** empty log message ***
kono
parents: 323
diff changeset
585 Session Manager をまたがった接続のテスト (kono)
338
bcb4ea4ff208 *** empty log message ***
kono
parents: 334
diff changeset
586 Done: Sun Oct 12 19:18:23 JST 2008
330
ddfc786811b9 *** empty log message ***
kono
parents: 323
diff changeset
587
ddfc786811b9 *** empty log message ***
kono
parents: 323
diff changeset
588 Todo:
ddfc786811b9 *** empty log message ***
kono
parents: 323
diff changeset
589 Optimizerを使った場合のテスト (kono)
334
4fae49280699 Test pattern for Inter-Session Manager communication
kono
parents: 330
diff changeset
590 行番号0があるとだめらしい。
386
bba62c4ac323 sync-option
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 385
diff changeset
591 Done: (takano) Thu Oct 23 13:05:52 JST 2008
bba62c4ac323 sync-option
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 385
diff changeset
592
330
ddfc786811b9 *** empty log message ***
kono
parents: 323
diff changeset
593
ddfc786811b9 *** empty log message ***
kono
parents: 323
diff changeset
594 Todo:
340
f55843e829d6 *** empty log message ***
kono
parents: 339
diff changeset
595 manager.remove(editor) の動作のタイミング、 channel closeの扱い
f55843e829d6 *** empty log message ***
kono
parents: 339
diff changeset
596 たぶん、quit2のackで、殺すのが正しいと思う。(kono)
341
a9a740e685fa remove session using QUIT_2_ACK
kono
parents: 340
diff changeset
597 Done: Mon Oct 13 02:57:45 JST 2008
330
ddfc786811b9 *** empty log message ***
kono
parents: 323
diff changeset
598
ddfc786811b9 *** empty log message ***
kono
parents: 323
diff changeset
599
322
5893fd8c0f50 *** empty log message ***
kono
parents: 315
diff changeset
600 Fri Oct 10 15:24:42 JST 2008
323
1e605880d49e *** empty log message ***
kono
parents: 322
diff changeset
601 sid は大域的にuniqueにする必要がある。UPDATEで新しくsessionを作ったことを
1e605880d49e *** empty log message ***
kono
parents: 322
diff changeset
602 通知して、Masterが新しいsidを決定し、UPDATE_ACKで他のSessionManagerに知らせる(kono)
361
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
603 Done: Sun Oct 19 21:29:08 JST 2008
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
604 put時に、そのsession managerでsession manager idを使って、
65c6d12a5835 *** empty log message ***
kono
parents: 358
diff changeset
605 uniqueなsidを作成する。put/join/ackで他のSessionManagerに知らせる。
322
5893fd8c0f50 *** empty log message ***
kono
parents: 315
diff changeset
606
315
20fb70068089 *** empty log message ***
kono
parents: 305
diff changeset
607 Mon Oct 6 16:39:57 JST 2008
20fb70068089 *** empty log message ***
kono
parents: 305
diff changeset
608
20fb70068089 *** empty log message ***
kono
parents: 305
diff changeset
609 Todo: translator にある5つのqueueが、Editor にもある。merge のアルゴリズムの
20fb70068089 *** empty log message ***
kono
parents: 305
diff changeset
610 実装を見直す必要がある。(kono)
330
ddfc786811b9 *** empty log message ***
kono
parents: 323
diff changeset
611 Done:Sat Oct 11 22:28:49 JST 2008
315
20fb70068089 *** empty log message ***
kono
parents: 305
diff changeset
612
20fb70068089 *** empty log message ***
kono
parents: 305
diff changeset
613 Todo:
386
bba62c4ac323 sync-option
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 385
diff changeset
614 SessionManager の向うにあるeditorにREPCommandを送るコードがない。Editor 扱いしても良いが、
bba62c4ac323 sync-option
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 385
diff changeset
615 Editor が複雑すぎるので、それは好ましくない。Editor に nextChannelを持たせるのが良いか? (kono)
323
1e605880d49e *** empty log message ***
kono
parents: 322
diff changeset
616 Done: Forwarder を作った
315
20fb70068089 *** empty log message ***
kono
parents: 305
diff changeset
617
20fb70068089 *** empty log message ***
kono
parents: 305
diff changeset
618 Todo:
20fb70068089 *** empty log message ***
kono
parents: 305
diff changeset
619 SessionManger のeditor がmerge 中のeditor commandをblockするのは良いが、
20fb70068089 *** empty log message ***
kono
parents: 305
diff changeset
620 sessionManger コマンドをblockされるのは困る。(kono)
330
ddfc786811b9 *** empty log message ***
kono
parents: 323
diff changeset
621 Done: Sat Oct 11 22:28:49 JST 2008
305
ffd8bb47b188 *** empty log message ***
kono
parents: 304
diff changeset
622
ffd8bb47b188 *** empty log message ***
kono
parents: 304
diff changeset
623 Wed Oct 1 20:58:51 JST 2008
ffd8bb47b188 *** empty log message ***
kono
parents: 304
diff changeset
624
ffd8bb47b188 *** empty log message ***
kono
parents: 304
diff changeset
625 Todo: Session ring 廻るcommand packetは、基本的に書き換えられるべきではない
ffd8bb47b188 *** empty log message ***
kono
parents: 304
diff changeset
626   eid, seq の組でuniqueになる。現状では、そここで書き換えが起きているらしい。
ffd8bb47b188 *** empty log message ***
kono
parents: 304
diff changeset
627 eid = -1 (Session Manager), eid = -2 (MergeCommand) あたりが
315
20fb70068089 *** empty log message ***
kono
parents: 305
diff changeset
628 特殊らしい。 でも、実際には生成されてないっぽい。(kono)
20fb70068089 *** empty log message ***
kono
parents: 305
diff changeset
629 Done: Mon Oct 6 16:40:14 JST 2008 (kono)
305
ffd8bb47b188 *** empty log message ***
kono
parents: 304
diff changeset
630
ffd8bb47b188 *** empty log message ***
kono
parents: 304
diff changeset
631 Todo: SessionManagerのprotocolのswitch文で、そこら中でgetEditor/getSessionが
315
20fb70068089 *** empty log message ***
kono
parents: 305
diff changeset
632   呼ばれている。これらは、for loopで探しているので、繰り返し行うのは変。(kono)
305
ffd8bb47b188 *** empty log message ***
kono
parents: 304
diff changeset
633
315
20fb70068089 *** empty log message ***
kono
parents: 305
diff changeset
634 Todo: REPCMD_INSERTが止まらない... (kono)
20fb70068089 *** empty log message ***
kono
parents: 305
diff changeset
635 Done: Mon Oct 6 16:40:38 JST 2008 (kono)
305
ffd8bb47b188 *** empty log message ***
kono
parents: 304
diff changeset
636
315
20fb70068089 *** empty log message ***
kono
parents: 305
diff changeset
637 Todo: SessionMnager のmessageをREPLogger baseに書き換える。 (kono)
386
bba62c4ac323 sync-option
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 385
diff changeset
638 Done: Thu Oct 23 13:05:52 JST 2008
bba62c4ac323 sync-option
one@firefly.cr.ie.u-ryukyu.ac.jp
parents: 385
diff changeset
639
300
8f6b7a1890b2 *** empty log message ***
kono
parents:
diff changeset
640 Wed Oct 1 15:35:44 JST 2008
8f6b7a1890b2 *** empty log message ***
kono
parents:
diff changeset
641
315
20fb70068089 *** empty log message ***
kono
parents: 305
diff changeset
642 Todo: SessionManager 複数のコマンドをまとめてeditorに送るとdead lockする
20fb70068089 *** empty log message ***
kono
parents: 305
diff changeset
643 可能性がある。送信キューを作り、select loop しながら、ひとつずつコマンドを
20fb70068089 *** empty log message ***
kono
parents: 305
diff changeset
644 送信する (kono)
20fb70068089 *** empty log message ***
kono
parents: 305
diff changeset
645 Done: (kono)
300
8f6b7a1890b2 *** empty log message ***
kono
parents:
diff changeset
646
8f6b7a1890b2 *** empty log message ***
kono
parents:
diff changeset
647 Todo: Editor quit, quit2 の実装
8f6b7a1890b2 *** empty log message ***
kono
parents:
diff changeset
648   quit2 では、自分の送信したコマンドが戻ってくるまで待つ必要がある。
315
20fb70068089 *** empty log message ***
kono
parents: 305
diff changeset
649   editor 毎の状態となる。(kono)
20fb70068089 *** empty log message ***
kono
parents: 305
diff changeset
650 Done: (kono)
20fb70068089 *** empty log message ***
kono
parents: 305
diff changeset
651