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.37 by root, Sun Sep 6 00:13:21 2009 UTC vs.
Revision 1.57 by root, Thu Mar 1 18:31:42 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
101 delete $self->{connect_addr};
97 delete $self->{connect_w}; 102 delete $self->{connect_w};
98 delete $self->{connect_to}; 103 delete $self->{connect_to};
99 104
100 $self->{transport} = $transport; 105 $self->{transport} = $transport;
101 106
102 my $transport_send = $transport->can ("send"); 107 my $transport_send = $transport->{send};
103
104 $self->{send} = sub {
105 $transport_send->($transport, $_[0]);
106 };
107 108
108 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1); 109 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1);
109 110
111 $self->{send} = $transport_send;
112
110 $transport->send ($_) 113 $transport_send->($_)
111 for @{ delete $self->{queue} || [] }; 114 for @{ delete $self->{queue} || [] };
112} 115}
113 116
114sub connect { 117sub connect {
115 my ($self, @addresses) = @_; 118 my ($self) = @_;
116 119
117 return if $self->{transport}; 120 return if $self->{transport};
121 return if $self->{connect_w};
118 122
119 Scalar::Util::weaken $self; 123 Scalar::Util::weaken $self;
120 124
121 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout}; 125 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout};
122 126
123 $self->{connect_to} ||= AE::timer $monitor, 0, sub { 127 $self->{connect_to} ||= AE::timer $monitor, 0, sub {
124 $self->transport_error (transport_error => $self->{id}, "unable to connect"); 128 $self->transport_error (transport_error => $self->{id}, "unable to connect");
125 }; 129 };
126 130
131 # maybe @$addresses?
132 my @addresses = @{ $AnyEvent::MP::Kernel::GLOBAL_DB{"'l"}{$self->{id}} };
133
127 return unless @addresses; 134 unless (@addresses) {
128 return if $self->{connect_w}; 135 # on global nodes, all bets are off now - we either know the node, or we don't
136 unless ($AnyEvent::MP::Kernel::GLOBAL) {
137 AnyEvent::MP::Kernel::g_find ($self->{id});
138 }
139 return;
140 }
141
142 $self->{connect_addr} = \@addresses; # a bit weird, but efficient
129 143
130 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]"); 144 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
131 145
132 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval}; 146 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
133 147
… …
136 150
137 $interval = 0.4 if $interval < 0.4; 151 $interval = 0.4 if $interval < 0.4;
138 152
139 my @endpoints; 153 my @endpoints;
140 154
141 $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 {
142 @endpoints = @addresses 156 @endpoints = @addresses
143 unless @endpoints; 157 unless @endpoints;
144 158
145 my $endpoint = shift @endpoints; 159 my $endpoint = shift @endpoints;
146 160
… …
158} 172}
159 173
160sub kill { 174sub kill {
161 my ($self, $port, @reason) = @_; 175 my ($self, $port, @reason) = @_;
162 176
163 $self->send (["", kil => $port, @reason]); 177 $self->{send} (["", kil => $port, @reason]);
164} 178}
165 179
166sub monitor { 180sub monitor {
167 my ($self, $portid, $cb) = @_; 181 my ($self, $portid, $cb) = @_;
168 182
… …
186 $self->send (["", mon0 => $portid]); 200 $self->send (["", mon0 => $portid]);
187 delete $self->{monitor}{$portid}; 201 delete $self->{monitor}{$portid};
188 } 202 }
189} 203}
190 204
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; 205package AnyEvent::MP::Node::Self;
197 206
198use base "AnyEvent::MP::Node"; 207use base "AnyEvent::MP::Node";
199 208
200sub connect { 209sub connect {
201 # we are trivially connected 210 # we are trivially connected
202} 211}
203 212
213# delay every so often to avoid recursion, also used to delay after spawn
214our $DELAY = -50;
215our @DELAY;
216our $DELAY_W;
217
218sub _send_delayed {
219 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE{""};
220 (shift @DELAY)->()
221 while @DELAY;
222 undef $DELAY_W;
223 $DELAY = -50;
224}
225
204sub transport_reset { 226sub transport_reset {
205 my ($self) = @_; 227 my ($self) = @_;
206 228
207 Scalar::Util::weaken $self; 229 Scalar::Util::weaken $self;
208 230
209 $self->{send} = sub { 231 $self->{send} = sub {
232 if ($DELAY++ >= 0) {
233 my $msg = $_[0];
234 push @DELAY, sub { AnyEvent::MP::Kernel::_inject (@$msg) };
235 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
236 return;
237 }
238
210 local $AnyEvent::MP::Kernel::SRCNODE = $self; 239 local $AnyEvent::MP::Kernel::SRCNODE = $self;
211 AnyEvent::MP::Kernel::_inject (@{ $_[0] }); 240 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
212 }; 241 };
213} 242}
214 243
… …
217 246
218 $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})");
219} 248}
220 249
221sub kill { 250sub kill {
222 my ($self, $port, @reason) = @_; 251 my (undef, @args) = @_;
223 252
224 delete $AnyEvent::MP::Kernel::PORT{$port}; 253 # we _always_ delay kil's, to avoid calling mon callbacks
225 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 254 # from anything but the event loop context.
226 255 $DELAY = 1;
227 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port} 256 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) };
228 or !@reason 257 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
229 or $AnyEvent::MP::Kernel::WARN->(8, "unmonitored local port $port died with reason: @reason");
230
231 $_->(@reason) for values %$mon;
232} 258}
233 259
234sub monitor { 260sub monitor {
235 my ($self, $portid, $cb) = @_; 261 # maybe always delay, too?
236 262 if ($DELAY_W) {
237 return $cb->(no_such_port => "cannot monitor nonexistent port", "$self->{id}#$portid") 263 my @args = @_;
238 unless exists $AnyEvent::MP::Kernel::PORT{$portid}; 264 push @DELAY, sub { AnyEvent::MP::Kernel::_monitor (@args) };
239 265 return;
240 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb; 266 }
267 &AnyEvent::MP::Kernel::_monitor;
241} 268}
242 269
243sub unmonitor { 270sub unmonitor {
244 my ($self, $portid, $cb) = @_; 271 # no need to always delay
272 if ($DELAY_W) {
273 my @args = @_;
274 push @DELAY, sub { AnyEvent::MP::Kernel::_unmonitor (@args) };
275 return;
276 }
245 277
246 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0}; 278 &AnyEvent::MP::Kernel::_unmonitor;
247} 279}
248 280
249=head1 SEE ALSO 281=head1 SEE ALSO
250 282
251L<AnyEvent::MP>. 283L<AnyEvent::MP>.

Diff Legend

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