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.27 by root, Thu Aug 27 07:12:48 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->init;
29 $self->transport_reset; 29 $self->transport_reset;
30 30
31 $self 31 $self
… …
83 83
84# called after handshake was successful 84# called after handshake was successful
85sub transport_connect { 85sub transport_connect {
86 my ($self, $transport) = @_; 86 my ($self, $transport) = @_;
87 87
88 delete $self->{trial};
89
88 $self->transport_error (transport_error => "switched connections") 90 $self->transport_error (transport_error => "switched connections")
89 if $self->{transport}; 91 if $self->{transport};
90 92
91 delete $self->{connect_w}; 93 delete $self->{connect_w};
92 delete $self->{connect_to}; 94 delete $self->{connect_to};
… …
104 $transport->send ($_) 106 $transport->send ($_)
105 for @{ delete $self->{queue} || [] }; 107 for @{ delete $self->{queue} || [] };
106} 108}
107 109
108sub connect { 110sub connect {
109 my ($self) = @_; 111 my ($self, @addresses) = @_;
110 112
111 return if $self->{transport}; 113 return if $self->{transport};
112
113 # just ignore connect requests for slave nodes - let's hope it connects to us instead
114 return if $self->{noderef} =~ /^slave\//;
115 114
116 Scalar::Util::weaken $self; 115 Scalar::Util::weaken $self;
117 116
118 $self->{connect_to} ||= AE::timer 117 $self->{connect_to} ||= AE::timer
119 $AnyEvent::MP::Config::CFG{monitor_timeout} || $AnyEvent::MP::Kernel::MONITOR_TIMEOUT, 118 $AnyEvent::MP::Config::CFG{monitor_timeout} || $AnyEvent::MP::Kernel::MONITOR_TIMEOUT,
120 0, 119 0,
121 sub { 120 sub {
122 $self->transport_error (transport_error => $self->{noderef}, "unable to connect"); 121 $self->transport_error (transport_error => $self->{id}, "unable to connect");
123 }; 122 };
123
124 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
125 return unless @addresses;
124 126
125 unless ($self->{connect_w}) { 127 unless ($self->{connect_w}) {
126 my @endpoints; 128 my @endpoints;
127 my %trial;
128 129
129 $self->{connect_w} = AE::timer 130 $self->{connect_w} = AE::timer
130 rand, 131 rand,
131 $AnyEvent::MP::Config::CFG{connect_interval} || $AnyEvent::MP::Kernel::CONNECT_INTERVAL, 132 $AnyEvent::MP::Config::CFG{connect_interval} || $AnyEvent::MP::Kernel::CONNECT_INTERVAL,
132 sub { 133 sub {
133 @endpoints = split /,/, $self->{noderef} 134 @endpoints = @addresses
134 unless @endpoints; 135 unless @endpoints;
135 136
136 my $endpoint = shift @endpoints; 137 my $endpoint = shift @endpoints;
137 138
139 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint");
140
138 $trial{$endpoint} ||= do { 141 $self->{trial}{$endpoint} ||= do {
139 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint 142 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
140 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{noderef}: not a resolved node reference."); 143 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{id}: not a resolved node reference.");
141 144
142 AnyEvent::MP::Transport::mp_connect 145 AnyEvent::MP::Transport::mp_connect
143 $host, $port, 146 $host, $port,
144 sub { delete $trial{$endpoint} } 147 sub { delete $self->{trial}{$endpoint} },
145 ;
146 }; 148 };
147 } 149 }
148 ; 150 ;
149 } 151 }
150} 152}
… …
202 local $AnyEvent::MP::Kernel::SRCNODE = $self; 204 local $AnyEvent::MP::Kernel::SRCNODE = $self;
203 AnyEvent::MP::Kernel::_inject (@{ $_[0] }); 205 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
204 }; 206 };
205} 207}
206 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
207sub kill { 215sub kill {
208 my ($self, $port, @reason) = @_; 216 my ($self, $port, @reason) = @_;
209 217
210 delete $AnyEvent::MP::Kernel::PORT{$port}; 218 delete $AnyEvent::MP::Kernel::PORT{$port};
211 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 219 delete $AnyEvent::MP::Kernel::PORT_DATA{$port};

Diff Legend

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