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.31 by root, Fri Aug 28 23:06:33 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 only after successful handshake
54sub transport_error { 64sub transport_error {
55 my ($self, @reason) = @_; 65 my ($self, @reason) = @_;
56 66
67 my $no_transport = !$self->{transport};
68
69 delete $self->{connect_w};
70 delete $self->{connect_to};
71
57 delete $self->{queue}; 72 delete $self->{queue};
58 $self->transport_reset; 73 $self->transport_reset;
59 74
60 if (my $mon = delete $self->{lmon}) { 75 if (my $mon = delete $self->{lmon}) {
61 $_->(@reason) for map @$_, values %$mon; 76 $_->(@reason) for map @$_, values %$mon;
62 } 77 }
78
79 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 0, @reason)
80 unless $no_transport;
63} 81}
64 82
65# called after handshake was successful 83# called after handshake was successful
66sub transport_connect { 84sub transport_connect {
67 my ($self, $transport) = @_; 85 my ($self, $transport) = @_;
68 86
69 $self->transport_reset 87 delete $self->{trial};
88
89 $self->transport_error (transport_error => "switched connections")
70 if $self->{transport}; 90 if $self->{transport};
71 91
72 delete $self->{connect_w}; 92 delete $self->{connect_w};
73 delete $self->{connect_to}; 93 delete $self->{connect_to};
74 94
75 $self->{transport} = $transport; 95 $self->{transport} = $transport;
76 96
97 my $transport_send = $transport->can ("send");
98
77 $self->{send} = sub { 99 $self->{send} = sub {
78 $transport->send ($_[1]); 100 $transport_send->($transport, $_[0]);
79 }; 101 };
102
103 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1);
80 104
81 $transport->send ($_) 105 $transport->send ($_)
82 for @{ delete $self->{queue} || [] }; 106 for @{ delete $self->{queue} || [] };
83} 107}
84 108
85sub connect { 109sub connect {
86 my ($self) = @_; 110 my ($self, @addresses) = @_;
111
112 return if $self->{transport};
87 113
88 Scalar::Util::weaken $self; 114 Scalar::Util::weaken $self;
89 115
90 $self->{connect_to} ||= AE::timer 116 $self->{connect_to} ||= AE::timer
91 $AnyEvent::MP::Config::CFG{monitor_timeout} || $AnyEvent::MP::Kernel::MONITOR_TIMEOUT, 117 $AnyEvent::MP::Config::CFG{monitor_timeout} || $AnyEvent::MP::Kernel::MONITOR_TIMEOUT,
92 0, 118 0,
93 sub { 119 sub {
94 $self->transport_error (transport_error => $self->{noderef}, "unable to connect"); 120 $self->transport_error (transport_error => $self->{id}, "unable to connect");
95 }; 121 };
122
123 return unless @addresses;
124
125 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
96 126
97 unless ($self->{connect_w}) { 127 unless ($self->{connect_w}) {
98 my @endpoints; 128 my @endpoints;
99 my %trial;
100 129
101 $self->{connect_w} = AE::timer 130 $self->{connect_w} = AE::timer
102 0, 131 rand,
103 $AnyEvent::MP::Config::CFG{connect_interval} || $AnyEvent::MP::Kernel::CONNECT_INTERVAL, 132 $AnyEvent::MP::Config::CFG{connect_interval} || $AnyEvent::MP::Kernel::CONNECT_INTERVAL,
104 sub { 133 sub {
105 @endpoints = split /,/, $self->{noderef} 134 @endpoints = @addresses
106 unless @endpoints; 135 unless @endpoints;
107 136
108 my $endpoint = shift @endpoints; 137 my $endpoint = shift @endpoints;
109 138
139 $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint");
140
110 $trial{$endpoint} ||= do { 141 $self->{trial}{$endpoint} ||= do {
111 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint 142 my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
112 or return $AnyEvent::MP::Kernel::WARN->("$self->{noderef}: not a resolved node reference."); 143 or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{id}: not a resolved node reference.");
113 144
114 AnyEvent::MP::Transport::mp_connect 145 AnyEvent::MP::Transport::mp_connect
115 $host, $port, 146 $host, $port,
116 sub { delete $trial{$endpoint} } 147 sub { delete $self->{trial}{$endpoint} },
117 ;
118 }; 148 };
119 } 149 }
120 ; 150 ;
121 } 151 }
122} 152}
… …
131 my ($self, $portid, $cb) = @_; 161 my ($self, $portid, $cb) = @_;
132 162
133 my $list = $self->{lmon}{$portid} ||= []; 163 my $list = $self->{lmon}{$portid} ||= [];
134 164
135 $self->send (["", mon1 => $portid]) 165 $self->send (["", mon1 => $portid])
136 unless @$list; 166 unless @$list || !length $portid;
137 167
138 push @$list, $cb; 168 push @$list, $cb;
139} 169}
140 170
141sub unmonitor { 171sub unmonitor {
… …
150 $self->send (["", mon0 => $portid]); 180 $self->send (["", mon0 => $portid]);
151 delete $self->{monitor}{$portid}; 181 delete $self->{monitor}{$portid};
152 } 182 }
153} 183}
154 184
185# used for direct slave connections as well
155package AnyEvent::MP::Node::Direct; 186package AnyEvent::MP::Node::Direct;
156 187
157use base "AnyEvent::MP::Node::External"; 188use base "AnyEvent::MP::Node::External";
158 189
159package AnyEvent::MP::Node::Indirect; 190package AnyEvent::MP::Node::Self;
160 191
161use base "AnyEvent::MP::Node::Direct"; 192use base "AnyEvent::MP::Node";
162 193
163sub connect { 194sub connect {
164 my ($self) = @_; 195 # we are trivially connected
165
166 $self->transport_error (transport_error => $self->{noderef}, "unable to connect to indirect node");
167} 196}
168
169package AnyEvent::MP::Node::Self;
170
171use base "AnyEvent::MP::Node";
172 197
173sub transport_reset { 198sub transport_reset {
174 my ($self) = @_; 199 my ($self) = @_;
175 200
201 Scalar::Util::weaken $self;
202
176 $self->{send} = sub { 203 $self->{send} = sub {
177 local $AnyEvent::MP::Kernel::SRCNODE = $_[0]; 204 local $AnyEvent::MP::Kernel::SRCNODE = $self;
178 AnyEvent::MP::Kernel::_inject (@{ $_[1] }); 205 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
179 }; 206 };
207}
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})");
180} 213}
181 214
182sub kill { 215sub kill {
183 my ($self, $port, @reason) = @_; 216 my ($self, $port, @reason) = @_;
184 217
185 delete $AnyEvent::MP::Kernel::PORT{$port}; 218 delete $AnyEvent::MP::Kernel::PORT{$port};
186 delete $AnyEvent::MP::Kernel::PORT_DATA{$port}; 219 delete $AnyEvent::MP::Kernel::PORT_DATA{$port};
187 220
188 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port} 221 my $mon = delete $AnyEvent::MP::Kernel::LMON{$port}
189 or !@reason 222 or !@reason
190 or $AnyEvent::MP::Kernel::WARN->("unmonitored local port $port died with reason: @reason"); 223 or $AnyEvent::MP::Kernel::WARN->(2, "unmonitored local port $port died with reason: @reason");
191 224
192 $_->(@reason) for values %$mon; 225 $_->(@reason) for values %$mon;
193} 226}
194 227
195sub monitor { 228sub monitor {

Diff Legend

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