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.7 by root, Tue Aug 4 14:10:51 2009 UTC vs.
Revision 1.11 by root, Wed Aug 5 09:38:56 2009 UTC

… …
21use AnyEvent::MP::Transport (); 21use AnyEvent::MP::Transport ();
22 22
23use base Exporter::; 23use base Exporter::;
24 24
25our $VERSION = '0.0'; 25our $VERSION = '0.0';
26
27our $DEFAULT_PORT = "4040";
28
29sub normalise_noderef($) {
30 my ($noderef) = @_;
31
32 my $cv = AE::cv;
33 my @res;
34
35 $cv->begin (sub {
36 my %seen;
37 my @refs;
38 for (sort { $a->[0] <=> $b->[0] } @res) {
39 push @refs, $_->[1] unless $seen{$_->[1]}++
40 }
41 shift->send (join ",", @refs);
42 });
43
44 $noderef = $DEFAULT_PORT unless length $noderef;
45
46 my $idx;
47 for my $t (split /,/, $noderef) {
48 my $pri = ++$idx;
49
50 #TODO: this should be outside normalise_noderef and in become_public
51 if ($t =~ /^\d*$/) {
52 require POSIX;
53 my $nodename = (POSIX::uname ())[1];
54
55 $cv->begin;
56 AnyEvent::Socket::resolve_sockaddr $nodename, $t || "aemp=$DEFAULT_PORT", "tcp", 0, undef, sub {
57 for (@_) {
58 my ($service, $host) = AnyEvent::Socket::unpack_sockaddr $_->[3];
59 push @res, [
60 $pri += 1e-5,
61 AnyEvent::Socket::format_hostport AnyEvent::Socket::format_address $host, $service
62 ];
63 }
64 $cv->end;
65 };
66
67# my (undef, undef, undef, undef, @ipv4) = gethostbyname $nodename;
68#
69# for (@ipv4) {
70# push @res, [
71# $pri,
72# AnyEvent::Socket::format_hostport AnyEvent::Socket::format_address $_, $t || $DEFAULT_PORT,
73# ];
74# }
75 } else {
76 my ($host, $port) = AnyEvent::Socket::parse_hostport $t, "aemp=$DEFAULT_PORT"
77 or Carp::croak "$t: unparsable transport descriptor";
78
79 $cv->begin;
80 AnyEvent::Socket::resolve_sockaddr $host, $port, "tcp", 0, undef, sub {
81 for (@_) {
82 my ($service, $host) = AnyEvent::Socket::unpack_sockaddr $_->[3];
83 push @res, [
84 $pri += 1e-5,
85 AnyEvent::Socket::format_hostport AnyEvent::Socket::format_address $host, $service
86 ];
87 }
88 $cv->end;
89 }
90 }
91 }
92
93 $cv->end;
94
95 $cv
96}
97 26
98sub new { 27sub new {
99 my ($class, $noderef) = @_; 28 my ($class, $noderef) = @_;
100 29
101 bless { noderef => $noderef }, $class 30 bless { noderef => $noderef }, $class
… …
120 49
121sub kill { 50sub kill {
122 my ($self, $port, @reason) = @_; 51 my ($self, $port, @reason) = @_;
123 52
124 $self->send (["", kil => $port, @reason]); 53 $self->send (["", kil => $port, @reason]);
125
126# delete $AnyEvent::MP::Base::PORT{$port};
127
128# my $mon = delete $AnyEvent::MP::Base::LMON{$port}
129# or return;
130
131# $_->(@reason) for values %$mon;
132} 54}
133 55
134sub monitor { 56sub monitor {
135 my ($self, $portid, $cb) = @_; 57 my ($self, $portid, $cb) = @_;
136 58
137 return $cb->() 59 return $cb->(transport_error => "node unreachable")
138 if $self->{failed}; 60 if $self->{failed};
139 61
140 my $list = $self->{lmon}{$portid} ||= []; 62 my $list = $self->{lmon}{$portid} ||= [];
141 63
142 $self->send (["", mon1 => $portid]) 64 $self->send (["", mon1 => $portid])
… …
162sub set_transport { 84sub set_transport {
163 my ($self, $transport) = @_; 85 my ($self, $transport) = @_;
164 86
165 $self->clr_transport 87 $self->clr_transport
166 if $self->{transport}; 88 if $self->{transport};
167
168 delete $self->{trial};
169 delete $self->{next_connect};
170 delete $self->{failed};
171 89
172 if ( 90 if (
173 exists $self->{remote_uniq} 91 exists $self->{remote_uniq}
174 && $self->{remote_uniq} ne $transport->{remote_uniq} 92 && $self->{remote_uniq} ne $transport->{remote_uniq}
175 ) { 93 ) {
176 # uniq changed, drop queue 94 # uniq changed, different node
95 $self->fail ("node restart detected");
96 }
97
98 delete $self->{trial};
99 delete $self->{next_connect};
177 delete $self->{queue}; 100 delete $self->{failed};
178 #TODO: "DOWN"
179 }
180 101
181 $self->{remote_uniq} = $transport->{remote_uniq}; 102 $self->{remote_uniq} = $transport->{remote_uniq};
182 $self->{transport} = $transport; 103 $self->{transport} = $transport;
183 104
184 $transport->send ($_) 105 $transport->send ($_)
185 for @{ delete $self->{queue} || [] }; 106 for @{ delete $self->{queue} || [] };
186} 107}
187 108
109sub fail {
110 my ($self, @reason) = @_;
111
112 delete $self->{queue};
113
114 $self->{failed} = 1;
115
116 if (my $mon = delete $self->{lmon}) {
117 $_->(@reason) for map @$_, values %$mon;
118 }
119}
120
188sub clr_transport { 121sub clr_transport {
189 my ($self) = @_; 122 my ($self, @reason) = @_;
190 123
191 delete $self->{transport}; 124 delete $self->{transport};
192 $self->{failed} = 1;
193
194 if (my $mon = delete $self->{monitor}) {
195 $_->() for map @$_, values %$mon;
196 }
197
198 $self->connect; 125 $self->connect;
199} 126}
200 127
201sub connect { 128sub connect {
202 my ($self) = @_; 129 my ($self) = @_;
203 130
204 Scalar::Util::weaken $self; 131 Scalar::Util::weaken $self;
205 132
206 unless (exists $self->{n_noderef}) {
207 return if $self->{n_noderef_}++;
208 (AnyEvent::MP::Node::normalise_noderef ($self->{noderef}))->cb (sub {
209 $self or return;
210 delete $self->{n_noderef_};
211 my $noderef = shift->recv;
212
213 $self->{n_noderef} = $noderef;
214
215 $AnyEvent::MP::Base::NODE{$_} = $self
216 for split /,/, $noderef;
217
218 $self->connect;
219 });
220 return;
221 }
222
223 $self->{retry} ||= [split /,/, $self->{n_noderef}]; 133 $self->{retry} ||= [split /,/, $self->{noderef}];
224 134
225 my $endpoint = shift @{ $self->{retry} }; 135 my $endpoint = shift @{ $self->{retry} };
226 136
227 if (defined $endpoint) { 137 if (defined $endpoint) {
228 $self->{trial}{$endpoint} ||= do { 138 $self->{trial}{$endpoint} ||= do {
229 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint 139 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
230 or return; 140 or return $AnyEvent::MP::Base::WARN->("$self->{noderef}: not a resolved node reference.");
231 141
232 my ($w, $g); 142 my ($w, $g);
233 143
234 $w = AE::timer $AnyEvent::MP::Base::CONNECT_TIMEOUT, 0, sub { 144 $w = AE::timer $AnyEvent::MP::Base::CONNECT_TIMEOUT, 0, sub {
235 delete $self->{trial}{$endpoint}; 145 delete $self->{trial}{$endpoint};
… …
245 155
246 [$w, \$g] 156 [$w, \$g]
247 }; 157 };
248 } else { 158 } else {
249 delete $self->{retry}; 159 delete $self->{retry};
160 $self->fail (transport_error => $self->{noderef}, "unable to connect");
250 } 161 }
251 162
252 $self->{next_connect} = AE::timer $AnyEvent::MP::Base::CONNECT_INTERVAL, 0, sub { 163 $self->{next_connect} = AE::timer $AnyEvent::MP::Base::CONNECT_INTERVAL, 0, sub {
253 $self->connect; 164 $self->connect;
254 }; 165 };
… …
269 180
270sub kill { 181sub kill {
271 my ($self, $port, @reason) = @_; 182 my ($self, $port, @reason) = @_;
272 183
273 delete $AnyEvent::MP::Base::PORT{$port}; 184 delete $AnyEvent::MP::Base::PORT{$port};
185 delete $AnyEvent::MP::Base::PORT_DATA{$port};
274 186
275 my $mon = delete $AnyEvent::MP::Base::LMON{$port} 187 my $mon = delete $AnyEvent::MP::Base::LMON{$port}
276 or return; 188 or !@reason
189 or $AnyEvent::MP::Base::WARN->("unmonitored local port $port died with reason: @reason");
277 190
278 $_->(@reason) for values %$mon; 191 $_->(@reason) for values %$mon;
279} 192}
280 193
281sub monitor { 194sub monitor {

Diff Legend

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