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.40 by root, Tue Sep 8 20:56:05 2009 UTC vs.
Revision 1.44 by root, Fri Oct 2 20:40:10 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
… …
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::Kernel::CONFIG->{connect_interval}; 140 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
133 141
… …
200sub connect { 208sub connect {
201 # we are trivially connected 209 # we are trivially connected
202} 210}
203 211
204# delay every so often to avoid recursion, also used to delay after spawn 212# delay every so often to avoid recursion, also used to delay after spawn
205our $DELAY; 213our $DELAY = -50;
206our @DELAY; 214our @DELAY;
207our $DELAY_W; 215our $DELAY_W;
208 216
209sub _send_delayed { 217sub _send_delayed {
210 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE{""}; 218 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE{""};
… …
240 248
241sub kill { 249sub kill {
242 my ($self, $port, @reason) = @_; 250 my ($self, $port, @reason) = @_;
243 251
244 my $delay_cb = sub { 252 my $delay_cb = sub {
245 delete $AnyEvent::MP::Kernel::PORT{$port}; 253 delete $AnyEvent::MP::Kernel::PORT{$port}
254 or return; # killing nonexistent ports is O.K.
246 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 255 delete $AnyEvent::MP::Kernel::PORT_DATA{$port};
247 256
248 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port} 257 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port}
249 or !@reason 258 or !@reason
250 or $AnyEvent::MP::Kernel::WARN->(8, "unmonitored local port $port died with reason: @reason"); 259 or $AnyEvent::MP::Kernel::WARN->(8, "unmonitored local port $port died with reason: @reason");
251 260
252 $_->(@reason) for values %$mon; 261 $_->(@reason) for values %$mon;
253 }; 262 };
254 263
255 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb; 264 # we _always_ delay kil's, to avoid calling mon callbacks
265 # from anything but the event loop context.
266 $DELAY = 1;
267 push @DELAY, $delay_cb;
256} 268}
257 269
258sub monitor { 270sub monitor {
259 my ($self, $portid, $cb) = @_; 271 my ($self, $portid, $cb) = @_;
260 272

Diff Legend

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