September 2019 - Wine-commits

Alexandre Julliard : ntdll: Handle single step exception in signal handler on i386.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: 5e2b0585cd4f39fdc916d4afcd19f2d1fa4fd21c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e2b0585cd4f39fdc916d4af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 12 19:27:05 2019 +0200 ntdll: Handle single step exception in signal handler on i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 44 +++++++++++++------------------------------- 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 5699a99932..580bfb2d5c 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1988,36 +1988,6 @@ done: } -/********************************************************************** - * raise_trap_exception - */ -static void WINAPI raise_trap_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) -{ - NTSTATUS status; - - if (rec->ExceptionCode == EXCEPTION_SINGLE_STEP) - { - /* when single stepping can't tell whether this is a hw bp or a - * single step interrupt. try to avoid as much overhead as possible - * and only do a server call if there is any hw bp enabled. */ - - if( !(context->EFlags & 0x100) || (x86_thread_data()->dr7 & 0xff) ) - { - /* (possible) hardware breakpoint, fetch the debug registers */ - DWORD saved_flags = context->ContextFlags; - context->ContextFlags = CONTEXT_DEBUG_REGISTERS; - NtGetContextThread(GetCurrentThread(), context); - context->ContextFlags |= saved_flags; /* restore flags */ - } - - context->EFlags &= ~0x100; /* clear single-step flag */ - } - - status = NtRaiseException( rec, context, TRUE ); - raise_status( status, rec ); -} - - /********************************************************************** * raise_generic_exception * @@ -2141,6 +2111,18 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { case TRAP_x86_TRCTRAP: /* Single-step exception */ stack->rec.ExceptionCode = EXCEPTION_SINGLE_STEP; + /* when single stepping can't tell whether this is a hw bp or a + * single step interrupt. try to avoid as much overhead as possible + * and only do a server call if there is any hw bp enabled. */ + if (!(stack->context.EFlags & 0x100) || (stack->context.Dr7 & 0xff)) + { + /* (possible) hardware breakpoint, fetch the debug registers */ + DWORD saved_flags = stack->context.ContextFlags; + stack->context.ContextFlags = CONTEXT_DEBUG_REGISTERS; + NtGetContextThread( GetCurrentThread(), &stack->context ); + stack->context.ContextFlags |= saved_flags; /* restore flags */ + } + stack->context.EFlags &= ~0x100; /* clear single-step flag */ break; case TRAP_x86_BPTFLT: /* Breakpoint exception */ stack->rec.ExceptionAddress = (char *)stack->rec.ExceptionAddress - 1; /* back up over the int3 instruction */ @@ -2153,7 +2135,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) stack->rec.ExceptionInformation[2] = 0; /* FIXME */ break; } - setup_raise_exception( context, stack, raise_trap_exception ); + setup_raise_exception( context, stack, raise_generic_exception ); }

1 0

Alexandre Julliard : ntdll: Handle alignment fault in signal handler on i386.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: 846de4aef8bebcd165223d5f0d1ad6363cab739c URL: https://source.winehq.org/git/wine.git/?a=commit;h=846de4aef8bebcd165223d5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 12 19:34:04 2019 +0200 ntdll: Handle alignment fault in signal handler on i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 580bfb2d5c..4087b9b0c1 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1956,15 +1956,6 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context } } break; - case EXCEPTION_DATATYPE_MISALIGNMENT: - /* FIXME: pass through exception handler first? */ - if (context->EFlags & 0x00040000) - { - /* Disable AC flag, return */ - context->EFlags &= ~0x00040000; - goto done; - } - break; case EXCEPTION_BREAKPOINT: if (!is_wow64) { @@ -2078,6 +2069,12 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) stack->rec.ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; break; case TRAP_x86_ALIGNFLT: /* Alignment check exception */ + /* FIXME: pass through exception handler first? */ + if (stack->context.EFlags & 0x00040000) + { + EFL_sig(context) &= ~0x00040000; /* disable AC flag */ + return; + } stack->rec.ExceptionCode = EXCEPTION_DATATYPE_MISALIGNMENT; break; default:

1 0

Alexandre Julliard : ntdll: Handle breakpoint interrupt in signal handler on i386.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: 0bd24653266dd4cb3c232748f2b0ad115af60092 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bd24653266dd4cb3c232748… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 12 19:48:48 2019 +0200 ntdll: Handle breakpoint interrupt in signal handler on i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 80 ++++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 4087b9b0c1..9ce318c27d 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1589,30 +1589,6 @@ static inline DWORD is_privileged_instr( CONTEXT *context ) } -/*********************************************************************** - * handle_interrupt - * - * Handle an interrupt. - */ -static inline BOOL handle_interrupt( unsigned int interrupt, EXCEPTION_RECORD *rec, CONTEXT *context ) -{ - switch(interrupt) - { - case 0x2d: - context->Eip += 3; - rec->ExceptionCode = EXCEPTION_BREAKPOINT; - rec->ExceptionAddress = (void *)context->Eip; - rec->NumberParameters = is_wow64 ? 1 : 3; - rec->ExceptionInformation[0] = context->Eax; - rec->ExceptionInformation[1] = context->Ecx; - rec->ExceptionInformation[2] = context->Edx; - return TRUE; - default: - return FALSE; - } -} - - /*********************************************************************** * check_invalid_gs * @@ -1956,21 +1932,6 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context } } break; - case EXCEPTION_BREAKPOINT: - if (!is_wow64) - { - /* On Wow64, the upper DWORD of Rax contains garbage, and the debug - * service is usually not recognized when called from usermode. */ - switch (rec->ExceptionInformation[0]) - { - case 1: /* BREAKPOINT_PRINT */ - case 3: /* BREAKPOINT_LOAD_SYMBOLS */ - case 4: /* BREAKPOINT_UNLOAD_SYMBOLS */ - case 5: /* BREAKPOINT_COMMAND_STRING (>= Win2003) */ - goto done; - } - } - break; } status = NtRaiseException( rec, context, TRUE ); raise_status( status, rec ); @@ -1993,6 +1954,45 @@ static void WINAPI raise_generic_exception( EXCEPTION_RECORD *rec, CONTEXT *cont } +/*********************************************************************** + * handle_interrupt + * + * Handle an interrupt. + */ +static BOOL handle_interrupt( unsigned int interrupt, ucontext_t *sigcontext, struct stack_layout *stack ) +{ + switch(interrupt) + { + case 0x2d: + if (!is_wow64) + { + /* On Wow64, the upper DWORD of Rax contains garbage, and the debug + * service is usually not recognized when called from usermode. */ + switch (stack->context.Eax) + { + case 1: /* BREAKPOINT_PRINT */ + case 3: /* BREAKPOINT_LOAD_SYMBOLS */ + case 4: /* BREAKPOINT_UNLOAD_SYMBOLS */ + case 5: /* BREAKPOINT_COMMAND_STRING (>= Win2003) */ + EIP_sig(sigcontext) += 3; + return TRUE; + } + } + stack->context.Eip += 3; + stack->rec.ExceptionCode = EXCEPTION_BREAKPOINT; + stack->rec.ExceptionAddress = (void *)stack->context.Eip; + stack->rec.NumberParameters = is_wow64 ? 1 : 3; + stack->rec.ExceptionInformation[0] = stack->context.Eax; + stack->rec.ExceptionInformation[1] = stack->context.Ecx; + stack->rec.ExceptionInformation[2] = stack->context.Edx; + setup_raise_exception( sigcontext, stack, raise_generic_exception ); + return TRUE; + default: + return FALSE; + } +} + + /********************************************************************** * segv_handler * @@ -2051,7 +2051,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { WORD err = get_error_code(context); if (!err && (stack->rec.ExceptionCode = is_privileged_instr( &stack->context ))) break; - if ((err & 7) == 2 && handle_interrupt( err >> 3, &stack->rec, &stack->context )) break; + if ((err & 7) == 2 && handle_interrupt( err >> 3, context, stack )) return; stack->rec.ExceptionCode = EXCEPTION_ACCESS_VIOLATION; stack->rec.NumberParameters = 2; stack->rec.ExceptionInformation[0] = 0;

1 0

Alexandre Julliard : ntdll: Handle invalid %gs fault in signal handler on i386.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: 58139dcb125390b9a2bcd79869d571337d8ab3d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58139dcb125390b9a2bcd798… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 12 20:00:48 2019 +0200 ntdll: Handle invalid %gs fault in signal handler on i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 9ce318c27d..9511255754 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1594,18 +1594,19 @@ static inline DWORD is_privileged_instr( CONTEXT *context ) * * Check for fault caused by invalid %gs value (some copy protection schemes mess with it). */ -static inline BOOL check_invalid_gs( CONTEXT *context ) +static inline BOOL check_invalid_gs( ucontext_t *sigcontext, CONTEXT *context ) { - unsigned int prefix_count = 0; - const BYTE *instr = (BYTE *)context->Eip; + BYTE instr[14]; + unsigned int i, len; WORD system_gs = x86_thread_data()->gs; if (context->SegGs == system_gs) return FALSE; if (!wine_ldt_is_system( context->SegCs )) return FALSE; /* only handle faults in system libraries */ - if (virtual_is_valid_code_address( instr, 1 )) return FALSE; + if (virtual_is_valid_code_address( (BYTE *)context->Eip, 1 )) return FALSE; - for (;;) switch(*instr) + len = virtual_uninterrupted_read_memory( (BYTE *)context->Eip, instr, sizeof(instr) ); + for (i = 0; i < len; i++) switch (instr[i]) { /* instruction prefixes */ case 0x2e: /* %cs: */ @@ -1618,16 +1619,17 @@ static inline BOOL check_invalid_gs( CONTEXT *context ) case 0xf0: /* lock */ case 0xf2: /* repne */ case 0xf3: /* repe */ - if (++prefix_count >= 15) return FALSE; - instr++; continue; case 0x65: /* %gs: */ TRACE( "%04x/%04x at %p, fixing up\n", context->SegGs, system_gs, instr ); - context->SegGs = system_gs; +#ifdef GS_sig + GS_sig(sigcontext) = system_gs; +#endif return TRUE; default: return FALSE; } + return FALSE; } @@ -1911,8 +1913,6 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context case EXCEPTION_ACCESS_VIOLATION: if (rec->NumberParameters == 2) { - if (rec->ExceptionInformation[1] == 0xffffffff && check_invalid_gs( context )) - goto done; if (!(rec->ExceptionCode = virtual_handle_fault( (void *)rec->ExceptionInformation[1], rec->ExceptionInformation[0], FALSE ))) goto done; @@ -2059,7 +2059,10 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) if ((err & 7) == 4 && !wine_ldt_is_system( err | 7 )) stack->rec.ExceptionInformation[1] = err & ~7; else + { stack->rec.ExceptionInformation[1] = 0xffffffff; + if (check_invalid_gs( context, &stack->context )) return; + } } break; case TRAP_x86_PAGEFLT: /* Page fault */

1 0

Alexandre Julliard : ntdll: Handle page faults in signal handler on i386.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: df3fad6383e79d1485413ad549c55240843d2418 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df3fad6383e79d1485413ad5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 12 20:36:50 2019 +0200 ntdll: Handle page faults in signal handler on i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 9511255754..587940c032 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1913,11 +1913,7 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context case EXCEPTION_ACCESS_VIOLATION: if (rec->NumberParameters == 2) { - if (!(rec->ExceptionCode = virtual_handle_fault( (void *)rec->ExceptionInformation[1], - rec->ExceptionInformation[0], FALSE ))) - goto done; - if (rec->ExceptionCode == EXCEPTION_ACCESS_VIOLATION && - rec->ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT) + if (rec->ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT) { ULONG flags; NtQueryInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, @@ -2066,10 +2062,12 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) } break; case TRAP_x86_PAGEFLT: /* Page fault */ - stack->rec.ExceptionCode = EXCEPTION_ACCESS_VIOLATION; stack->rec.NumberParameters = 2; stack->rec.ExceptionInformation[0] = (get_error_code(context) >> 1) & 0x09; stack->rec.ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; + if (!(stack->rec.ExceptionCode = virtual_handle_fault( (void *)stack->rec.ExceptionInformation[1], + stack->rec.ExceptionInformation[0], FALSE ))) + return; break; case TRAP_x86_ALIGNFLT: /* Alignment check exception */ /* FIXME: pass through exception handler first? */

1 0

Francois Gouget : testbot: Add support for WineTest's subtests.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: tools Branch: master Commit: 04a261728720b3163a0f3ad48746340ef2c4507c URL: https://source.winehq.org/git/tools.git/?a=commit;h=04a261728720b3163a0f3ad… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 12 11:18:13 2019 +0200 testbot: Add support for WineTest's subtests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 3dca2e4..21f7dd0 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -183,6 +183,8 @@ sub _NewCurrentUnit($$) # complain about misplaced skips. Dll => $Dll, Unit => $Unit, + Units => {$Unit => 1}, + UnitsRE => $Unit, UnitSize => 0, LineFailures => 0, LineTodos => 0, @@ -209,7 +211,7 @@ sub _CheckUnit($$$$) { my ($Parser, $Cur, $Unit, $Type) = @_; - if ($Unit eq $Cur->{Unit} or $Cur->{Unit} eq "") + if ($Cur->{Units}->{$Unit} or $Cur->{Unit} eq "") { $Parser->{IsWineTest} = 1; } @@ -337,28 +339,41 @@ sub ParseWineTestReport($$$) # Recognize skipped messages in case we need to skip tests in the VMs $Cur->{Rc} = 0 if ($Type eq "skipped"); } + elsif ($Line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)\r?$/) + { + my ($Unit, $SubUnit) = ($1, $2); + if ($Cur->{Units}->{$Unit}) + { + $Cur->{Units}->{$SubUnit} = 1; + $Cur->{UnitsRE} = join("|", keys %{$Cur->{Units}}); + } + else + { + _AddError($Parser, "Misplaced $SubUnit subtest\n"); + } + } elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Test (?:failed|succeeded inside todo block): / or ($Cur->{Unit} ne "" and - $Line =~ /($Cur->{Unit})\.c:\d+: Test (?:failed|succeeded inside todo block): /)) + $Line =~ /($Cur->{UnitsRE})\.c:\d+: Test (?:failed|succeeded inside todo block): /)) { _CheckUnit($Parser, $Cur, $1, "failure"); $Cur->{LineFailures}++; } elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Test marked todo: / or ($Cur->{Unit} ne "" and - $Line =~ /($Cur->{Unit})\.c:\d+: Test marked todo: /)) + $Line =~ /($Cur->{UnitsRE})\.c:\d+: Test marked todo: /)) { _CheckUnit($Parser, $Cur, $1, "todo"); $Cur->{LineTodos}++; } elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Tests skipped: / or ($Cur->{Unit} ne "" and - $Line =~ /($Cur->{Unit})\.c:\d+: Tests skipped: /)) + $Line =~ /($Cur->{UnitsRE})\.c:\d+: Tests skipped: /)) { my $Unit = $1; # Don't complain and don't count misplaced skips. Only complain if they # are misreported (see _CloseTestUnit). - if ($Unit eq $Cur->{Unit} or $Cur->{Unit} eq "") + if ($Cur->{Units}->{$Unit} or $Cur->{Unit} eq "") { $Cur->{LineSkips}++; } @@ -374,11 +389,11 @@ sub ParseWineTestReport($$$) } elsif ($Line =~ /^(?:([0-9a-f]+):)?([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or ($Cur->{Unit} ne "" and - $Line =~ /(?:([0-9a-f]+):)?($Cur->{Unit}): unhandled exception [0-9a-fA-F]{8} at /)) + $Line =~ /(?:([0-9a-f]+):)?($Cur->{UnitsRE}): unhandled exception [0-9a-fA-F]{8} at /)) { my ($Pid, $Unit) = ($1, $2); - if ($Unit eq $Cur->{Unit}) + if ($Cur->{Units}->{$Unit}) { # This also replaces a test summary line. $Cur->{Pids}->{$Pid || 0} = 1;

1 0

Francois Gouget : testbot/CheckForWinetestUpdate: Document the task types.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: tools Branch: master Commit: ec125a134fb9b919aceb7e9e076a93a396551062 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ec125a134fb9b919aceb7e9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 12 14:31:27 2019 +0200 testbot/CheckForWinetestUpdate: Document the task types. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 95cb13d..590226c 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -65,8 +65,11 @@ my %WineTestUrls = ( "exe64" => "http://test.winehq.org/builds/winetest64-latest.exe" ); -my %TaskTypes = (build => 1, base32 => 1, winetest32 => 1, all64 => 1, - wine => 1); +my %TaskTypes = (build => "Update and rebuild Wine on the build VMs.", + base32 => "Run WineTest on the 32 bit Windows VMs with the 'base' role.", + winetest32 => "Run WineTest on the 32 bit Windows VMs with the 'winetest' role.", + all64 => "Run WineTest on the all the 64 bit Windows VMs.", + wine => "Update, rebuild and run WineTest on the Wine VMs."); my $Debug; @@ -441,7 +444,11 @@ if (defined $Usage) { print "Usage: $Name0 [--debug] [--log-only] [--help] [--create] [TASKTYPE] ...\n"; print "\n"; - print "Where TASKTYPE is one of: ", join(" ", sort keys %TaskTypes), "\n"; + print "Where TASKTYPE is one of:\n"; + foreach my $TaskType (sort keys %TaskTypes) + { + printf(" %-15s %s\n", $TaskType, $TaskTypes{$TaskType}); + } exit $Usage; }

1 0

Francois Gouget : testbot/LibvirtTool: Provide a more complete domain state description.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: tools Branch: master Commit: 397b6264aecee52a5d2a3da1fabaeaeb020ee803 URL: https://source.winehq.org/git/tools.git/?a=commit;h=397b6264aecee52a5d2a3da… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 12 14:31:32 2019 +0200 testbot/LibvirtTool: Provide a more complete domain state description. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LibvirtDomain.pm | 110 ++++++++++++++++++++++++++++++- 1 file changed, 107 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index 40e0f78..8d9b9df 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -42,6 +42,110 @@ use Image::Magick; my %_Hypervisors; my %_Domains; + +# +# Domain state description +# + +my %_StateNameReasons = ( + Sys::Virt::Domain::STATE_NOSTATE => ["no state", + { + Sys::Virt::Domain::STATE_NOSTATE_UNKNOWN => "unknown", + }], + Sys::Virt::Domain::STATE_RUNNING => ["running", + { + Sys::Virt::Domain::STATE_RUNNING_BOOTED => "booted", + Sys::Virt::Domain::STATE_RUNNING_FROM_SNAPSHOT => "snapshot", + Sys::Virt::Domain::STATE_RUNNING_MIGRATED => "migrated", + Sys::Virt::Domain::STATE_RUNNING_MIGRATION_CANCELED => "migration canceled", + Sys::Virt::Domain::STATE_RUNNING_RESTORED => "restored", + Sys::Virt::Domain::STATE_RUNNING_SAVE_CANCELED => "save canceled", + Sys::Virt::Domain::STATE_RUNNING_UNKNOWN => "unknown", + Sys::Virt::Domain::STATE_RUNNING_UNPAUSED => "unpaused", + Sys::Virt::Domain::STATE_RUNNING_WAKEUP => "wakeup", + Sys::Virt::Domain::STATE_RUNNING_CRASHED => "crashed", + Sys::Virt::Domain::STATE_RUNNING_POSTCOPY => "postcopy", + }], + Sys::Virt::Domain::STATE_BLOCKED => ["blocked", + { + Sys::Virt::Domain::STATE_BLOCKED_UNKNOWN => "unknown", + }], + Sys::Virt::Domain::STATE_PAUSED => ["paused", + { + Sys::Virt::Domain::STATE_PAUSED_DUMP => "dump", + Sys::Virt::Domain::STATE_PAUSED_FROM_SNAPSHOT => "from snapshot", + Sys::Virt::Domain::STATE_PAUSED_IOERROR => "ioerror", + Sys::Virt::Domain::STATE_PAUSED_MIGRATION => "migration", + Sys::Virt::Domain::STATE_PAUSED_SAVE => "save", + Sys::Virt::Domain::STATE_PAUSED_UNKNOWN => "unknown", + Sys::Virt::Domain::STATE_PAUSED_USER => "user", + Sys::Virt::Domain::STATE_PAUSED_WATCHDOG => "watchdog", + Sys::Virt::Domain::STATE_PAUSED_SHUTTING_DOWN => "shutting down", + Sys::Virt::Domain::STATE_PAUSED_SNAPSHOT => "snapshot", + Sys::Virt::Domain::STATE_PAUSED_CRASHED => "crashed", + Sys::Virt::Domain::STATE_PAUSED_STARTING_UP => "starting up", + Sys::Virt::Domain::STATE_PAUSED_POSTCOPY => "postcopy", + Sys::Virt::Domain::STATE_PAUSED_POSTCOPY_FAILED => "postcopy failed", + }], + Sys::Virt::Domain::STATE_SHUTDOWN => ["shutdown", + { + Sys::Virt::Domain::STATE_SHUTDOWN_UNKNOWN => "unknown", + }], + Sys::Virt::Domain::STATE_SHUTOFF => ["shutoff", + { + Sys::Virt::Domain::STATE_SHUTOFF_CRASHED => "crashed", + Sys::Virt::Domain::STATE_SHUTOFF_DESTROYED => "destroyed", + Sys::Virt::Domain::STATE_SHUTOFF_FAILED => "failed", + Sys::Virt::Domain::STATE_SHUTOFF_FROM_SNAPSHOT => "from snapshot", + Sys::Virt::Domain::STATE_SHUTOFF_MIGRATED => "migrated", + Sys::Virt::Domain::STATE_SHUTOFF_SAVED => "saved", + Sys::Virt::Domain::STATE_SHUTOFF_SHUTDOWN => "shutdown", + Sys::Virt::Domain::STATE_SHUTOFF_UNKNOWN => "unknown", + Sys::Virt::Domain::STATE_SHUTOFF_DAEMON => "daemon", + }], + Sys::Virt::Domain::STATE_CRASHED => ["crashed", + { + Sys::Virt::Domain::STATE_CRASHED_UNKNOWN => "unknown", + Sys::Virt::Domain::STATE_CRASHED_PANICKED => "panicked", + }], + Sys::Virt::Domain::STATE_PMSUSPENDED => ["pmsuspended", + { + Sys::Virt::Domain::STATE_PMSUSPENDED_UNKNOWN => "unknown", + Sys::Virt::Domain::STATE_PMSUSPENDED_DISK_UNKNOWN => "disk unknown", + }], +); + +=pod +=over 12 + +=item C<_GetStateDescription()> + +Provides a description of the domain state for diagnostics. + +=back +=cut + +sub _GetStateDescription($$) +{ + my ($State, $Reason) = @_; + + my $StateInfo = $_StateNameReasons{$State}; + my ($StateName, $ReasonName); + if ($StateInfo) + { + $StateName = $StateInfo->[0]; + $ReasonName = $StateInfo->[1]->{$Reason}; + } + + return join(":", $StateName || sprintf("%d", $State), + $ReasonName || sprintf("%d", $Reason)); +} + + +# +# LibvirtDomain class +# + sub new($$) { my ($class, $VM) = @_; @@ -290,8 +394,8 @@ sub PowerOff($) # destroy() sets $@->code to Sys::Virt::Error::ERR_OPERATION_INVALID (55) # if the domain was already off. But this could happen for other reasons so # just check the domain state. - my ($State, $_Reason); - eval { ($State, $_Reason) = $Domain->get_state() }; + my ($State, $Reason); + eval { ($State, $Reason) = $Domain->get_state() }; if ($@) { # Only return the initial error @@ -302,7 +406,7 @@ sub PowerOff($) # This is what we wanted so ignore past errors return undef; } - return $self->_Reset($self->{VM}->Name ." is not off (". _GetStateName($State) ."): $ErrMessage"); + return $self->_Reset($self->{VM}->Name ." is not off (". _GetStateDescription($State, $Reason) ."): $ErrMessage"); } my %_StreamData;

1 0

Francois Gouget : testbot: Add BatchQuote() to quote and escape batch parameters.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: tools Branch: master Commit: cdef2d8f07f0befc17ec88d1bfe63d537d07ef10 URL: https://source.winehq.org/git/tools.git/?a=commit;h=cdef2d8f07f0befc17ec88d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 12 14:36:55 2019 +0200 testbot: Add BatchQuote() to quote and escape batch parameters. This also fixes percent and caret escaping and documents some batch file parameter escaping quirks. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 9 +-------- testbot/lib/WineTestBot/Utils.pm | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 53e9e50..432bf51 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -479,14 +479,7 @@ elsif ($Step->Type eq "suite") $Info .= $VM->Details; } # Escape the arguments for cmd's command interpreter - my $EMail = $AdminEMail; - $EMail =~ s/"/\\"/g; - $EMail =~ s/%/%%/g; - $EMail =~ s/%/%%/g; - $Info =~ s/"/\\"/g; - $Info =~ s/%/%%/g; - $Info =~ s/%/%%/g; - $Script .= "-q -o $RptFileName -t $Tag -m \"$EMail\" -i \"$Info\"\r\n"; + $Script .= "-q -o $RptFileName -t $Tag -m ". BatchQuote($AdminEMail) ." -i ". BatchQuote($Info) ."\r\n"; $Script .= "$FileName -q -s $RptFileName\r\n" if (!$Mission->{nosubmit}); } Debug(Elapsed($Start), " Sending the script: [$Script]\n"); diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 83f60fa..97fb129 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -333,6 +333,31 @@ sub IsValidFileName($) =pod =over 12 +=item C<BatchQuote()> + +Quotes strings so they can be used in Windows batch files. + +Note that escaping is subtly different between the command line, batch files +and inside for loops in batch files! This function ignores the latter case. + +=back +=cut +sub BatchQuote($) +{ + my ($Str)=@_; + + $Str =~ s/"/\\"/g; + # Backslashes don't need to be doubled, they only take on a special meaning + # when followed by a double quote. Single quotes and backquotes don't have + # a special meaning either. + $Str =~ s/%/%%/g; + $Str =~ s/\^/^^/g; + return "\"$Str\""; +} + +=pod +=over 12 + =item C<ShQuote()> Quotes strings so they can be used in shell commands.

1 0

Francois Gouget : testbot/VMs: Make sure only one process uses a VM at a time.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: tools Branch: master Commit: c0c486a133f12a95af29a759692a38988ed123b7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c0c486a133f12a95af29a75… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 11 17:02:37 2019 +0200 testbot/VMs: Make sure only one process uses a VM at a time. The TestBot should already be respecting that rule. But starting a process to operate on a VM always goes through VM::Run() so enforce this rule by checking that the VM's ChildPid field is not already set before starting a new process. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 78e066f..2bf3504 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -154,6 +154,7 @@ use WineTestBot::LibvirtDomain; use WineTestBot::Missions; use WineTestBot::RecordGroups; use WineTestBot::TestAgent; +use WineTestBot::Utils; sub _initialize($$) @@ -374,9 +375,16 @@ sub OnSaved($) sub Run($$$$$$) { my ($self, $NewStatus, $Args, $ChildTimeout, $ChildSetup, $SetupData) = @_; - my $Tool = basename($Args->[0]); + if (defined $self->ChildPid) + { + my $ErrMessage = "Cannot run ". ShArgv2Cmd(@$Args) ." because the ". $self->ChildPid ." process is already using the ". $self->Name ." VM"; + require WineTestBot::Log; + WineTestBot::Log::LogMsg("$ErrMessage\n"); + return $ErrMessage; + } + # There are two $VM->ChildPid race conditions to avoid: # - Between the child process and new calls to ScheduleJobs(). # We cannot leave setting ChildPid to the child process because then it

1 0