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.40 by root, Tue Sep 8 20:56:05 2009 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 {
… …
40sub send { 39sub send {
41 &{ shift->{send} } 40 &{ shift->{send} }
42} 41}
43 42
44# nodes reachable via the network 43# nodes reachable via the network
45package AnyEvent::MP::Node::External; 44package AnyEvent::MP::Node::Remote;
46 45
47use base "AnyEvent::MP::Node"; 46use base "AnyEvent::MP::Node";
48 47
49# called at init time, mostly sets {send} 48# called at init time, mostly sets {send}
50sub transport_reset { 49sub transport_reset {
… …
89sub transport_connect { 88sub transport_connect {
90 my ($self, $transport) = @_; 89 my ($self, $transport) = @_;
91 90
92 delete $self->{trial}; 91 delete $self->{trial};
93 92
94 $self->transport_error (transport_error => "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_w}; 96 delete $self->{connect_w};
98 delete $self->{connect_to}; 97 delete $self->{connect_to};
99 98
100 $self->{transport} = $transport; 99 $self->{transport} = $transport;
101 100
102 my $transport_send = $transport->can ("send"); 101 my $transport_send = $transport->{send};
103
104 $self->{send} = sub {
105 $transport_send->($transport, $_[0]);
106 };
107 102
108 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1); 103 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1);
109 104
105 $self->{send} = $transport_send;
106
110 $transport->send ($_) 107 $transport_send->($_)
111 for @{ delete $self->{queue} || [] }; 108 for @{ delete $self->{queue} || [] };
112} 109}
113 110
114sub connect { 111sub connect {
115 my ($self, @addresses) = @_; 112 my ($self) = @_;
116 113
117 return if $self->{transport}; 114 return if $self->{transport};
115 return if $self->{connect_w};
118 116
119 Scalar::Util::weaken $self; 117 Scalar::Util::weaken $self;
120 118
121 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout}; 119 $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"); 120 $self->transport_error (transport_error => $self->{id}, "unable to connect");
125 }; 121 };
126 122
127 return unless @addresses; 123 # maybe @$addresses?
124 my $addresses = $AnyEvent::MP::Kernel::GLOBAL_DB{"'l"}{$self->{id}};
125
126 if ($addresses) {
127 $self->connect_to ($addresses);
128 } else {
129 # on global nodes, all bets are off now - we either know the node, or we don't
130 unless ($AnyEvent::MP::Kernel::GLOBAL) {
131 AnyEvent::MP::Kernel::g_find ($self->{id});
132 }
133 }
134}
135
136sub connect_to {
137 my ($self, $addresses) = @_;
138
139 return if $self->{transport};
128 return if $self->{connect_w}; 140 return if $self->{connect_w};
129 141
142 return unless @$addresses;
143
130 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]"); 144 AE::log 9 => "connecting to $self->{id} with [@$addresses]";
131 145
146 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout};
132 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval}; 147 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
133 148
134 $interval = ($monitor - $interval) / @addresses 149 $interval = ($monitor - $interval) / @$addresses
135 if ($monitor - $interval) / @addresses < $interval; 150 if ($monitor - $interval) / @$addresses < $interval;
136 151
137 $interval = 0.4 if $interval < 0.4; 152 $interval = 0.4 if $interval < 0.4;
138 153
139 my @endpoints; 154 my @endpoints = reverse @$addresses;
140 155
141 $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 {
142 @endpoints = @addresses
143 unless @endpoints;
144
145 my $endpoint = shift @endpoints; 157 my $endpoint = pop @endpoints;
146 158
147 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint"); 159 AE::log 9 => "connecting to $self->{id} at $endpoint";
148 160
149 $self->{trial}{$endpoint} ||= do { 161 $self->{trial}{$endpoint} ||= do {
150 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint 162 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
151 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.";
152 164
153 AnyEvent::MP::Transport::mp_connect 165 AnyEvent::MP::Transport::mp_connect
154 $host, $port, 166 $host, $port,
155 sub { delete $self->{trial}{$endpoint} }, 167 sub { delete $self->{trial}{$endpoint} },
156 }; 168 };
… …
158} 170}
159 171
160sub kill { 172sub kill {
161 my ($self, $port, @reason) = @_; 173 my ($self, $port, @reason) = @_;
162 174
163 $self->send (["", kil => $port, @reason]); 175 $self->{send} (["", kil => $port, @reason]);
164} 176}
165 177
166sub monitor { 178sub monitor {
167 my ($self, $portid, $cb) = @_; 179 my ($self, $portid, $cb) = @_;
168 180
… …
186 $self->send (["", mon0 => $portid]); 198 $self->send (["", mon0 => $portid]);
187 delete $self->{monitor}{$portid}; 199 delete $self->{monitor}{$portid};
188 } 200 }
189} 201}
190 202
191# used for direct slave connections as well
192package AnyEvent::MP::Node::Direct;
193
194use base "AnyEvent::MP::Node::External";
195
196package AnyEvent::MP::Node::Self; 203package AnyEvent::MP::Node::Self;
197 204
198use base "AnyEvent::MP::Node"; 205use base "AnyEvent::MP::Node";
199 206
200sub connect { 207sub connect {
201 # we are trivially connected 208 # we are trivially connected
202} 209}
203 210
204# 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
205our $DELAY; 212our $DELAY = -50;
206our @DELAY; 213our @DELAY;
207our $DELAY_W; 214our $DELAY_W;
208 215
209sub _send_delayed { 216our $send_delayed = sub {
210 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE{""}; 217 $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE;
211 (shift @DELAY)->() 218 (shift @DELAY)->()
212 while @DELAY; 219 while @DELAY;
213 undef $DELAY_W; 220 undef $DELAY_W;
214 $DELAY = -50; 221 $DELAY = -50;
215} 222};
216 223
217sub transport_reset { 224sub transport_reset {
218 my ($self) = @_; 225 my ($self) = @_;
219 226
220 Scalar::Util::weaken $self; 227 Scalar::Util::weaken $self;
221 228
222 $self->{send} = sub { 229 $self->{send} = sub {
223 if ($DELAY++ >= 0) { 230 if (++$DELAY > 0) {
224 my $msg = $_[0]; 231 my $msg = $_[0];
225 push @DELAY, sub { AnyEvent::MP::Kernel::_inject (@$msg) }; 232 push @DELAY, sub { AnyEvent::MP::Kernel::_inject (@$msg) };
226 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed; 233 $DELAY_W ||= AE::timer 0, 0, $send_delayed;
227 return; 234 return;
228 } 235 }
229 236
230 local $AnyEvent::MP::Kernel::SRCNODE = $self; 237 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE;
231 AnyEvent::MP::Kernel::_inject (@{ $_[0] }); 238 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
232 }; 239 };
233} 240}
234 241
235sub transport_connect { 242sub transport_connect {
236 my ($self, $tp) = @_; 243 my ($self, $tp) = @_;
237 244
238 $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})";
239} 246}
240 247
241sub kill { 248sub kill {
242 my ($self, $port, @reason) = @_; 249 my (undef, @args) = @_;
243 250
244 my $delay_cb = sub { 251 # we _always_ delay kil's, to avoid calling mon callbacks
245 delete $AnyEvent::MP::Kernel::PORT{$port}; 252 # from anything but the event loop context.
246 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 253 $DELAY = 1;
247 254 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) };
248 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port} 255 $DELAY_W ||= AE::timer 0, 0, $send_delayed;
249 or !@reason
250 or $AnyEvent::MP::Kernel::WARN->(8, "unmonitored local port $port died with reason: @reason");
251
252 $_->(@reason) for values %$mon;
253 };
254
255 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb;
256} 256}
257 257
258sub monitor { 258sub monitor {
259 my ($self, $portid, $cb) = @_; 259 # maybe always delay, too?
260 260 if ($DELAY_W) {
261 my $delay_cb = sub { 261 my @args = @_;
262 return $cb->(no_such_port => "cannot monitor nonexistent port", "$self->{id}#$portid") 262 push @DELAY, sub { AnyEvent::MP::Kernel::_monitor (@args) };
263 unless exists $AnyEvent::MP::Kernel::PORT{$portid}; 263 return;
264
265 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb;
266 }; 264 }
267 265 &AnyEvent::MP::Kernel::_monitor;
268 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb;
269} 266}
270 267
271sub unmonitor { 268sub unmonitor {
272 my ($self, $portid, $cb) = @_; 269 # no need to always delay
273 270 if ($DELAY_W) {
274 my $delay_cb = sub { 271 my @args = @_;
275 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0}; 272 push @DELAY, sub { AnyEvent::MP::Kernel::_unmonitor (@args) };
273 return;
276 }; 274 }
277 275
278 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb; 276 &AnyEvent::MP::Kernel::_unmonitor;
279} 277}
280 278
281=head1 SEE ALSO 279=head1 SEE ALSO
282 280
283L<AnyEvent::MP>. 281L<AnyEvent::MP>.

Diff Legend

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