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.20 by root, Thu Aug 13 00:23:36 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}
… …
54 60
55# called only after successful handshake 61# called only after successful handshake
56sub transport_error { 62sub transport_error {
57 my ($self, @reason) = @_; 63 my ($self, @reason) = @_;
58 64
59 $self->{transport} 65 my $no_transport = !$self->{transport};
60 or return; 66
67 delete $self->{connect_w};
68 delete $self->{connect_to};
61 69
62 delete $self->{queue}; 70 delete $self->{queue};
63 $self->transport_reset; 71 $self->transport_reset;
64
65 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 0, @reason);
66 72
67 if (my $mon = delete $self->{lmon}) { 73 if (my $mon = delete $self->{lmon}) {
68 $_->(@reason) for map @$_, values %$mon; 74 $_->(@reason) for map @$_, values %$mon;
69 } 75 }
76
77 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 0, @reason)
78 unless $no_transport;
70} 79}
71 80
72# called after handshake was successful 81# called after handshake was successful
73sub transport_connect { 82sub transport_connect {
74 my ($self, $transport) = @_; 83 my ($self, $transport) = @_;
75 84
85 delete $self->{trial};
86
76 $self->transport_error (transport_error => "switched connections") 87 $self->transport_error (transport_error => "switched connections")
77 if $self->{transport}; 88 if $self->{transport};
78 89
79 delete $self->{connect_w}; 90 delete $self->{connect_w};
80 delete $self->{connect_to}; 91 delete $self->{connect_to};
… …
92 $transport->send ($_) 103 $transport->send ($_)
93 for @{ delete $self->{queue} || [] }; 104 for @{ delete $self->{queue} || [] };
94} 105}
95 106
96sub connect { 107sub connect {
97 my ($self) = @_; 108 my ($self, @addresses) = @_;
109
110 return if $self->{transport};
98 111
99 Scalar::Util::weaken $self; 112 Scalar::Util::weaken $self;
100 113
101 $self->{connect_to} ||= AE::timer 114 $self->{connect_to} ||= AE::timer
102 $AnyEvent::MP::Config::CFG{monitor_timeout} || $AnyEvent::MP::Kernel::MONITOR_TIMEOUT, 115 $AnyEvent::MP::Config::CFG{monitor_timeout} || $AnyEvent::MP::Kernel::MONITOR_TIMEOUT,
103 0, 116 0,
104 sub { 117 sub {
105 $self->transport_error (transport_error => $self->{noderef}, "unable to connect"); 118 $self->transport_error (transport_error => $self->{id}, "unable to connect");
106 }; 119 };
120
121 return unless @addresses;
122
123 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
107 124
108 unless ($self->{connect_w}) { 125 unless ($self->{connect_w}) {
109 my @endpoints; 126 my @endpoints;
110 my %trial;
111 127
112 $self->{connect_w} = AE::timer 128 $self->{connect_w} = AE::timer
113 0, 129 rand,
114 $AnyEvent::MP::Config::CFG{connect_interval} || $AnyEvent::MP::Kernel::CONNECT_INTERVAL, 130 $AnyEvent::MP::Config::CFG{connect_interval} || $AnyEvent::MP::Kernel::CONNECT_INTERVAL,
115 sub { 131 sub {
116 @endpoints = split /,/, $self->{noderef} 132 @endpoints = @addresses
117 unless @endpoints; 133 unless @endpoints;
118 134
119 my $endpoint = shift @endpoints; 135 my $endpoint = shift @endpoints;
120 136
137 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint");
138
121 $trial{$endpoint} ||= do { 139 $self->{trial}{$endpoint} ||= do {
122 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint 140 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
123 or return $AnyEvent::MP::Kernel::WARN->("$self->{noderef}: not a resolved node reference."); 141 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{id}: not a resolved node reference.");
124 142
125 AnyEvent::MP::Transport::mp_connect 143 AnyEvent::MP::Transport::mp_connect
126 $host, $port, 144 $host, $port,
127 sub { delete $trial{$endpoint} } 145 sub { delete $self->{trial}{$endpoint} },
128 ;
129 }; 146 };
130 } 147 }
131 ; 148 ;
132 } 149 }
133} 150}
… …
142 my ($self, $portid, $cb) = @_; 159 my ($self, $portid, $cb) = @_;
143 160
144 my $list = $self->{lmon}{$portid} ||= []; 161 my $list = $self->{lmon}{$portid} ||= [];
145 162
146 $self->send (["", mon1 => $portid]) 163 $self->send (["", mon1 => $portid])
147 unless @$list; 164 unless @$list || !length $portid;
148 165
149 push @$list, $cb; 166 push @$list, $cb;
150} 167}
151 168
152sub unmonitor { 169sub unmonitor {
… …
161 $self->send (["", mon0 => $portid]); 178 $self->send (["", mon0 => $portid]);
162 delete $self->{monitor}{$portid}; 179 delete $self->{monitor}{$portid};
163 } 180 }
164} 181}
165 182
183# used for direct slave connections as well
166package AnyEvent::MP::Node::Direct; 184package AnyEvent::MP::Node::Direct;
167 185
168use base "AnyEvent::MP::Node::External"; 186use base "AnyEvent::MP::Node::External";
169
170package AnyEvent::MP::Node::Indirect;
171
172use base "AnyEvent::MP::Node::Direct";
173
174sub connect {
175 my ($self) = @_;
176
177 $self->transport_error (transport_error => $self->{noderef}, "unable to connect to indirect node");
178}
179 187
180package AnyEvent::MP::Node::Self; 188package AnyEvent::MP::Node::Self;
181 189
182use base "AnyEvent::MP::Node"; 190use base "AnyEvent::MP::Node";
183 191
… …
194 local $AnyEvent::MP::Kernel::SRCNODE = $self; 202 local $AnyEvent::MP::Kernel::SRCNODE = $self;
195 AnyEvent::MP::Kernel::_inject (@{ $_[0] }); 203 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
196 }; 204 };
197} 205}
198 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
199sub kill { 213sub kill {
200 my ($self, $port, @reason) = @_; 214 my ($self, $port, @reason) = @_;
201 215
202 delete $AnyEvent::MP::Kernel::PORT{$port}; 216 delete $AnyEvent::MP::Kernel::PORT{$port};
203 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 217 delete $AnyEvent::MP::Kernel::PORT_DATA{$port};
204 218
205 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port} 219 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port}
206 or !@reason 220 or !@reason
207 or $AnyEvent::MP::Kernel::WARN->("unmonitored local port $port died with reason: @reason"); 221 or $AnyEvent::MP::Kernel::WARN->(2, "unmonitored local port $port died with reason: @reason");
208 222
209 $_->(@reason) for values %$mon; 223 $_->(@reason) for values %$mon;
210} 224}
211 225
212sub monitor { 226sub monitor {

Diff Legend

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