Francois Gouget : testbot/TestAgent: Make a couple of Wait() variable names more explicit.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Apr 4 08:42:36 CDT 2016
Module: tools
Branch: master
Commit: 629db98627c2514367ab111f68dfa8ea0c4a5dd2
URL: http://source.winehq.org/git/tools.git/?a=commit;h=629db98627c2514367ab111f68dfa8ea0c4a5dd2
Author: Francois Gouget <fgouget at free.fr>
Date: Mon Apr 4 12:29:10 2016 +0200
testbot/TestAgent: Make a couple of Wait() variable names more explicit.
These timeout and deadline are specific to this Wait() operation unlike
the general TestAgent timeout and deadline fields.
Signed-off-by: Francois Gouget <fgouget at free.fr>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
testbot/lib/WineTestBot/TestAgent.pm | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm
index 43481a9..7f1fc24 100644
--- a/testbot/lib/WineTestBot/TestAgent.pm
+++ b/testbot/lib/WineTestBot/TestAgent.pm
@@ -1171,7 +1171,7 @@ sub Run($$$;$$$)
=item C<Wait()>
-Waits at most Timeout seconds for the specified remote process to terminate.
+Waits at most WaitTimeout seconds for the specified remote process to terminate.
The Keepalive specifies how often, in seconds, to check that the remote end
is still alive and reachable.
@@ -1180,21 +1180,21 @@ is still alive and reachable.
sub Wait($$$;$)
{
- my ($self, $Pid, $Timeout, $Keepalive) = @_;
- debug("Wait $Pid, ", defined $Timeout ? $Timeout : "<undef>", ", ",
+ my ($self, $Pid, $WaitTimeout, $Keepalive) = @_;
+ debug("Wait $Pid, ", defined $WaitTimeout ? $WaitTimeout : "<undef>", ", ",
defined $Keepalive ? $Keepalive : "<undef>", "\n");
my $Result;
$Keepalive ||= 0xffffffff;
my $OldTimeout = $self->{timeout};
- my $Deadline = $Timeout ? time() + $Timeout : undef;
+ my $WaitDeadline = $WaitTimeout ? time() + $WaitTimeout : undef;
while (1)
{
my $Remaining = $Keepalive;
- if ($Deadline)
+ if ($WaitDeadline)
{
- $Remaining = $Deadline - time();
+ $Remaining = $WaitDeadline - time();
last if ($Remaining < 0);
$Remaining = $Keepalive if ($Keepalive < $Remaining);
}
More information about the wine-cvs
mailing list