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.38 by root, Mon Sep 7 12:04:32 2009 UTC vs.
Revision 1.54 by root, Wed Feb 29 18:44:59 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};
118 117
119 Scalar::Util::weaken $self; 118 Scalar::Util::weaken $self;
120 119
… …
122 121
123 $self->{connect_to} ||= AE::timer $monitor, 0, sub { 122 $self->{connect_to} ||= AE::timer $monitor, 0, sub {
124 $self->transport_error (transport_error => $self->{id}, "unable to connect"); 123 $self->transport_error (transport_error => $self->{id}, "unable to connect");
125 }; 124 };
126 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
127 return unless @addresses; 132 unless (@addresses) {
128 return if $self->{connect_w}; 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 g_find => $self->{id},
137 sub {
138 return unless $self; # just to be sure
139 return unless @{ $_[0] };
140
141 local $AnyEvent::MP::Kernel::GLOBAL_ADDR->{$self->{id}} = $_[0]; #d# UGLY
142 $self->connect;
143 }
144 );
145 }
146
147 return;
148 }
149
150 $self->{connect_addr} = \@addresses; # a bit weird, but efficient
129 151
130 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]"); 152 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
131 153
132 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval}; 154 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
133 155
… …
158} 180}
159 181
160sub kill { 182sub kill {
161 my ($self, $port, @reason) = @_; 183 my ($self, $port, @reason) = @_;
162 184
163 $self->send (["", kil => $port, @reason]); 185 $self->{send} (["", kil => $port, @reason]);
164} 186}
165 187
166sub monitor { 188sub monitor {
167 my ($self, $portid, $cb) = @_; 189 my ($self, $portid, $cb) = @_;
168 190
… …
186 $self->send (["", mon0 => $portid]); 208 $self->send (["", mon0 => $portid]);
187 delete $self->{monitor}{$portid}; 209 delete $self->{monitor}{$portid};
188 } 210 }
189} 211}
190 212
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; 213package AnyEvent::MP::Node::Self;
197 214
198use base "AnyEvent::MP::Node"; 215use base "AnyEvent::MP::Node";
199 216
200sub connect { 217sub connect {
201 # we are trivially connected 218 # we are trivially connected
202} 219}
203 220
204# delay every so often to avoid recursion, also used to delay after spawn 221# delay every so often to avoid recursion, also used to delay after spawn
205our $DELAY; 222our $DELAY = -50;
206our @DELAY; 223our @DELAY;
207our $DELAY_W; 224our $DELAY_W;
208 225
209sub _send_delayed { 226sub _send_delayed {
210 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE{""}; 227 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE{""};
211 AnyEvent::MP::Kernel::_inject (@{ shift @DELAY }) 228 (shift @DELAY)->()
212 while @DELAY; 229 while @DELAY;
213 undef $DELAY_W; 230 undef $DELAY_W;
214 $DELAY = -50; 231 $DELAY = -50;
215} 232}
216 233
… …
219 236
220 Scalar::Util::weaken $self; 237 Scalar::Util::weaken $self;
221 238
222 $self->{send} = sub { 239 $self->{send} = sub {
223 if ($DELAY++ >= 0) { 240 if ($DELAY++ >= 0) {
224 push @DELAY, $_[0]; 241 my $msg = $_[0];
242 push @DELAY, sub { AnyEvent::MP::Kernel::_inject (@$msg) };
225 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed; 243 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
226 } else { 244 return;
227 local $AnyEvent::MP::Kernel::SRCNODE = $self;
228 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
229 } 245 }
246
247 local $AnyEvent::MP::Kernel::SRCNODE = $self;
248 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
230 }; 249 };
231} 250}
232 251
233sub transport_connect { 252sub transport_connect {
234 my ($self, $tp) = @_; 253 my ($self, $tp) = @_;
235 254
236 $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})");
237} 256}
238 257
239sub kill { 258sub kill {
240 my ($self, $port, @reason) = @_; 259 my (undef, @args) = @_;
241 260
242 delete $AnyEvent::MP::Kernel::PORT{$port}; 261 # we _always_ delay kil's, to avoid calling mon callbacks
243 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 262 # from anything but the event loop context.
244 263 $DELAY = 1;
245 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port} 264 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) };
246 or !@reason 265 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
247 or $AnyEvent::MP::Kernel::WARN->(8, "unmonitored local port $port died with reason: @reason");
248
249 $_->(@reason) for values %$mon;
250} 266}
251 267
252sub monitor { 268sub monitor {
253 my ($self, $portid, $cb) = @_; 269 # maybe always delay, too?
254 270 if ($DELAY_W) {
255 return $cb->(no_such_port => "cannot monitor nonexistent port", "$self->{id}#$portid") 271 my @args = @_;
256 unless exists $AnyEvent::MP::Kernel::PORT{$portid}; 272 push @DELAY, sub { AnyEvent::MP::Kernel::_monitor (@args) };
257 273 return;
258 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb; 274 }
275 &AnyEvent::MP::Kernel::_monitor;
259} 276}
260 277
261sub unmonitor { 278sub unmonitor {
262 my ($self, $portid, $cb) = @_; 279 # no need to always delay
280 if ($DELAY_W) {
281 my @args = @_;
282 push @DELAY, sub { AnyEvent::MP::Kernel::_unmonitor (@args) };
283 return;
284 }
263 285
264 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0}; 286 &AnyEvent::MP::Kernel::_unmonitor;
265} 287}
266 288
267=head1 SEE ALSO 289=head1 SEE ALSO
268 290
269L<AnyEvent::MP>. 291L<AnyEvent::MP>.

Diff Legend

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