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.4 by root, Sat Aug 1 15:04:30 2009 UTC vs.
Revision 1.6 by root, Mon Aug 3 21:35:03 2009 UTC

… …
13package AnyEvent::MP::Node; 13package AnyEvent::MP::Node;
14 14
15use common::sense; 15use common::sense;
16 16
17use AE (); 17use AE ();
18use AnyEvent::Util ();
18use AnyEvent::Socket (); 19use AnyEvent::Socket ();
19 20
20use AnyEvent::MP::Transport (); 21use AnyEvent::MP::Transport ();
21 22
22use base Exporter::; 23use base Exporter::;
23 24
24our $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}
25 97
26sub new { 98sub new {
27 my ($class, $noderef) = @_; 99 my ($class, $noderef) = @_;
28 100
29 bless { noderef => $noderef }, $class 101 bless { noderef => $noderef }, $class
… …
44 $self->{queue} = [$msg]; 116 $self->{queue} = [$msg];
45 $self->connect; 117 $self->connect;
46 } 118 }
47} 119}
48 120
121sub monitor {
122 my ($self, $portid, $cb) = @_;
123
124 return $cb->()
125 if $self->{failed};
126
127 my $list = $self->{lmon}{$portid} ||= [];
128
129 $self->send (["", mon1 => $portid])
130 unless @$list;
131
132 push @$list, $cb;
133}
134
135sub unmonitor {
136 my ($self, $portid, $cb) = @_;
137
138 my $list = $self->{lmon}{$portid}
139 or return;
140
141 @$list = grep $_ != $cb, @$list;
142
143 unless (@$list) {
144 $self->send (["", mon0 => $portid]);
145 delete $self->{monitor}{$portid};
146 }
147}
148
49sub set_transport { 149sub set_transport {
50 my ($self, $transport) = @_; 150 my ($self, $transport) = @_;
51 151
152 $self->clr_transport
153 if $self->{transport};
154
52 delete $self->{trial}; 155 delete $self->{trial};
53 delete $self->{next_connect}; 156 delete $self->{next_connect};
157 delete $self->{failed};
54 158
55 if ( 159 if (
56 exists $self->{remote_uniq} 160 exists $self->{remote_uniq}
57 && $self->{remote_uniq} ne $transport->{remote_uniq} 161 && $self->{remote_uniq} ne $transport->{remote_uniq}
58 ) { 162 ) {
… …
70 174
71sub clr_transport { 175sub clr_transport {
72 my ($self) = @_; 176 my ($self) = @_;
73 177
74 delete $self->{transport}; 178 delete $self->{transport};
179 $self->{failed} = 1;
180
181 if (my $mon = delete $self->{monitor}) {
182 $_->() for map @$_, values %$mon;
183 }
75 184
76 $self->connect; 185 $self->connect;
77} 186}
78 187
79sub connect { 188sub connect {
80 my ($self) = @_; 189 my ($self) = @_;
81 190
82 Scalar::Util::weaken $self; 191 Scalar::Util::weaken $self;
83 192
84 unless (exists $self->{n_noderef}) { 193 unless (exists $self->{n_noderef}) {
194 return if $self->{n_noderef_}++;
85 (AnyEvent::MP::normalise_noderef ($self->{noderef}))->cb (sub { 195 (AnyEvent::MP::Node::normalise_noderef ($self->{noderef}))->cb (sub {
86 $self or return; 196 $self or return;
197 delete $self->{n_noderef_};
87 my $noderef = shift->recv; 198 my $noderef = shift->recv;
88 199
89 $self->{n_noderef} = $noderef; 200 $self->{n_noderef} = $noderef;
90 201
91 $AnyEvent::MP::NODE{$_} = $self 202 $AnyEvent::MP::Base::NODE{$_} = $self
92 for split /,/, $noderef; 203 for split /,/, $noderef;
93 204
94 $self->connect; 205 $self->connect;
95 }); 206 });
96 return; 207 return;
… …
105 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint 216 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
106 or return; 217 or return;
107 218
108 my ($w, $g); 219 my ($w, $g);
109 220
110 $w = AE::timer $AnyEvent::MP::CONNECT_TIMEOUT, 0, sub { 221 $w = AE::timer $AnyEvent::MP::Base::CONNECT_TIMEOUT, 0, sub {
111 delete $self->{trial}{$endpoint}; 222 delete $self->{trial}{$endpoint};
112 }; 223 };
113 $g = AnyEvent::MP::Transport::mp_connect 224 $g = AnyEvent::MP::Transport::mp_connect
114 $host, $port, 225 $host, $port,
115 sub { 226 sub {
… …
123 }; 234 };
124 } else { 235 } else {
125 delete $self->{retry}; 236 delete $self->{retry};
126 } 237 }
127 238
128 $self->{next_connect} = AE::timer $AnyEvent::MP::CONNECT_INTERVAL, 0, sub { 239 $self->{next_connect} = AE::timer $AnyEvent::MP::Base::CONNECT_INTERVAL, 0, sub {
129 $self->connect; 240 $self->connect;
130 }; 241 };
131} 242}
132 243
133package AnyEvent::MP::Node::Self; 244package AnyEvent::MP::Node::Self;
… …
137sub set_transport { 248sub set_transport {
138 die "FATAL error, set_transport was called"; 249 die "FATAL error, set_transport was called";
139} 250}
140 251
141sub send { 252sub send {
253 local $AnyEvent::MP::Base::SRCNODE = $_[0];
142 AnyEvent::MP::_inject ($_[1]); 254 AnyEvent::MP::Base::_inject (@{ $_[1] });
255}
256
257sub monitor {
258 my ($self, $portid, $cb) = @_;
259
260 return $cb->()
261 unless exists $AnyEvent::MP::Base::PORT{$portid};
262
263 $AnyEvent::MP::Base::LMON{$portid}{$cb+0} = $cb;
264}
265
266sub unmonitor {
267 my ($self, $portid, $cb) = @_;
268
269 delete $AnyEvent::MP::Base::LMON{$portid}{$cb+0};
143} 270}
144 271
145=head1 SEE ALSO 272=head1 SEE ALSO
146 273
147L<AnyEvent>. 274L<AnyEvent>.

Diff Legend

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