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.51 by root, Sat Mar 13 00:29:41 2010 UTC vs.
Revision 1.55 by root, Wed Feb 29 19:23:44 2012 UTC

… …
40sub send { 40sub send {
41 &{ shift->{send} } 41 &{ shift->{send} }
42} 42}
43 43
44# nodes reachable via the network 44# nodes reachable via the network
45package AnyEvent::MP::Node::External; 45package AnyEvent::MP::Node::Remote;
46 46
47use base "AnyEvent::MP::Node"; 47use base "AnyEvent::MP::Node";
48 48
49# called at init time, mostly sets {send} 49# called at init time, mostly sets {send}
50sub transport_reset { 50sub transport_reset {
… …
98 delete $self->{connect_w}; 98 delete $self->{connect_w};
99 delete $self->{connect_to}; 99 delete $self->{connect_to};
100 100
101 $self->{transport} = $transport; 101 $self->{transport} = $transport;
102 102
103 my $transport_send = $transport->can ("send"); 103 my $transport_send = $transport->{send};
104 104
105 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1); 105 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1);
106 106
107 $self->{send} = sub { 107 $self->{send} = $transport_send;
108 $transport_send->($transport, $_[0]);
109 };
110 108
111 $transport->send ($_) 109 $transport_send->($_)
112 for @{ delete $self->{queue} || [] }; 110 for @{ delete $self->{queue} || [] };
113} 111}
114 112
115sub connect { 113sub connect {
116 my ($self, @addresses) = @_; 114 my ($self) = @_;
117 115
118 return if $self->{transport}; 116 return if $self->{transport};
117 return if $self->{connect_w};
119 118
120 Scalar::Util::weaken $self; 119 Scalar::Util::weaken $self;
121 120
122 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout}; 121 my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout};
123 122
124 $self->{connect_to} ||= AE::timer $monitor, 0, sub { 123 $self->{connect_to} ||= AE::timer $monitor, 0, sub {
125 $self->transport_error (transport_error => $self->{id}, "unable to connect"); 124 $self->transport_error (transport_error => $self->{id}, "unable to connect");
126 }; 125 };
127 126
127 # maybe @$addresses?
128 my @addresses = @{
129 $AnyEvent::MP::Kernel::GLOBAL_ADDR->{$self->{id}}
130 || $AnyEvent::MP::Kernel::NODE_ADDR->{$self->{id}}
131 };
132
128 return unless @addresses; 133 unless (@addresses) {
134 # on global nodes, all bets are off now - we either know the node, or we don't
135 unless ($AnyEvent::MP::Kernel::GLOBAL) {
136 $self->{connect_w} = AnyEvent::MP::Kernel::global_req (
137 g_find => $self->{id},
138 sub {
139 return unless $self; # just to be sure
140 return unless @{ $_[0] };
129 141
130 if ($self->{connect_w}) { 142 local $AnyEvent::MP::Kernel::GLOBAL_ADDR->{$self->{id}} = $_[0]; #d# UGLY
131 # sometimes we get told about new addresses after we started to connect 143 delete $self->{connect_w};
132 unshift @{$self->{connect_addr}}, @addresses; 144 $self->connect;
145 }
146 );
147 }
148
133 return; 149 return;
134 } 150 }
135 151
136 $self->{connect_addr} = \@addresses; # a bit weird, but efficient 152 $self->{connect_addr} = \@addresses; # a bit weird, but efficient
137 153
… …
144 160
145 $interval = 0.4 if $interval < 0.4; 161 $interval = 0.4 if $interval < 0.4;
146 162
147 my @endpoints; 163 my @endpoints;
148 164
149 $self->{connect_w} = AE::timer 0.050 * rand, $interval * (0.9 + 0.1 * rand), sub { 165 $self->{connect_w} = AE::timer 0, $interval * (0.9 + 0.1 * rand), sub {
150 @endpoints = @addresses 166 @endpoints = @addresses
151 unless @endpoints; 167 unless @endpoints;
152 168
153 my $endpoint = shift @endpoints; 169 my $endpoint = shift @endpoints;
154 170
… …
166} 182}
167 183
168sub kill { 184sub kill {
169 my ($self, $port, @reason) = @_; 185 my ($self, $port, @reason) = @_;
170 186
171 $self->send (["", kil => $port, @reason]); 187 $self->{send} (["", kil => $port, @reason]);
172} 188}
173 189
174sub monitor { 190sub monitor {
175 my ($self, $portid, $cb) = @_; 191 my ($self, $portid, $cb) = @_;
176 192
… …
193 unless (@$list) { 209 unless (@$list) {
194 $self->send (["", mon0 => $portid]); 210 $self->send (["", mon0 => $portid]);
195 delete $self->{monitor}{$portid}; 211 delete $self->{monitor}{$portid};
196 } 212 }
197} 213}
198
199# used for direct slave connections as well
200package AnyEvent::MP::Node::Direct;
201
202use base "AnyEvent::MP::Node::External";
203 214
204package AnyEvent::MP::Node::Self; 215package AnyEvent::MP::Node::Self;
205 216
206use base "AnyEvent::MP::Node"; 217use base "AnyEvent::MP::Node";
207 218

Diff Legend

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