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.57 by root, Thu Mar 1 18:31:42 2012 UTC vs.
Revision 1.65 by root, Fri Mar 23 21:16:36 2012 UTC

… …
10 10
11This is an internal utility module, horrible to look at, so don't. 11This is an internal utility module, horrible to look at, so don't.
12 12
13=cut 13=cut
14 14
15package AnyEvent::MP::Node; 15package AnyEvent::MP::Node; # base class for nodes
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 {
… …
35 34
36sub init { 35sub init {
37 # 36 #
38} 37}
39 38
40#d# only needed for bad global code at the moment
41sub transport_error {
42}
43
44sub send { 39sub send {
45 &{ shift->{send} } 40 &{ shift->{send} }
46} 41}
47 42
48# nodes reachable via the network 43# nodes reachable via the network
49package AnyEvent::MP::Node::Remote; 44package AnyEvent::MP::Node::Remote; # a remote node
50 45
51use base "AnyEvent::MP::Node"; 46use base "AnyEvent::MP::Node";
52 47
53# called at init time, mostly sets {send} 48# called at init time, mostly sets {send}
54sub transport_reset { 49sub transport_reset {
… …
96 delete $self->{trial}; 91 delete $self->{trial};
97 92
98 $self->transport_error (transport_error => $self->{id}, "switched connections") 93 $self->transport_error (transport_error => $self->{id}, "switched connections")
99 if $self->{transport}; 94 if $self->{transport};
100 95
101 delete $self->{connect_addr};
102 delete $self->{connect_w}; 96 delete $self->{connect_w};
103 delete $self->{connect_to}; 97 delete $self->{connect_to};
104 98
105 $self->{transport} = $transport; 99 $self->{transport} = $transport;
106 100
… …
120 return if $self->{transport}; 114 return if $self->{transport};
121 return if $self->{connect_w}; 115 return if $self->{connect_w};
122 116
123 Scalar::Util::weaken $self; 117 Scalar::Util::weaken $self;
124 118
125 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout}; 119 $self->{connect_to} ||= AE::timer $AnyEvent::MP::Kernel::CONFIG->{connect_interval}, 0, sub {
126
127 $self->{connect_to} ||= AE::timer $monitor, 0, sub {
128 $self->transport_error (transport_error => $self->{id}, "unable to connect"); 120 $self->transport_error (transport_error => $self->{id}, "unable to connect");
129 }; 121 };
130 122
131 # maybe @$addresses? 123 # maybe @$addresses?
132 my @addresses = @{ $AnyEvent::MP::Kernel::GLOBAL_DB{"'l"}{$self->{id}} }; 124 my $addresses = $AnyEvent::MP::Kernel::GLOBAL_DB{"'l"}{$self->{id}};
133 125
134 unless (@addresses) { 126 if ($addresses) {
127 $self->connect_to ($addresses);
128 } else {
135 # on global nodes, all bets are 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
136 unless ($AnyEvent::MP::Kernel::GLOBAL) { 130 unless ($AnyEvent::MP::Kernel::GLOBAL) {
137 AnyEvent::MP::Kernel::g_find ($self->{id}); 131 AnyEvent::MP::Kernel::g_find ($self->{id});
138 } 132 }
139 return; 133 }
134}
135
136sub connect_to {
137 my ($self, $addresses) = @_;
138
139 return if $self->{transport};
140 return if $self->{connect_w};
141
142 return unless @$addresses;
140 } 143
141
142 $self->{connect_addr} = \@addresses; # a bit weird, but efficient
143
144 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]"); 144 AE::log 9 => "connecting to $self->{id} with [@$addresses]";
145 145
146 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout};
146 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval}; 147 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
147 148
148 $interval = ($monitor - $interval) / @addresses 149 $interval = ($monitor - $interval) / @$addresses
149 if ($monitor - $interval) / @addresses < $interval; 150 if ($monitor - $interval) / @$addresses < $interval;
150 151
151 $interval = 0.4 if $interval < 0.4; 152 $interval = 0.4 if $interval < 0.4;
152 153
153 my @endpoints; 154 my @endpoints = reverse @$addresses;
154 155
155 $self->{connect_w} = AE::timer 0, $interval * (0.9 + 0.1 * rand), sub { 156 $self->{connect_w} = AE::timer 0, $interval * (0.9 + 0.1 * rand), sub {
156 @endpoints = @addresses
157 unless @endpoints;
158
159 my $endpoint = shift @endpoints; 157 my $endpoint = pop @endpoints;
160 158
161 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint"); 159 AE::log 9 => "connecting to $self->{id} at $endpoint";
162 160
163 $self->{trial}{$endpoint} ||= do { 161 $self->{trial}{$endpoint} ||= do {
164 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint 162 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
165 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.";
166 164
167 AnyEvent::MP::Transport::mp_connect 165 AnyEvent::MP::Transport::mp_connect
168 $host, $port, 166 $host, $port,
169 sub { delete $self->{trial}{$endpoint} }, 167 sub { delete $self->{trial}{$endpoint} },
170 }; 168 };
… …
200 $self->send (["", mon0 => $portid]); 198 $self->send (["", mon0 => $portid]);
201 delete $self->{monitor}{$portid}; 199 delete $self->{monitor}{$portid};
202 } 200 }
203} 201}
204 202
205package AnyEvent::MP::Node::Self; 203package AnyEvent::MP::Node::Self; # the local node
206 204
207use base "AnyEvent::MP::Node"; 205use base "AnyEvent::MP::Node";
208 206
209sub connect { 207sub connect {
210 # we are trivially connected 208 # we are trivially connected
… …
213# 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
214our $DELAY = -50; 212our $DELAY = -50;
215our @DELAY; 213our @DELAY;
216our $DELAY_W; 214our $DELAY_W;
217 215
218sub _send_delayed { 216our $send_delayed = sub {
219 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE{""}; 217 $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE;
220 (shift @DELAY)->() 218 (shift @DELAY)->()
221 while @DELAY; 219 while @DELAY;
222 undef $DELAY_W; 220 undef $DELAY_W;
223 $DELAY = -50; 221 $DELAY = -50;
224} 222};
225 223
226sub transport_reset { 224sub transport_reset {
227 my ($self) = @_; 225 my ($self) = @_;
228 226
229 Scalar::Util::weaken $self; 227 Scalar::Util::weaken $self;
230 228
231 $self->{send} = sub { 229 $self->{send} = sub {
232 if ($DELAY++ >= 0) { 230 if (++$DELAY > 0) {
233 my $msg = $_[0]; 231 my $msg = $_[0];
234 push @DELAY, sub { AnyEvent::MP::Kernel::_inject (@$msg) }; 232 push @DELAY, sub { AnyEvent::MP::Kernel::_inject (@$msg) };
235 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed; 233 $DELAY_W ||= AE::timer 0, 0, $send_delayed;
236 return; 234 return;
237 } 235 }
238 236
239 local $AnyEvent::MP::Kernel::SRCNODE = $self; 237 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE;
240 AnyEvent::MP::Kernel::_inject (@{ $_[0] }); 238 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
241 }; 239 };
242} 240}
243 241
244sub transport_connect { 242sub transport_connect {
245 my ($self, $tp) = @_; 243 my ($self, $tp) = @_;
246 244
247 $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})";
248} 246}
249 247
250sub kill { 248sub kill {
251 my (undef, @args) = @_; 249 my (undef, @args) = @_;
252 250
253 # we _always_ delay kil's, to avoid calling mon callbacks 251 # we _always_ delay kil's, to avoid calling mon callbacks
254 # from anything but the event loop context. 252 # from anything but the event loop context.
255 $DELAY = 1; 253 $DELAY = 1;
256 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) }; 254 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) };
257 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed; 255 $DELAY_W ||= AE::timer 0, 0, $send_delayed;
258} 256}
259 257
260sub monitor { 258sub monitor {
261 # maybe always delay, too? 259 # maybe always delay, too?
262 if ($DELAY_W) { 260 if ($DELAY_W) {

Diff Legend

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