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.33 by root, Sun Aug 30 21:45:51 2009 UTC vs.
Revision 1.43 by root, Thu Oct 1 16:11:05 2009 UTC

… …
92 delete $self->{trial}; 92 delete $self->{trial};
93 93
94 $self->transport_error (transport_error => "switched connections") 94 $self->transport_error (transport_error => "switched connections")
95 if $self->{transport}; 95 if $self->{transport};
96 96
97 delete $self->{connect_addr};
97 delete $self->{connect_w}; 98 delete $self->{connect_w};
98 delete $self->{connect_to}; 99 delete $self->{connect_to};
99 100
100 $self->{transport} = $transport; 101 $self->{transport} = $transport;
101 102
… …
116 117
117 return if $self->{transport}; 118 return if $self->{transport};
118 119
119 Scalar::Util::weaken $self; 120 Scalar::Util::weaken $self;
120 121
121 my $monitor = $AnyEvent::MP::Config::CFG{monitor_timeout} || $AnyEvent::MP::Kernel::MONITOR_TIMEOUT; 122 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout};
122 123
123 $self->{connect_to} ||= AE::timer $monitor, 0, sub { 124 $self->{connect_to} ||= AE::timer $monitor, 0, sub {
124 $self->transport_error (transport_error => $self->{id}, "unable to connect"); 125 $self->transport_error (transport_error => $self->{id}, "unable to connect");
125 }; 126 };
126 127
127 return unless @addresses; 128 return unless @addresses;
129
128 return if $self->{connect_w}; 130 if ($self->{connect_w}) {
131 # sometimes we get told about new addresses after we started to connect
132 unshift @{$self->{connect_addr}}, @addresses;
133 return;
134 }
135
136 $self->{connect_addr} = \@addresses; # a bit weird, but efficient
129 137
130 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]"); 138 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
131 139
132 my $interval = $AnyEvent::MP::Config::CFG{connect_interval} || $AnyEvent::MP::Kernel::CONNECT_INTERVAL; 140 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
133 141
134 $interval = ($monitor - $interval) / @addresses 142 $interval = ($monitor - $interval) / @addresses
135 if ($monitor - $interval) / @addresses < $interval; 143 if ($monitor - $interval) / @addresses < $interval;
136 144
137 $interval = 0.4 if $interval < 0.4; 145 $interval = 0.4 if $interval < 0.4;
138 146
139 my @endpoints; 147 my @endpoints;
140 148
141 $self->{connect_w} = AE::timer rand, $interval, sub { 149 $self->{connect_w} = AE::timer 0.050 * rand, $interval * (0.9 + 0.1 * rand), sub {
142 @endpoints = @addresses 150 @endpoints = @addresses
143 unless @endpoints; 151 unless @endpoints;
144 152
145 my $endpoint = shift @endpoints; 153 my $endpoint = shift @endpoints;
146 154
… …
199 207
200sub connect { 208sub connect {
201 # we are trivially connected 209 # we are trivially connected
202} 210}
203 211
212# delay every so often to avoid recursion, also used to delay after spawn
213our $DELAY = -50;
214our @DELAY;
215our $DELAY_W;
216
217sub _send_delayed {
218 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE{""};
219 (shift @DELAY)->()
220 while @DELAY;
221 undef $DELAY_W;
222 $DELAY = -50;
223}
224
204sub transport_reset { 225sub transport_reset {
205 my ($self) = @_; 226 my ($self) = @_;
206 227
207 Scalar::Util::weaken $self; 228 Scalar::Util::weaken $self;
208 229
209 $self->{send} = sub { 230 $self->{send} = sub {
231 if ($DELAY++ >= 0) {
232 my $msg = $_[0];
233 push @DELAY, sub { AnyEvent::MP::Kernel::_inject (@$msg) };
234 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
235 return;
236 }
237
210 local $AnyEvent::MP::Kernel::SRCNODE = $self; 238 local $AnyEvent::MP::Kernel::SRCNODE = $self;
211 AnyEvent::MP::Kernel::_inject (@{ $_[0] }); 239 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
212 }; 240 };
213} 241}
214 242
… …
219} 247}
220 248
221sub kill { 249sub kill {
222 my ($self, $port, @reason) = @_; 250 my ($self, $port, @reason) = @_;
223 251
252 my $delay_cb = sub {
224 delete $AnyEvent::MP::Kernel::PORT{$port}; 253 delete $AnyEvent::MP::Kernel::PORT{$port}
254 or return; # killing nonexistent ports is O.K.
225 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 255 delete $AnyEvent::MP::Kernel::PORT_DATA{$port};
226 256
227 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port} 257 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port}
228 or !@reason 258 or !@reason
229 or $AnyEvent::MP::Kernel::WARN->(2, "unmonitored local port $port died with reason: @reason"); 259 or $AnyEvent::MP::Kernel::WARN->(8, "unmonitored local port $port died with reason: @reason");
230 260
231 $_->(@reason) for values %$mon; 261 $_->(@reason) for values %$mon;
262 };
263
264 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb;
232} 265}
233 266
234sub monitor { 267sub monitor {
235 my ($self, $portid, $cb) = @_; 268 my ($self, $portid, $cb) = @_;
236 269
270 my $delay_cb = sub {
237 return $cb->(no_such_port => "cannot monitor nonexistent port") 271 return $cb->(no_such_port => "cannot monitor nonexistent port", "$self->{id}#$portid")
238 unless exists $AnyEvent::MP::Kernel::PORT{$portid}; 272 unless exists $AnyEvent::MP::Kernel::PORT{$portid};
239 273
240 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb; 274 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb;
275 };
276
277 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb;
241} 278}
242 279
243sub unmonitor { 280sub unmonitor {
244 my ($self, $portid, $cb) = @_; 281 my ($self, $portid, $cb) = @_;
245 282
283 my $delay_cb = sub {
246 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0}; 284 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0};
285 };
286
287 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb;
247} 288}
248 289
249=head1 SEE ALSO 290=head1 SEE ALSO
250 291
251L<AnyEvent::MP>. 292L<AnyEvent::MP>.

Diff Legend

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