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.43 by root, Thu Oct 1 16:11:05 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_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};
119 117
120 Scalar::Util::weaken $self; 118 Scalar::Util::weaken $self;
121 119
… …
123 121
124 $self->{connect_to} ||= AE::timer $monitor, 0, sub { 122 $self->{connect_to} ||= AE::timer $monitor, 0, sub {
125 $self->transport_error (transport_error => $self->{id}, "unable to connect"); 123 $self->transport_error (transport_error => $self->{id}, "unable to connect");
126 }; 124 };
127 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
128 return unless @addresses; 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] };
129 140
130 if ($self->{connect_w}) { 141 local $AnyEvent::MP::Kernel::GLOBAL_ADDR->{$self->{id}} = $_[0]; #d# UGLY
131 # sometimes we get told about new addresses after we started to connect 142 $self->connect;
132 unshift @{$self->{connect_addr}}, @addresses; 143 }
144 );
145 }
146
133 return; 147 return;
134 } 148 }
135 149
136 $self->{connect_addr} = \@addresses; # a bit weird, but efficient 150 $self->{connect_addr} = \@addresses; # a bit weird, but efficient
137 151
… …
166} 180}
167 181
168sub kill { 182sub kill {
169 my ($self, $port, @reason) = @_; 183 my ($self, $port, @reason) = @_;
170 184
171 $self->send (["", kil => $port, @reason]); 185 $self->{send} (["", kil => $port, @reason]);
172} 186}
173 187
174sub monitor { 188sub monitor {
175 my ($self, $portid, $cb) = @_; 189 my ($self, $portid, $cb) = @_;
176 190
… …
193 unless (@$list) { 207 unless (@$list) {
194 $self->send (["", mon0 => $portid]); 208 $self->send (["", mon0 => $portid]);
195 delete $self->{monitor}{$portid}; 209 delete $self->{monitor}{$portid};
196 } 210 }
197} 211}
198
199# used for direct slave connections as well
200package AnyEvent::MP::Node::Direct;
201
202use base "AnyEvent::MP::Node::External";
203 212
204package AnyEvent::MP::Node::Self; 213package AnyEvent::MP::Node::Self;
205 214
206use base "AnyEvent::MP::Node"; 215use base "AnyEvent::MP::Node";
207 216
… …
245 254
246 $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})");
247} 256}
248 257
249sub kill { 258sub kill {
250 my ($self, $port, @reason) = @_; 259 my (undef, @args) = @_;
251 260
252 my $delay_cb = sub { 261 # we _always_ delay kil's, to avoid calling mon callbacks
253 delete $AnyEvent::MP::Kernel::PORT{$port} 262 # from anything but the event loop context.
254 or return; # killing nonexistent ports is O.K. 263 $DELAY = 1;
255 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 264 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) };
256 265 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
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
264 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb;
265} 266}
266 267
267sub monitor { 268sub monitor {
268 my ($self, $portid, $cb) = @_; 269 # maybe always delay, too?
269 270 if ($DELAY_W) {
270 my $delay_cb = sub { 271 my @args = @_;
271 return $cb->(no_such_port => "cannot monitor nonexistent port", "$self->{id}#$portid") 272 push @DELAY, sub { AnyEvent::MP::Kernel::_monitor (@args) };
272 unless exists $AnyEvent::MP::Kernel::PORT{$portid}; 273 return;
273
274 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb;
275 }; 274 }
276 275 &AnyEvent::MP::Kernel::_monitor;
277 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb;
278} 276}
279 277
280sub unmonitor { 278sub unmonitor {
281 my ($self, $portid, $cb) = @_; 279 # no need to always delay
282 280 if ($DELAY_W) {
283 my $delay_cb = sub { 281 my @args = @_;
284 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0}; 282 push @DELAY, sub { AnyEvent::MP::Kernel::_unmonitor (@args) };
283 return;
285 }; 284 }
286 285
287 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb; 286 &AnyEvent::MP::Kernel::_unmonitor;
288} 287}
289 288
290=head1 SEE ALSO 289=head1 SEE ALSO
291 290
292L<AnyEvent::MP>. 291L<AnyEvent::MP>.

Diff Legend

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