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.20 by root, Thu Aug 13 00:23:36 2009 UTC

… …
29 29
30 $self 30 $self
31} 31}
32 32
33sub send { 33sub send {
34 &{$_[0]->{send}} 34 &{ shift->{send} }
35} 35}
36 36
37package AnyEvent::MP::Node::External; 37package AnyEvent::MP::Node::External;
38 38
39use base "AnyEvent::MP::Node"; 39use base "AnyEvent::MP::Node";
… …
42sub transport_reset { 42sub transport_reset {
43 my ($self) = @_; 43 my ($self) = @_;
44 44
45 delete $self->{transport}; 45 delete $self->{transport};
46 46
47 Scalar::Util::weaken $self;
48
47 $self->{send} = sub { 49 $self->{send} = sub {
48 push @{$_[0]{queue}}, $_[1]; 50 push @{$self->{queue}}, shift;
49 $_[0]->connect; 51 $self->connect;
50 }; 52 };
51} 53}
52 54
53# called only after successful handshake 55# called only after successful handshake
54sub transport_error { 56sub transport_error {
55 my ($self, @reason) = @_; 57 my ($self, @reason) = @_;
56 58
59 $self->{transport}
60 or return;
61
57 delete $self->{queue}; 62 delete $self->{queue};
58 $self->transport_reset; 63 $self->transport_reset;
64
65 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 0, @reason);
59 66
60 if (my $mon = delete $self->{lmon}) { 67 if (my $mon = delete $self->{lmon}) {
61 $_->(@reason) for map @$_, values %$mon; 68 $_->(@reason) for map @$_, values %$mon;
62 } 69 }
63} 70}
64 71
65# called after handshake was successful 72# called after handshake was successful
66sub transport_connect { 73sub transport_connect {
67 my ($self, $transport) = @_; 74 my ($self, $transport) = @_;
68 75
69 $self->transport_reset 76 $self->transport_error (transport_error => "switched connections")
70 if $self->{transport}; 77 if $self->{transport};
71 78
72 delete $self->{connect_w}; 79 delete $self->{connect_w};
73 delete $self->{connect_to}; 80 delete $self->{connect_to};
74 81
75 $self->{transport} = $transport; 82 $self->{transport} = $transport;
76 83
84 my $transport_send = $transport->can ("send");
85
77 $self->{send} = sub { 86 $self->{send} = sub {
78 $transport->send ($_[1]); 87 $transport_send->($transport, $_[0]);
79 }; 88 };
89
90 AnyEvent::MP::Kernel::_inject_nodeevent ($self, 1);
80 91
81 $transport->send ($_) 92 $transport->send ($_)
82 for @{ delete $self->{queue} || [] }; 93 for @{ delete $self->{queue} || [] };
83} 94}
84 95
… …
168 179
169package AnyEvent::MP::Node::Self; 180package AnyEvent::MP::Node::Self;
170 181
171use base "AnyEvent::MP::Node"; 182use base "AnyEvent::MP::Node";
172 183
184sub connect {
185 # we are trivially connected
186}
187
173sub transport_reset { 188sub transport_reset {
174 my ($self) = @_; 189 my ($self) = @_;
175 190
191 Scalar::Util::weaken $self;
192
176 $self->{send} = sub { 193 $self->{send} = sub {
177 local $AnyEvent::MP::Kernel::SRCNODE = $_[0]; 194 local $AnyEvent::MP::Kernel::SRCNODE = $self;
178 AnyEvent::MP::Kernel::_inject (@{ $_[1] }); 195 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
179 }; 196 };
180} 197}
181 198
182sub kill { 199sub kill {
183 my ($self, $port, @reason) = @_; 200 my ($self, $port, @reason) = @_;

Diff Legend

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