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.31 by root, Fri Aug 28 23:06:33 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 {
… …
58 push @{$self->{queue}}, shift; 62 push @{$self->{queue}}, shift;
59 $self->connect; 63 $self->connect;
60 }; 64 };
61} 65}
62 66
63# called only after successful handshake 67# called each time we fail to establish a connection,
68# or the existing connection failed
64sub transport_error { 69sub transport_error {
65 my ($self, @reason) = @_; 70 my ($self, @reason) = @_;
66 71
67 my $no_transport = !$self->{transport}; 72 my $no_transport = !$self->{transport};
68 73
… …
76 $_->(@reason) for map @$_, values %$mon; 81 $_->(@reason) for map @$_, values %$mon;
77 } 82 }
78 83
79 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 0, @reason) 84 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 0, @reason)
80 unless $no_transport; 85 unless $no_transport;
86
87 # if we are here and are idle, we nuke ourselves
88 delete $AnyEvent::MP::Kernel::NODE{$self->{id}}
89 unless $self->{transport} || $self->{connect_to};
81} 90}
82 91
83# called after handshake was successful 92# called after handshake was successful
84sub transport_connect { 93sub transport_connect {
85 my ($self, $transport) = @_; 94 my ($self, $transport) = @_;
86 95
87 delete $self->{trial}; 96 delete $self->{trial};
88 97
89 $self->transport_error (transport_error => "switched connections") 98 $self->transport_error (transport_error => $self->{id}, "switched connections")
90 if $self->{transport}; 99 if $self->{transport};
91 100
101 delete $self->{connect_addr};
92 delete $self->{connect_w}; 102 delete $self->{connect_w};
93 delete $self->{connect_to}; 103 delete $self->{connect_to};
94 104
95 $self->{transport} = $transport; 105 $self->{transport} = $transport;
96 106
97 my $transport_send = $transport->can ("send"); 107 my $transport_send = $transport->{send};
98
99 $self->{send} = sub {
100 $transport_send->($transport, $_[0]);
101 };
102 108
103 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1); 109 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1);
104 110
111 $self->{send} = $transport_send;
112
105 $transport->send ($_) 113 $transport_send->($_)
106 for @{ delete $self->{queue} || [] }; 114 for @{ delete $self->{queue} || [] };
107} 115}
108 116
109sub connect { 117sub connect {
110 my ($self, @addresses) = @_; 118 my ($self) = @_;
111 119
112 return if $self->{transport}; 120 return if $self->{transport};
121 return if $self->{connect_w};
113 122
114 Scalar::Util::weaken $self; 123 Scalar::Util::weaken $self;
115 124
125 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout};
126
116 $self->{connect_to} ||= AE::timer 127 $self->{connect_to} ||= AE::timer $monitor, 0, sub {
117 $AnyEvent::MP::Config::CFG{monitor_timeout} || $AnyEvent::MP::Kernel::MONITOR_TIMEOUT,
118 0,
119 sub {
120 $self->transport_error (transport_error => $self->{id}, "unable to connect"); 128 $self->transport_error (transport_error => $self->{id}, "unable to connect");
129 };
130
131 # maybe @$addresses?
132 my @addresses = @{ $AnyEvent::MP::Kernel::GLOBAL_DB{"'l"}{$self->{id}} };
133
134 unless (@addresses) {
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
143
144 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
145
146 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
147
148 $interval = ($monitor - $interval) / @addresses
149 if ($monitor - $interval) / @addresses < $interval;
150
151 $interval = 0.4 if $interval < 0.4;
152
153 my @endpoints;
154
155 $self->{connect_w} = AE::timer 0, $interval * (0.9 + 0.1 * rand), sub {
156 @endpoints = @addresses
157 unless @endpoints;
158
159 my $endpoint = shift @endpoints;
160
161 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint");
162
163 $self->{trial}{$endpoint} ||= do {
164 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
165 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{id}: not a resolved node reference.");
166
167 AnyEvent::MP::Transport::mp_connect
168 $host, $port,
169 sub { delete $self->{trial}{$endpoint} },
121 }; 170 };
122
123 return unless @addresses;
124
125 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
126
127 unless ($self->{connect_w}) {
128 my @endpoints;
129
130 $self->{connect_w} = AE::timer
131 rand,
132 $AnyEvent::MP::Config::CFG{connect_interval} || $AnyEvent::MP::Kernel::CONNECT_INTERVAL,
133 sub {
134 @endpoints = @addresses
135 unless @endpoints;
136
137 my $endpoint = shift @endpoints;
138
139 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint");
140
141 $self->{trial}{$endpoint} ||= do {
142 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
143 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{id}: not a resolved node reference.");
144
145 AnyEvent::MP::Transport::mp_connect
146 $host, $port,
147 sub { delete $self->{trial}{$endpoint} },
148 };
149 }
150 ;
151 } 171 };
152} 172}
153 173
154sub kill { 174sub kill {
155 my ($self, $port, @reason) = @_; 175 my ($self, $port, @reason) = @_;
156 176
157 $self->send (["", kil => $port, @reason]); 177 $self->{send} (["", kil => $port, @reason]);
158} 178}
159 179
160sub monitor { 180sub monitor {
161 my ($self, $portid, $cb) = @_; 181 my ($self, $portid, $cb) = @_;
162 182
… …
180 $self->send (["", mon0 => $portid]); 200 $self->send (["", mon0 => $portid]);
181 delete $self->{monitor}{$portid}; 201 delete $self->{monitor}{$portid};
182 } 202 }
183} 203}
184 204
185# used for direct slave connections as well
186package AnyEvent::MP::Node::Direct;
187
188use base "AnyEvent::MP::Node::External";
189
190package AnyEvent::MP::Node::Self; 205package AnyEvent::MP::Node::Self;
191 206
192use base "AnyEvent::MP::Node"; 207use base "AnyEvent::MP::Node";
193 208
194sub connect { 209sub connect {
195 # we are trivially connected 210 # we are trivially connected
196} 211}
197 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
198sub transport_reset { 226sub transport_reset {
199 my ($self) = @_; 227 my ($self) = @_;
200 228
201 Scalar::Util::weaken $self; 229 Scalar::Util::weaken $self;
202 230
203 $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
204 local $AnyEvent::MP::Kernel::SRCNODE = $self; 239 local $AnyEvent::MP::Kernel::SRCNODE = $self;
205 AnyEvent::MP::Kernel::_inject (@{ $_[0] }); 240 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
206 }; 241 };
207} 242}
208 243
… …
211 246
212 $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})");
213} 248}
214 249
215sub kill { 250sub kill {
216 my ($self, $port, @reason) = @_; 251 my (undef, @args) = @_;
217 252
218 delete $AnyEvent::MP::Kernel::PORT{$port}; 253 # we _always_ delay kil's, to avoid calling mon callbacks
219 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 254 # from anything but the event loop context.
220 255 $DELAY = 1;
221 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port} 256 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) };
222 or !@reason 257 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
223 or $AnyEvent::MP::Kernel::WARN->(2, "unmonitored local port $port died with reason: @reason");
224
225 $_->(@reason) for values %$mon;
226} 258}
227 259
228sub monitor { 260sub monitor {
229 my ($self, $portid, $cb) = @_; 261 # maybe always delay, too?
230 262 if ($DELAY_W) {
231 return $cb->(no_such_port => "cannot monitor nonexistent port") 263 my @args = @_;
232 unless exists $AnyEvent::MP::Kernel::PORT{$portid}; 264 push @DELAY, sub { AnyEvent::MP::Kernel::_monitor (@args) };
233 265 return;
234 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb; 266 }
267 &AnyEvent::MP::Kernel::_monitor;
235} 268}
236 269
237sub unmonitor { 270sub unmonitor {
238 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 }
239 277
240 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0}; 278 &AnyEvent::MP::Kernel::_unmonitor;
241} 279}
242 280
243=head1 SEE ALSO 281=head1 SEE ALSO
244 282
245L<AnyEvent::MP>. 283L<AnyEvent::MP>.

Diff Legend

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