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.55 by root, Wed Feb 29 19:23:44 2012 UTC vs.
Revision 1.61 by root, Wed Mar 21 23:48:39 2012 UTC

… …
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
… …
116 return if $self->{transport}; 115 return if $self->{transport};
117 return if $self->{connect_w}; 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::Kernel::CONFIG->{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 # maybe @$addresses? 124 # maybe @$addresses?
128 my @addresses = @{
129 $AnyEvent::MP::Kernel::GLOBAL_ADDR->{$self->{id}} 125 my $addresses = $AnyEvent::MP::Kernel::GLOBAL_DB{"'l"}{$self->{id}};
130 || $AnyEvent::MP::Kernel::NODE_ADDR->{$self->{id}}
131 };
132 126
133 unless (@addresses) { 127 if ($addresses) {
128 $self->connect_to ($addresses);
129 } else {
134 # on global nodes, all bets are off now - we either know the node, or we don't 130 # on global nodes, all bets are off now - we either know the node, or we don't
135 unless ($AnyEvent::MP::Kernel::GLOBAL) { 131 unless ($AnyEvent::MP::Kernel::GLOBAL) {
136 $self->{connect_w} = AnyEvent::MP::Kernel::global_req ( 132 AnyEvent::MP::Kernel::g_find ($self->{id});
137 g_find => $self->{id},
138 sub {
139 return unless $self; # just to be sure
140 return unless @{ $_[0] };
141
142 local $AnyEvent::MP::Kernel::GLOBAL_ADDR->{$self->{id}} = $_[0]; #d# UGLY
143 delete $self->{connect_w};
144 $self->connect;
145 }
146 );
147 } 133 }
134 }
135}
148 136
149 return; 137sub connect_to {
138 my ($self, $addresses) = @_;
139
140 return if $self->{transport};
141 return if $self->{connect_w};
142
143 return unless @$addresses;
150 } 144
151
152 $self->{connect_addr} = \@addresses; # a bit weird, but efficient
153
154 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]"); 145 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@$addresses]");
155 146
147 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout};
156 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval}; 148 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
157 149
158 $interval = ($monitor - $interval) / @addresses 150 $interval = ($monitor - $interval) / @$addresses
159 if ($monitor - $interval) / @addresses < $interval; 151 if ($monitor - $interval) / @$addresses < $interval;
160 152
161 $interval = 0.4 if $interval < 0.4; 153 $interval = 0.4 if $interval < 0.4;
162 154
163 my @endpoints; 155 my @endpoints = reverse @$addresses;
164 156
165 $self->{connect_w} = AE::timer 0, $interval * (0.9 + 0.1 * rand), sub { 157 $self->{connect_w} = AE::timer 0, $interval * (0.9 + 0.1 * rand), sub {
166 @endpoints = @addresses
167 unless @endpoints;
168
169 my $endpoint = shift @endpoints; 158 my $endpoint = pop @endpoints;
170 159
171 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint"); 160 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint");
172 161
173 $self->{trial}{$endpoint} ||= do { 162 $self->{trial}{$endpoint} ||= do {
174 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint 163 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
… …
179 sub { delete $self->{trial}{$endpoint} }, 168 sub { delete $self->{trial}{$endpoint} },
180 }; 169 };
181 }; 170 };
182} 171}
183 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
184sub kill { 228sub kill {
185 my ($self, $port, @reason) = @_; 229 my ($self, $port, @reason) = @_;
186 230
187 $self->{send} (["", kil => $port, @reason]); 231 $self->{send} (["", kil => $port, @reason]);
188} 232}
… …
223# 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
224our $DELAY = -50; 268our $DELAY = -50;
225our @DELAY; 269our @DELAY;
226our $DELAY_W; 270our $DELAY_W;
227 271
228sub _send_delayed { 272our $send_delayed = sub {
229 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE{""}; 273 $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE;
230 (shift @DELAY)->() 274 (shift @DELAY)->()
231 while @DELAY; 275 while @DELAY;
232 undef $DELAY_W; 276 undef $DELAY_W;
233 $DELAY = -50; 277 $DELAY = -50;
234} 278};
235 279
236sub transport_reset { 280sub transport_reset {
237 my ($self) = @_; 281 my ($self) = @_;
238 282
239 Scalar::Util::weaken $self; 283 Scalar::Util::weaken $self;
240 284
241 $self->{send} = sub { 285 $self->{send} = sub {
242 if ($DELAY++ >= 0) { 286 if (++$DELAY > 0) {
243 my $msg = $_[0]; 287 my $msg = $_[0];
244 push @DELAY, sub { AnyEvent::MP::Kernel::_inject (@$msg) }; 288 push @DELAY, sub { AnyEvent::MP::Kernel::_inject (@$msg) };
245 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed; 289 $DELAY_W ||= AE::timer 0, 0, $send_delayed;
246 return; 290 return;
247 } 291 }
248 292
249 local $AnyEvent::MP::Kernel::SRCNODE = $self; 293 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE;
250 AnyEvent::MP::Kernel::_inject (@{ $_[0] }); 294 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
251 }; 295 };
252} 296}
253 297
254sub transport_connect { 298sub transport_connect {
… …
262 306
263 # we _always_ delay kil's, to avoid calling mon callbacks 307 # we _always_ delay kil's, to avoid calling mon callbacks
264 # from anything but the event loop context. 308 # from anything but the event loop context.
265 $DELAY = 1; 309 $DELAY = 1;
266 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) }; 310 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) };
267 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed; 311 $DELAY_W ||= AE::timer 0, 0, $send_delayed;
268} 312}
269 313
270sub monitor { 314sub monitor {
271 # maybe always delay, too? 315 # maybe always delay, too?
272 if ($DELAY_W) { 316 if ($DELAY_W) {

Diff Legend

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