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.2 by root, Sat Aug 1 07:11:45 2009 UTC vs.
Revision 1.12 by root, Wed Aug 5 19:55:58 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::;
… …
33 34
34use base "AnyEvent::MP::Node"; 35use base "AnyEvent::MP::Node";
35 36
36sub send { 37sub send {
37 my ($self, $msg) = @_; 38 my ($self, $msg) = @_;
38
39 warn "send $self $self->{noderef}\n";#d#
40 39
41 if ($self->{transport}) { 40 if ($self->{transport}) {
42 $self->{transport}->send ($msg); 41 $self->{transport}->send ($msg);
43 } elsif ($self->{queue}) { 42 } elsif ($self->{queue}) {
44 push @{ $self->{queue} }, $msg; 43 push @{ $self->{queue} }, $msg;
… …
46 $self->{queue} = [$msg]; 45 $self->{queue} = [$msg];
47 $self->connect; 46 $self->connect;
48 } 47 }
49} 48}
50 49
50sub kill {
51 my ($self, $port, @reason) = @_;
52
53 $self->send (["", kil => $port, @reason]);
54}
55
56sub monitor {
57 my ($self, $portid, $cb) = @_;
58
59 return $cb->(transport_error => "node unreachable")
60 if $self->{failed};
61
62 my $list = $self->{lmon}{$portid} ||= [];
63
64 $self->send (["", mon1 => $portid])
65 unless @$list;
66
67 push @$list, $cb;
68}
69
70sub unmonitor {
71 my ($self, $portid, $cb) = @_;
72
73 my $list = $self->{lmon}{$portid}
74 or return;
75
76 @$list = grep $_ != $cb, @$list;
77
78 unless (@$list) {
79 $self->send (["", mon0 => $portid]);
80 delete $self->{monitor}{$portid};
81 }
82}
83
51sub set_transport { 84sub set_transport {
52 my ($self, $transport) = @_; 85 my ($self, $transport) = @_;
53 86
54 delete $self->{trial}; 87 $self->clr_transport
55 delete $self->{next_connect}; 88 if $self->{transport};
56
57 use Data::Dumper; warn "set_transport $self->{noderef} $self $AnyEvent::MP::NODE{'10.0.0.1:4040'}\n";#d#
58 89
59 if ( 90 if (
60 exists $self->{remote_uniq} 91 exists $self->{remote_uniq}
61 && $self->{remote_uniq} ne $transport->{remote_uniq} 92 && $self->{remote_uniq} ne $transport->{remote_uniq}
62 ) { 93 ) {
63 # 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};
64 delete $self->{queue}; 100 delete $self->{failed};
65 #TODO: "DOWN"
66 }
67 101
68 $self->{remote_uniq} = $transport->{remote_uniq}; 102 $self->{remote_uniq} = $transport->{remote_uniq};
69 $self->{transport} = $transport; 103 $self->{transport} = $transport;
70 104
71 $transport->send ($_) 105 $transport->send ($_)
72 for @{ delete $self->{queue} || [] }; 106 for @{ delete $self->{queue} || [] };
73} 107}
74 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
75sub clr_transport { 121sub clr_transport {
76 my ($self) = @_; 122 my ($self, @reason) = @_;
77 123
78 delete $self->{transport}; 124 delete $self->{transport};
79 warn "clr_transport\n"; 125 $self->connect;
80} 126}
81 127
82sub connect { 128sub connect {
83 my ($self) = @_; 129 my ($self) = @_;
84 130
85 Scalar::Util::weaken $self; 131 Scalar::Util::weaken $self;
86 132
87 unless (exists $self->{n_noderef}) {
88 (AnyEvent::MP::normalise_noderef ($self->{noderef}))->cb (sub {
89 $self or return;
90 my $noderef = shift->recv;
91
92 $self->{n_noderef} = $noderef;
93
94 $AnyEvent::MP::NODE{$_} = $self
95 for split /,/, $noderef;
96
97 $self->connect;
98 });
99 return;
100 }
101
102 $self->{retry} ||= [split /,/, $self->{n_noderef}]; 133 $self->{retry} ||= [split /,/, $self->{noderef}];
103 134
104 my $endpoint = shift @{ $self->{retry} }; 135 my $endpoint = shift @{ $self->{retry} };
105 136
106 if (defined $endpoint) { 137 if (defined $endpoint) {
107 $self->{trial}{$endpoint} ||= do { 138 $self->{trial}{$endpoint} ||= do {
108 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint 139 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
109 or return; 140 or return $AnyEvent::MP::Base::WARN->("$self->{noderef}: not a resolved node reference.");
110 141
111 my ($w, $g); 142 my ($w, $g);
112 143
113 $w = AE::timer $AnyEvent::MP::CONNECT_TIMEOUT, 0, sub { 144 $w = AE::timer $AnyEvent::MP::Base::CONNECT_TIMEOUT, 0, sub {
114 delete $self->{trial}{$endpoint}; 145 delete $self->{trial}{$endpoint};
115 }; 146 };
116 $g = AnyEvent::MP::Transport::mp_connect 147 $g = AnyEvent::MP::Transport::mp_connect
117 $host, $port, 148 $host, $port,
118 sub { 149 sub {
… …
124 155
125 [$w, \$g] 156 [$w, \$g]
126 }; 157 };
127 } else { 158 } else {
128 delete $self->{retry}; 159 delete $self->{retry};
160 $self->fail (transport_error => $self->{noderef}, "unable to connect");
129 } 161 }
130 162
131 $self->{next_connect} = AE::timer $AnyEvent::MP::CONNECT_INTERVAL, 0, sub { 163 $self->{next_connect} = AE::timer $AnyEvent::MP::Base::CONNECT_INTERVAL, 0, sub {
132 $self->connect; 164 $self->connect;
133 }; 165 };
134} 166}
135 167
136package AnyEvent::MP::Node::Self; 168package AnyEvent::MP::Node::Self;
137 169
138use base "AnyEvent::MP::Node"; 170use base "AnyEvent::MP::Node";
139 171
140sub set_transport { 172sub set_transport {
141 die "FATAL error, set_transport was called"; 173 Carp::confess "FATAL error, set_transport was called on local node";
142} 174}
143 175
144sub send { 176sub send {
177 local $AnyEvent::MP::Base::SRCNODE = $_[0];
145 AnyEvent::MP::_inject ($_[1]); 178 AnyEvent::MP::Base::_inject (@{ $_[1] });
179}
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
194sub monitor {
195 my ($self, $portid, $cb) = @_;
196
197 return $cb->()
198 unless exists $AnyEvent::MP::Base::PORT{$portid};
199
200 $AnyEvent::MP::Base::LMON{$portid}{$cb+0} = $cb;
201}
202
203sub unmonitor {
204 my ($self, $portid, $cb) = @_;
205
206 delete $AnyEvent::MP::Base::LMON{$portid}{$cb+0};
146} 207}
147 208
148=head1 SEE ALSO 209=head1 SEE ALSO
149 210
150L<AnyEvent>. 211L<AnyEvent>.

Diff Legend

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