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.18 by root, Wed Aug 12 21:39:59 2009 UTC vs.
Revision 1.32 by root, Sun Aug 30 09:24:09 2009 UTC

1=head1 NAME 1=head1 NAME
2 2
3AnyEvent::MP::Node - a single processing node (CPU/process...) 3AnyEvent::MP::Node - represent a node
4 4
5=head1 SYNOPSIS 5=head1 SYNOPSIS
6 6
7 use AnyEvent::MP::Node; 7 use AnyEvent::MP::Node;
8 8
9=head1 DESCRIPTION 9=head1 DESCRIPTION
10
11This is an internal utility module, horrible to look at, so don't.
10 12
11=cut 13=cut
12 14
13package AnyEvent::MP::Node; 15package AnyEvent::MP::Node;
14 16
… …
19use AnyEvent::Socket (); 21use AnyEvent::Socket ();
20 22
21use AnyEvent::MP::Transport (); 23use AnyEvent::MP::Transport ();
22 24
23sub new { 25sub new {
24 my ($self, $noderef) = @_; 26 my ($self, $id) = @_;
25 27
26 $self = bless { noderef => $noderef }, $self; 28 $self = bless { id => $id }, $self;
27 29
30 $self->init;
28 $self->transport_reset; 31 $self->transport_reset;
29 32
30 $self 33 $self
31} 34}
32 35
36sub init {
37 #
38}
39
33sub send { 40sub send {
34 &{$_[0]->{send}} 41 &{ shift->{send} }
35} 42}
36 43
44# nodes reachable via the network
37package AnyEvent::MP::Node::External; 45package AnyEvent::MP::Node::External;
38 46
39use base "AnyEvent::MP::Node"; 47use base "AnyEvent::MP::Node";
40 48
41# called at init time, mostly sets {send} 49# called at init time, mostly sets {send}
42sub transport_reset { 50sub transport_reset {
43 my ($self) = @_; 51 my ($self) = @_;
44 52
45 delete $self->{transport}; 53 delete $self->{transport};
46 54
55 Scalar::Util::weaken $self;
56
47 $self->{send} = sub { 57 $self->{send} = sub {
48 push @{$_[0]{queue}}, $_[1]; 58 push @{$self->{queue}}, shift;
49 $_[0]->connect; 59 $self->connect;
50 }; 60 };
51} 61}
52 62
53# called only after successful handshake 63# called each time we fail to establish a connection,
64# or the existing connection failed
54sub transport_error { 65sub transport_error {
55 my ($self, @reason) = @_; 66 my ($self, @reason) = @_;
67
68 my $no_transport = !$self->{transport};
69
70 delete $self->{connect_w};
71 delete $self->{connect_to};
56 72
57 delete $self->{queue}; 73 delete $self->{queue};
58 $self->transport_reset; 74 $self->transport_reset;
59 75
60 if (my $mon = delete $self->{lmon}) { 76 if (my $mon = delete $self->{lmon}) {
61 $_->(@reason) for map @$_, values %$mon; 77 $_->(@reason) for map @$_, values %$mon;
62 } 78 }
79
80 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 0, @reason)
81 unless $no_transport;
82
83 # if we are here and are idle, we nuke ourselves
84 delete $AnyEvent::MP::Kernel::NODE{$self->{id}}
85 unless $self->{transport} || $self->{connect_to};
63} 86}
64 87
65# called after handshake was successful 88# called after handshake was successful
66sub transport_connect { 89sub transport_connect {
67 my ($self, $transport) = @_; 90 my ($self, $transport) = @_;
68 91
69 $self->transport_reset 92 delete $self->{trial};
93
94 $self->transport_error (transport_error => "switched connections")
70 if $self->{transport}; 95 if $self->{transport};
71 96
72 delete $self->{connect_w}; 97 delete $self->{connect_w};
73 delete $self->{connect_to}; 98 delete $self->{connect_to};
74 99
75 $self->{transport} = $transport; 100 $self->{transport} = $transport;
76 101
102 my $transport_send = $transport->can ("send");
103
77 $self->{send} = sub { 104 $self->{send} = sub {
78 $transport->send ($_[1]); 105 $transport_send->($transport, $_[0]);
79 }; 106 };
107
108 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1);
80 109
81 $transport->send ($_) 110 $transport->send ($_)
82 for @{ delete $self->{queue} || [] }; 111 for @{ delete $self->{queue} || [] };
83} 112}
84 113
85sub connect { 114sub connect {
86 my ($self) = @_; 115 my ($self, @addresses) = @_;
116
117 return if $self->{transport};
87 118
88 Scalar::Util::weaken $self; 119 Scalar::Util::weaken $self;
89 120
90 $self->{connect_to} ||= AE::timer 121 $self->{connect_to} ||= AE::timer
91 $AnyEvent::MP::Config::CFG{monitor_timeout} || $AnyEvent::MP::Kernel::MONITOR_TIMEOUT, 122 $AnyEvent::MP::Config::CFG{monitor_timeout} || $AnyEvent::MP::Kernel::MONITOR_TIMEOUT,
92 0, 123 0,
93 sub { 124 sub {
94 $self->transport_error (transport_error => $self->{noderef}, "unable to connect"); 125 $self->transport_error (transport_error => $self->{id}, "unable to connect");
95 }; 126 };
127
128 return unless @addresses;
129
130 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
96 131
97 unless ($self->{connect_w}) { 132 unless ($self->{connect_w}) {
98 my @endpoints; 133 my @endpoints;
99 my %trial;
100 134
101 $self->{connect_w} = AE::timer 135 $self->{connect_w} = AE::timer
102 0, 136 rand,
103 $AnyEvent::MP::Config::CFG{connect_interval} || $AnyEvent::MP::Kernel::CONNECT_INTERVAL, 137 $AnyEvent::MP::Config::CFG{connect_interval} || $AnyEvent::MP::Kernel::CONNECT_INTERVAL,
104 sub { 138 sub {
105 @endpoints = split /,/, $self->{noderef} 139 @endpoints = @addresses
106 unless @endpoints; 140 unless @endpoints;
107 141
108 my $endpoint = shift @endpoints; 142 my $endpoint = shift @endpoints;
109 143
144 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint");
145
110 $trial{$endpoint} ||= do { 146 $self->{trial}{$endpoint} ||= do {
111 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint 147 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
112 or return $AnyEvent::MP::Kernel::WARN->("$self->{noderef}: not a resolved node reference."); 148 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{id}: not a resolved node reference.");
113 149
114 AnyEvent::MP::Transport::mp_connect 150 AnyEvent::MP::Transport::mp_connect
115 $host, $port, 151 $host, $port,
116 sub { delete $trial{$endpoint} } 152 sub { delete $self->{trial}{$endpoint} },
117 ;
118 }; 153 };
119 } 154 }
120 ; 155 ;
121 } 156 }
122} 157}
… …
131 my ($self, $portid, $cb) = @_; 166 my ($self, $portid, $cb) = @_;
132 167
133 my $list = $self->{lmon}{$portid} ||= []; 168 my $list = $self->{lmon}{$portid} ||= [];
134 169
135 $self->send (["", mon1 => $portid]) 170 $self->send (["", mon1 => $portid])
136 unless @$list; 171 unless @$list || !length $portid;
137 172
138 push @$list, $cb; 173 push @$list, $cb;
139} 174}
140 175
141sub unmonitor { 176sub unmonitor {
… …
150 $self->send (["", mon0 => $portid]); 185 $self->send (["", mon0 => $portid]);
151 delete $self->{monitor}{$portid}; 186 delete $self->{monitor}{$portid};
152 } 187 }
153} 188}
154 189
190# used for direct slave connections as well
155package AnyEvent::MP::Node::Direct; 191package AnyEvent::MP::Node::Direct;
156 192
157use base "AnyEvent::MP::Node::External"; 193use base "AnyEvent::MP::Node::External";
158 194
159package AnyEvent::MP::Node::Indirect; 195package AnyEvent::MP::Node::Self;
160 196
161use base "AnyEvent::MP::Node::Direct"; 197use base "AnyEvent::MP::Node";
162 198
163sub connect { 199sub connect {
164 my ($self) = @_; 200 # we are trivially connected
165
166 $self->transport_error (transport_error => $self->{noderef}, "unable to connect to indirect node");
167} 201}
168
169package AnyEvent::MP::Node::Self;
170
171use base "AnyEvent::MP::Node";
172 202
173sub transport_reset { 203sub transport_reset {
174 my ($self) = @_; 204 my ($self) = @_;
175 205
206 Scalar::Util::weaken $self;
207
176 $self->{send} = sub { 208 $self->{send} = sub {
177 local $AnyEvent::MP::Kernel::SRCNODE = $_[0]; 209 local $AnyEvent::MP::Kernel::SRCNODE = $self;
178 AnyEvent::MP::Kernel::_inject (@{ $_[1] }); 210 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
179 }; 211 };
212}
213
214sub transport_connect {
215 my ($self, $tp) = @_;
216
217 $AnyEvent::MP::Kernel::WARN->(9, "I refuse to talk to myself ($tp->{peerhost}:$tp->{peerport})");
180} 218}
181 219
182sub kill { 220sub kill {
183 my ($self, $port, @reason) = @_; 221 my ($self, $port, @reason) = @_;
184 222
185 delete $AnyEvent::MP::Kernel::PORT{$port}; 223 delete $AnyEvent::MP::Kernel::PORT{$port};
186 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 224 delete $AnyEvent::MP::Kernel::PORT_DATA{$port};
187 225
188 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port} 226 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port}
189 or !@reason 227 or !@reason
190 or $AnyEvent::MP::Kernel::WARN->("unmonitored local port $port died with reason: @reason"); 228 or $AnyEvent::MP::Kernel::WARN->(2, "unmonitored local port $port died with reason: @reason");
191 229
192 $_->(@reason) for values %$mon; 230 $_->(@reason) for values %$mon;
193} 231}
194 232
195sub monitor { 233sub monitor {

Diff Legend

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