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.20 by root, Thu Aug 13 00:23:36 2009 UTC vs.
Revision 1.25 by root, Sat Aug 15 15:08:07 2009 UTC

… …
48 48
49 $self->{send} = sub { 49 $self->{send} = sub {
50 push @{$self->{queue}}, shift; 50 push @{$self->{queue}}, shift;
51 $self->connect; 51 $self->connect;
52 }; 52 };
53
54 $self->connect
55 if $self->{autoconnect};
53} 56}
54 57
55# called only after successful handshake 58# called only after successful handshake
56sub transport_error { 59sub transport_error {
57 my ($self, @reason) = @_; 60 my ($self, @reason) = @_;
58 61
59 $self->{transport} 62 my $no_transport = !$self->{transport};
60 or return; 63
64 delete $self->{connect_w};
65 delete $self->{connect_to};
61 66
62 delete $self->{queue}; 67 delete $self->{queue};
63 $self->transport_reset; 68 $self->transport_reset;
64 69
65 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 0, @reason); 70 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 0, @reason)
71 unless $no_transport;
66 72
67 if (my $mon = delete $self->{lmon}) { 73 if (my $mon = delete $self->{lmon}) {
68 $_->(@reason) for map @$_, values %$mon; 74 $_->(@reason) for map @$_, values %$mon;
69 } 75 }
70} 76}
71 77
72# called after handshake was successful 78# called after handshake was successful
73sub transport_connect { 79sub transport_connect {
74 my ($self, $transport) = @_; 80 my ($self, $transport) = @_;
75 81
82 # first connect with a master node
83 $AnyEvent::MP::Kernel::SLAVE->($self)
84 if ref $AnyEvent::MP::Kernel::SLAVE;
85
76 $self->transport_error (transport_error => "switched connections") 86 $self->transport_error (transport_error => "switched connections")
77 if $self->{transport}; 87 if $self->{transport};
78 88
79 delete $self->{connect_w}; 89 delete $self->{connect_w};
80 delete $self->{connect_to}; 90 delete $self->{connect_to};
… …
93 for @{ delete $self->{queue} || [] }; 103 for @{ delete $self->{queue} || [] };
94} 104}
95 105
96sub connect { 106sub connect {
97 my ($self) = @_; 107 my ($self) = @_;
108
109 return if $self->{transport};
98 110
99 Scalar::Util::weaken $self; 111 Scalar::Util::weaken $self;
100 112
101 $self->{connect_to} ||= AE::timer 113 $self->{connect_to} ||= AE::timer
102 $AnyEvent::MP::Config::CFG{monitor_timeout} || $AnyEvent::MP::Kernel::MONITOR_TIMEOUT, 114 $AnyEvent::MP::Config::CFG{monitor_timeout} || $AnyEvent::MP::Kernel::MONITOR_TIMEOUT,
… …
118 130
119 my $endpoint = shift @endpoints; 131 my $endpoint = shift @endpoints;
120 132
121 $trial{$endpoint} ||= do { 133 $trial{$endpoint} ||= do {
122 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint 134 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
123 or return $AnyEvent::MP::Kernel::WARN->("$self->{noderef}: not a resolved node reference."); 135 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{noderef}: not a resolved node reference.");
124 136
125 AnyEvent::MP::Transport::mp_connect 137 AnyEvent::MP::Transport::mp_connect
126 $host, $port, 138 $host, $port,
127 sub { delete $trial{$endpoint} } 139 sub { delete $trial{$endpoint} }
128 ; 140 ;
… …
142 my ($self, $portid, $cb) = @_; 154 my ($self, $portid, $cb) = @_;
143 155
144 my $list = $self->{lmon}{$portid} ||= []; 156 my $list = $self->{lmon}{$portid} ||= [];
145 157
146 $self->send (["", mon1 => $portid]) 158 $self->send (["", mon1 => $portid])
147 unless @$list; 159 unless @$list || !length $portid;
148 160
149 push @$list, $cb; 161 push @$list, $cb;
150} 162}
151 163
152sub unmonitor { 164sub unmonitor {
… …
169 181
170package AnyEvent::MP::Node::Indirect; 182package AnyEvent::MP::Node::Indirect;
171 183
172use base "AnyEvent::MP::Node::Direct"; 184use base "AnyEvent::MP::Node::Direct";
173 185
186sub master {
187 my ($self) = @_;
188
189 my (undef, $master) = split /\@/, $self->{noderef}, 2;
190 $master =~ s/!/,/g;
191 $master
192}
193
194sub transport_reset {
195 my ($self) = @_;
196
197 if ($self->{transport}) {
198 # as an optimisation, immediately nuke slave nodes
199 delete $AnyEvent::MP::Kernel::NODE{$self->{noderef}};
200 } else {
201 $self->SUPER::transport_reset;
202 return;#d##TODO#
203
204 my $noderef = $self->{noderef};
205 my $master = $self->master;
206
207 # slave nodes are so cool - we can always send to them :)
208
209 $self->{send} = sub {
210 $self->connect;
211 snd $master, snd => $noderef, @_;
212 };
213 }
214}
215
174sub connect { 216sub connect {
175 my ($self) = @_; 217 my ($self) = @_;
176 218
177 $self->transport_error (transport_error => $self->{noderef}, "unable to connect to indirect node"); 219 #TODO#
220# # ask for a connection, #TODO# rate-limit this somehow
221# snd $self->master, relay => $self->{noderef}, connect_node => $AnyEvent::MP::Kernel::NODE;
178} 222}
179 223
180package AnyEvent::MP::Node::Self; 224package AnyEvent::MP::Node::Self;
181 225
182use base "AnyEvent::MP::Node"; 226use base "AnyEvent::MP::Node";
… …
202 delete $AnyEvent::MP::Kernel::PORT{$port}; 246 delete $AnyEvent::MP::Kernel::PORT{$port};
203 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 247 delete $AnyEvent::MP::Kernel::PORT_DATA{$port};
204 248
205 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port} 249 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port}
206 or !@reason 250 or !@reason
207 or $AnyEvent::MP::Kernel::WARN->("unmonitored local port $port died with reason: @reason"); 251 or $AnyEvent::MP::Kernel::WARN->(2, "unmonitored local port $port died with reason: @reason");
208 252
209 $_->(@reason) for values %$mon; 253 $_->(@reason) for values %$mon;
210} 254}
211 255
212sub monitor { 256sub monitor {

Diff Legend

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