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.43 by root, Thu Oct 1 16:11:05 2009 UTC vs.
Revision 1.51 by root, Sat Mar 13 00:29:41 2010 UTC

89sub transport_connect { 89sub transport_connect {
90 my ($self, $transport) = @_; 90 my ($self, $transport) = @_;
91 91
92 delete $self->{trial}; 92 delete $self->{trial};
93 93
94 $self->transport_error (transport_error => "switched connections") 94 $self->transport_error (transport_error => $self->{id}, "switched connections")
95 if $self->{transport}; 95 if $self->{transport};
96 96
97 delete $self->{connect_addr}; 97 delete $self->{connect_addr};
98 delete $self->{connect_w}; 98 delete $self->{connect_w};
99 delete $self->{connect_to}; 99 delete $self->{connect_to};
100 100
101 $self->{transport} = $transport; 101 $self->{transport} = $transport;
102 102
103 my $transport_send = $transport->can ("send"); 103 my $transport_send = $transport->can ("send");
104 104
105 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1);
106
105 $self->{send} = sub { 107 $self->{send} = sub {
106 $transport_send->($transport, $_[0]); 108 $transport_send->($transport, $_[0]);
107 }; 109 };
108
109 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1);
110 110
111 $transport->send ($_) 111 $transport->send ($_)
112 for @{ delete $self->{queue} || [] }; 112 for @{ delete $self->{queue} || [] };
113} 113}
114 114
245 245
246 $AnyEvent::MP::Kernel::WARN->(9, "I refuse to talk to myself ($tp->{peerhost}:$tp->{peerport})"); 246 $AnyEvent::MP::Kernel::WARN->(9, "I refuse to talk to myself ($tp->{peerhost}:$tp->{peerport})");
247} 247}
248 248
249sub kill { 249sub kill {
250 my ($self, $port, @reason) = @_; 250 my (undef, @args) = @_;
251 251
252 my $delay_cb = sub { 252 # we _always_ delay kil's, to avoid calling mon callbacks
253 delete $AnyEvent::MP::Kernel::PORT{$port} 253 # from anything but the event loop context.
254 or return; # killing nonexistent ports is O.K. 254 $DELAY = 1;
255 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 255 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) };
256 256 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
257 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port}
258 or !@reason
259 or $AnyEvent::MP::Kernel::WARN->(8, "unmonitored local port $port died with reason: @reason");
260
261 $_->(@reason) for values %$mon;
262 };
263
264 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb;
265} 257}
266 258
267sub monitor { 259sub monitor {
268 my ($self, $portid, $cb) = @_; 260 # maybe always delay, too?
269 261 if ($DELAY_W) {
270 my $delay_cb = sub { 262 my @args = @_;
271 return $cb->(no_such_port => "cannot monitor nonexistent port", "$self->{id}#$portid") 263 push @DELAY, sub { AnyEvent::MP::Kernel::_monitor (@args) };
272 unless exists $AnyEvent::MP::Kernel::PORT{$portid}; 264 return;
273
274 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb;
275 }; 265 }
276 266 &AnyEvent::MP::Kernel::_monitor;
277 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb;
278} 267}
279 268
280sub unmonitor { 269sub unmonitor {
281 my ($self, $portid, $cb) = @_; 270 # no need to always delay
282 271 if ($DELAY_W) {
283 my $delay_cb = sub { 272 my @args = @_;
284 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0}; 273 push @DELAY, sub { AnyEvent::MP::Kernel::_unmonitor (@args) };
274 return;
285 }; 275 }
286 276
287 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb; 277 &AnyEvent::MP::Kernel::_unmonitor;
288} 278}
289 279
290=head1 SEE ALSO 280=head1 SEE ALSO
291 281
292L<AnyEvent::MP>. 282L<AnyEvent::MP>.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines