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.24 by root, Sat Aug 15 04:34:34 2009 UTC vs.
Revision 1.27 by root, Thu Aug 27 07:12:48 2009 UTC

… …
23sub new { 23sub new {
24 my ($self, $noderef) = @_; 24 my ($self, $noderef) = @_;
25 25
26 $self = bless { noderef => $noderef }, $self; 26 $self = bless { noderef => $noderef }, $self;
27 27
28 $self->init;
28 $self->transport_reset; 29 $self->transport_reset;
29 30
30 $self 31 $self
32}
33
34sub init {
35 #
31} 36}
32 37
33sub send { 38sub send {
34 &{ shift->{send} } 39 &{ shift->{send} }
35} 40}
36 41
42# nodes reachable via the network
37package AnyEvent::MP::Node::External; 43package AnyEvent::MP::Node::External;
38 44
39use base "AnyEvent::MP::Node"; 45use base "AnyEvent::MP::Node";
40 46
41# called at init time, mostly sets {send} 47# called at init time, mostly sets {send}
… …
77 83
78# called after handshake was successful 84# called after handshake was successful
79sub transport_connect { 85sub transport_connect {
80 my ($self, $transport) = @_; 86 my ($self, $transport) = @_;
81 87
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") 88 $self->transport_error (transport_error => "switched connections")
87 if $self->{transport}; 89 if $self->{transport};
88 90
89 delete $self->{connect_w}; 91 delete $self->{connect_w};
90 delete $self->{connect_to}; 92 delete $self->{connect_to};
… …
105 107
106sub connect { 108sub connect {
107 my ($self) = @_; 109 my ($self) = @_;
108 110
109 return if $self->{transport}; 111 return if $self->{transport};
112
113 # just ignore connect requests for slave nodes - let's hope it connects to us instead
114 return if $self->{noderef} =~ /^slave\//;
110 115
111 Scalar::Util::weaken $self; 116 Scalar::Util::weaken $self;
112 117
113 $self->{connect_to} ||= AE::timer 118 $self->{connect_to} ||= AE::timer
114 $AnyEvent::MP::Config::CFG{monitor_timeout} || $AnyEvent::MP::Kernel::MONITOR_TIMEOUT, 119 $AnyEvent::MP::Config::CFG{monitor_timeout} || $AnyEvent::MP::Kernel::MONITOR_TIMEOUT,
… …
120 unless ($self->{connect_w}) { 125 unless ($self->{connect_w}) {
121 my @endpoints; 126 my @endpoints;
122 my %trial; 127 my %trial;
123 128
124 $self->{connect_w} = AE::timer 129 $self->{connect_w} = AE::timer
125 0, 130 rand,
126 $AnyEvent::MP::Config::CFG{connect_interval} || $AnyEvent::MP::Kernel::CONNECT_INTERVAL, 131 $AnyEvent::MP::Config::CFG{connect_interval} || $AnyEvent::MP::Kernel::CONNECT_INTERVAL,
127 sub { 132 sub {
128 @endpoints = split /,/, $self->{noderef} 133 @endpoints = split /,/, $self->{noderef}
129 unless @endpoints; 134 unless @endpoints;
130 135
131 my $endpoint = shift @endpoints; 136 my $endpoint = shift @endpoints;
132 137
133 $trial{$endpoint} ||= do { 138 $trial{$endpoint} ||= do {
134 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint 139 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
135 or return $AnyEvent::MP::Kernel::WARN->("$self->{noderef}: not a resolved node reference."); 140 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{noderef}: not a resolved node reference.");
136 141
137 AnyEvent::MP::Transport::mp_connect 142 AnyEvent::MP::Transport::mp_connect
138 $host, $port, 143 $host, $port,
139 sub { delete $trial{$endpoint} } 144 sub { delete $trial{$endpoint} }
140 ; 145 ;
… …
173 $self->send (["", mon0 => $portid]); 178 $self->send (["", mon0 => $portid]);
174 delete $self->{monitor}{$portid}; 179 delete $self->{monitor}{$portid};
175 } 180 }
176} 181}
177 182
183# used for direct slave connections as well
178package AnyEvent::MP::Node::Direct; 184package AnyEvent::MP::Node::Direct;
179 185
180use base "AnyEvent::MP::Node::External"; 186use base "AnyEvent::MP::Node::External";
181
182package AnyEvent::MP::Node::Indirect;
183
184use base "AnyEvent::MP::Node::Direct";
185
186sub master {
187 my ($self) = @_;
188
189 my (undef, $master) = split /\@/, $self->{noderef}, 2;
190 $master =~ s/!/,/g;
191 $master
192}
193
194sub transport_reset {
195 my ($self) = @_;
196
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#
203
204 my $noderef = $self->{noderef};
205 my $master = $self->master;
206
207 # slave nodes are so cool - we can always send to them :)
208
209 $self->{send} = sub {
210 $self->connect;
211 snd $master, snd => $noderef, @_;
212 };
213 }
214}
215
216sub connect {
217 my ($self) = @_;
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 187
224package AnyEvent::MP::Node::Self; 188package AnyEvent::MP::Node::Self;
225 189
226use base "AnyEvent::MP::Node"; 190use base "AnyEvent::MP::Node";
227 191
… …
246 delete $AnyEvent::MP::Kernel::PORT{$port}; 210 delete $AnyEvent::MP::Kernel::PORT{$port};
247 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 211 delete $AnyEvent::MP::Kernel::PORT_DATA{$port};
248 212
249 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port} 213 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port}
250 or !@reason 214 or !@reason
251 or $AnyEvent::MP::Kernel::WARN->("unmonitored local port $port died with reason: @reason"); 215 or $AnyEvent::MP::Kernel::WARN->(2, "unmonitored local port $port died with reason: @reason");
252 216
253 $_->(@reason) for values %$mon; 217 $_->(@reason) for values %$mon;
254} 218}
255 219
256sub monitor { 220sub monitor {

Diff Legend

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