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.41 by root, Fri Sep 11 02:32:23 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) = @_;
208sub connect { 206sub connect {
209 # we are trivially connected 207 # we are trivially connected
210} 208}
211 209
212# delay every so often to avoid recursion, also used to delay after spawn 210# delay every so often to avoid recursion, also used to delay after spawn
213our $DELAY; 211our $DELAY = -50;
214our @DELAY; 212our @DELAY;
215our $DELAY_W; 213our $DELAY_W;
216 214
217sub _send_delayed { 215sub _send_delayed {
218 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE{""}; 216 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE{""};
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 249
252 my $delay_cb = sub { 250 # we _always_ delay kil's, to avoid calling mon callbacks
253 delete $AnyEvent::MP::Kernel::PORT{$port}; 251 # from anything but the event loop context.
254 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 252 $DELAY = 1;
255 253 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) };
256 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port} 254 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
257 or !@reason
258 or $AnyEvent::MP::Kernel::WARN->(8, "unmonitored local port $port died with reason: @reason");
259
260 $_->(@reason) for values %$mon;
261 };
262
263 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb;
264} 255}
265 256
266sub monitor { 257sub monitor {
267 my ($self, $portid, $cb) = @_; 258 # maybe always delay, too?
268 259 if ($DELAY_W) {
269 my $delay_cb = sub { 260 my @args = @_;
270 return $cb->(no_such_port => "cannot monitor nonexistent port", "$self->{id}#$portid") 261 push @DELAY, sub { AnyEvent::MP::Kernel::_monitor (@args) };
271 unless exists $AnyEvent::MP::Kernel::PORT{$portid}; 262 return;
272
273 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb;
274 }; 263 }
275 264 &AnyEvent::MP::Kernel::_monitor;
276 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb;
277} 265}
278 266
279sub unmonitor { 267sub unmonitor {
280 my ($self, $portid, $cb) = @_; 268 # no need to always delay
281 269 if ($DELAY_W) {
282 my $delay_cb = sub { 270 my @args = @_;
283 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0}; 271 push @DELAY, sub { AnyEvent::MP::Kernel::_unmonitor (@args) };
272 return;
284 }; 273 }
285 274
286 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb; 275 &AnyEvent::MP::Kernel::_unmonitor;
287} 276}
288 277
289=head1 SEE ALSO 278=head1 SEE ALSO
290 279
291L<AnyEvent::MP>. 280L<AnyEvent::MP>.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines