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.54 by root, Wed Feb 29 18:44:59 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};
119 117
120 Scalar::Util::weaken $self; 118 Scalar::Util::weaken $self;
121 119
… …
123 121
124 $self->{connect_to} ||= AE::timer $monitor, 0, sub { 122 $self->{connect_to} ||= AE::timer $monitor, 0, sub {
125 $self->transport_error (transport_error => $self->{id}, "unable to connect"); 123 $self->transport_error (transport_error => $self->{id}, "unable to connect");
126 }; 124 };
127 125
126 # maybe @$addresses?
127 my @addresses = @{
128 $AnyEvent::MP::Kernel::GLOBAL_ADDR->{$self->{id}}
129 || $AnyEvent::MP::Kernel::NODE_ADDR->{$self->{id}}
130 };
131
128 return unless @addresses; 132 unless (@addresses) {
133 # on global nodes, all betsa re off now - we either know the node, or we don't
134 unless ($AnyEvent::MP::Kernel::GLOBAL) {
135 $self->{connect_w} = AnyEvent::MP::Kernel::global_req (
136 g_find => $self->{id},
137 sub {
138 return unless $self; # just to be sure
139 return unless @{ $_[0] };
129 140
130 if ($self->{connect_w}) { 141 local $AnyEvent::MP::Kernel::GLOBAL_ADDR->{$self->{id}} = $_[0]; #d# UGLY
131 # sometimes we get told about new addresses after we started to connect 142 $self->connect;
132 unshift @{$self->{connect_addr}}, @addresses; 143 }
144 );
145 }
146
133 return; 147 return;
134 } 148 }
135 149
136 $self->{connect_addr} = \@addresses; # a bit weird, but efficient 150 $self->{connect_addr} = \@addresses; # a bit weird, but efficient
137 151
… …
166} 180}
167 181
168sub kill { 182sub kill {
169 my ($self, $port, @reason) = @_; 183 my ($self, $port, @reason) = @_;
170 184
171 $self->send (["", kil => $port, @reason]); 185 $self->{send} (["", kil => $port, @reason]);
172} 186}
173 187
174sub monitor { 188sub monitor {
175 my ($self, $portid, $cb) = @_; 189 my ($self, $portid, $cb) = @_;
176 190
… …
193 unless (@$list) { 207 unless (@$list) {
194 $self->send (["", mon0 => $portid]); 208 $self->send (["", mon0 => $portid]);
195 delete $self->{monitor}{$portid}; 209 delete $self->{monitor}{$portid};
196 } 210 }
197} 211}
198
199# used for direct slave connections as well
200package AnyEvent::MP::Node::Direct;
201
202use base "AnyEvent::MP::Node::External";
203 212
204package AnyEvent::MP::Node::Self; 213package AnyEvent::MP::Node::Self;
205 214
206use base "AnyEvent::MP::Node"; 215use base "AnyEvent::MP::Node";
207 216

Diff Legend

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