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.45 by root, Mon Oct 5 19:26:32 2009 UTC vs.
Revision 1.52 by root, Sat Mar 13 20:29:04 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->{send};
104
105 $self->{send} = sub {
106 $transport_send->($transport, $_[0]);
107 };
108 104
109 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1); 105 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1);
110 106
107 $self->{send} = $transport_send;
108
111 $transport->send ($_) 109 $transport_send->($_)
112 for @{ delete $self->{queue} || [] }; 110 for @{ delete $self->{queue} || [] };
113} 111}
114 112
115sub connect { 113sub connect {
116 my ($self, @addresses) = @_; 114 my ($self, @addresses) = @_;
… …
245 243
246 $AnyEvent::MP::Kernel::WARN->(9, "I refuse to talk to myself ($tp->{peerhost}:$tp->{peerport})"); 244 $AnyEvent::MP::Kernel::WARN->(9, "I refuse to talk to myself ($tp->{peerhost}:$tp->{peerport})");
247} 245}
248 246
249sub kill { 247sub kill {
250 my ($self, $port, @reason) = @_; 248 my (undef, @args) = @_;
251
252 my $delay_cb = sub {
253 delete $AnyEvent::MP::Kernel::PORT{$port}
254 or return; # killing nonexistent ports is O.K.
255 delete $AnyEvent::MP::Kernel::PORT_DATA{$port};
256
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 249
264 # we _always_ delay kil's, to avoid calling mon callbacks 250 # we _always_ delay kil's, to avoid calling mon callbacks
265 # from anything but the event loop context. 251 # from anything but the event loop context.
266 $DELAY = 1; 252 $DELAY = 1;
267 push @DELAY, $delay_cb; 253 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) };
268 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed; 254 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
269} 255}
270 256
271sub monitor { 257sub monitor {
272 my ($self, $portid, $cb) = @_; 258 # maybe always delay, too?
273 259 if ($DELAY_W) {
274 my $delay_cb = sub { 260 my @args = @_;
275 return $cb->(no_such_port => "cannot monitor nonexistent port", "$self->{id}#$portid") 261 push @DELAY, sub { AnyEvent::MP::Kernel::_monitor (@args) };
276 unless exists $AnyEvent::MP::Kernel::PORT{$portid}; 262 return;
277
278 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb;
279 }; 263 }
280 264 &AnyEvent::MP::Kernel::_monitor;
281 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb;
282} 265}
283 266
284sub unmonitor { 267sub unmonitor {
285 my ($self, $portid, $cb) = @_; 268 # no need to always delay
286 269 if ($DELAY_W) {
287 my $delay_cb = sub { 270 my @args = @_;
288 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0}; 271 push @DELAY, sub { AnyEvent::MP::Kernel::_unmonitor (@args) };
272 return;
289 }; 273 }
290 274
291 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb; 275 &AnyEvent::MP::Kernel::_unmonitor;
292} 276}
293 277
294=head1 SEE ALSO 278=head1 SEE ALSO
295 279
296L<AnyEvent::MP>. 280L<AnyEvent::MP>.

Diff Legend

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