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.6 by root, Mon Aug 3 21:35:03 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
… …
116 $self->{queue} = [$msg]; 45 $self->{queue} = [$msg];
117 $self->connect; 46 $self->connect;
118 } 47 }
119} 48}
120 49
50sub kill {
51 my ($self, $port, @reason) = @_;
52
53 $self->send (["", kil => $port, @reason]);
54}
55
121sub monitor { 56sub monitor {
122 my ($self, $portid, $cb) = @_; 57 my ($self, $portid, $cb) = @_;
123 58
124 return $cb->() 59 return $cb->(transport_error => "node unreachable")
125 if $self->{failed}; 60 if $self->{failed};
126 61
127 my $list = $self->{lmon}{$portid} ||= []; 62 my $list = $self->{lmon}{$portid} ||= [];
128 63
129 $self->send (["", mon1 => $portid]) 64 $self->send (["", mon1 => $portid])
… …
149sub set_transport { 84sub set_transport {
150 my ($self, $transport) = @_; 85 my ($self, $transport) = @_;
151 86
152 $self->clr_transport 87 $self->clr_transport
153 if $self->{transport}; 88 if $self->{transport};
154
155 delete $self->{trial};
156 delete $self->{next_connect};
157 delete $self->{failed};
158 89
159 if ( 90 if (
160 exists $self->{remote_uniq} 91 exists $self->{remote_uniq}
161 && $self->{remote_uniq} ne $transport->{remote_uniq} 92 && $self->{remote_uniq} ne $transport->{remote_uniq}
162 ) { 93 ) {
163 # 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};
164 delete $self->{queue}; 100 delete $self->{failed};
165 #TODO: "DOWN"
166 }
167 101
168 $self->{remote_uniq} = $transport->{remote_uniq}; 102 $self->{remote_uniq} = $transport->{remote_uniq};
169 $self->{transport} = $transport; 103 $self->{transport} = $transport;
170 104
171 $transport->send ($_) 105 $transport->send ($_)
172 for @{ delete $self->{queue} || [] }; 106 for @{ delete $self->{queue} || [] };
173} 107}
174 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
175sub clr_transport { 121sub clr_transport {
176 my ($self) = @_; 122 my ($self, @reason) = @_;
177 123
178 delete $self->{transport}; 124 delete $self->{transport};
179 $self->{failed} = 1;
180
181 if (my $mon = delete $self->{monitor}) {
182 $_->() for map @$_, values %$mon;
183 }
184
185 $self->connect; 125 $self->connect;
186} 126}
187 127
188sub connect { 128sub connect {
189 my ($self) = @_; 129 my ($self) = @_;
190 130
191 Scalar::Util::weaken $self; 131 Scalar::Util::weaken $self;
192 132
193 unless (exists $self->{n_noderef}) {
194 return if $self->{n_noderef_}++;
195 (AnyEvent::MP::Node::normalise_noderef ($self->{noderef}))->cb (sub {
196 $self or return;
197 delete $self->{n_noderef_};
198 my $noderef = shift->recv;
199
200 $self->{n_noderef} = $noderef;
201
202 $AnyEvent::MP::Base::NODE{$_} = $self
203 for split /,/, $noderef;
204
205 $self->connect;
206 });
207 return;
208 }
209
210 $self->{retry} ||= [split /,/, $self->{n_noderef}]; 133 $self->{retry} ||= [split /,/, $self->{noderef}];
211 134
212 my $endpoint = shift @{ $self->{retry} }; 135 my $endpoint = shift @{ $self->{retry} };
213 136
214 if (defined $endpoint) { 137 if (defined $endpoint) {
215 $self->{trial}{$endpoint} ||= do { 138 $self->{trial}{$endpoint} ||= do {
216 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint 139 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
217 or return; 140 or return $AnyEvent::MP::Base::WARN->("$self->{noderef}: not a resolved node reference.");
218 141
219 my ($w, $g); 142 my ($w, $g);
220 143
221 $w = AE::timer $AnyEvent::MP::Base::CONNECT_TIMEOUT, 0, sub { 144 $w = AE::timer $AnyEvent::MP::Base::CONNECT_TIMEOUT, 0, sub {
222 delete $self->{trial}{$endpoint}; 145 delete $self->{trial}{$endpoint};
… …
232 155
233 [$w, \$g] 156 [$w, \$g]
234 }; 157 };
235 } else { 158 } else {
236 delete $self->{retry}; 159 delete $self->{retry};
160 $self->fail (transport_error => $self->{noderef}, "unable to connect");
237 } 161 }
238 162
239 $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 {
240 $self->connect; 164 $self->connect;
241 }; 165 };
… …
252sub send { 176sub send {
253 local $AnyEvent::MP::Base::SRCNODE = $_[0]; 177 local $AnyEvent::MP::Base::SRCNODE = $_[0];
254 AnyEvent::MP::Base::_inject (@{ $_[1] }); 178 AnyEvent::MP::Base::_inject (@{ $_[1] });
255} 179}
256 180
181sub kill {
182 my ($self, $port, @reason) = @_;
183
184 delete $AnyEvent::MP::Base::PORT{$port};
185 delete $AnyEvent::MP::Base::PORT_DATA{$port};
186
187 my $mon = delete $AnyEvent::MP::Base::LMON{$port}
188 or !@reason
189 or $AnyEvent::MP::Base::WARN->("unmonitored local port $port died with reason: @reason");
190
191 $_->(@reason) for values %$mon;
192}
193
257sub monitor { 194sub monitor {
258 my ($self, $portid, $cb) = @_; 195 my ($self, $portid, $cb) = @_;
259 196
260 return $cb->() 197 return $cb->()
261 unless exists $AnyEvent::MP::Base::PORT{$portid}; 198 unless exists $AnyEvent::MP::Base::PORT{$portid};

Diff Legend

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