annotate Todo @ 502:49b689b17d06 default tip

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