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.32 by root, Sun Aug 30 09:24:09 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
… …
116 117
117 return if $self->{transport}; 118 return if $self->{transport};
118 119
119 Scalar::Util::weaken $self; 120 Scalar::Util::weaken $self;
120 121
122 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout};
123
121 $self->{connect_to} ||= AE::timer 124 $self->{connect_to} ||= AE::timer $monitor, 0, sub {
122 $AnyEvent::MP::Config::CFG{monitor_timeout} || $AnyEvent::MP::Kernel::MONITOR_TIMEOUT,
123 0,
124 sub {
125 $self->transport_error (transport_error => $self->{id}, "unable to connect"); 125 $self->transport_error (transport_error => $self->{id}, "unable to connect");
126 };
127
128 return unless @addresses;
129
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
137
138 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
139
140 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
141
142 $interval = ($monitor - $interval) / @addresses
143 if ($monitor - $interval) / @addresses < $interval;
144
145 $interval = 0.4 if $interval < 0.4;
146
147 my @endpoints;
148
149 $self->{connect_w} = AE::timer 0.050 * rand, $interval * (0.9 + 0.1 * rand), sub {
150 @endpoints = @addresses
151 unless @endpoints;
152
153 my $endpoint = shift @endpoints;
154
155 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint");
156
157 $self->{trial}{$endpoint} ||= do {
158 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
159 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{id}: not a resolved node reference.");
160
161 AnyEvent::MP::Transport::mp_connect
162 $host, $port,
163 sub { delete $self->{trial}{$endpoint} },
126 }; 164 };
127
128 return unless @addresses;
129
130 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
131
132 unless ($self->{connect_w}) {
133 my @endpoints;
134
135 $self->{connect_w} = AE::timer
136 rand,
137 $AnyEvent::MP::Config::CFG{connect_interval} || $AnyEvent::MP::Kernel::CONNECT_INTERVAL,
138 sub {
139 @endpoints = @addresses
140 unless @endpoints;
141
142 my $endpoint = shift @endpoints;
143
144 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint");
145
146 $self->{trial}{$endpoint} ||= do {
147 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
148 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{id}: not a resolved node reference.");
149
150 AnyEvent::MP::Transport::mp_connect
151 $host, $port,
152 sub { delete $self->{trial}{$endpoint} },
153 };
154 }
155 ;
156 } 165 };
157} 166}
158 167
159sub kill { 168sub kill {
160 my ($self, $port, @reason) = @_; 169 my ($self, $port, @reason) = @_;
161 170
… …
198 207
199sub connect { 208sub connect {
200 # we are trivially connected 209 # we are trivially connected
201} 210}
202 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
203sub transport_reset { 225sub transport_reset {
204 my ($self) = @_; 226 my ($self) = @_;
205 227
206 Scalar::Util::weaken $self; 228 Scalar::Util::weaken $self;
207 229
208 $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
209 local $AnyEvent::MP::Kernel::SRCNODE = $self; 238 local $AnyEvent::MP::Kernel::SRCNODE = $self;
210 AnyEvent::MP::Kernel::_inject (@{ $_[0] }); 239 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
211 }; 240 };
212} 241}
213 242
… …
218} 247}
219 248
220sub kill { 249sub kill {
221 my ($self, $port, @reason) = @_; 250 my ($self, $port, @reason) = @_;
222 251
252 my $delay_cb = sub {
223 delete $AnyEvent::MP::Kernel::PORT{$port}; 253 delete $AnyEvent::MP::Kernel::PORT{$port}
254 or return; # killing nonexistent ports is O.K.
224 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 255 delete $AnyEvent::MP::Kernel::PORT_DATA{$port};
225 256
226 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port} 257 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port}
227 or !@reason 258 or !@reason
228 or $AnyEvent::MP::Kernel::WARN->(2, "unmonitored local port $port died with reason: @reason"); 259 or $AnyEvent::MP::Kernel::WARN->(8, "unmonitored local port $port died with reason: @reason");
229 260
230 $_->(@reason) for values %$mon; 261 $_->(@reason) for values %$mon;
262 };
263
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;
231} 268}
232 269
233sub monitor { 270sub monitor {
234 my ($self, $portid, $cb) = @_; 271 my ($self, $portid, $cb) = @_;
235 272
273 my $delay_cb = sub {
236 return $cb->(no_such_port => "cannot monitor nonexistent port") 274 return $cb->(no_such_port => "cannot monitor nonexistent port", "$self->{id}#$portid")
237 unless exists $AnyEvent::MP::Kernel::PORT{$portid}; 275 unless exists $AnyEvent::MP::Kernel::PORT{$portid};
238 276
239 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb; 277 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb;
278 };
279
280 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb;
240} 281}
241 282
242sub unmonitor { 283sub unmonitor {
243 my ($self, $portid, $cb) = @_; 284 my ($self, $portid, $cb) = @_;
244 285
286 my $delay_cb = sub {
245 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0}; 287 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0};
288 };
289
290 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb;
246} 291}
247 292
248=head1 SEE ALSO 293=head1 SEE ALSO
249 294
250L<AnyEvent::MP>. 295L<AnyEvent::MP>.

Diff Legend

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