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.44 by root, Fri Oct 2 20:40:10 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_addr};
98 delete $self->{connect_w}; 98 delete $self->{connect_w};
99 delete $self->{connect_to}; 99 delete $self->{connect_to};
100 100
101 $self->{transport} = $transport; 101 $self->{transport} = $transport;
102 102
103 my $transport_send = $transport->can ("send"); 103 my $transport_send = $transport->{send};
104
105 $self->{send} = sub {
106 $transport_send->($transport, $_[0]);
107 };
108 104
109 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1); 105 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1);
110 106
107 $self->{send} = $transport_send;
108
111 $transport->send ($_) 109 $transport_send->($_)
112 for @{ delete $self->{queue} || [] }; 110 for @{ delete $self->{queue} || [] };
113} 111}
114 112
115sub connect { 113sub connect {
116 my ($self, @addresses) = @_; 114 my ($self) = @_;
117 115
118 return if $self->{transport}; 116 return if $self->{transport};
117 return if $self->{connect_w};
119 118
120 Scalar::Util::weaken $self; 119 Scalar::Util::weaken $self;
121 120
122 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout}; 121 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout};
123 122
124 $self->{connect_to} ||= AE::timer $monitor, 0, sub { 123 $self->{connect_to} ||= AE::timer $monitor, 0, sub {
125 $self->transport_error (transport_error => $self->{id}, "unable to connect"); 124 $self->transport_error (transport_error => $self->{id}, "unable to connect");
126 }; 125 };
127 126
127 # maybe @$addresses?
128 my @addresses = @{ $AnyEvent::MP::Kernel::GLOBAL_DB{"'l"}{$self->{id}} };
129
128 return unless @addresses; 130 unless (@addresses) {
129 131 # on global nodes, all bets are off now - we either know the node, or we don't
130 if ($self->{connect_w}) { 132 unless ($AnyEvent::MP::Kernel::GLOBAL) {
131 # sometimes we get told about new addresses after we started to connect 133 AnyEvent::MP::Kernel::g_find ($self->{id});
132 unshift @{$self->{connect_addr}}, @addresses; 134 }
133 return; 135 return;
134 } 136 }
135 137
136 $self->{connect_addr} = \@addresses; # a bit weird, but efficient 138 $self->{connect_addr} = \@addresses; # a bit weird, but efficient
137 139
… …
144 146
145 $interval = 0.4 if $interval < 0.4; 147 $interval = 0.4 if $interval < 0.4;
146 148
147 my @endpoints; 149 my @endpoints;
148 150
149 $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 {
150 @endpoints = @addresses 152 @endpoints = @addresses
151 unless @endpoints; 153 unless @endpoints;
152 154
153 my $endpoint = shift @endpoints; 155 my $endpoint = shift @endpoints;
154 156
… …
166} 168}
167 169
168sub kill { 170sub kill {
169 my ($self, $port, @reason) = @_; 171 my ($self, $port, @reason) = @_;
170 172
171 $self->send (["", kil => $port, @reason]); 173 $self->{send} (["", kil => $port, @reason]);
172} 174}
173 175
174sub monitor { 176sub monitor {
175 my ($self, $portid, $cb) = @_; 177 my ($self, $portid, $cb) = @_;
176 178
… …
193 unless (@$list) { 195 unless (@$list) {
194 $self->send (["", mon0 => $portid]); 196 $self->send (["", mon0 => $portid]);
195 delete $self->{monitor}{$portid}; 197 delete $self->{monitor}{$portid};
196 } 198 }
197} 199}
198
199# used for direct slave connections as well
200package AnyEvent::MP::Node::Direct;
201
202use base "AnyEvent::MP::Node::External";
203 200
204package AnyEvent::MP::Node::Self; 201package AnyEvent::MP::Node::Self;
205 202
206use base "AnyEvent::MP::Node"; 203use base "AnyEvent::MP::Node";
207 204
… …
245 242
246 $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})");
247} 244}
248 245
249sub kill { 246sub kill {
250 my ($self, $port, @reason) = @_; 247 my (undef, @args) = @_;
251
252 my $delay_cb = sub {
253 delete $AnyEvent::MP::Kernel::PORT{$port}
254 or return; # killing nonexistent ports is O.K.
255 delete $AnyEvent::MP::Kernel::PORT_DATA{$port};
256
257 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port}
258 or !@reason
259 or $AnyEvent::MP::Kernel::WARN->(8, "unmonitored local port $port died with reason: @reason");
260
261 $_->(@reason) for values %$mon;
262 };
263 248
264 # we _always_ delay kil's, to avoid calling mon callbacks 249 # we _always_ delay kil's, to avoid calling mon callbacks
265 # from anything but the event loop context. 250 # from anything but the event loop context.
266 $DELAY = 1; 251 $DELAY = 1;
267 push @DELAY, $delay_cb; 252 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) };
253 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
268} 254}
269 255
270sub monitor { 256sub monitor {
271 my ($self, $portid, $cb) = @_; 257 # maybe always delay, too?
272 258 if ($DELAY_W) {
273 my $delay_cb = sub { 259 my @args = @_;
274 return $cb->(no_such_port => "cannot monitor nonexistent port", "$self->{id}#$portid") 260 push @DELAY, sub { AnyEvent::MP::Kernel::_monitor (@args) };
275 unless exists $AnyEvent::MP::Kernel::PORT{$portid}; 261 return;
276
277 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb;
278 }; 262 }
279 263 &AnyEvent::MP::Kernel::_monitor;
280 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb;
281} 264}
282 265
283sub unmonitor { 266sub unmonitor {
284 my ($self, $portid, $cb) = @_; 267 # no need to always delay
285 268 if ($DELAY_W) {
286 my $delay_cb = sub { 269 my @args = @_;
287 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0}; 270 push @DELAY, sub { AnyEvent::MP::Kernel::_unmonitor (@args) };
271 return;
288 }; 272 }
289 273
290 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb; 274 &AnyEvent::MP::Kernel::_unmonitor;
291} 275}
292 276
293=head1 SEE ALSO 277=head1 SEE ALSO
294 278
295L<AnyEvent::MP>. 279L<AnyEvent::MP>.

Diff Legend

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