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.38 by root, Mon Sep 7 12:04:32 2009 UTC vs.
Revision 1.49 by root, Wed Dec 30 15:33:08 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
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
… …
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{""};
211 AnyEvent::MP::Kernel::_inject (@{ shift @DELAY }) 219 (shift @DELAY)->()
212 while @DELAY; 220 while @DELAY;
213 undef $DELAY_W; 221 undef $DELAY_W;
214 $DELAY = -50; 222 $DELAY = -50;
215} 223}
216 224
… …
219 227
220 Scalar::Util::weaken $self; 228 Scalar::Util::weaken $self;
221 229
222 $self->{send} = sub { 230 $self->{send} = sub {
223 if ($DELAY++ >= 0) { 231 if ($DELAY++ >= 0) {
224 push @DELAY, $_[0]; 232 my $msg = $_[0];
233 push @DELAY, sub { AnyEvent::MP::Kernel::_inject (@$msg) };
225 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed; 234 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
226 } else { 235 return;
227 local $AnyEvent::MP::Kernel::SRCNODE = $self;
228 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
229 } 236 }
237
238 local $AnyEvent::MP::Kernel::SRCNODE = $self;
239 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
230 }; 240 };
231} 241}
232 242
233sub transport_connect { 243sub transport_connect {
234 my ($self, $tp) = @_; 244 my ($self, $tp) = @_;
235 245
236 $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})");
237} 247}
238 248
239sub kill { 249sub kill {
240 my ($self, $port, @reason) = @_; 250 my (undef, @args) = @_;
241 251
242 delete $AnyEvent::MP::Kernel::PORT{$port}; 252 # we _always_ delay kil's, to avoid calling mon callbacks
243 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 253 # from anything but the event loop context.
244 254 $DELAY = 1;
245 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port} 255 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) };
246 or !@reason 256 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
247 or $AnyEvent::MP::Kernel::WARN->(8, "unmonitored local port $port died with reason: @reason");
248
249 $_->(@reason) for values %$mon;
250} 257}
251 258
252sub monitor { 259sub monitor {
253 my ($self, $portid, $cb) = @_; 260 # shortcut
254 261 if ($DELAY_W) {
255 return $cb->(no_such_port => "cannot monitor nonexistent port", "$self->{id}#$portid") 262 my @args = @_;
256 unless exists $AnyEvent::MP::Kernel::PORT{$portid}; 263 push @DELAY, sub { AnyEvent::MP::Kernel::_monitor (@args) };
257 264 return;
258 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb; 265 }
266 &AnyEvent::MP::Kernel::_monitor;
259} 267}
260 268
261sub unmonitor { 269sub unmonitor {
262 my ($self, $portid, $cb) = @_; 270 if ($DELAY_W) {
271 my @args = @_;
272 push @DELAY, sub { AnyEvent::MP::Kernel::_unmonitor (@args) };
273 return;
274 }
263 275
264 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0}; 276 &AnyEvent::MP::Kernel::_unmonitor;
265} 277}
266 278
267=head1 SEE ALSO 279=head1 SEE ALSO
268 280
269L<AnyEvent::MP>. 281L<AnyEvent::MP>.

Diff Legend

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