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.52 by root, Sat Mar 13 20:29:04 2010 UTC

… …
58 push @{$self->{queue}}, shift; 58 push @{$self->{queue}}, shift;
59 $self->connect; 59 $self->connect;
60 }; 60 };
61} 61}
62 62
63# called only after successful handshake 63# called each time we fail to establish a connection,
64# or the existing connection failed
64sub transport_error { 65sub transport_error {
65 my ($self, @reason) = @_; 66 my ($self, @reason) = @_;
66 67
67 my $no_transport = !$self->{transport}; 68 my $no_transport = !$self->{transport};
68 69
… …
76 $_->(@reason) for map @$_, values %$mon; 77 $_->(@reason) for map @$_, values %$mon;
77 } 78 }
78 79
79 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 0, @reason) 80 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 0, @reason)
80 unless $no_transport; 81 unless $no_transport;
82
83 # if we are here and are idle, we nuke ourselves
84 delete $AnyEvent::MP::Kernel::NODE{$self->{id}}
85 unless $self->{transport} || $self->{connect_to};
81} 86}
82 87
83# called after handshake was successful 88# called after handshake was successful
84sub transport_connect { 89sub transport_connect {
85 my ($self, $transport) = @_; 90 my ($self, $transport) = @_;
86 91
87 delete $self->{trial}; 92 delete $self->{trial};
88 93
89 $self->transport_error (transport_error => "switched connections") 94 $self->transport_error (transport_error => $self->{id}, "switched connections")
90 if $self->{transport}; 95 if $self->{transport};
91 96
97 delete $self->{connect_addr};
92 delete $self->{connect_w}; 98 delete $self->{connect_w};
93 delete $self->{connect_to}; 99 delete $self->{connect_to};
94 100
95 $self->{transport} = $transport; 101 $self->{transport} = $transport;
96 102
97 my $transport_send = $transport->can ("send"); 103 my $transport_send = $transport->{send};
98
99 $self->{send} = sub {
100 $transport_send->($transport, $_[0]);
101 };
102 104
103 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1); 105 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1);
104 106
107 $self->{send} = $transport_send;
108
105 $transport->send ($_) 109 $transport_send->($_)
106 for @{ delete $self->{queue} || [] }; 110 for @{ delete $self->{queue} || [] };
107} 111}
108 112
109sub connect { 113sub connect {
110 my ($self, @addresses) = @_; 114 my ($self, @addresses) = @_;
111 115
112 return if $self->{transport}; 116 return if $self->{transport};
113 117
114 Scalar::Util::weaken $self; 118 Scalar::Util::weaken $self;
115 119
120 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout};
121
116 $self->{connect_to} ||= AE::timer 122 $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"); 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} },
121 }; 162 };
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 } 163 };
152} 164}
153 165
154sub kill { 166sub kill {
155 my ($self, $port, @reason) = @_; 167 my ($self, $port, @reason) = @_;
156 168
… …
193 205
194sub connect { 206sub connect {
195 # we are trivially connected 207 # we are trivially connected
196} 208}
197 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
198sub transport_reset { 223sub transport_reset {
199 my ($self) = @_; 224 my ($self) = @_;
200 225
201 Scalar::Util::weaken $self; 226 Scalar::Util::weaken $self;
202 227
203 $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
204 local $AnyEvent::MP::Kernel::SRCNODE = $self; 236 local $AnyEvent::MP::Kernel::SRCNODE = $self;
205 AnyEvent::MP::Kernel::_inject (@{ $_[0] }); 237 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
206 }; 238 };
207} 239}
208 240
… …
211 243
212 $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})");
213} 245}
214 246
215sub kill { 247sub kill {
216 my ($self, $port, @reason) = @_; 248 my (undef, @args) = @_;
217 249
218 delete $AnyEvent::MP::Kernel::PORT{$port}; 250 # we _always_ delay kil's, to avoid calling mon callbacks
219 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 251 # from anything but the event loop context.
220 252 $DELAY = 1;
221 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port} 253 push @DELAY, sub { AnyEvent::MP::Kernel::_kill (@args) };
222 or !@reason 254 $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} 255}
227 256
228sub monitor { 257sub monitor {
229 my ($self, $portid, $cb) = @_; 258 # maybe always delay, too?
230 259 if ($DELAY_W) {
231 return $cb->(no_such_port => "cannot monitor nonexistent port") 260 my @args = @_;
232 unless exists $AnyEvent::MP::Kernel::PORT{$portid}; 261 push @DELAY, sub { AnyEvent::MP::Kernel::_monitor (@args) };
233 262 return;
234 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb; 263 }
264 &AnyEvent::MP::Kernel::_monitor;
235} 265}
236 266
237sub unmonitor { 267sub unmonitor {
238 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 }
239 274
240 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0}; 275 &AnyEvent::MP::Kernel::_unmonitor;
241} 276}
242 277
243=head1 SEE ALSO 278=head1 SEE ALSO
244 279
245L<AnyEvent::MP>. 280L<AnyEvent::MP>.

Diff Legend

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