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.34 by root, Wed Sep 2 13:05:29 2009 UTC vs.
Revision 1.40 by root, Tue Sep 8 20:56:05 2009 UTC

… …
116 116
117 return if $self->{transport}; 117 return if $self->{transport};
118 118
119 Scalar::Util::weaken $self; 119 Scalar::Util::weaken $self;
120 120
121 my $monitor = $AnyEvent::MP::Config::CFG{monitor_timeout} || $AnyEvent::MP::Kernel::MONITOR_TIMEOUT; 121 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout};
122 122
123 $self->{connect_to} ||= AE::timer $monitor, 0, sub { 123 $self->{connect_to} ||= AE::timer $monitor, 0, sub {
124 $self->transport_error (transport_error => $self->{id}, "unable to connect"); 124 $self->transport_error (transport_error => $self->{id}, "unable to connect");
125 }; 125 };
126 126
127 return unless @addresses; 127 return unless @addresses;
128 return if $self->{connect_w}; 128 return if $self->{connect_w};
129 129
130 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]"); 130 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
131 131
132 my $interval = $AnyEvent::MP::Config::CFG{connect_interval} || $AnyEvent::MP::Kernel::CONNECT_INTERVAL; 132 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
133 133
134 $interval = ($monitor - $interval) / @addresses 134 $interval = ($monitor - $interval) / @addresses
135 if ($monitor - $interval) / @addresses < $interval; 135 if ($monitor - $interval) / @addresses < $interval;
136 136
137 $interval = 0.4 if $interval < 0.4; 137 $interval = 0.4 if $interval < 0.4;
… …
199 199
200sub connect { 200sub connect {
201 # we are trivially connected 201 # we are trivially connected
202} 202}
203 203
204# delay every so often to avoid recursion, also used to delay after spawn
205our $DELAY;
206our @DELAY;
207our $DELAY_W;
208
209sub _send_delayed {
210 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE{""};
211 (shift @DELAY)->()
212 while @DELAY;
213 undef $DELAY_W;
214 $DELAY = -50;
215}
216
204sub transport_reset { 217sub transport_reset {
205 my ($self) = @_; 218 my ($self) = @_;
206 219
207 Scalar::Util::weaken $self; 220 Scalar::Util::weaken $self;
208 221
209 $self->{send} = sub { 222 $self->{send} = sub {
223 if ($DELAY++ >= 0) {
224 my $msg = $_[0];
225 push @DELAY, sub { AnyEvent::MP::Kernel::_inject (@$msg) };
226 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
227 return;
228 }
229
210 local $AnyEvent::MP::Kernel::SRCNODE = $self; 230 local $AnyEvent::MP::Kernel::SRCNODE = $self;
211 AnyEvent::MP::Kernel::_inject (@{ $_[0] }); 231 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
212 }; 232 };
213} 233}
214 234
… …
219} 239}
220 240
221sub kill { 241sub kill {
222 my ($self, $port, @reason) = @_; 242 my ($self, $port, @reason) = @_;
223 243
244 my $delay_cb = sub {
224 delete $AnyEvent::MP::Kernel::PORT{$port}; 245 delete $AnyEvent::MP::Kernel::PORT{$port};
225 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 246 delete $AnyEvent::MP::Kernel::PORT_DATA{$port};
226 247
227 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port} 248 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port}
228 or !@reason 249 or !@reason
229 or $AnyEvent::MP::Kernel::WARN->(2, "unmonitored local port $port died with reason: @reason"); 250 or $AnyEvent::MP::Kernel::WARN->(8, "unmonitored local port $port died with reason: @reason");
230 251
231 $_->(@reason) for values %$mon; 252 $_->(@reason) for values %$mon;
253 };
254
255 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb;
232} 256}
233 257
234sub monitor { 258sub monitor {
235 my ($self, $portid, $cb) = @_; 259 my ($self, $portid, $cb) = @_;
236 260
261 my $delay_cb = sub {
237 return $cb->(no_such_port => "cannot monitor nonexistent port") 262 return $cb->(no_such_port => "cannot monitor nonexistent port", "$self->{id}#$portid")
238 unless exists $AnyEvent::MP::Kernel::PORT{$portid}; 263 unless exists $AnyEvent::MP::Kernel::PORT{$portid};
239 264
240 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb; 265 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb;
266 };
267
268 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb;
241} 269}
242 270
243sub unmonitor { 271sub unmonitor {
244 my ($self, $portid, $cb) = @_; 272 my ($self, $portid, $cb) = @_;
245 273
274 my $delay_cb = sub {
246 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0}; 275 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0};
276 };
277
278 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb;
247} 279}
248 280
249=head1 SEE ALSO 281=head1 SEE ALSO
250 282
251L<AnyEvent::MP>. 283L<AnyEvent::MP>.

Diff Legend

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