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.36 by root, Fri Sep 4 21:01:22 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_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
102 my $transport_send = $transport->can ("send"); 103 my $transport_send = $transport->can ("send");
103 104
105 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1);
106
104 $self->{send} = sub { 107 $self->{send} = sub {
105 $transport_send->($transport, $_[0]); 108 $transport_send->($transport, $_[0]);
106 }; 109 };
107 110
108 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1);
109
110 $transport->send ($_) 111 $transport->send ($_)
111 for @{ delete $self->{queue} || [] }; 112 for @{ delete $self->{queue} || [] };
112} 113}
113 114
114sub connect { 115sub connect {
… …
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
… …
199 207
200sub connect { 208sub connect {
201 # we are trivially connected 209 # we are trivially connected
202} 210}
203 211
212# delay every so often to avoid recursion, also used to delay after spawn
213our $DELAY = -50;
214our @DELAY;
215our $DELAY_W;
216
217sub _send_delayed {
218 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE{""};
219 (shift @DELAY)->()
220 while @DELAY;
221 undef $DELAY_W;
222 $DELAY = -50;
223}
224
204sub transport_reset { 225sub transport_reset {
205 my ($self) = @_; 226 my ($self) = @_;
206 227
207 Scalar::Util::weaken $self; 228 Scalar::Util::weaken $self;
208 229
209 $self->{send} = sub { 230 $self->{send} = sub {
231 if ($DELAY++ >= 0) {
232 my $msg = $_[0];
233 push @DELAY, sub { AnyEvent::MP::Kernel::_inject (@$msg) };
234 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
235 return;
236 }
237
210 local $AnyEvent::MP::Kernel::SRCNODE = $self; 238 local $AnyEvent::MP::Kernel::SRCNODE = $self;
211 AnyEvent::MP::Kernel::_inject (@{ $_[0] }); 239 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
212 }; 240 };
213} 241}
214 242
… …
217 245
218 $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})");
219} 247}
220 248
221sub kill { 249sub kill {
222 my ($self, $port, @reason) = @_; 250 my (undef, @args) = @_;
223 251
224 delete $AnyEvent::MP::Kernel::PORT{$port}; 252 # we _always_ delay kil's, to avoid calling mon callbacks
225 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 253 # from anything but the event loop context.
226 254 $DELAY = 1;
227 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port} 255 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) };
228 or !@reason 256 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
229 or $AnyEvent::MP::Kernel::WARN->(8, "unmonitored local port $port died with reason: @reason");
230
231 $_->(@reason) for values %$mon;
232} 257}
233 258
234sub monitor { 259sub monitor {
235 my ($self, $portid, $cb) = @_; 260 # maybe always delay, too?
236 261 if ($DELAY_W) {
237 return $cb->(no_such_port => "cannot monitor nonexistent port") 262 my @args = @_;
238 unless exists $AnyEvent::MP::Kernel::PORT{$portid}; 263 push @DELAY, sub { AnyEvent::MP::Kernel::_monitor (@args) };
239 264 return;
240 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb; 265 }
266 &AnyEvent::MP::Kernel::_monitor;
241} 267}
242 268
243sub unmonitor { 269sub unmonitor {
244 my ($self, $portid, $cb) = @_; 270 # no need to always delay
271 if ($DELAY_W) {
272 my @args = @_;
273 push @DELAY, sub { AnyEvent::MP::Kernel::_unmonitor (@args) };
274 return;
275 }
245 276
246 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0}; 277 &AnyEvent::MP::Kernel::_unmonitor;
247} 278}
248 279
249=head1 SEE ALSO 280=head1 SEE ALSO
250 281
251L<AnyEvent::MP>. 282L<AnyEvent::MP>.

Diff Legend

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