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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines