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.52 by root, Sat Mar 13 20:29:04 2010 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 {
… …
92 delete $self->{trial}; 92 delete $self->{trial};
93 93
94 $self->transport_error (transport_error => $self->{id}, "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
… …
109 $transport_send->($_) 108 $transport_send->($_)
110 for @{ delete $self->{queue} || [] }; 109 for @{ delete $self->{queue} || [] };
111} 110}
112 111
113sub connect { 112sub connect {
114 my ($self, @addresses) = @_; 113 my ($self) = @_;
115 114
116 return if $self->{transport}; 115 return if $self->{transport};
116 return if $self->{connect_w};
117 117
118 Scalar::Util::weaken $self; 118 Scalar::Util::weaken $self;
119 119
120 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout}; 120 $self->{connect_to} ||= AE::timer $AnyEvent::MP::Kernel::CONFIG->{connect_interval}, 0, sub {
121
122 $self->{connect_to} ||= AE::timer $monitor, 0, sub {
123 $self->transport_error (transport_error => $self->{id}, "unable to connect"); 121 $self->transport_error (transport_error => $self->{id}, "unable to connect");
124 }; 122 };
125 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
126 return unless @addresses; 143 return unless @$addresses;
127
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 } 144
133
134 $self->{connect_addr} = \@addresses; # a bit weird, but efficient
135
136 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]"); 145 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@$addresses]");
137 146
147 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout};
138 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval}; 148 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
139 149
140 $interval = ($monitor - $interval) / @addresses 150 $interval = ($monitor - $interval) / @$addresses
141 if ($monitor - $interval) / @addresses < $interval; 151 if ($monitor - $interval) / @$addresses < $interval;
142 152
143 $interval = 0.4 if $interval < 0.4; 153 $interval = 0.4 if $interval < 0.4;
144 154
145 my @endpoints; 155 my @endpoints = reverse @$addresses;
146 156
147 $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 {
148 @endpoints = @addresses
149 unless @endpoints;
150
151 my $endpoint = shift @endpoints; 158 my $endpoint = pop @endpoints;
152 159
153 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint"); 160 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint");
154 161
155 $self->{trial}{$endpoint} ||= do { 162 $self->{trial}{$endpoint} ||= do {
156 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint 163 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
… …
161 sub { delete $self->{trial}{$endpoint} }, 168 sub { delete $self->{trial}{$endpoint} },
162 }; 169 };
163 }; 170 };
164} 171}
165 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
166sub kill { 228sub kill {
167 my ($self, $port, @reason) = @_; 229 my ($self, $port, @reason) = @_;
168 230
169 $self->send (["", kil => $port, @reason]); 231 $self->{send} (["", kil => $port, @reason]);
170} 232}
171 233
172sub monitor { 234sub monitor {
173 my ($self, $portid, $cb) = @_; 235 my ($self, $portid, $cb) = @_;
174 236
… …
191 unless (@$list) { 253 unless (@$list) {
192 $self->send (["", mon0 => $portid]); 254 $self->send (["", mon0 => $portid]);
193 delete $self->{monitor}{$portid}; 255 delete $self->{monitor}{$portid};
194 } 256 }
195} 257}
196
197# used for direct slave connections as well
198package AnyEvent::MP::Node::Direct;
199
200use base "AnyEvent::MP::Node::External";
201 258
202package AnyEvent::MP::Node::Self; 259package AnyEvent::MP::Node::Self;
203 260
204use base "AnyEvent::MP::Node"; 261use base "AnyEvent::MP::Node";
205 262
… …
210# delay every so often to avoid recursion, also used to delay after spawn 267# delay every so often to avoid recursion, also used to delay after spawn
211our $DELAY = -50; 268our $DELAY = -50;
212our @DELAY; 269our @DELAY;
213our $DELAY_W; 270our $DELAY_W;
214 271
215sub _send_delayed { 272our $send_delayed = sub {
216 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE{""}; 273 $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE;
217 (shift @DELAY)->() 274 (shift @DELAY)->()
218 while @DELAY; 275 while @DELAY;
219 undef $DELAY_W; 276 undef $DELAY_W;
220 $DELAY = -50; 277 $DELAY = -50;
221} 278};
222 279
223sub transport_reset { 280sub transport_reset {
224 my ($self) = @_; 281 my ($self) = @_;
225 282
226 Scalar::Util::weaken $self; 283 Scalar::Util::weaken $self;
227 284
228 $self->{send} = sub { 285 $self->{send} = sub {
229 if ($DELAY++ >= 0) { 286 if (++$DELAY > 0) {
230 my $msg = $_[0]; 287 my $msg = $_[0];
231 push @DELAY, sub { AnyEvent::MP::Kernel::_inject (@$msg) }; 288 push @DELAY, sub { AnyEvent::MP::Kernel::_inject (@$msg) };
232 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed; 289 $DELAY_W ||= AE::timer 0, 0, $send_delayed;
233 return; 290 return;
234 } 291 }
235 292
236 local $AnyEvent::MP::Kernel::SRCNODE = $self; 293 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE;
237 AnyEvent::MP::Kernel::_inject (@{ $_[0] }); 294 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
238 }; 295 };
239} 296}
240 297
241sub transport_connect { 298sub transport_connect {
… …
249 306
250 # we _always_ delay kil's, to avoid calling mon callbacks 307 # we _always_ delay kil's, to avoid calling mon callbacks
251 # from anything but the event loop context. 308 # from anything but the event loop context.
252 $DELAY = 1; 309 $DELAY = 1;
253 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) }; 310 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) };
254 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed; 311 $DELAY_W ||= AE::timer 0, 0, $send_delayed;
255} 312}
256 313
257sub monitor { 314sub monitor {
258 # maybe always delay, too? 315 # maybe always delay, too?
259 if ($DELAY_W) { 316 if ($DELAY_W) {

Diff Legend

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