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.57 by root, Thu Mar 1 18:31:42 2012 UTC

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

Diff Legend

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