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.38 by root, Mon Sep 7 12:04:32 2009 UTC

… …
116 116
117 return if $self->{transport}; 117 return if $self->{transport};
118 118
119 Scalar::Util::weaken $self; 119 Scalar::Util::weaken $self;
120 120
121 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout};
122
121 $self->{connect_to} ||= AE::timer 123 $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"); 124 $self->transport_error (transport_error => $self->{id}, "unable to connect");
125 };
126
127 return unless @addresses;
128 return if $self->{connect_w};
129
130 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
131
132 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
133
134 $interval = ($monitor - $interval) / @addresses
135 if ($monitor - $interval) / @addresses < $interval;
136
137 $interval = 0.4 if $interval < 0.4;
138
139 my @endpoints;
140
141 $self->{connect_w} = AE::timer 0.050 * rand, $interval * (0.9 + 0.1 * rand), sub {
142 @endpoints = @addresses
143 unless @endpoints;
144
145 my $endpoint = shift @endpoints;
146
147 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint");
148
149 $self->{trial}{$endpoint} ||= do {
150 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
151 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{id}: not a resolved node reference.");
152
153 AnyEvent::MP::Transport::mp_connect
154 $host, $port,
155 sub { delete $self->{trial}{$endpoint} },
126 }; 156 };
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 } 157 };
157} 158}
158 159
159sub kill { 160sub kill {
160 my ($self, $port, @reason) = @_; 161 my ($self, $port, @reason) = @_;
161 162
… …
198 199
199sub connect { 200sub connect {
200 # we are trivially connected 201 # we are trivially connected
201} 202}
202 203
204# delay every so often to avoid recursion, also used to delay after spawn
205our $DELAY;
206our @DELAY;
207our $DELAY_W;
208
209sub _send_delayed {
210 local $AnyEvent::MP::Kernel::SRCNODE = $AnyEvent::MP::Kernel::NODE{""};
211 AnyEvent::MP::Kernel::_inject (@{ shift @DELAY })
212 while @DELAY;
213 undef $DELAY_W;
214 $DELAY = -50;
215}
216
203sub transport_reset { 217sub transport_reset {
204 my ($self) = @_; 218 my ($self) = @_;
205 219
206 Scalar::Util::weaken $self; 220 Scalar::Util::weaken $self;
207 221
208 $self->{send} = sub { 222 $self->{send} = sub {
223 if ($DELAY++ >= 0) {
224 push @DELAY, $_[0];
225 $DELAY_W ||= AE::timer 0, 0, \&_send_delayed;
226 } else {
209 local $AnyEvent::MP::Kernel::SRCNODE = $self; 227 local $AnyEvent::MP::Kernel::SRCNODE = $self;
210 AnyEvent::MP::Kernel::_inject (@{ $_[0] }); 228 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
229 }
211 }; 230 };
212} 231}
213 232
214sub transport_connect { 233sub transport_connect {
215 my ($self, $tp) = @_; 234 my ($self, $tp) = @_;
… …
223 delete $AnyEvent::MP::Kernel::PORT{$port}; 242 delete $AnyEvent::MP::Kernel::PORT{$port};
224 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 243 delete $AnyEvent::MP::Kernel::PORT_DATA{$port};
225 244
226 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port} 245 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port}
227 or !@reason 246 or !@reason
228 or $AnyEvent::MP::Kernel::WARN->(2, "unmonitored local port $port died with reason: @reason"); 247 or $AnyEvent::MP::Kernel::WARN->(8, "unmonitored local port $port died with reason: @reason");
229 248
230 $_->(@reason) for values %$mon; 249 $_->(@reason) for values %$mon;
231} 250}
232 251
233sub monitor { 252sub monitor {
234 my ($self, $portid, $cb) = @_; 253 my ($self, $portid, $cb) = @_;
235 254
236 return $cb->(no_such_port => "cannot monitor nonexistent port") 255 return $cb->(no_such_port => "cannot monitor nonexistent port", "$self->{id}#$portid")
237 unless exists $AnyEvent::MP::Kernel::PORT{$portid}; 256 unless exists $AnyEvent::MP::Kernel::PORT{$portid};
238 257
239 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb; 258 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb;
240} 259}
241 260

Diff Legend

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