ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/AnyEvent-MP/MP/Node.pm
(Generate patch)

Comparing cvsroot/AnyEvent-MP/MP/Node.pm (file contents):
Revision 1.18 by root, Wed Aug 12 21:39:59 2009 UTC vs.
Revision 1.19 by root, Wed Aug 12 22:03:15 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 {
… …
72 delete $self->{connect_w}; 74 delete $self->{connect_w};
73 delete $self->{connect_to}; 75 delete $self->{connect_to};
74 76
75 $self->{transport} = $transport; 77 $self->{transport} = $transport;
76 78
79 my $transport_send = $transport->can ("send");
80
77 $self->{send} = sub { 81 $self->{send} = sub {
78 $transport->send ($_[1]); 82 $transport_send->($transport, $_[0]);
79 }; 83 };
80 84
81 $transport->send ($_) 85 $transport->send ($_)
82 for @{ delete $self->{queue} || [] }; 86 for @{ delete $self->{queue} || [] };
83} 87}
… …
171use base "AnyEvent::MP::Node"; 175use base "AnyEvent::MP::Node";
172 176
173sub transport_reset { 177sub transport_reset {
174 my ($self) = @_; 178 my ($self) = @_;
175 179
180 Scalar::Util::weaken $self;
181
176 $self->{send} = sub { 182 $self->{send} = sub {
177 local $AnyEvent::MP::Kernel::SRCNODE = $_[0]; 183 local $AnyEvent::MP::Kernel::SRCNODE = $self;
178 AnyEvent::MP::Kernel::_inject (@{ $_[1] }); 184 AnyEvent::MP::Kernel::_inject (@{ $_[0] });
179 }; 185 };
180} 186}
181 187
182sub kill { 188sub kill {
183 my ($self, $port, @reason) = @_; 189 my ($self, $port, @reason) = @_;

Diff Legend

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