ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/AnyEvent-MP/MP/Node.pm
(Generate patch)

Comparing AnyEvent-MP/MP/Node.pm (file contents):
Revision 1.59 by root, Sat Mar 3 11:38:43 2012 UTC vs.
Revision 1.62 by root, Thu Mar 22 00:48:29 2012 UTC

… …
140 return if $self->{transport}; 140 return if $self->{transport};
141 return if $self->{connect_w}; 141 return if $self->{connect_w};
142 142
143 return unless @$addresses; 143 return unless @$addresses;
144 144
145 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@$addresses]"); 145 AE::log 9 => "connecting to $self->{id} with [@$addresses]";
146 146
147 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout}; 147 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout};
148 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval}; 148 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
149 149
150 $interval = ($monitor - $interval) / @$addresses 150 $interval = ($monitor - $interval) / @$addresses
… …
155 my @endpoints = reverse @$addresses; 155 my @endpoints = reverse @$addresses;
156 156
157 $self->{connect_w} = AE::timer 0, $interval * (0.9 + 0.1 * rand), sub { 157 $self->{connect_w} = AE::timer 0, $interval * (0.9 + 0.1 * rand), sub {
158 my $endpoint = pop @endpoints; 158 my $endpoint = pop @endpoints;
159 159
160 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint"); 160 AE::log 9 => "connecting to $self->{id} at $endpoint";
161 161
162 $self->{trial}{$endpoint} ||= do { 162 $self->{trial}{$endpoint} ||= do {
163 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint 163 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
164 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{id}: not a resolved node reference."); 164 or return AE::log critical => "$self->{id}: '$endpoint' is not a resolved node reference.";
165 165
166 AnyEvent::MP::Transport::mp_connect 166 AnyEvent::MP::Transport::mp_connect
167 $host, $port, 167 $host, $port,
168 sub { delete $self->{trial}{$endpoint} }, 168 sub { delete $self->{trial}{$endpoint} },
169 }; 169 };
170 }; 170 };
171} 171}
172 172
173sub connect {
174 my ($self) = @_;
175
176 return if $self->{transport};
177 return if $self->{connect_w};
178
179 Scalar::Util::weaken $self;
180
181 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout};
182
183 $self->{connect_to} ||= AE::timer $monitor, 0, sub {
184 $self->transport_error (transport_error => $self->{id}, "unable to connect");
185 };
186
187 # maybe @$addresses?
188 my @addresses = @{ $AnyEvent::MP::Kernel::GLOBAL_DB{"'l"}{$self->{id}} };
189
190 unless (@addresses) {
191 # on global nodes, all bets are off now - we either know the node, or we don't
192 unless ($AnyEvent::MP::Kernel::GLOBAL) {
193 AnyEvent::MP::Kernel::g_find ($self->{id});
194 }
195 return;
196 }
197
198 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
199
200 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
201
202 $interval = ($monitor - $interval) / @addresses
203 if ($monitor - $interval) / @addresses < $interval;
204
205 $interval = 0.4 if $interval < 0.4;
206
207 my @endpoints;
208
209 $self->{connect_w} = AE::timer 0, $interval * (0.9 + 0.1 * rand), sub {
210 @endpoints = @addresses
211 unless @endpoints;
212
213 my $endpoint = shift @endpoints;
214
215 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint");
216
217 $self->{trial}{$endpoint} ||= do {
218 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
219 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{id}: not a resolved node reference.");
220
221 AnyEvent::MP::Transport::mp_connect
222 $host, $port,
223 sub { delete $self->{trial}{$endpoint} },
224 };
225 };
226}
227
228sub kill { 173sub kill {
229 my ($self, $port, @reason) = @_; 174 my ($self, $port, @reason) = @_;
230 175
231 $self->{send} (["", kil => $port, @reason]); 176 $self->{send} (["", kil => $port, @reason]);
232} 177}
… …
267# delay every so often to avoid recursion, also used to delay after spawn 212# delay every so often to avoid recursion, also used to delay after spawn
268our $DELAY = -50; 213our $DELAY = -50;
269our @DELAY; 214our @DELAY;
270our $DELAY_W; 215our $DELAY_W;
271 216
272sub _send_delayed { 217our $send_delayed = sub {
273 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE{""}; 218 $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE;
274 (shift @DELAY)->() 219 (shift @DELAY)->()
275 while @DELAY; 220 while @DELAY;
276 undef $DELAY_W; 221 undef $DELAY_W;
277 $DELAY = -50; 222 $DELAY = -50;
278} 223};
279 224
280sub transport_reset { 225sub transport_reset {
281 my ($self) = @_; 226 my ($self) = @_;
282 227
283 Scalar::Util::weaken $self; 228 Scalar::Util::weaken $self;
284 229
285 $self->{send} = sub { 230 $self->{send} = sub {
286 if ($DELAY++ >= 0) { 231 if (++$DELAY > 0) {
287 my $msg = $_[0]; 232 my $msg = $_[0];
288 push @DELAY, sub { AnyEvent::MP::Kernel::_inject (@$msg) }; 233 push @DELAY, sub { AnyEvent::MP::Kernel::_inject (@$msg) };
289 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed; 234 $DELAY_W ||= AE::timer 0, 0, $send_delayed;
290 return; 235 return;
291 } 236 }
292 237
293 local $AnyEvent::MP::Kernel::SRCNODE = $self; 238 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE;
294 AnyEvent::MP::Kernel::_inject (@{ $_[0] }); 239 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
295 }; 240 };
296} 241}
297 242
298sub transport_connect { 243sub transport_connect {
299 my ($self, $tp) = @_; 244 my ($self, $tp) = @_;
300 245
301 $AnyEvent::MP::Kernel::WARN->(9, "I refuse to talk to myself ($tp->{peerhost}:$tp->{peerport})"); 246 AE::log 9 => "I refuse to talk to myself ($tp->{peerhost}:$tp->{peerport})";
302} 247}
303 248
304sub kill { 249sub kill {
305 my (undef, @args) = @_; 250 my (undef, @args) = @_;
306 251
307 # we _always_ delay kil's, to avoid calling mon callbacks 252 # we _always_ delay kil's, to avoid calling mon callbacks
308 # from anything but the event loop context. 253 # from anything but the event loop context.
309 $DELAY = 1; 254 $DELAY = 1;
310 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) }; 255 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) };
311 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed; 256 $DELAY_W ||= AE::timer 0, 0, $send_delayed;
312} 257}
313 258
314sub monitor { 259sub monitor {
315 # maybe always delay, too? 260 # maybe always delay, too?
316 if ($DELAY_W) { 261 if ($DELAY_W) {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines