annotate Todo @ 472:2107530c3d72 old-merge-version

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