wine-commits September 2019

wine-commits@winehq.org

2 participants
629 discussions

Alexandre Julliard : ntdll: Factor out setup_raise_exception() on i386.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: 41509c0d5be4172d673249e1faccaf1117d43434 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41509c0d5be4172d673249e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 12 19:23:26 2019 +0200 ntdll: Factor out setup_raise_exception() on i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 69 ++++++++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index d58e1e5653..5699a99932 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1786,7 +1786,7 @@ static BOOL check_atl_thunk( EXCEPTION_RECORD *rec, CONTEXT *context ) * Setup the exception record and context on the thread stack. */ static struct stack_layout *setup_exception_record( ucontext_t *sigcontext, void *stack_ptr, - WORD fs, WORD gs, raise_func func ) + WORD fs, WORD gs ) { struct stack_layout *stack = stack_ptr; DWORD exception_code = 0; @@ -1848,10 +1848,6 @@ static struct stack_layout *setup_exception_record( ucontext_t *sigcontext, void #elif defined(VALGRIND_MAKE_WRITABLE) VALGRIND_MAKE_WRITABLE(stack, sizeof(*stack)); #endif - stack->ret_addr = (void *)0xdeadbabe; /* raise_func must not return */ - stack->rec_ptr = &stack->rec; - stack->context_ptr = &stack->context; - stack->rec.ExceptionRecord = NULL; stack->rec.ExceptionCode = exception_code; stack->rec.ExceptionFlags = EXCEPTION_CONTINUABLE; @@ -1859,19 +1855,6 @@ static struct stack_layout *setup_exception_record( ucontext_t *sigcontext, void stack->rec.NumberParameters = 0; save_context( &stack->context, sigcontext, fs, gs ); - - /* now modify the sigcontext to return to the raise function */ - ESP_sig(sigcontext) = (DWORD)stack; - EIP_sig(sigcontext) = (DWORD)func; - /* clear single-step, direction, and align check flag */ - EFL_sig(sigcontext) &= ~(0x100|0x400|0x40000); - CS_sig(sigcontext) = wine_get_cs(); - DS_sig(sigcontext) = wine_get_ds(); - ES_sig(sigcontext) = wine_get_es(); - FS_sig(sigcontext) = wine_get_fs(); - GS_sig(sigcontext) = wine_get_gs(); - SS_sig(sigcontext) = wine_get_ss(); - return stack; } @@ -1883,12 +1866,35 @@ static struct stack_layout *setup_exception_record( ucontext_t *sigcontext, void * sigcontext so that the return from the signal handler will call * the raise function. */ -static struct stack_layout *setup_exception( ucontext_t *sigcontext, raise_func func ) +static struct stack_layout *setup_exception( ucontext_t *sigcontext ) { WORD fs, gs; void *stack = init_handler( sigcontext, &fs, &gs ); - return setup_exception_record( sigcontext, stack, fs, gs, func ); + return setup_exception_record( sigcontext, stack, fs, gs ); +} + + +/*********************************************************************** + * setup_raise_exception + * + * Change context to setup a call to a raise exception function. + */ +static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout *stack, raise_func func ) +{ + ESP_sig(sigcontext) = (DWORD)stack; + EIP_sig(sigcontext) = (DWORD)func; + /* clear single-step, direction, and align check flag */ + EFL_sig(sigcontext) &= ~(0x100|0x400|0x40000); + CS_sig(sigcontext) = wine_get_cs(); + DS_sig(sigcontext) = wine_get_ds(); + ES_sig(sigcontext) = wine_get_es(); + FS_sig(sigcontext) = wine_get_fs(); + GS_sig(sigcontext) = wine_get_gs(); + SS_sig(sigcontext) = wine_get_ss(); + stack->ret_addr = (void *)0xdeadbabe; /* raise_func must not return */ + stack->rec_ptr = &stack->rec; /* arguments for raise_func */ + stack->context_ptr = &stack->context; } @@ -2055,14 +2061,14 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) case 1: /* handled */ return; case -1: /* overflow */ - stack = setup_exception_record( context, stack_ptr, fs, gs, raise_segv_exception ); + stack = setup_exception_record( context, stack_ptr, fs, gs ); stack->rec.ExceptionCode = EXCEPTION_STACK_OVERFLOW; - return; + goto done; } } - stack = setup_exception_record( context, stack_ptr, fs, gs, raise_segv_exception ); - if (stack->rec.ExceptionCode == EXCEPTION_STACK_OVERFLOW) return; + stack = setup_exception_record( context, stack_ptr, fs, gs ); + if (stack->rec.ExceptionCode == EXCEPTION_STACK_OVERFLOW) goto done; switch(get_trap_code(context)) { @@ -2116,6 +2122,8 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) stack->rec.ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; break; } +done: + setup_raise_exception( context, stack, raise_segv_exception ); } @@ -2127,7 +2135,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { ucontext_t *context = sigcontext; - struct stack_layout *stack = setup_exception( context, raise_trap_exception ); + struct stack_layout *stack = setup_exception( context ); switch(get_trap_code(context)) { @@ -2145,6 +2153,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 ); } @@ -2156,7 +2165,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { ucontext_t *context = sigcontext; - struct stack_layout *stack = setup_exception( context, raise_generic_exception ); + struct stack_layout *stack = setup_exception( context ); switch(get_trap_code(context)) { @@ -2189,6 +2198,8 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) stack->rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; break; } + + setup_raise_exception( context, stack, raise_generic_exception ); } @@ -2205,8 +2216,9 @@ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) init_handler( sigcontext, &fs, &gs ); if (!dispatch_signal(SIGINT)) { - struct stack_layout *stack = setup_exception( sigcontext, raise_generic_exception ); + struct stack_layout *stack = setup_exception( sigcontext ); stack->rec.ExceptionCode = CONTROL_C_EXIT; + setup_raise_exception( sigcontext, stack, raise_generic_exception ); } } @@ -2217,9 +2229,10 @@ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { - struct stack_layout *stack = setup_exception( sigcontext, raise_generic_exception ); + struct stack_layout *stack = setup_exception( sigcontext ); stack->rec.ExceptionCode = EXCEPTION_WINE_ASSERTION; stack->rec.ExceptionFlags = EH_NONCONTINUABLE; + setup_raise_exception( sigcontext, stack, raise_generic_exception ); }

1 0

Alexandre Julliard : ntdll: Use a stack_layout structure to build exception data on i386.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: 04c73a89309fb20b0bb6fa06de048e113779b28b URL: https://source.winehq.org/git/wine.git/?a=commit;h=04c73a89309fb20b0bb6fa06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 12 19:20:14 2019 +0200 ntdll: Use a stack_layout structure to build exception data on i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 138 ++++++++++++++++++++++------------------------- 1 file changed, 63 insertions(+), 75 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=04c73a89309fb20b0bb6…

1 0

Alexandre Julliard : ntdll: Use a stack_layout structure to build exception data on x86-64.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: 6e6711d77371dc96c7127cf6518be8ef796a8e58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e6711d77371dc96c7127cf6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 12 16:44:21 2019 +0200 ntdll: Use a stack_layout structure to build exception data on x86-64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 174 ++++++++++++++++++++------------------------- 1 file changed, 79 insertions(+), 95 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6e6711d77371dc96c712…

1 0

Alexandre Julliard : ntdll: Use virtual_uninterrupted_read_memory() to read code inside signal handler on x86-64.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: 24876bf17e7c6c7c9c39a6a05aa609cba33c93a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24876bf17e7c6c7c9c39a6a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 12 11:31:13 2019 +0200 ntdll: Use virtual_uninterrupted_read_memory() to read code inside signal handler on x86-64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index feb2e69d3f..d48f445f67 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2829,10 +2829,11 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec */ static inline DWORD is_privileged_instr( CONTEXT *context ) { - const BYTE *instr = (BYTE *)context->Rip; - unsigned int prefix_count = 0; + BYTE instr[16]; + unsigned int i, prefix_count = 0; + unsigned int len = virtual_uninterrupted_read_memory( (BYTE *)context->Rip, instr, sizeof(instr) ); - for (;;) switch(*instr) + for (i = 0; i < len; i++) switch (instr[i]) { /* instruction prefixes */ case 0x2e: /* %cs: */ @@ -2863,11 +2864,11 @@ static inline DWORD is_privileged_instr( CONTEXT *context ) case 0xf2: /* repne */ case 0xf3: /* repe */ if (++prefix_count >= 15) return EXCEPTION_ILLEGAL_INSTRUCTION; - instr++; continue; case 0x0f: /* extended instruction */ - switch(instr[1]) + if (i == len - 1) return 0; + switch (instr[i + 1]) { case 0x06: /* clts */ case 0x08: /* invd */ @@ -2899,6 +2900,7 @@ static inline DWORD is_privileged_instr( CONTEXT *context ) default: return 0; } + return 0; }

1 0

Alexandre Julliard : configure: Check for unw_step() instead of unw_getcontext().
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: wine Branch: master Commit: 4c0f59ddbc863976a21bfceacf5b65157efbb421 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c0f59ddbc863976a21bfcea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 12 11:38:30 2019 +0200 configure: Check for unw_step() instead of unw_getcontext(). unw_getcontext() can be inlined. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 40 ++++++++++++++++++++-------------------- configure.ac | 22 +++++++++++----------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/configure b/configure index 83d8591c1d..109d2423a2 100755 --- a/configure +++ b/configure @@ -14893,9 +14893,9 @@ $as_echo "$as_me:${as_lineno-$LINENO}: libunwind cflags: $UNWIND_CFLAGS" >&5 $as_echo "$as_me:${as_lineno-$LINENO}: libunwind libs: $UNWIND_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $UNWIND_CFLAGS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unw_getcontext" >&5 -$as_echo_n "checking for unw_getcontext... " >&6; } -if ${wine_cv_have_unw_getcontext+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unw_step" >&5 +$as_echo_n "checking for unw_step... " >&6; } +if ${wine_cv_have_unw_step+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14905,28 +14905,28 @@ else int main () { -unw_context_t context; unw_getcontext( &context ); +unw_context_t context; unw_step( &context ); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - wine_cv_have_unw_getcontext="yes" + wine_cv_have_unw_step="yes" else - wine_cv_have_unw_getcontext="no" + wine_cv_have_unw_step="no" fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_unw_getcontext" >&5 -$as_echo "$wine_cv_have_unw_getcontext" >&6; } - if test "$wine_cv_have_unw_getcontext" = no -a -n "$UNWIND_LIBS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_unw_step" >&5 +$as_echo "$wine_cv_have_unw_step" >&6; } + if test "$wine_cv_have_unw_step" = no -a -n "$UNWIND_LIBS" then save_libs=$LIBS LIBS="$UNWIND_LIBS $LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unw_getcontext in libunwind" >&5 -$as_echo_n "checking for unw_getcontext in libunwind... " >&6; } -if ${wine_cv_have_libunwind_unw_getcontext+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unw_step in libunwind" >&5 +$as_echo_n "checking for unw_step in libunwind... " >&6; } +if ${wine_cv_have_libunwind_unw_step+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14936,25 +14936,25 @@ else int main () { -unw_context_t context; unw_getcontext( &context ); +unw_context_t context; unw_step( &context ); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - wine_cv_have_libunwind_unw_getcontext="yes" + wine_cv_have_libunwind_unw_step="yes" else - wine_cv_have_libunwind_unw_getcontext="no" + wine_cv_have_libunwind_unw_step="no" fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_libunwind_unw_getcontext" >&5 -$as_echo "$wine_cv_have_libunwind_unw_getcontext" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_libunwind_unw_step" >&5 +$as_echo "$wine_cv_have_libunwind_unw_step" >&6; } LIBS=$save_libs fi - test "$wine_cv_have_libunwind_unw_getcontext" = yes || UNWIND_LIBS="" - if test "x$wine_cv_have_unw_getcontext$wine_cv_have_libunwind_unw_getcontext" != xnono + test "$wine_cv_have_libunwind_unw_step" = yes || UNWIND_LIBS="" + if test "x$wine_cv_have_unw_step$wine_cv_have_libunwind_unw_step" != xnono then $as_echo "#define HAVE_LIBUNWIND 1" >>confdefs.h @@ -14967,7 +14967,7 @@ test -z "$UNWIND_LIBS" || UNWIND_LIBS=`echo " $UNWIND_LIBS" | sed 's/ -L$[^/]$ fi case $host in aarch64*|*-darwin*) - if test "x$wine_cv_have_unw_getcontext$wine_cv_have_libunwind_unw_getcontext" != xnono; then : + if test "x$wine_cv_have_unw_step$wine_cv_have_libunwind_unw_step" != xnono; then : case "x$with_unwind" in x) as_fn_append wine_notices "|libunwind ${notice_platform}development files not found, stack unwinding won't work." ;; xno) ;; diff --git a/configure.ac b/configure.ac index b39b6b2c90..dfa6b6ac9c 100644 --- a/configure.ac +++ b/configure.ac @@ -1694,32 +1694,32 @@ dnl **** Check for libuwind **** if test "x$with_unwind" != xno then WINE_PACKAGE_FLAGS(UNWIND,[libunwind],[-lunwind],,, - [AC_CACHE_CHECK([for unw_getcontext],wine_cv_have_unw_getcontext, + [AC_CACHE_CHECK([for unw_step],wine_cv_have_unw_step, [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define UNW_LOCAL_ONLY #include <libunwind.h>]], - [[unw_context_t context; unw_getcontext( &context );]])], - [wine_cv_have_unw_getcontext="yes"],[wine_cv_have_unw_getcontext="no"])]) - if test "$wine_cv_have_unw_getcontext" = no -a -n "$UNWIND_LIBS" + [[unw_context_t context; unw_step( &context );]])], + [wine_cv_have_unw_step="yes"],[wine_cv_have_unw_step="no"])]) + if test "$wine_cv_have_unw_step" = no -a -n "$UNWIND_LIBS" then save_libs=$LIBS LIBS="$UNWIND_LIBS $LIBS" - AC_CACHE_CHECK([for unw_getcontext in libunwind],wine_cv_have_libunwind_unw_getcontext, + AC_CACHE_CHECK([for unw_step in libunwind],wine_cv_have_libunwind_unw_step, [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define UNW_LOCAL_ONLY #include <libunwind.h>]], - [[unw_context_t context; unw_getcontext( &context );]])], - [wine_cv_have_libunwind_unw_getcontext="yes"], - [wine_cv_have_libunwind_unw_getcontext="no"])]) + [[unw_context_t context; unw_step( &context );]])], + [wine_cv_have_libunwind_unw_step="yes"], + [wine_cv_have_libunwind_unw_step="no"])]) LIBS=$save_libs fi - test "$wine_cv_have_libunwind_unw_getcontext" = yes || UNWIND_LIBS="" - if test "x$wine_cv_have_unw_getcontext$wine_cv_have_libunwind_unw_getcontext" != xnono + test "$wine_cv_have_libunwind_unw_step" = yes || UNWIND_LIBS="" + if test "x$wine_cv_have_unw_step$wine_cv_have_libunwind_unw_step" != xnono then AC_DEFINE(HAVE_LIBUNWIND,1,[Define to 1 if you have the `unwind' library (-lunwind).]) fi]) fi case $host in aarch64*|*-darwin*) - WINE_NOTICE_WITH(unwind,[test "x$wine_cv_have_unw_getcontext$wine_cv_have_libunwind_unw_getcontext" != xnono], + WINE_NOTICE_WITH(unwind,[test "x$wine_cv_have_unw_step$wine_cv_have_libunwind_unw_step" != xnono], [libunwind ${notice_platform}development files not found, stack unwinding won't work.]) ;; esac

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/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/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: 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 : winetest: Add support for WineTest's subtests.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: tools Branch: master Commit: 057a6d205baad9d32d041fcc6ebca736efe6e65e URL: https://source.winehq.org/git/tools.git/?a=commit;h=057a6d205baad9d32d041fc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 12 11:18:19 2019 +0200 winetest: Add support for WineTest's subtests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 48 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index e5b2815..1bbd78e 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -2,6 +2,7 @@ # # Copyright (C) 2004 Ferenc Wagner # Copyright (C) 2008 Alexandre Julliard +# Copyright (C) 2017, 2019 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -442,8 +443,9 @@ while ($line = <IN> || "") # Parse the tests output # -my ($dll, $unit, $source, $rev, $result) = ("", "", ""); +my ($dll, $unit, $units_re, $source, $rev, $result) = ("", "", "", ""); my $unitsize = 0; +my %units; my ($failures, $todo, $skipped) = (0, 0, 0); my ($s_failures, $s_todo, $s_skipped, $s_total) = (0, 0, 0, 0); my (%pids, $rc, $summary, $broken); @@ -455,9 +457,9 @@ sub get_source_link($$) my $source_link = defined $_unit ? "$_unit.c" : $source ne "-" ? $source : "$dll:$unit"; $source_link .= ":$_lnum" if (defined $_lnum); - if (defined $_unit and $_unit ne $unit) + if (defined $_unit and !$units{$_unit}) { - # If the line is not for the current test unit we'll let its + # If the line is not for a current test unit we'll let its # developer hash it out with the polluter ;-) $broken = 1; } @@ -481,7 +483,7 @@ sub add_test_line($$) sub check_unit($$) { my ($l_unit, $l_type) = @_; - if ($l_unit ne $unit) + if (!$units{$l_unit}) { add_test_line("end", "Misplaced $l_type message\n"); $extra_failures++; @@ -576,7 +578,8 @@ sub close_test_unit($) mydie "too many failed test units (>$maxfailedtests at $dll:$unit)"; } - $dll = $unit = ""; + $dll = $unit = $units_re = ""; + %units = (); $unitsize = 0; $failures = $todo = $skipped = 0; $s_failures = $s_todo = $s_skipped = $s_total = 0; @@ -599,6 +602,8 @@ while ($line = <IN>) { close_test_unit(0) if ($dll ne ""); ($dll, $unit, $source, $rev) = ($l_dll, $l_unit, $l_source, $l_rev); + %units = ($unit => 1); + $units_re = join("|", keys %units); $testbox = create_test_unit_box(); if ($l_type eq "skipped") @@ -609,40 +614,56 @@ while ($line = <IN>) { $rc = 0; } } + elsif ($line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)\r?$/) + { + my ($l_unit, $l_subunit) = ($1, $2); + if ($units{$l_unit}) + { + $units{$l_subunit} = 1; + $units_re = join("|", keys %units); + } + else + { + add_test_line("end", "Misplaced $l_subunit subtest\n"); + $extra_failures++; + } + } elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/ or ($unit ne "" and - $line =~ /^(.*?)($unit)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/)) + $line =~ /^(.*?)($units_re)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/)) { my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); add_test_line("failed", escapeHTML($pollution) . get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); + check_unit($l_unit, "failure"); $failures++; } elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (Test marked todo: .*)$/ or ($unit ne "" and - $line =~ /^(.*?)($unit)\.c:(\d+): (Test marked todo: .*)$/)) + $line =~ /^(.*?)($units_re)\.c:(\d+): (Test marked todo: .*)$/)) { my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); add_test_line("todo", escapeHTML($pollution) . get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); + check_unit($l_unit, "todo"); $todo++; } elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (Tests skipped: .*)$/ or ($unit ne "" and - $line =~ /^(.*?)($unit)\.c:(\d+): (Tests skipped: .*)$/)) + $line =~ /^(.*?)($units_re)\.c:(\d+): (Tests skipped: .*)$/)) { my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); add_test_line("skipped", escapeHTML($pollution) . get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); # Don't complain and don't count misplaced skips - $skipped++ if ($l_unit eq $unit); + $skipped++ if ($units{$l_unit}); } elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (.*)$/ or ($unit ne "" and - $line =~ /^(.*?)($unit)\.c:(\d+): (.*)$/)) + $line =~ /^(.*?)($units_re)\.c:(\d+): (.*)$/)) { my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); add_test_line("trace", escapeHTML($pollution) . @@ -651,10 +672,10 @@ while ($line = <IN>) { } elsif ($line =~ /^(?:([0-9a-f]+):)?([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or ($unit ne "" and - $line =~ /(?:([0-9a-f]+):)?($unit): unhandled exception [0-9a-fA-F]{8} at /)) + $line =~ /(?:([0-9a-f]+):)?($units_re): unhandled exception [0-9a-fA-F]{8} at /)) { my ($l_pid, $l_unit) = ($1, $2); - if ($l_unit eq $unit) + if ($units{$l_unit}) { # This also replaces a test summary line. $pids{$l_pid || 0} = 1; @@ -706,6 +727,9 @@ while ($line = <IN>) { # Then switch to the new one, warning it's missing a start line, # and that its results may be inconsistent. ($dll, $unit, $source, $rev) = ($l_dll, $l_unit, "-", "-"); + %units = ($unit => 1); + $units_re = join("|", keys %units); + $testbox = create_test_unit_box(); add_test_line("end", "The $l_dll:$l_unit start line is missing (or it is garbled)"); $extra_failures++;

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2019