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.32 by root, Sun Aug 30 09:24:09 2009 UTC vs.
Revision 1.53 by root, Tue Feb 28 18:37:24 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 {
… …
89sub transport_connect { 89sub transport_connect {
90 my ($self, $transport) = @_; 90 my ($self, $transport) = @_;
91 91
92 delete $self->{trial}; 92 delete $self->{trial};
93 93
94 $self->transport_error (transport_error => "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};
97 delete $self->{connect_w}; 98 delete $self->{connect_w};
98 delete $self->{connect_to}; 99 delete $self->{connect_to};
99 100
100 $self->{transport} = $transport; 101 $self->{transport} = $transport;
101 102
102 my $transport_send = $transport->can ("send"); 103 my $transport_send = $transport->{send};
103
104 $self->{send} = sub {
105 $transport_send->($transport, $_[0]);
106 };
107 104
108 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1); 105 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1);
109 106
107 $self->{send} = $transport_send;
108
110 $transport->send ($_) 109 $transport_send->($_)
111 for @{ delete $self->{queue} || [] }; 110 for @{ delete $self->{queue} || [] };
112} 111}
113 112
114sub connect { 113sub connect {
115 my ($self, @addresses) = @_; 114 my ($self) = @_;
116 115
117 return if $self->{transport}; 116 return if $self->{transport};
118 117
119 Scalar::Util::weaken $self; 118 Scalar::Util::weaken $self;
120 119
120 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout};
121
121 $self->{connect_to} ||= AE::timer 122 $self->{connect_to} ||= AE::timer $monitor, 0, sub {
122 $AnyEvent::MP::Config::CFG{monitor_timeout} || $AnyEvent::MP::Kernel::MONITOR_TIMEOUT,
123 0,
124 sub {
125 $self->transport_error (transport_error => $self->{id}, "unable to connect"); 123 $self->transport_error (transport_error => $self->{id}, "unable to connect");
124 };
125
126 # maybe @$addresses?
127 my @addresses = @{
128 $AnyEvent::MP::Kernel::GLOBAL_ADDR->{$self->{id}}
129 || $AnyEvent::MP::Kernel::NODE_ADDR->{$self->{id}}
130 };
131
132 unless (@addresses) {
133 # on global nodes, all betsa re off now - we either know the node, or we don't
134 unless ($AnyEvent::MP::Kernel::GLOBAL) {
135 $self->{connect_w} = AnyEvent::MP::Kernel::global_req (
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 }
146
147 return;
148 }
149
150 $self->{connect_addr} = \@addresses; # a bit weird, but efficient
151
152 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
153
154 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
155
156 $interval = ($monitor - $interval) / @addresses
157 if ($monitor - $interval) / @addresses < $interval;
158
159 $interval = 0.4 if $interval < 0.4;
160
161 my @endpoints;
162
163 $self->{connect_w} = AE::timer 0.050 * rand, $interval * (0.9 + 0.1 * rand), sub {
164 @endpoints = @addresses
165 unless @endpoints;
166
167 my $endpoint = shift @endpoints;
168
169 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint");
170
171 $self->{trial}{$endpoint} ||= do {
172 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
173 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{id}: not a resolved node reference.");
174
175 AnyEvent::MP::Transport::mp_connect
176 $host, $port,
177 sub { delete $self->{trial}{$endpoint} },
126 }; 178 };
127
128 return unless @addresses;
129
130 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
131
132 unless ($self->{connect_w}) {
133 my @endpoints;
134
135 $self->{connect_w} = AE::timer
136 rand,
137 $AnyEvent::MP::Config::CFG{connect_interval} || $AnyEvent::MP::Kernel::CONNECT_INTERVAL,
138 sub {
139 @endpoints = @addresses
140 unless @endpoints;
141
142 my $endpoint = shift @endpoints;
143
144 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint");
145
146 $self->{trial}{$endpoint} ||= do {
147 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
148 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{id}: not a resolved node reference.");
149
150 AnyEvent::MP::Transport::mp_connect
151 $host, $port,
152 sub { delete $self->{trial}{$endpoint} },
153 };
154 }
155 ;
156 } 179 };
157} 180}
158 181
159sub kill { 182sub kill {
160 my ($self, $port, @reason) = @_; 183 my ($self, $port, @reason) = @_;
161 184
162 $self->send (["", kil => $port, @reason]); 185 $self->{send} (["", kil => $port, @reason]);
163} 186}
164 187
165sub monitor { 188sub monitor {
166 my ($self, $portid, $cb) = @_; 189 my ($self, $portid, $cb) = @_;
167 190
… …
185 $self->send (["", mon0 => $portid]); 208 $self->send (["", mon0 => $portid]);
186 delete $self->{monitor}{$portid}; 209 delete $self->{monitor}{$portid};
187 } 210 }
188} 211}
189 212
190# used for direct slave connections as well
191package AnyEvent::MP::Node::Direct;
192
193use base "AnyEvent::MP::Node::External";
194
195package AnyEvent::MP::Node::Self; 213package AnyEvent::MP::Node::Self;
196 214
197use base "AnyEvent::MP::Node"; 215use base "AnyEvent::MP::Node";
198 216
199sub connect { 217sub connect {
200 # we are trivially connected 218 # we are trivially connected
201} 219}
202 220
221# delay every so often to avoid recursion, also used to delay after spawn
222our $DELAY = -50;
223our @DELAY;
224our $DELAY_W;
225
226sub _send_delayed {
227 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE{""};
228 (shift @DELAY)->()
229 while @DELAY;
230 undef $DELAY_W;
231 $DELAY = -50;
232}
233
203sub transport_reset { 234sub transport_reset {
204 my ($self) = @_; 235 my ($self) = @_;
205 236
206 Scalar::Util::weaken $self; 237 Scalar::Util::weaken $self;
207 238
208 $self->{send} = sub { 239 $self->{send} = sub {
240 if ($DELAY++ >= 0) {
241 my $msg = $_[0];
242 push @DELAY, sub { AnyEvent::MP::Kernel::_inject (@$msg) };
243 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
244 return;
245 }
246
209 local $AnyEvent::MP::Kernel::SRCNODE = $self; 247 local $AnyEvent::MP::Kernel::SRCNODE = $self;
210 AnyEvent::MP::Kernel::_inject (@{ $_[0] }); 248 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
211 }; 249 };
212} 250}
213 251
… …
216 254
217 $AnyEvent::MP::Kernel::WARN->(9, "I refuse to talk to myself ($tp->{peerhost}:$tp->{peerport})"); 255 $AnyEvent::MP::Kernel::WARN->(9, "I refuse to talk to myself ($tp->{peerhost}:$tp->{peerport})");
218} 256}
219 257
220sub kill { 258sub kill {
221 my ($self, $port, @reason) = @_; 259 my (undef, @args) = @_;
222 260
223 delete $AnyEvent::MP::Kernel::PORT{$port}; 261 # we _always_ delay kil's, to avoid calling mon callbacks
224 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 262 # from anything but the event loop context.
225 263 $DELAY = 1;
226 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port} 264 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) };
227 or !@reason 265 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
228 or $AnyEvent::MP::Kernel::WARN->(2, "unmonitored local port $port died with reason: @reason");
229
230 $_->(@reason) for values %$mon;
231} 266}
232 267
233sub monitor { 268sub monitor {
234 my ($self, $portid, $cb) = @_; 269 # maybe always delay, too?
235 270 if ($DELAY_W) {
236 return $cb->(no_such_port => "cannot monitor nonexistent port") 271 my @args = @_;
237 unless exists $AnyEvent::MP::Kernel::PORT{$portid}; 272 push @DELAY, sub { AnyEvent::MP::Kernel::_monitor (@args) };
238 273 return;
239 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb; 274 }
275 &AnyEvent::MP::Kernel::_monitor;
240} 276}
241 277
242sub unmonitor { 278sub unmonitor {
243 my ($self, $portid, $cb) = @_; 279 # no need to always delay
280 if ($DELAY_W) {
281 my @args = @_;
282 push @DELAY, sub { AnyEvent::MP::Kernel::_unmonitor (@args) };
283 return;
284 }
244 285
245 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0}; 286 &AnyEvent::MP::Kernel::_unmonitor;
246} 287}
247 288
248=head1 SEE ALSO 289=head1 SEE ALSO
249 290
250L<AnyEvent::MP>. 291L<AnyEvent::MP>.

Diff Legend

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