annotate Todo @ 428:b5f1bcc8a156

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