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.34 by root, Wed Sep 2 13:05:29 2009 UTC vs.
Revision 1.58 by root, Fri Mar 2 19:21:16 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};
117 return if $self->{connect_w};
118 118
119 Scalar::Util::weaken $self; 119 Scalar::Util::weaken $self;
120 120
121 my $monitor = $AnyEvent::MP::Config::CFG{monitor_timeout} || $AnyEvent::MP::Kernel::MONITOR_TIMEOUT; 121 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout};
122 122
123 $self->{connect_to} ||= AE::timer $monitor, 0, sub { 123 $self->{connect_to} ||= AE::timer $monitor, 0, sub {
124 $self->transport_error (transport_error => $self->{id}, "unable to connect"); 124 $self->transport_error (transport_error => $self->{id}, "unable to connect");
125 }; 125 };
126 126
127 # maybe @$addresses?
128 my @addresses = @{ $AnyEvent::MP::Kernel::GLOBAL_DB{"'l"}{$self->{id}} };
129
127 return unless @addresses; 130 unless (@addresses) {
128 return if $self->{connect_w}; 131 # on global nodes, all bets are off now - we either know the node, or we don't
132 unless ($AnyEvent::MP::Kernel::GLOBAL) {
133 AnyEvent::MP::Kernel::g_find ($self->{id});
134 }
135 return;
136 }
137
138 $self->{connect_addr} = \@addresses; # a bit weird, but efficient
129 139
130 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]"); 140 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
131 141
132 my $interval = $AnyEvent::MP::Config::CFG{connect_interval} || $AnyEvent::MP::Kernel::CONNECT_INTERVAL; 142 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
133 143
134 $interval = ($monitor - $interval) / @addresses 144 $interval = ($monitor - $interval) / @addresses
135 if ($monitor - $interval) / @addresses < $interval; 145 if ($monitor - $interval) / @addresses < $interval;
136 146
137 $interval = 0.4 if $interval < 0.4; 147 $interval = 0.4 if $interval < 0.4;
138 148
139 my @endpoints; 149 my @endpoints;
140 150
141 $self->{connect_w} = AE::timer 0.050 * rand, $interval * (0.9 + 0.1 * rand), sub { 151 $self->{connect_w} = AE::timer 0, $interval * (0.9 + 0.1 * rand), sub {
142 @endpoints = @addresses 152 @endpoints = @addresses
143 unless @endpoints; 153 unless @endpoints;
144 154
145 my $endpoint = shift @endpoints; 155 my $endpoint = shift @endpoints;
146 156
… …
158} 168}
159 169
160sub kill { 170sub kill {
161 my ($self, $port, @reason) = @_; 171 my ($self, $port, @reason) = @_;
162 172
163 $self->send (["", kil => $port, @reason]); 173 $self->{send} (["", kil => $port, @reason]);
164} 174}
165 175
166sub monitor { 176sub monitor {
167 my ($self, $portid, $cb) = @_; 177 my ($self, $portid, $cb) = @_;
168 178
… …
186 $self->send (["", mon0 => $portid]); 196 $self->send (["", mon0 => $portid]);
187 delete $self->{monitor}{$portid}; 197 delete $self->{monitor}{$portid};
188 } 198 }
189} 199}
190 200
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; 201package AnyEvent::MP::Node::Self;
197 202
198use base "AnyEvent::MP::Node"; 203use base "AnyEvent::MP::Node";
199 204
200sub connect { 205sub connect {
201 # we are trivially connected 206 # we are trivially connected
202} 207}
203 208
209# delay every so often to avoid recursion, also used to delay after spawn
210our $DELAY = -50;
211our @DELAY;
212our $DELAY_W;
213
214sub _send_delayed {
215 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE{""};
216 (shift @DELAY)->()
217 while @DELAY;
218 undef $DELAY_W;
219 $DELAY = -50;
220}
221
204sub transport_reset { 222sub transport_reset {
205 my ($self) = @_; 223 my ($self) = @_;
206 224
207 Scalar::Util::weaken $self; 225 Scalar::Util::weaken $self;
208 226
209 $self->{send} = sub { 227 $self->{send} = sub {
228 if ($DELAY++ >= 0) {
229 my $msg = $_[0];
230 push @DELAY, sub { AnyEvent::MP::Kernel::_inject (@$msg) };
231 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
232 return;
233 }
234
210 local $AnyEvent::MP::Kernel::SRCNODE = $self; 235 local $AnyEvent::MP::Kernel::SRCNODE = $self;
211 AnyEvent::MP::Kernel::_inject (@{ $_[0] }); 236 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
212 }; 237 };
213} 238}
214 239
… …
217 242
218 $AnyEvent::MP::Kernel::WARN->(9, "I refuse to talk to myself ($tp->{peerhost}:$tp->{peerport})"); 243 $AnyEvent::MP::Kernel::WARN->(9, "I refuse to talk to myself ($tp->{peerhost}:$tp->{peerport})");
219} 244}
220 245
221sub kill { 246sub kill {
222 my ($self, $port, @reason) = @_; 247 my (undef, @args) = @_;
223 248
224 delete $AnyEvent::MP::Kernel::PORT{$port}; 249 # we _always_ delay kil's, to avoid calling mon callbacks
225 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 250 # from anything but the event loop context.
226 251 $DELAY = 1;
227 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port} 252 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) };
228 or !@reason 253 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
229 or $AnyEvent::MP::Kernel::WARN->(2, "unmonitored local port $port died with reason: @reason");
230
231 $_->(@reason) for values %$mon;
232} 254}
233 255
234sub monitor { 256sub monitor {
235 my ($self, $portid, $cb) = @_; 257 # maybe always delay, too?
236 258 if ($DELAY_W) {
237 return $cb->(no_such_port => "cannot monitor nonexistent port") 259 my @args = @_;
238 unless exists $AnyEvent::MP::Kernel::PORT{$portid}; 260 push @DELAY, sub { AnyEvent::MP::Kernel::_monitor (@args) };
239 261 return;
240 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb; 262 }
263 &AnyEvent::MP::Kernel::_monitor;
241} 264}
242 265
243sub unmonitor { 266sub unmonitor {
244 my ($self, $portid, $cb) = @_; 267 # no need to always delay
268 if ($DELAY_W) {
269 my @args = @_;
270 push @DELAY, sub { AnyEvent::MP::Kernel::_unmonitor (@args) };
271 return;
272 }
245 273
246 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0}; 274 &AnyEvent::MP::Kernel::_unmonitor;
247} 275}
248 276
249=head1 SEE ALSO 277=head1 SEE ALSO
250 278
251L<AnyEvent::MP>. 279L<AnyEvent::MP>.

Diff Legend

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