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.30 by root, Fri Aug 28 20:57:42 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}
… …
48 54
49 $self->{send} = sub { 55 $self->{send} = sub {
50 push @{$self->{queue}}, shift; 56 push @{$self->{queue}}, shift;
51 $self->connect; 57 $self->connect;
52 }; 58 };
53
54 $self->connect
55 if $self->{autoconnect};
56} 59}
57 60
58# called only after successful handshake 61# called only after successful handshake
59sub transport_error { 62sub transport_error {
60 my ($self, @reason) = @_; 63 my ($self, @reason) = @_;
… …
65 delete $self->{connect_to}; 68 delete $self->{connect_to};
66 69
67 delete $self->{queue}; 70 delete $self->{queue};
68 $self->transport_reset; 71 $self->transport_reset;
69 72
70 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 0, @reason)
71 unless $no_transport;
72
73 if (my $mon = delete $self->{lmon}) { 73 if (my $mon = delete $self->{lmon}) {
74 $_->(@reason) for map @$_, values %$mon; 74 $_->(@reason) for map @$_, values %$mon;
75 } 75 }
76
77 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 0, @reason)
78 unless $no_transport;
76} 79}
77 80
78# called after handshake was successful 81# called after handshake was successful
79sub transport_connect { 82sub transport_connect {
80 my ($self, $transport) = @_; 83 my ($self, $transport) = @_;
81 84
82 # first connect with a master node 85 delete $self->{trial};
83 $AnyEvent::MP::Kernel::SLAVE->($self)
84 if ref $AnyEvent::MP::Kernel::SLAVE;
85 86
86 $self->transport_error (transport_error => "switched connections") 87 $self->transport_error (transport_error => "switched connections")
87 if $self->{transport}; 88 if $self->{transport};
88 89
89 delete $self->{connect_w}; 90 delete $self->{connect_w};
… …
102 $transport->send ($_) 103 $transport->send ($_)
103 for @{ delete $self->{queue} || [] }; 104 for @{ delete $self->{queue} || [] };
104} 105}
105 106
106sub connect { 107sub connect {
107 my ($self) = @_; 108 my ($self, @addresses) = @_;
108 109
109 return if $self->{transport}; 110 return if $self->{transport};
110 111
111 Scalar::Util::weaken $self; 112 Scalar::Util::weaken $self;
112 113
113 $self->{connect_to} ||= AE::timer 114 $self->{connect_to} ||= AE::timer
114 $AnyEvent::MP::Config::CFG{monitor_timeout} || $AnyEvent::MP::Kernel::MONITOR_TIMEOUT, 115 $AnyEvent::MP::Config::CFG{monitor_timeout} || $AnyEvent::MP::Kernel::MONITOR_TIMEOUT,
115 0, 116 0,
116 sub { 117 sub {
117 $self->transport_error (transport_error => $self->{noderef}, "unable to connect"); 118 $self->transport_error (transport_error => $self->{id}, "unable to connect");
118 }; 119 };
120
121 return unless @addresses;
122
123 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
119 124
120 unless ($self->{connect_w}) { 125 unless ($self->{connect_w}) {
121 my @endpoints; 126 my @endpoints;
122 my %trial;
123 127
124 $self->{connect_w} = AE::timer 128 $self->{connect_w} = AE::timer
125 rand, 129 rand,
126 $AnyEvent::MP::Config::CFG{connect_interval} || $AnyEvent::MP::Kernel::CONNECT_INTERVAL, 130 $AnyEvent::MP::Config::CFG{connect_interval} || $AnyEvent::MP::Kernel::CONNECT_INTERVAL,
127 sub { 131 sub {
128 @endpoints = split /,/, $self->{noderef} 132 @endpoints = @addresses
129 unless @endpoints; 133 unless @endpoints;
130 134
131 my $endpoint = shift @endpoints; 135 my $endpoint = shift @endpoints;
132 136
137 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint");
138
133 $trial{$endpoint} ||= do { 139 $self->{trial}{$endpoint} ||= do {
134 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint 140 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
135 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{noderef}: not a resolved node reference."); 141 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{id}: not a resolved node reference.");
136 142
137 AnyEvent::MP::Transport::mp_connect 143 AnyEvent::MP::Transport::mp_connect
138 $host, $port, 144 $host, $port,
139 sub { delete $trial{$endpoint} } 145 sub { delete $self->{trial}{$endpoint} },
140 ;
141 }; 146 };
142 } 147 }
143 ; 148 ;
144 } 149 }
145} 150}
… …
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
… …
238 local $AnyEvent::MP::Kernel::SRCNODE = $self; 202 local $AnyEvent::MP::Kernel::SRCNODE = $self;
239 AnyEvent::MP::Kernel::_inject (@{ $_[0] }); 203 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
240 }; 204 };
241} 205}
242 206
207sub transport_connect {
208 my ($self, $tp) = @_;
209
210 $AnyEvent::MP::Kernel::WARN->(9, "I refuse to talk to myself ($tp->{peerhost}:$tp->{peerport})");
211}
212
243sub kill { 213sub kill {
244 my ($self, $port, @reason) = @_; 214 my ($self, $port, @reason) = @_;
245 215
246 delete $AnyEvent::MP::Kernel::PORT{$port}; 216 delete $AnyEvent::MP::Kernel::PORT{$port};
247 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 217 delete $AnyEvent::MP::Kernel::PORT_DATA{$port};

Diff Legend

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