=cut
sub run {
- my $self = shift;
-
- my %args = @_;
-
- $self->start(%args);
- my $guard = Test::Valgrind::Session::Guard->new(sub { $self->finish });
+ my ($self, %args) = @_;
- $self->_run($args{command});
-}
-
-sub _run {
- my ($self, $cmd) = @_;
+ for (qw<action tool command>) {
+ my $base = 'Test::Valgrind::' . ucfirst;
+ my $value = $args{$_};
+ $self->_croak("Invalid $_") unless Scalar::Util::blessed($value)
+ and $value->isa($base);
+ $self->$_($args{$_})
+ }
+ my $cmd = $self->command;
if ($cmd->isa('Test::Valgrind::Command::Aggregate')) {
- $self->_run($_) for $cmd->commands;
+ for my $subcmd ($cmd->commands) {
+ $args{command} = $subcmd;
+ $self->run(%args);
+ }
return;
}
- $self->command($cmd);
-
$self->report($self->report_class->new_diag(
'Using valgrind ' . $self->version . ' located at ' . $self->valgrind
));
@supp_args = map "--suppressions=$_", @supp_files;
}
+ my $guard = Test::Valgrind::Session::Guard->new(sub { $self->finish });
+ $self->start;
+
pipe my $vrdr, my $vwtr or $self->_croak("pipe(\$vrdr, \$vwtr): $!");
{
my $oldfh = select $vrdr;
$self->_croak("fork(): $!") unless defined $pid;
if ($pid == 0) {
- eval 'setpgrp 0, 0';
+ {
+ local $@;
+ eval { setpgrp(0, 0) };
+ }
close $vrdr or $self->_croak("close(\$vrdr): $!");
fcntl $vwtr, Fcntl::F_SETFD(), 0
or $self->_croak("fcntl(\$vwtr, F_SETFD, 0): $!");
local $SIG{INT} = sub {
kill -(POSIX::SIGKILL()) => $pid;
waitpid $pid, 0;
- die 'interrupted';
+ die 'valgrind analysis was interrupted';
};
close $vwtr or $self->_croak("close(\$vwtr): $!");
- $self->parser->parse($self, $vrdr);
+ my $aborted = $self->parser->parse($self, $vrdr);
+
+ kill -(POSIX::SIGKILL()) => $pid if $aborted;
$self->{exit_code} = (waitpid($pid, 0) == $pid) ? $? >> 8 : 255;
=head2 C<start>
- $tvs->start(
- action => $action,
- tool => $tool,
- command => $command,
- );
+ $tvs->start;
Starts the action and tool associated to the current run.
It's automatically called at the beginning of L</run>.
sub start {
my $self = shift;
- my %args = @_;
-
- for (qw<action tool command>) {
- my $base = 'Test::Valgrind::' . ucfirst;
- my $value = $args{$_};
- $self->_croak("Invalid $_") unless Scalar::Util::blessed($value)
- and $value->isa($base);
- $self->$_($args{$_})
- }
-
delete @{$self}{qw<last_status exit_code>};
$self->tool->start($self);