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

Diff Legend

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