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.26 by root, Sat Aug 15 15:13:04 2009 UTC vs.
Revision 1.29 by root, Fri Aug 28 00:31:14 2009 UTC

… …
19use AnyEvent::Socket (); 19use AnyEvent::Socket ();
20 20
21use AnyEvent::MP::Transport (); 21use AnyEvent::MP::Transport ();
22 22
23sub new { 23sub new {
24 my ($self, $noderef) = @_; 24 my ($self, $id) = @_;
25 25
26 $self = bless { noderef => $noderef }, $self; 26 $self = bless { id => $id }, $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 88 delete $self->{trial};
83 $AnyEvent::MP::Kernel::SLAVE->($self)
84 if ref $AnyEvent::MP::Kernel::SLAVE;
85 89
86 $self->transport_error (transport_error => "switched connections") 90 $self->transport_error (transport_error => "switched connections")
87 if $self->{transport}; 91 if $self->{transport};
88 92
89 delete $self->{connect_w}; 93 delete $self->{connect_w};
… …
102 $transport->send ($_) 106 $transport->send ($_)
103 for @{ delete $self->{queue} || [] }; 107 for @{ delete $self->{queue} || [] };
104} 108}
105 109
106sub connect { 110sub connect {
107 my ($self) = @_; 111 my ($self, @addresses) = @_;
108 112
109 return if $self->{transport}; 113 return if $self->{transport};
110 114
111 Scalar::Util::weaken $self; 115 Scalar::Util::weaken $self;
112 116
113 $self->{connect_to} ||= AE::timer 117 $self->{connect_to} ||= AE::timer
114 $AnyEvent::MP::Config::CFG{monitor_timeout} || $AnyEvent::MP::Kernel::MONITOR_TIMEOUT, 118 $AnyEvent::MP::Config::CFG{monitor_timeout} || $AnyEvent::MP::Kernel::MONITOR_TIMEOUT,
115 0, 119 0,
116 sub { 120 sub {
117 $self->transport_error (transport_error => $self->{noderef}, "unable to connect"); 121 $self->transport_error (transport_error => $self->{id}, "unable to connect");
118 }; 122 };
123
124 return unless @addresses;
125
126 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
119 127
120 unless ($self->{connect_w}) { 128 unless ($self->{connect_w}) {
121 my @endpoints; 129 my @endpoints;
122 my %trial;
123 130
124 $self->{connect_w} = AE::timer 131 $self->{connect_w} = AE::timer
125 rand, 132 rand,
126 $AnyEvent::MP::Config::CFG{connect_interval} || $AnyEvent::MP::Kernel::CONNECT_INTERVAL, 133 $AnyEvent::MP::Config::CFG{connect_interval} || $AnyEvent::MP::Kernel::CONNECT_INTERVAL,
127 sub { 134 sub {
128 @endpoints = split /,/, $self->{noderef} 135 @endpoints = @addresses
129 unless @endpoints; 136 unless @endpoints;
130 137
131 my $endpoint = shift @endpoints; 138 my $endpoint = shift @endpoints;
132 139
140 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint");
141
133 $trial{$endpoint} ||= do { 142 $self->{trial}{$endpoint} ||= do {
134 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint 143 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
135 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{noderef}: not a resolved node reference."); 144 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{id}: not a resolved node reference.");
136 145
137 AnyEvent::MP::Transport::mp_connect 146 AnyEvent::MP::Transport::mp_connect
138 $host, $port, 147 $host, $port,
139 sub { delete $trial{$endpoint} } 148 sub { delete $self->{trial}{$endpoint} },
140 ;
141 }; 149 };
142 } 150 }
143 ; 151 ;
144 } 152 }
145} 153}
… …
173 $self->send (["", mon0 => $portid]); 181 $self->send (["", mon0 => $portid]);
174 delete $self->{monitor}{$portid}; 182 delete $self->{monitor}{$portid};
175 } 183 }
176} 184}
177 185
186# used for direct slave connections as well
178package AnyEvent::MP::Node::Direct; 187package AnyEvent::MP::Node::Direct;
179 188
180use base "AnyEvent::MP::Node::External"; 189use 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 190
224package AnyEvent::MP::Node::Self; 191package AnyEvent::MP::Node::Self;
225 192
226use base "AnyEvent::MP::Node"; 193use base "AnyEvent::MP::Node";
227 194
… …
238 local $AnyEvent::MP::Kernel::SRCNODE = $self; 205 local $AnyEvent::MP::Kernel::SRCNODE = $self;
239 AnyEvent::MP::Kernel::_inject (@{ $_[0] }); 206 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
240 }; 207 };
241} 208}
242 209
210sub transport_connect {
211 my ($self, $tp) = @_;
212
213 $AnyEvent::MP::Kernel::WARN->(9, "I refuse to talk to myself ($tp->{peerhost}:$tp->{peerport})");
214}
215
243sub kill { 216sub kill {
244 my ($self, $port, @reason) = @_; 217 my ($self, $port, @reason) = @_;
245 218
246 delete $AnyEvent::MP::Kernel::PORT{$port}; 219 delete $AnyEvent::MP::Kernel::PORT{$port};
247 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 220 delete $AnyEvent::MP::Kernel::PORT_DATA{$port};

Diff Legend

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