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

Diff Legend

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