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.35 by root, Thu Sep 3 20:16:36 2009 UTC vs.
Revision 1.61 by root, Wed Mar 21 23:48:39 2012 UTC

… …
40sub send { 40sub send {
41 &{ shift->{send} } 41 &{ shift->{send} }
42} 42}
43 43
44# nodes reachable via the network 44# nodes reachable via the network
45package AnyEvent::MP::Node::External; 45package AnyEvent::MP::Node::Remote;
46 46
47use base "AnyEvent::MP::Node"; 47use base "AnyEvent::MP::Node";
48 48
49# called at init time, mostly sets {send} 49# called at init time, mostly sets {send}
50sub transport_reset { 50sub transport_reset {
… …
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_w}; 97 delete $self->{connect_w};
98 delete $self->{connect_to}; 98 delete $self->{connect_to};
99 99
100 $self->{transport} = $transport; 100 $self->{transport} = $transport;
101 101
102 my $transport_send = $transport->can ("send"); 102 my $transport_send = $transport->{send};
103
104 $self->{send} = sub {
105 $transport_send->($transport, $_[0]);
106 };
107 103
108 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1); 104 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1);
109 105
106 $self->{send} = $transport_send;
107
110 $transport->send ($_) 108 $transport_send->($_)
111 for @{ delete $self->{queue} || [] }; 109 for @{ delete $self->{queue} || [] };
112} 110}
113 111
114sub connect { 112sub connect {
115 my ($self, @addresses) = @_; 113 my ($self) = @_;
116 114
117 return if $self->{transport}; 115 return if $self->{transport};
116 return if $self->{connect_w};
118 117
119 Scalar::Util::weaken $self; 118 Scalar::Util::weaken $self;
120 119
121 my $monitor = $AnyEvent::MP::Config::CFG{monitor_timeout} || $AnyEvent::MP::Kernel::MONITOR_TIMEOUT; 120 $self->{connect_to} ||= AE::timer $AnyEvent::MP::Kernel::CONFIG->{connect_interval}, 0, sub {
122
123 $self->{connect_to} ||= AE::timer $monitor, 0, sub {
124 $self->transport_error (transport_error => $self->{id}, "unable to connect"); 121 $self->transport_error (transport_error => $self->{id}, "unable to connect");
125 }; 122 };
126 123
127 return unless @addresses; 124 # maybe @$addresses?
125 my $addresses = $AnyEvent::MP::Kernel::GLOBAL_DB{"'l"}{$self->{id}};
126
127 if ($addresses) {
128 $self->connect_to ($addresses);
129 } else {
130 # on global nodes, all bets are off now - we either know the node, or we don't
131 unless ($AnyEvent::MP::Kernel::GLOBAL) {
132 AnyEvent::MP::Kernel::g_find ($self->{id});
133 }
134 }
135}
136
137sub connect_to {
138 my ($self, $addresses) = @_;
139
140 return if $self->{transport};
128 return if $self->{connect_w}; 141 return if $self->{connect_w};
129 142
143 return unless @$addresses;
144
130 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]"); 145 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@$addresses]");
131 146
132 my $interval = $AnyEvent::MP::Config::CFG{connect_interval} || $AnyEvent::MP::Kernel::CONNECT_INTERVAL; 147 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout};
148 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
133 149
134 $interval = ($monitor - $interval) / @addresses 150 $interval = ($monitor - $interval) / @$addresses
135 if ($monitor - $interval) / @addresses < $interval; 151 if ($monitor - $interval) / @$addresses < $interval;
136 152
137 $interval = 0.4 if $interval < 0.4; 153 $interval = 0.4 if $interval < 0.4;
138 154
139 my @endpoints; 155 my @endpoints = reverse @$addresses;
140 156
141 $self->{connect_w} = AE::timer 0.050 * rand, $interval * (0.9 + 0.1 * rand), sub { 157 $self->{connect_w} = AE::timer 0, $interval * (0.9 + 0.1 * rand), sub {
142 @endpoints = @addresses
143 unless @endpoints;
144
145 my $endpoint = shift @endpoints; 158 my $endpoint = pop @endpoints;
146 159
147 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint"); 160 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint");
148 161
149 $self->{trial}{$endpoint} ||= do { 162 $self->{trial}{$endpoint} ||= do {
150 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint 163 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
… …
155 sub { delete $self->{trial}{$endpoint} }, 168 sub { delete $self->{trial}{$endpoint} },
156 }; 169 };
157 }; 170 };
158} 171}
159 172
173sub connect {
174 my ($self) = @_;
175
176 return if $self->{transport};
177 return if $self->{connect_w};
178
179 Scalar::Util::weaken $self;
180
181 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout};
182
183 $self->{connect_to} ||= AE::timer $monitor, 0, sub {
184 $self->transport_error (transport_error => $self->{id}, "unable to connect");
185 };
186
187 # maybe @$addresses?
188 my @addresses = @{ $AnyEvent::MP::Kernel::GLOBAL_DB{"'l"}{$self->{id}} };
189
190 unless (@addresses) {
191 # on global nodes, all bets are off now - we either know the node, or we don't
192 unless ($AnyEvent::MP::Kernel::GLOBAL) {
193 AnyEvent::MP::Kernel::g_find ($self->{id});
194 }
195 return;
196 }
197
198 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
199
200 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
201
202 $interval = ($monitor - $interval) / @addresses
203 if ($monitor - $interval) / @addresses < $interval;
204
205 $interval = 0.4 if $interval < 0.4;
206
207 my @endpoints;
208
209 $self->{connect_w} = AE::timer 0, $interval * (0.9 + 0.1 * rand), sub {
210 @endpoints = @addresses
211 unless @endpoints;
212
213 my $endpoint = shift @endpoints;
214
215 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint");
216
217 $self->{trial}{$endpoint} ||= do {
218 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
219 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{id}: not a resolved node reference.");
220
221 AnyEvent::MP::Transport::mp_connect
222 $host, $port,
223 sub { delete $self->{trial}{$endpoint} },
224 };
225 };
226}
227
160sub kill { 228sub kill {
161 my ($self, $port, @reason) = @_; 229 my ($self, $port, @reason) = @_;
162 230
163 $self->send (["", kil => $port, @reason]); 231 $self->{send} (["", kil => $port, @reason]);
164} 232}
165 233
166sub monitor { 234sub monitor {
167 my ($self, $portid, $cb) = @_; 235 my ($self, $portid, $cb) = @_;
168 236
… …
186 $self->send (["", mon0 => $portid]); 254 $self->send (["", mon0 => $portid]);
187 delete $self->{monitor}{$portid}; 255 delete $self->{monitor}{$portid};
188 } 256 }
189} 257}
190 258
191# used for direct slave connections as well
192package AnyEvent::MP::Node::Direct;
193
194use base "AnyEvent::MP::Node::External";
195
196package AnyEvent::MP::Node::Self; 259package AnyEvent::MP::Node::Self;
197 260
198use base "AnyEvent::MP::Node"; 261use base "AnyEvent::MP::Node";
199 262
200sub connect { 263sub connect {
201 # we are trivially connected 264 # we are trivially connected
202} 265}
203 266
267# delay every so often to avoid recursion, also used to delay after spawn
268our $DELAY = -50;
269our @DELAY;
270our $DELAY_W;
271
272our $send_delayed = sub {
273 $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE;
274 (shift @DELAY)->()
275 while @DELAY;
276 undef $DELAY_W;
277 $DELAY = -50;
278};
279
204sub transport_reset { 280sub transport_reset {
205 my ($self) = @_; 281 my ($self) = @_;
206 282
207 Scalar::Util::weaken $self; 283 Scalar::Util::weaken $self;
208 284
209 $self->{send} = sub { 285 $self->{send} = sub {
286 if (++$DELAY > 0) {
287 my $msg = $_[0];
288 push @DELAY, sub { AnyEvent::MP::Kernel::_inject (@$msg) };
289 $DELAY_W ||= AE::timer 0, 0, $send_delayed;
290 return;
291 }
292
210 local $AnyEvent::MP::Kernel::SRCNODE = $self; 293 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE;
211 AnyEvent::MP::Kernel::_inject (@{ $_[0] }); 294 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
212 }; 295 };
213} 296}
214 297
215sub transport_connect { 298sub transport_connect {
… …
217 300
218 $AnyEvent::MP::Kernel::WARN->(9, "I refuse to talk to myself ($tp->{peerhost}:$tp->{peerport})"); 301 $AnyEvent::MP::Kernel::WARN->(9, "I refuse to talk to myself ($tp->{peerhost}:$tp->{peerport})");
219} 302}
220 303
221sub kill { 304sub kill {
222 my ($self, $port, @reason) = @_; 305 my (undef, @args) = @_;
223 306
224 delete $AnyEvent::MP::Kernel::PORT{$port}; 307 # we _always_ delay kil's, to avoid calling mon callbacks
225 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 308 # from anything but the event loop context.
226 309 $DELAY = 1;
227 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port} 310 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) };
228 or !@reason 311 $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} 312}
233 313
234sub monitor { 314sub monitor {
235 my ($self, $portid, $cb) = @_; 315 # maybe always delay, too?
236 316 if ($DELAY_W) {
237 return $cb->(no_such_port => "cannot monitor nonexistent port") 317 my @args = @_;
238 unless exists $AnyEvent::MP::Kernel::PORT{$portid}; 318 push @DELAY, sub { AnyEvent::MP::Kernel::_monitor (@args) };
239 319 return;
240 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb; 320 }
321 &AnyEvent::MP::Kernel::_monitor;
241} 322}
242 323
243sub unmonitor { 324sub unmonitor {
244 my ($self, $portid, $cb) = @_; 325 # no need to always delay
326 if ($DELAY_W) {
327 my @args = @_;
328 push @DELAY, sub { AnyEvent::MP::Kernel::_unmonitor (@args) };
329 return;
330 }
245 331
246 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0}; 332 &AnyEvent::MP::Kernel::_unmonitor;
247} 333}
248 334
249=head1 SEE ALSO 335=head1 SEE ALSO
250 336
251L<AnyEvent::MP>. 337L<AnyEvent::MP>.

Diff Legend

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