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.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_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->{send};
103
104 $self->{send} = sub {
105 $transport_send->($transport, $_[0]);
106 };
107 104
108 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1); 105 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1);
109 106
107 $self->{send} = $transport_send;
108
110 $transport->send ($_) 109 $transport_send->($_)
111 for @{ delete $self->{queue} || [] }; 110 for @{ delete $self->{queue} || [] };
112} 111}
113 112
114sub connect { 113sub connect {
115 my ($self, @addresses) = @_; 114 my ($self, @addresses) = @_;
… …
123 $self->{connect_to} ||= AE::timer $monitor, 0, sub { 122 $self->{connect_to} ||= AE::timer $monitor, 0, sub {
124 $self->transport_error (transport_error => $self->{id}, "unable to connect"); 123 $self->transport_error (transport_error => $self->{id}, "unable to connect");
125 }; 124 };
126 125
127 return unless @addresses; 126 return unless @addresses;
127
128 return if $self->{connect_w}; 128 if ($self->{connect_w}) {
129 # sometimes we get told about new addresses after we started to connect
130 unshift @{$self->{connect_addr}}, @addresses;
131 return;
132 }
133
134 $self->{connect_addr} = \@addresses; # a bit weird, but efficient
129 135
130 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]"); 136 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
131 137
132 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval}; 138 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
133 139
… …
199 205
200sub connect { 206sub connect {
201 # we are trivially connected 207 # we are trivially connected
202} 208}
203 209
210# delay every so often to avoid recursion, also used to delay after spawn
211our $DELAY = -50;
212our @DELAY;
213our $DELAY_W;
214
215sub _send_delayed {
216 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE{""};
217 (shift @DELAY)->()
218 while @DELAY;
219 undef $DELAY_W;
220 $DELAY = -50;
221}
222
204sub transport_reset { 223sub transport_reset {
205 my ($self) = @_; 224 my ($self) = @_;
206 225
207 Scalar::Util::weaken $self; 226 Scalar::Util::weaken $self;
208 227
209 $self->{send} = sub { 228 $self->{send} = sub {
229 if ($DELAY++ >= 0) {
230 my $msg = $_[0];
231 push @DELAY, sub { AnyEvent::MP::Kernel::_inject (@$msg) };
232 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
233 return;
234 }
235
210 local $AnyEvent::MP::Kernel::SRCNODE = $self; 236 local $AnyEvent::MP::Kernel::SRCNODE = $self;
211 AnyEvent::MP::Kernel::_inject (@{ $_[0] }); 237 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
212 }; 238 };
213} 239}
214 240
… …
217 243
218 $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})");
219} 245}
220 246
221sub kill { 247sub kill {
222 my ($self, $port, @reason) = @_; 248 my (undef, @args) = @_;
223 249
224 delete $AnyEvent::MP::Kernel::PORT{$port}; 250 # we _always_ delay kil's, to avoid calling mon callbacks
225 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 251 # from anything but the event loop context.
226 252 $DELAY = 1;
227 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port} 253 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) };
228 or !@reason 254 $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} 255}
233 256
234sub monitor { 257sub monitor {
235 my ($self, $portid, $cb) = @_; 258 # maybe always delay, too?
236 259 if ($DELAY_W) {
237 return $cb->(no_such_port => "cannot monitor nonexistent port") 260 my @args = @_;
238 unless exists $AnyEvent::MP::Kernel::PORT{$portid}; 261 push @DELAY, sub { AnyEvent::MP::Kernel::_monitor (@args) };
239 262 return;
240 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb; 263 }
264 &AnyEvent::MP::Kernel::_monitor;
241} 265}
242 266
243sub unmonitor { 267sub unmonitor {
244 my ($self, $portid, $cb) = @_; 268 # no need to always delay
269 if ($DELAY_W) {
270 my @args = @_;
271 push @DELAY, sub { AnyEvent::MP::Kernel::_unmonitor (@args) };
272 return;
273 }
245 274
246 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0}; 275 &AnyEvent::MP::Kernel::_unmonitor;
247} 276}
248 277
249=head1 SEE ALSO 278=head1 SEE ALSO
250 279
251L<AnyEvent::MP>. 280L<AnyEvent::MP>.

Diff Legend

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