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.30 by root, Fri Aug 28 20:57:42 2009 UTC

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

Diff Legend

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