MemcachedTest.pm (memcached-1.6.8) | : | MemcachedTest.pm (memcached-1.6.9) | ||
---|---|---|---|---|
skipping to change at line 390 | skipping to change at line 390 | |||
} | } | |||
END { | END { | |||
for (@unixsockets) { | for (@unixsockets) { | |||
unlink $_; | unlink $_; | |||
} | } | |||
} | } | |||
############################################################################ | ############################################################################ | |||
package Memcached::Handle; | package Memcached::Handle; | |||
use POSIX ":sys_wait_h"; | ||||
sub new { | sub new { | |||
my ($class, %params) = @_; | my ($class, %params) = @_; | |||
return bless \%params, $class; | return bless \%params, $class; | |||
} | } | |||
sub DESTROY { | sub DESTROY { | |||
my $self = shift; | my $self = shift; | |||
kill 2, $self->{pid}; | kill 2, $self->{pid}; | |||
} | } | |||
sub stop { | sub stop { | |||
my $self = shift; | my $self = shift; | |||
kill 15, $self->{pid}; | kill 15, $self->{pid}; | |||
} | } | |||
sub graceful_stop { | sub graceful_stop { | |||
my $self = shift; | my $self = shift; | |||
kill 'SIGUSR1', $self->{pid}; | kill 'SIGUSR1', $self->{pid}; | |||
} | } | |||
# -1 if the pid is actually dead. | ||||
sub is_running { | ||||
my $self = shift; | ||||
return waitpid($self->{pid}, WNOHANG) >= 0 ? 1 : 0; | ||||
} | ||||
sub host { $_[0]{host} } | sub host { $_[0]{host} } | |||
sub port { $_[0]{port} } | sub port { $_[0]{port} } | |||
sub udpport { $_[0]{udpport} } | sub udpport { $_[0]{udpport} } | |||
sub sock { | sub sock { | |||
my $self = shift; | my $self = shift; | |||
if ($self->{conn} && ($self->{domainsocket} || getpeername($self->{conn}))) { | if ($self->{conn} && ($self->{domainsocket} || getpeername($self->{conn}))) { | |||
return $self->{conn}; | return $self->{conn}; | |||
} | } | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 7 lines changed or added |