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.32 by root, Sun Aug 30 09:24:09 2009 UTC vs.
Revision 1.52 by root, Sat Mar 13 20:29:04 2010 UTC

… …
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, @addresses) = @_;
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
120 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout};
121
121 $self->{connect_to} ||= AE::timer 122 $self->{connect_to} ||= AE::timer $monitor, 0, sub {
122 $AnyEvent::MP::Config::CFG{monitor_timeout} || $AnyEvent::MP::Kernel::MONITOR_TIMEOUT,
123 0,
124 sub {
125 $self->transport_error (transport_error => $self->{id}, "unable to connect"); 123 $self->transport_error (transport_error => $self->{id}, "unable to connect");
124 };
125
126 return unless @addresses;
127
128 if ($self->{connect_w}) {
129 # sometimes we get told about new addresses after we started to connect
130 unshift @{$self->{connect_addr}}, @addresses;
131 return;
132 }
133
134 $self->{connect_addr} = \@addresses; # a bit weird, but efficient
135
136 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
137
138 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
139
140 $interval = ($monitor - $interval) / @addresses
141 if ($monitor - $interval) / @addresses < $interval;
142
143 $interval = 0.4 if $interval < 0.4;
144
145 my @endpoints;
146
147 $self->{connect_w} = AE::timer 0.050 * rand, $interval * (0.9 + 0.1 * rand), sub {
148 @endpoints = @addresses
149 unless @endpoints;
150
151 my $endpoint = shift @endpoints;
152
153 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint");
154
155 $self->{trial}{$endpoint} ||= do {
156 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
157 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{id}: not a resolved node reference.");
158
159 AnyEvent::MP::Transport::mp_connect
160 $host, $port,
161 sub { delete $self->{trial}{$endpoint} },
126 }; 162 };
127
128 return unless @addresses;
129
130 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
131
132 unless ($self->{connect_w}) {
133 my @endpoints;
134
135 $self->{connect_w} = AE::timer
136 rand,
137 $AnyEvent::MP::Config::CFG{connect_interval} || $AnyEvent::MP::Kernel::CONNECT_INTERVAL,
138 sub {
139 @endpoints = @addresses
140 unless @endpoints;
141
142 my $endpoint = shift @endpoints;
143
144 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint");
145
146 $self->{trial}{$endpoint} ||= do {
147 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
148 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{id}: not a resolved node reference.");
149
150 AnyEvent::MP::Transport::mp_connect
151 $host, $port,
152 sub { delete $self->{trial}{$endpoint} },
153 };
154 }
155 ;
156 } 163 };
157} 164}
158 165
159sub kill { 166sub kill {
160 my ($self, $port, @reason) = @_; 167 my ($self, $port, @reason) = @_;
161 168
… …
198 205
199sub connect { 206sub connect {
200 # we are trivially connected 207 # we are trivially connected
201} 208}
202 209
210# delay every so often to avoid recursion, also used to delay after spawn
211our $DELAY = -50;
212our @DELAY;
213our $DELAY_W;
214
215sub _send_delayed {
216 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE{""};
217 (shift @DELAY)->()
218 while @DELAY;
219 undef $DELAY_W;
220 $DELAY = -50;
221}
222
203sub transport_reset { 223sub transport_reset {
204 my ($self) = @_; 224 my ($self) = @_;
205 225
206 Scalar::Util::weaken $self; 226 Scalar::Util::weaken $self;
207 227
208 $self->{send} = sub { 228 $self->{send} = sub {
229 if ($DELAY++ >= 0) {
230 my $msg = $_[0];
231 push @DELAY, sub { AnyEvent::MP::Kernel::_inject (@$msg) };
232 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
233 return;
234 }
235
209 local $AnyEvent::MP::Kernel::SRCNODE = $self; 236 local $AnyEvent::MP::Kernel::SRCNODE = $self;
210 AnyEvent::MP::Kernel::_inject (@{ $_[0] }); 237 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
211 }; 238 };
212} 239}
213 240
… …
216 243
217 $AnyEvent::MP::Kernel::WARN->(9, "I refuse to talk to myself ($tp->{peerhost}:$tp->{peerport})"); 244 $AnyEvent::MP::Kernel::WARN->(9, "I refuse to talk to myself ($tp->{peerhost}:$tp->{peerport})");
218} 245}
219 246
220sub kill { 247sub kill {
221 my ($self, $port, @reason) = @_; 248 my (undef, @args) = @_;
222 249
223 delete $AnyEvent::MP::Kernel::PORT{$port}; 250 # we _always_ delay kil's, to avoid calling mon callbacks
224 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 251 # from anything but the event loop context.
225 252 $DELAY = 1;
226 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port} 253 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) };
227 or !@reason 254 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
228 or $AnyEvent::MP::Kernel::WARN->(2, "unmonitored local port $port died with reason: @reason");
229
230 $_->(@reason) for values %$mon;
231} 255}
232 256
233sub monitor { 257sub monitor {
234 my ($self, $portid, $cb) = @_; 258 # maybe always delay, too?
235 259 if ($DELAY_W) {
236 return $cb->(no_such_port => "cannot monitor nonexistent port") 260 my @args = @_;
237 unless exists $AnyEvent::MP::Kernel::PORT{$portid}; 261 push @DELAY, sub { AnyEvent::MP::Kernel::_monitor (@args) };
238 262 return;
239 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb; 263 }
264 &AnyEvent::MP::Kernel::_monitor;
240} 265}
241 266
242sub unmonitor { 267sub unmonitor {
243 my ($self, $portid, $cb) = @_; 268 # no need to always delay
269 if ($DELAY_W) {
270 my @args = @_;
271 push @DELAY, sub { AnyEvent::MP::Kernel::_unmonitor (@args) };
272 return;
273 }
244 274
245 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0}; 275 &AnyEvent::MP::Kernel::_unmonitor;
246} 276}
247 277
248=head1 SEE ALSO 278=head1 SEE ALSO
249 279
250L<AnyEvent::MP>. 280L<AnyEvent::MP>.

Diff Legend

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