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

Diff Legend

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