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

Diff Legend

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