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.53 by root, Tue Feb 28 18:37:24 2012 UTC vs.
Revision 1.63 by root, Fri Mar 23 03:24:41 2012 UTC

… …
14 14
15package AnyEvent::MP::Node; 15package AnyEvent::MP::Node;
16 16
17use common::sense; 17use common::sense;
18 18
19use AE ();
20use AnyEvent::Util (); 19use AnyEvent ();
21use AnyEvent::Socket (); 20use AnyEvent::Socket ();
22 21
23use AnyEvent::MP::Transport (); 22use AnyEvent::MP::Transport ();
24 23
25sub new { 24sub new {
… …
92 delete $self->{trial}; 91 delete $self->{trial};
93 92
94 $self->transport_error (transport_error => $self->{id}, "switched connections") 93 $self->transport_error (transport_error => $self->{id}, "switched connections")
95 if $self->{transport}; 94 if $self->{transport};
96 95
97 delete $self->{connect_addr};
98 delete $self->{connect_w}; 96 delete $self->{connect_w};
99 delete $self->{connect_to}; 97 delete $self->{connect_to};
100 98
101 $self->{transport} = $transport; 99 $self->{transport} = $transport;
102 100
… …
112 110
113sub connect { 111sub connect {
114 my ($self) = @_; 112 my ($self) = @_;
115 113
116 return if $self->{transport}; 114 return if $self->{transport};
115 return if $self->{connect_w};
117 116
118 Scalar::Util::weaken $self; 117 Scalar::Util::weaken $self;
119 118
120 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout}; 119 $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"); 120 $self->transport_error (transport_error => $self->{id}, "unable to connect");
124 }; 121 };
125 122
126 # maybe @$addresses? 123 # maybe @$addresses?
127 my @addresses = @{
128 $AnyEvent::MP::Kernel::GLOBAL_ADDR->{$self->{id}} 124 my $addresses = $AnyEvent::MP::Kernel::GLOBAL_DB{"'l"}{$self->{id}};
129 || $AnyEvent::MP::Kernel::NODE_ADDR->{$self->{id}}
130 };
131 125
132 unless (@addresses) { 126 if ($addresses) {
127 $self->connect_to ($addresses);
128 } else {
133 # on global nodes, all betsa re off now - we either know the node, or we don't 129 # on global nodes, all bets are off now - we either know the node, or we don't
134 unless ($AnyEvent::MP::Kernel::GLOBAL) { 130 unless ($AnyEvent::MP::Kernel::GLOBAL) {
135 $self->{connect_w} = AnyEvent::MP::Kernel::global_req ( 131 AnyEvent::MP::Kernel::g_find ($self->{id});
136 global_find => $self->{id},
137 sub {
138 return unless $self; # just to be sure
139 return unless @{ $_[0] };
140
141 local $AnyEvent::MP::Kernel::GLOBAL_ADDR->{$self->{id}} = $_[0]; #d# UGLY
142 $self->connect;
143 }
144 );
145 } 132 }
133 }
134}
146 135
147 return; 136sub connect_to {
137 my ($self, $addresses) = @_;
138
139 return if $self->{transport};
140 return if $self->{connect_w};
141
142 return unless @$addresses;
148 } 143
149
150 $self->{connect_addr} = \@addresses; # a bit weird, but efficient
151
152 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]"); 144 AE::log 9 => "connecting to $self->{id} with [@$addresses]";
153 145
146 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout};
154 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval}; 147 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
155 148
156 $interval = ($monitor - $interval) / @addresses 149 $interval = ($monitor - $interval) / @$addresses
157 if ($monitor - $interval) / @addresses < $interval; 150 if ($monitor - $interval) / @$addresses < $interval;
158 151
159 $interval = 0.4 if $interval < 0.4; 152 $interval = 0.4 if $interval < 0.4;
160 153
161 my @endpoints; 154 my @endpoints = reverse @$addresses;
162 155
163 $self->{connect_w} = AE::timer 0.050 * rand, $interval * (0.9 + 0.1 * rand), sub { 156 $self->{connect_w} = AE::timer 0, $interval * (0.9 + 0.1 * rand), sub {
164 @endpoints = @addresses
165 unless @endpoints;
166
167 my $endpoint = shift @endpoints; 157 my $endpoint = pop @endpoints;
168 158
169 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint"); 159 AE::log 9 => "connecting to $self->{id} at $endpoint";
170 160
171 $self->{trial}{$endpoint} ||= do { 161 $self->{trial}{$endpoint} ||= do {
172 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint 162 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
173 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{id}: not a resolved node reference."); 163 or return AE::log critical => "$self->{id}: '$endpoint' is not a resolved node reference.";
174 164
175 AnyEvent::MP::Transport::mp_connect 165 AnyEvent::MP::Transport::mp_connect
176 $host, $port, 166 $host, $port,
177 sub { delete $self->{trial}{$endpoint} }, 167 sub { delete $self->{trial}{$endpoint} },
178 }; 168 };
… …
221# delay every so often to avoid recursion, also used to delay after spawn 211# delay every so often to avoid recursion, also used to delay after spawn
222our $DELAY = -50; 212our $DELAY = -50;
223our @DELAY; 213our @DELAY;
224our $DELAY_W; 214our $DELAY_W;
225 215
226sub _send_delayed { 216our $send_delayed = sub {
227 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE{""}; 217 $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE;
228 (shift @DELAY)->() 218 (shift @DELAY)->()
229 while @DELAY; 219 while @DELAY;
230 undef $DELAY_W; 220 undef $DELAY_W;
231 $DELAY = -50; 221 $DELAY = -50;
232} 222};
233 223
234sub transport_reset { 224sub transport_reset {
235 my ($self) = @_; 225 my ($self) = @_;
236 226
237 Scalar::Util::weaken $self; 227 Scalar::Util::weaken $self;
238 228
239 $self->{send} = sub { 229 $self->{send} = sub {
240 if ($DELAY++ >= 0) { 230 if (++$DELAY > 0) {
241 my $msg = $_[0]; 231 my $msg = $_[0];
242 push @DELAY, sub { AnyEvent::MP::Kernel::_inject (@$msg) }; 232 push @DELAY, sub { AnyEvent::MP::Kernel::_inject (@$msg) };
243 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed; 233 $DELAY_W ||= AE::timer 0, 0, $send_delayed;
244 return; 234 return;
245 } 235 }
246 236
247 local $AnyEvent::MP::Kernel::SRCNODE = $self; 237 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE;
248 AnyEvent::MP::Kernel::_inject (@{ $_[0] }); 238 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
249 }; 239 };
250} 240}
251 241
252sub transport_connect { 242sub transport_connect {
253 my ($self, $tp) = @_; 243 my ($self, $tp) = @_;
254 244
255 $AnyEvent::MP::Kernel::WARN->(9, "I refuse to talk to myself ($tp->{peerhost}:$tp->{peerport})"); 245 AE::log 9 => "I refuse to talk to myself ($tp->{peerhost}:$tp->{peerport})";
256} 246}
257 247
258sub kill { 248sub kill {
259 my (undef, @args) = @_; 249 my (undef, @args) = @_;
260 250
261 # we _always_ delay kil's, to avoid calling mon callbacks 251 # we _always_ delay kil's, to avoid calling mon callbacks
262 # from anything but the event loop context. 252 # from anything but the event loop context.
263 $DELAY = 1; 253 $DELAY = 1;
264 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) }; 254 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) };
265 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed; 255 $DELAY_W ||= AE::timer 0, 0, $send_delayed;
266} 256}
267 257
268sub monitor { 258sub monitor {
269 # maybe always delay, too? 259 # maybe always delay, too?
270 if ($DELAY_W) { 260 if ($DELAY_W) {

Diff Legend

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