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.12 by root, Wed Aug 5 19:55:58 2009 UTC vs.
Revision 1.25 by root, Sat Aug 15 15:08:07 2009 UTC

… …
18use AnyEvent::Util (); 18use AnyEvent::Util ();
19use AnyEvent::Socket (); 19use AnyEvent::Socket ();
20 20
21use AnyEvent::MP::Transport (); 21use AnyEvent::MP::Transport ();
22 22
23use base Exporter::;
24
25our $VERSION = '0.0';
26
27sub new { 23sub new {
28 my ($class, $noderef) = @_; 24 my ($self, $noderef) = @_;
29 25
30 bless { noderef => $noderef }, $class 26 $self = bless { noderef => $noderef }, $self;
31}
32 27
28 $self->transport_reset;
29
30 $self
31}
32
33sub send {
34 &{ shift->{send} }
35}
36
33package AnyEvent::MP::Node::Direct; 37package AnyEvent::MP::Node::External;
34 38
35use base "AnyEvent::MP::Node"; 39use base "AnyEvent::MP::Node";
36 40
37sub send { 41# called at init time, mostly sets {send}
42sub transport_reset {
38 my ($self, $msg) = @_; 43 my ($self) = @_;
39 44
40 if ($self->{transport}) { 45 delete $self->{transport};
41 $self->{transport}->send ($msg); 46
42 } elsif ($self->{queue}) { 47 Scalar::Util::weaken $self;
48
49 $self->{send} = sub {
43 push @{ $self->{queue} }, $msg; 50 push @{$self->{queue}}, shift;
44 } else {
45 $self->{queue} = [$msg];
46 $self->connect; 51 $self->connect;
52 };
53
54 $self->connect
55 if $self->{autoconnect};
56}
57
58# called only after successful handshake
59sub transport_error {
60 my ($self, @reason) = @_;
61
62 my $no_transport = !$self->{transport};
63
64 delete $self->{connect_w};
65 delete $self->{connect_to};
66
67 delete $self->{queue};
68 $self->transport_reset;
69
70 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 0, @reason)
71 unless $no_transport;
72
73 if (my $mon = delete $self->{lmon}) {
74 $_->(@reason) for map @$_, values %$mon;
75 }
76}
77
78# called after handshake was successful
79sub transport_connect {
80 my ($self, $transport) = @_;
81
82 # first connect with a master node
83 $AnyEvent::MP::Kernel::SLAVE->($self)
84 if ref $AnyEvent::MP::Kernel::SLAVE;
85
86 $self->transport_error (transport_error => "switched connections")
87 if $self->{transport};
88
89 delete $self->{connect_w};
90 delete $self->{connect_to};
91
92 $self->{transport} = $transport;
93
94 my $transport_send = $transport->can ("send");
95
96 $self->{send} = sub {
97 $transport_send->($transport, $_[0]);
98 };
99
100 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1);
101
102 $transport->send ($_)
103 for @{ delete $self->{queue} || [] };
104}
105
106sub connect {
107 my ($self) = @_;
108
109 return if $self->{transport};
110
111 Scalar::Util::weaken $self;
112
113 $self->{connect_to} ||= AE::timer
114 $AnyEvent::MP::Config::CFG{monitor_timeout} || $AnyEvent::MP::Kernel::MONITOR_TIMEOUT,
115 0,
116 sub {
117 $self->transport_error (transport_error => $self->{noderef}, "unable to connect");
118 };
119
120 unless ($self->{connect_w}) {
121 my @endpoints;
122 my %trial;
123
124 $self->{connect_w} = AE::timer
125 0,
126 $AnyEvent::MP::Config::CFG{connect_interval} || $AnyEvent::MP::Kernel::CONNECT_INTERVAL,
127 sub {
128 @endpoints = split /,/, $self->{noderef}
129 unless @endpoints;
130
131 my $endpoint = shift @endpoints;
132
133 $trial{$endpoint} ||= do {
134 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
135 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{noderef}: not a resolved node reference.");
136
137 AnyEvent::MP::Transport::mp_connect
138 $host, $port,
139 sub { delete $trial{$endpoint} }
140 ;
141 };
142 }
143 ;
47 } 144 }
48} 145}
49 146
50sub kill { 147sub kill {
51 my ($self, $port, @reason) = @_; 148 my ($self, $port, @reason) = @_;
… …
54} 151}
55 152
56sub monitor { 153sub monitor {
57 my ($self, $portid, $cb) = @_; 154 my ($self, $portid, $cb) = @_;
58 155
59 return $cb->(transport_error => "node unreachable")
60 if $self->{failed};
61
62 my $list = $self->{lmon}{$portid} ||= []; 156 my $list = $self->{lmon}{$portid} ||= [];
63 157
64 $self->send (["", mon1 => $portid]) 158 $self->send (["", mon1 => $portid])
65 unless @$list; 159 unless @$list || !length $portid;
66 160
67 push @$list, $cb; 161 push @$list, $cb;
68} 162}
69 163
70sub unmonitor { 164sub unmonitor {
… …
79 $self->send (["", mon0 => $portid]); 173 $self->send (["", mon0 => $portid]);
80 delete $self->{monitor}{$portid}; 174 delete $self->{monitor}{$portid};
81 } 175 }
82} 176}
83 177
84sub set_transport { 178package AnyEvent::MP::Node::Direct;
179
180use base "AnyEvent::MP::Node::External";
181
182package AnyEvent::MP::Node::Indirect;
183
184use base "AnyEvent::MP::Node::Direct";
185
186sub master {
85 my ($self, $transport) = @_; 187 my ($self) = @_;
86 188
87 $self->clr_transport 189 my (undef, $master) = split /\@/, $self->{noderef}, 2;
190 $master =~ s/!/,/g;
191 $master
192}
193
194sub transport_reset {
195 my ($self) = @_;
196
88 if $self->{transport}; 197 if ($self->{transport}) {
198 # as an optimisation, immediately nuke slave nodes
199 delete $AnyEvent::MP::Kernel::NODE{$self->{noderef}};
200 } else {
201 $self->SUPER::transport_reset;
202 return;#d##TODO#
89 203
90 if ( 204 my $noderef = $self->{noderef};
91 exists $self->{remote_uniq} 205 my $master = $self->master;
92 && $self->{remote_uniq} ne $transport->{remote_uniq}
93 ) {
94 # uniq changed, different node
95 $self->fail ("node restart detected");
96 }
97 206
98 delete $self->{trial}; 207 # slave nodes are so cool - we can always send to them :)
99 delete $self->{next_connect};
100 delete $self->{failed};
101 208
102 $self->{remote_uniq} = $transport->{remote_uniq}; 209 $self->{send} = sub {
103 $self->{transport} = $transport;
104
105 $transport->send ($_)
106 for @{ delete $self->{queue} || [] };
107}
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
121sub clr_transport {
122 my ($self, @reason) = @_;
123
124 delete $self->{transport};
125 $self->connect; 210 $self->connect;
211 snd $master, snd => $noderef, @_;
212 };
213 }
126} 214}
127 215
128sub connect { 216sub connect {
129 my ($self) = @_; 217 my ($self) = @_;
130 218
219 #TODO#
220# # ask for a connection, #TODO# rate-limit this somehow
221# snd $self->master, relay => $self->{noderef}, connect_node => $AnyEvent::MP::Kernel::NODE;
222}
223
224package AnyEvent::MP::Node::Self;
225
226use base "AnyEvent::MP::Node";
227
228sub connect {
229 # we are trivially connected
230}
231
232sub transport_reset {
233 my ($self) = @_;
234
131 Scalar::Util::weaken $self; 235 Scalar::Util::weaken $self;
132 236
133 $self->{retry} ||= [split /,/, $self->{noderef}]; 237 $self->{send} = sub {
134 238 local $AnyEvent::MP::Kernel::SRCNODE = $self;
135 my $endpoint = shift @{ $self->{retry} }; 239 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
136
137 if (defined $endpoint) {
138 $self->{trial}{$endpoint} ||= do {
139 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
140 or return $AnyEvent::MP::Base::WARN->("$self->{noderef}: not a resolved node reference.");
141
142 my ($w, $g);
143
144 $w = AE::timer $AnyEvent::MP::Base::CONNECT_TIMEOUT, 0, sub {
145 delete $self->{trial}{$endpoint};
146 };
147 $g = AnyEvent::MP::Transport::mp_connect
148 $host, $port,
149 sub {
150 delete $self->{trial}{$endpoint}
151 unless @_;
152 $g = shift;
153 };
154 ;
155
156 [$w, \$g]
157 };
158 } else {
159 delete $self->{retry};
160 $self->fail (transport_error => $self->{noderef}, "unable to connect");
161 }
162
163 $self->{next_connect} = AE::timer $AnyEvent::MP::Base::CONNECT_INTERVAL, 0, sub {
164 $self->connect;
165 }; 240 };
166}
167
168package AnyEvent::MP::Node::Self;
169
170use base "AnyEvent::MP::Node";
171
172sub set_transport {
173 Carp::confess "FATAL error, set_transport was called on local node";
174}
175
176sub send {
177 local $AnyEvent::MP::Base::SRCNODE = $_[0];
178 AnyEvent::MP::Base::_inject (@{ $_[1] });
179} 241}
180 242
181sub kill { 243sub kill {
182 my ($self, $port, @reason) = @_; 244 my ($self, $port, @reason) = @_;
183 245
184 delete $AnyEvent::MP::Base::PORT{$port}; 246 delete $AnyEvent::MP::Kernel::PORT{$port};
185 delete $AnyEvent::MP::Base::PORT_DATA{$port}; 247 delete $AnyEvent::MP::Kernel::PORT_DATA{$port};
186 248
187 my $mon = delete $AnyEvent::MP::Base::LMON{$port} 249 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port}
188 or !@reason 250 or !@reason
189 or $AnyEvent::MP::Base::WARN->("unmonitored local port $port died with reason: @reason"); 251 or $AnyEvent::MP::Kernel::WARN->(2, "unmonitored local port $port died with reason: @reason");
190 252
191 $_->(@reason) for values %$mon; 253 $_->(@reason) for values %$mon;
192} 254}
193 255
194sub monitor { 256sub monitor {
195 my ($self, $portid, $cb) = @_; 257 my ($self, $portid, $cb) = @_;
196 258
197 return $cb->() 259 return $cb->(no_such_port => "cannot monitor nonexistent port")
198 unless exists $AnyEvent::MP::Base::PORT{$portid}; 260 unless exists $AnyEvent::MP::Kernel::PORT{$portid};
199 261
200 $AnyEvent::MP::Base::LMON{$portid}{$cb+0} = $cb; 262 $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0} = $cb;
201} 263}
202 264
203sub unmonitor { 265sub unmonitor {
204 my ($self, $portid, $cb) = @_; 266 my ($self, $portid, $cb) = @_;
205 267
206 delete $AnyEvent::MP::Base::LMON{$portid}{$cb+0}; 268 delete $AnyEvent::MP::Kernel::LMON{$portid}{$cb+0};
207} 269}
208 270
209=head1 SEE ALSO 271=head1 SEE ALSO
210 272
211L<AnyEvent>. 273L<AnyEvent::MP>.
212 274
213=head1 AUTHOR 275=head1 AUTHOR
214 276
215 Marc Lehmann <schmorp@schmorp.de> 277 Marc Lehmann <schmorp@schmorp.de>
216 http://home.schmorp.de/ 278 http://home.schmorp.de/

Diff Legend

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