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.40 by root, Tue Sep 8 20:56:05 2009 UTC vs.
Revision 1.55 by root, Wed Feb 29 19:23:44 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::Kernel::CONFIG->{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 = @{
129 $AnyEvent::MP::Kernel::GLOBAL_ADDR->{$self->{id}}
130 || $AnyEvent::MP::Kernel::NODE_ADDR->{$self->{id}}
131 };
132
127 return unless @addresses; 133 unless (@addresses) {
128 return if $self->{connect_w}; 134 # on global nodes, all bets are off now - we either know the node, or we don't
135 unless ($AnyEvent::MP::Kernel::GLOBAL) {
136 $self->{connect_w} = AnyEvent::MP::Kernel::global_req (
137 g_find => $self->{id},
138 sub {
139 return unless $self; # just to be sure
140 return unless @{ $_[0] };
141
142 local $AnyEvent::MP::Kernel::GLOBAL_ADDR->{$self->{id}} = $_[0]; #d# UGLY
143 delete $self->{connect_w};
144 $self->connect;
145 }
146 );
147 }
148
149 return;
150 }
151
152 $self->{connect_addr} = \@addresses; # a bit weird, but efficient
129 153
130 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]"); 154 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
131 155
132 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval}; 156 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
133 157
… …
136 160
137 $interval = 0.4 if $interval < 0.4; 161 $interval = 0.4 if $interval < 0.4;
138 162
139 my @endpoints; 163 my @endpoints;
140 164
141 $self->{connect_w} = AE::timer 0.050 * rand, $interval * (0.9 + 0.1 * rand), sub { 165 $self->{connect_w} = AE::timer 0, $interval * (0.9 + 0.1 * rand), sub {
142 @endpoints = @addresses 166 @endpoints = @addresses
143 unless @endpoints; 167 unless @endpoints;
144 168
145 my $endpoint = shift @endpoints; 169 my $endpoint = shift @endpoints;
146 170
… …
158} 182}
159 183
160sub kill { 184sub kill {
161 my ($self, $port, @reason) = @_; 185 my ($self, $port, @reason) = @_;
162 186
163 $self->send (["", kil => $port, @reason]); 187 $self->{send} (["", kil => $port, @reason]);
164} 188}
165 189
166sub monitor { 190sub monitor {
167 my ($self, $portid, $cb) = @_; 191 my ($self, $portid, $cb) = @_;
168 192
… …
186 $self->send (["", mon0 => $portid]); 210 $self->send (["", mon0 => $portid]);
187 delete $self->{monitor}{$portid}; 211 delete $self->{monitor}{$portid};
188 } 212 }
189} 213}
190 214
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; 215package AnyEvent::MP::Node::Self;
197 216
198use base "AnyEvent::MP::Node"; 217use base "AnyEvent::MP::Node";
199 218
200sub connect { 219sub connect {
201 # we are trivially connected 220 # we are trivially connected
202} 221}
203 222
204# delay every so often to avoid recursion, also used to delay after spawn 223# delay every so often to avoid recursion, also used to delay after spawn
205our $DELAY; 224our $DELAY = -50;
206our @DELAY; 225our @DELAY;
207our $DELAY_W; 226our $DELAY_W;
208 227
209sub _send_delayed { 228sub _send_delayed {
210 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE{""}; 229 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE{""};
… …
237 256
238 $AnyEvent::MP::Kernel::WARN->(9, "I refuse to talk to myself ($tp->{peerhost}:$tp->{peerport})"); 257 $AnyEvent::MP::Kernel::WARN->(9, "I refuse to talk to myself ($tp->{peerhost}:$tp->{peerport})");
239} 258}
240 259
241sub kill { 260sub kill {
242 my ($self, $port, @reason) = @_; 261 my (undef, @args) = @_;
243 262
244 my $delay_cb = sub { 263 # we _always_ delay kil's, to avoid calling mon callbacks
245 delete $AnyEvent::MP::Kernel::PORT{$port}; 264 # from anything but the event loop context.
246 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 265 $DELAY = 1;
247 266 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) };
248 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port} 267 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
249 or !@reason
250 or $AnyEvent::MP::Kernel::WARN->(8, "unmonitored local port $port died with reason: @reason");
251
252 $_->(@reason) for values %$mon;
253 };
254
255 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb;
256} 268}
257 269
258sub monitor { 270sub monitor {
259 my ($self, $portid, $cb) = @_; 271 # maybe always delay, too?
260 272 if ($DELAY_W) {
261 my $delay_cb = sub { 273 my @args = @_;
262 return $cb->(no_such_port => "cannot monitor nonexistent port", "$self->{id}#$portid") 274 push @DELAY, sub { AnyEvent::MP::Kernel::_monitor (@args) };
263 unless exists $AnyEvent::MP::Kernel::PORT{$portid}; 275 return;
264
265 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb;
266 }; 276 }
267 277 &AnyEvent::MP::Kernel::_monitor;
268 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb;
269} 278}
270 279
271sub unmonitor { 280sub unmonitor {
272 my ($self, $portid, $cb) = @_; 281 # no need to always delay
273 282 if ($DELAY_W) {
274 my $delay_cb = sub { 283 my @args = @_;
275 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0}; 284 push @DELAY, sub { AnyEvent::MP::Kernel::_unmonitor (@args) };
285 return;
276 }; 286 }
277 287
278 $DELAY_W ? push @DELAY, $delay_cb : &$delay_cb; 288 &AnyEvent::MP::Kernel::_unmonitor;
279} 289}
280 290
281=head1 SEE ALSO 291=head1 SEE ALSO
282 292
283L<AnyEvent::MP>. 293L<AnyEvent::MP>.

Diff Legend

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