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.60 by root, Wed Mar 21 15:22:16 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 $self->{connect_to} ||= AE::timer 120 $self->{connect_to} ||= AE::timer $AnyEvent::MP::Kernel::CONFIG->{connect_interval}, 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"); 121 $self->transport_error (transport_error => $self->{id}, "unable to connect");
122 };
123
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};
141 return if $self->{connect_w};
142
143 return unless @$addresses;
144
145 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@$addresses]");
146
147 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout};
148 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
149
150 $interval = ($monitor - $interval) / @$addresses
151 if ($monitor - $interval) / @$addresses < $interval;
152
153 $interval = 0.4 if $interval < 0.4;
154
155 my @endpoints = reverse @$addresses;
156
157 $self->{connect_w} = AE::timer 0, $interval * (0.9 + 0.1 * rand), sub {
158 my $endpoint = pop @endpoints;
159
160 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint");
161
162 $self->{trial}{$endpoint} ||= do {
163 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
164 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{id}: not a resolved node reference.");
165
166 AnyEvent::MP::Transport::mp_connect
167 $host, $port,
168 sub { delete $self->{trial}{$endpoint} },
126 }; 169 };
170 };
171}
127 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
128 return unless @addresses; 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 }
129 197
130 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]"); 198 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
131 199
132 unless ($self->{connect_w}) { 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
133 my @endpoints; 207 my @endpoints;
134 208
135 $self->{connect_w} = AE::timer 209 $self->{connect_w} = AE::timer 0, $interval * (0.9 + 0.1 * rand), sub {
136 rand,
137 $AnyEvent::MP::Config::CFG{connect_interval} || $AnyEvent::MP::Kernel::CONNECT_INTERVAL,
138 sub {
139 @endpoints = @addresses 210 @endpoints = @addresses
140 unless @endpoints; 211 unless @endpoints;
141 212
142 my $endpoint = shift @endpoints; 213 my $endpoint = shift @endpoints;
143 214
144 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint"); 215 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint");
145 216
146 $self->{trial}{$endpoint} ||= do { 217 $self->{trial}{$endpoint} ||= do {
147 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint 218 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
148 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{id}: not a resolved node reference."); 219 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{id}: not a resolved node reference.");
149 220
150 AnyEvent::MP::Transport::mp_connect 221 AnyEvent::MP::Transport::mp_connect
151 $host, $port, 222 $host, $port,
152 sub { delete $self->{trial}{$endpoint} }, 223 sub { delete $self->{trial}{$endpoint} },
153 };
154 }
155 ; 224 };
156 } 225 };
157} 226}
158 227
159sub kill { 228sub kill {
160 my ($self, $port, @reason) = @_; 229 my ($self, $port, @reason) = @_;
161 230
162 $self->send (["", kil => $port, @reason]); 231 $self->{send} (["", kil => $port, @reason]);
163} 232}
164 233
165sub monitor { 234sub monitor {
166 my ($self, $portid, $cb) = @_; 235 my ($self, $portid, $cb) = @_;
167 236
… …
185 $self->send (["", mon0 => $portid]); 254 $self->send (["", mon0 => $portid]);
186 delete $self->{monitor}{$portid}; 255 delete $self->{monitor}{$portid};
187 } 256 }
188} 257}
189 258
190# used for direct slave connections as well
191package AnyEvent::MP::Node::Direct;
192
193use base "AnyEvent::MP::Node::External";
194
195package AnyEvent::MP::Node::Self; 259package AnyEvent::MP::Node::Self;
196 260
197use base "AnyEvent::MP::Node"; 261use base "AnyEvent::MP::Node";
198 262
199sub connect { 263sub connect {
200 # we are trivially connected 264 # we are trivially connected
201} 265}
202 266
267# delay every so often to avoid recursion, also used to delay after spawn
268our $DELAY = -50;
269our @DELAY;
270our $DELAY_W;
271
272sub _send_delayed {
273 $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE;
274 (shift @DELAY)->()
275 while @DELAY;
276 undef $DELAY_W;
277 $DELAY = -50;
278}
279
203sub transport_reset { 280sub transport_reset {
204 my ($self) = @_; 281 my ($self) = @_;
205 282
206 Scalar::Util::weaken $self; 283 Scalar::Util::weaken $self;
207 284
208 $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
209 local $AnyEvent::MP::Kernel::SRCNODE = $self; 293 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE;
210 AnyEvent::MP::Kernel::_inject (@{ $_[0] }); 294 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
211 }; 295 };
212} 296}
213 297
214sub transport_connect { 298sub transport_connect {
… …
216 300
217 $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})");
218} 302}
219 303
220sub kill { 304sub kill {
221 my ($self, $port, @reason) = @_; 305 my (undef, @args) = @_;
222 306
223 delete $AnyEvent::MP::Kernel::PORT{$port}; 307 # we _always_ delay kil's, to avoid calling mon callbacks
224 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 308 # from anything but the event loop context.
225 309 $DELAY = 1;
226 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port} 310 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) };
227 or !@reason 311 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
228 or $AnyEvent::MP::Kernel::WARN->(2, "unmonitored local port $port died with reason: @reason");
229
230 $_->(@reason) for values %$mon;
231} 312}
232 313
233sub monitor { 314sub monitor {
234 my ($self, $portid, $cb) = @_; 315 # maybe always delay, too?
235 316 if ($DELAY_W) {
236 return $cb->(no_such_port => "cannot monitor nonexistent port") 317 my @args = @_;
237 unless exists $AnyEvent::MP::Kernel::PORT{$portid}; 318 push @DELAY, sub { AnyEvent::MP::Kernel::_monitor (@args) };
238 319 return;
239 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb; 320 }
321 &AnyEvent::MP::Kernel::_monitor;
240} 322}
241 323
242sub unmonitor { 324sub unmonitor {
243 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 }
244 331
245 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0}; 332 &AnyEvent::MP::Kernel::_unmonitor;
246} 333}
247 334
248=head1 SEE ALSO 335=head1 SEE ALSO
249 336
250L<AnyEvent::MP>. 337L<AnyEvent::MP>.

Diff Legend

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