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.33 by root, Sun Aug 30 21:45:51 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::Config::CFG{monitor_timeout} || $AnyEvent::MP::Kernel::MONITOR_TIMEOUT; 121 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout};
122 122
123 $self->{connect_to} ||= AE::timer $monitor, 0, sub { 123 $self->{connect_to} ||= AE::timer $monitor, 0, sub {
124 $self->transport_error (transport_error => $self->{id}, "unable to connect"); 124 $self->transport_error (transport_error => $self->{id}, "unable to connect");
125 }; 125 };
126 126
127 return unless @addresses; 127 return unless @addresses;
128 return if $self->{connect_w}; 128 return if $self->{connect_w};
129 129
130 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]"); 130 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
131 131
132 my $interval = $AnyEvent::MP::Config::CFG{connect_interval} || $AnyEvent::MP::Kernel::CONNECT_INTERVAL; 132 my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
133 133
134 $interval = ($monitor - $interval) / @addresses 134 $interval = ($monitor - $interval) / @addresses
135 if ($monitor - $interval) / @addresses < $interval; 135 if ($monitor - $interval) / @addresses < $interval;
136 136
137 $interval = 0.4 if $interval < 0.4; 137 $interval = 0.4 if $interval < 0.4;
138 138
139 my @endpoints; 139 my @endpoints;
140 140
141 $self->{connect_w} = AE::timer rand, $interval, sub { 141 $self->{connect_w} = AE::timer 0.050 * rand, $interval * (0.9 + 0.1 * rand), sub {
142 @endpoints = @addresses 142 @endpoints = @addresses
143 unless @endpoints; 143 unless @endpoints;
144 144
145 my $endpoint = shift @endpoints; 145 my $endpoint = shift @endpoints;
146 146
… …
199 199
200sub connect { 200sub connect {
201 # we are trivially connected 201 # we are trivially connected
202} 202}
203 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
204sub transport_reset { 217sub transport_reset {
205 my ($self) = @_; 218 my ($self) = @_;
206 219
207 Scalar::Util::weaken $self; 220 Scalar::Util::weaken $self;
208 221
209 $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 {
210 local $AnyEvent::MP::Kernel::SRCNODE = $self; 227 local $AnyEvent::MP::Kernel::SRCNODE = $self;
211 AnyEvent::MP::Kernel::_inject (@{ $_[0] }); 228 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
229 }
212 }; 230 };
213} 231}
214 232
215sub transport_connect { 233sub transport_connect {
216 my ($self, $tp) = @_; 234 my ($self, $tp) = @_;
… …
224 delete $AnyEvent::MP::Kernel::PORT{$port}; 242 delete $AnyEvent::MP::Kernel::PORT{$port};
225 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 243 delete $AnyEvent::MP::Kernel::PORT_DATA{$port};
226 244
227 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port} 245 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port}
228 or !@reason 246 or !@reason
229 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");
230 248
231 $_->(@reason) for values %$mon; 249 $_->(@reason) for values %$mon;
232} 250}
233 251
234sub monitor { 252sub monitor {
235 my ($self, $portid, $cb) = @_; 253 my ($self, $portid, $cb) = @_;
236 254
237 return $cb->(no_such_port => "cannot monitor nonexistent port") 255 return $cb->(no_such_port => "cannot monitor nonexistent port", "$self->{id}#$portid")
238 unless exists $AnyEvent::MP::Kernel::PORT{$portid}; 256 unless exists $AnyEvent::MP::Kernel::PORT{$portid};
239 257
240 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb; 258 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb;
241} 259}
242 260

Diff Legend

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