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.43 by root, Thu Oct 1 16:11:05 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_addr};
98 delete $self->{connect_w}; 97 delete $self->{connect_w};
99 delete $self->{connect_to}; 98 delete $self->{connect_to};
100 99
101 $self->{transport} = $transport; 100 $self->{transport} = $transport;
102 101
103 my $transport_send = $transport->can ("send"); 102 my $transport_send = $transport->{send};
104
105 $self->{send} = sub {
106 $transport_send->($transport, $_[0]);
107 };
108 103
109 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1); 104 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1);
110 105
106 $self->{send} = $transport_send;
107
111 $transport->send ($_) 108 $transport_send->($_)
112 for @{ delete $self->{queue} || [] }; 109 for @{ delete $self->{queue} || [] };
113} 110}
114 111
115sub connect { 112sub connect {
116 my ($self, @addresses) = @_; 113 my ($self) = @_;
117 114
118 return if $self->{transport}; 115 return if $self->{transport};
116 return if $self->{connect_w};
119 117
120 Scalar::Util::weaken $self; 118 Scalar::Util::weaken $self;
121 119
122 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout}; 120 $self->{connect_to} ||= AE::timer $AnyEvent::MP::Kernel::CONFIG->{connect_interval}, 0, sub {
123
124 $self->{connect_to} ||= AE::timer $monitor, 0, sub {
125 $self->transport_error (transport_error => $self->{id}, "unable to connect"); 121 $self->transport_error (transport_error => $self->{id}, "unable to connect");
126 }; 122 };
127 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
128 return unless @addresses; 143 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 } 144
135
136 $self->{connect_addr} = \@addresses; # a bit weird, but efficient
137
138 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]"); 145 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@$addresses]");
139 146
147 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout};
140 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval}; 148 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
141 149
142 $interval = ($monitor - $interval) / @addresses 150 $interval = ($monitor - $interval) / @$addresses
143 if ($monitor - $interval) / @addresses < $interval; 151 if ($monitor - $interval) / @$addresses < $interval;
144 152
145 $interval = 0.4 if $interval < 0.4; 153 $interval = 0.4 if $interval < 0.4;
146 154
147 my @endpoints; 155 my @endpoints = reverse @$addresses;
148 156
149 $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 {
150 @endpoints = @addresses
151 unless @endpoints;
152
153 my $endpoint = shift @endpoints; 158 my $endpoint = pop @endpoints;
154 159
155 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint"); 160 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint");
156 161
157 $self->{trial}{$endpoint} ||= do { 162 $self->{trial}{$endpoint} ||= do {
158 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint 163 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
… …
163 sub { delete $self->{trial}{$endpoint} }, 168 sub { delete $self->{trial}{$endpoint} },
164 }; 169 };
165 }; 170 };
166} 171}
167 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
168sub kill { 228sub kill {
169 my ($self, $port, @reason) = @_; 229 my ($self, $port, @reason) = @_;
170 230
171 $self->send (["", kil => $port, @reason]); 231 $self->{send} (["", kil => $port, @reason]);
172} 232}
173 233
174sub monitor { 234sub monitor {
175 my ($self, $portid, $cb) = @_; 235 my ($self, $portid, $cb) = @_;
176 236
… …
193 unless (@$list) { 253 unless (@$list) {
194 $self->send (["", mon0 => $portid]); 254 $self->send (["", mon0 => $portid]);
195 delete $self->{monitor}{$portid}; 255 delete $self->{monitor}{$portid};
196 } 256 }
197} 257}
198
199# used for direct slave connections as well
200package AnyEvent::MP::Node::Direct;
201
202use base "AnyEvent::MP::Node::External";
203 258
204package AnyEvent::MP::Node::Self; 259package AnyEvent::MP::Node::Self;
205 260
206use base "AnyEvent::MP::Node"; 261use base "AnyEvent::MP::Node";
207 262
… …
213our $DELAY = -50; 268our $DELAY = -50;
214our @DELAY; 269our @DELAY;
215our $DELAY_W; 270our $DELAY_W;
216 271
217sub _send_delayed { 272sub _send_delayed {
218 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE{""}; 273 $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE;
219 (shift @DELAY)->() 274 (shift @DELAY)->()
220 while @DELAY; 275 while @DELAY;
221 undef $DELAY_W; 276 undef $DELAY_W;
222 $DELAY = -50; 277 $DELAY = -50;
223} 278}
… …
233 push @DELAY, sub { AnyEvent::MP::Kernel::_inject (@$msg) }; 288 push @DELAY, sub { AnyEvent::MP::Kernel::_inject (@$msg) };
234 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed; 289 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
235 return; 290 return;
236 } 291 }
237 292
238 local $AnyEvent::MP::Kernel::SRCNODE = $self; 293 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE;
239 AnyEvent::MP::Kernel::_inject (@{ $_[0] }); 294 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
240 }; 295 };
241} 296}
242 297
243sub transport_connect { 298sub transport_connect {
… …
245 300
246 $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})");
247} 302}
248 303
249sub kill { 304sub kill {
250 my ($self, $port, @reason) = @_; 305 my (undef, @args) = @_;
251 306
252 my $delay_cb = sub { 307 # we _always_ delay kil's, to avoid calling mon callbacks
253 delete $AnyEvent::MP::Kernel::PORT{$port} 308 # from anything but the event loop context.
254 or return; # killing nonexistent ports is O.K. 309 $DELAY = 1;
255 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 310 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) };
256 311 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
257 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port}
258 or !@reason
259 or $AnyEvent::MP::Kernel::WARN->(8, "unmonitored local port $port died with reason: @reason");
260
261 $_->(@reason) for values %$mon;
262 };
263
264 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb;
265} 312}
266 313
267sub monitor { 314sub monitor {
268 my ($self, $portid, $cb) = @_; 315 # maybe always delay, too?
269 316 if ($DELAY_W) {
270 my $delay_cb = sub { 317 my @args = @_;
271 return $cb->(no_such_port => "cannot monitor nonexistent port", "$self->{id}#$portid") 318 push @DELAY, sub { AnyEvent::MP::Kernel::_monitor (@args) };
272 unless exists $AnyEvent::MP::Kernel::PORT{$portid}; 319 return;
273
274 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb;
275 }; 320 }
276 321 &AnyEvent::MP::Kernel::_monitor;
277 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb;
278} 322}
279 323
280sub unmonitor { 324sub unmonitor {
281 my ($self, $portid, $cb) = @_; 325 # no need to always delay
282 326 if ($DELAY_W) {
283 my $delay_cb = sub { 327 my @args = @_;
284 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0}; 328 push @DELAY, sub { AnyEvent::MP::Kernel::_unmonitor (@args) };
329 return;
285 }; 330 }
286 331
287 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb; 332 &AnyEvent::MP::Kernel::_unmonitor;
288} 333}
289 334
290=head1 SEE ALSO 335=head1 SEE ALSO
291 336
292L<AnyEvent::MP>. 337L<AnyEvent::MP>.

Diff Legend

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