summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorbrunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-01-17 18:05:51 +0000
committerbrunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-01-17 18:05:51 +0000
commit61a3f9ce2e5b7a22afdc21154d8f0857dba93cd1 (patch)
tree21c8d2b734390ccf10a4bc6cff11592894cd6614 /bin
parente61d89d5622cdc4dbd6cfd6a588c649a0d55761c (diff)
downloadATCD-61a3f9ce2e5b7a22afdc21154d8f0857dba93cd1.tar.gz
ChangeLogTag:Wed Jan 17 10:00:42 2001 Darrell Brunsch <brunsch@uci.edu>
Diffstat (limited to 'bin')
-rw-r--r--bin/PerlACE/Process_Unix.pm23
1 files changed, 11 insertions, 12 deletions
diff --git a/bin/PerlACE/Process_Unix.pm b/bin/PerlACE/Process_Unix.pm
index d8134dbd0c1..cd519aff697 100644
--- a/bin/PerlACE/Process_Unix.pm
+++ b/bin/PerlACE/Process_Unix.pm
@@ -82,7 +82,7 @@ sub Arguments
if (@_ != 0) {
$self->{ARGUMENTS} = shift;
}
-
+
return $self->{ARGUMENTS};
}
@@ -95,7 +95,7 @@ sub CommandLine ()
if (defined $self->{ARGUMENTS}) {
$commandline .= ' '.$self->{ARGUMENTS};
}
-
+
if ($PerlACE::Process::chorus == 1) {
$commandline = "rsh "
. $PerlACE::Process::chorushostname
@@ -119,12 +119,12 @@ sub Spawn ()
if ($self->{RUNNING} == 1) {
print STDERR "ERROR: Cannot Spawn: <$self->{EXECUTABLE}> ",
"already running\n";
- return -1;
+ return -1;
}
if (!defined $self->{EXECUTABLE}) {
print STDERR "ERROR: Cannot Spawn: No executable specified\n";
- return -1;
+ return -1;
}
FORK:
@@ -148,6 +148,7 @@ sub Spawn ()
print STDERR "ERROR: Can't fork <" . $self->CommandLine () . ">: $!\n";
}
}
+ $self->{RUNNING} = 1;
}
sub WaitKill ($)
@@ -160,9 +161,8 @@ sub WaitKill ($)
if ($status == -1) {
print STDERR "ERROR: $self->{EXECUTABLE} timedout\n";
$self->Kill ();
- # Don't need to Wait since we are on Win32
}
-
+
$self->{RUNNING} = 0;
return $status;
@@ -189,7 +189,6 @@ sub Terminate ()
if ($self->{RUNNING}) {
kill ('TERM', $self->{PROCESS});
- # print STDERR "Process_Unix::Kill 'TERM' $self->{PROCESS}\n";
}
}
@@ -199,17 +198,17 @@ sub Kill ()
if ($self->{RUNNING}) {
kill ('KILL', $self->{PROCESS});
- # print STDERR "Process_Unix::Kill 'TERM' $self->{PROCESS}\n";
+ waitpid ($self->{PROCESS}, 0);
}
+
+ $self->{RUNNING} = 0;
}
sub Wait ()
{
my $self = shift;
- if ($self->{RUNNING}) {
- waitpid ($self->{PROCESS}, 0);
- }
+ waitpid ($self->{PROCESS}, 0);
}
sub TimedWait
@@ -228,4 +227,4 @@ sub TimedWait
return -1;
}
-1;
+1; \ No newline at end of file