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.8 by root, Tue Aug 4 18:33:30 2009 UTC vs.
Revision 1.9 by root, Tue Aug 4 23:16:57 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
199sub connect { 128sub connect {
200 my ($self) = @_; 129 my ($self) = @_;
201 130
202 Scalar::Util::weaken $self; 131 Scalar::Util::weaken $self;
203 132
204 unless (exists $self->{n_noderef}) {
205 return if $self->{n_noderef_}++;
206 (AnyEvent::MP::Node::normalise_noderef ($self->{noderef}))->cb (sub {
207 $self or return;
208 delete $self->{n_noderef_};
209 my $noderef = shift->recv;
210
211 $self->{n_noderef} = $noderef;
212
213 $AnyEvent::MP::Base::NODE{$_} = $self
214 for split /,/, $noderef;
215
216 $self->connect;
217 });
218 return;
219 }
220
221 $self->{retry} ||= [split /,/, $self->{n_noderef}]; 133 $self->{retry} ||= [split /,/, $self->{noderef}];
222 134
223 my $endpoint = shift @{ $self->{retry} }; 135 my $endpoint = shift @{ $self->{retry} };
224 136
225 if (defined $endpoint) { 137 if (defined $endpoint) {
226 $self->{trial}{$endpoint} ||= do { 138 $self->{trial}{$endpoint} ||= do {
227 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint 139 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
228 or return; 140 or return $AnyEvent::MP::Base::WARN->("$self->{noderef}: not a resolved node reference.");
229 141
230 my ($w, $g); 142 my ($w, $g);
231 143
232 $w = AE::timer $AnyEvent::MP::Base::CONNECT_TIMEOUT, 0, sub { 144 $w = AE::timer $AnyEvent::MP::Base::CONNECT_TIMEOUT, 0, sub {
233 delete $self->{trial}{$endpoint}; 145 delete $self->{trial}{$endpoint};

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines