October 2017 - Wine-Commits

Ken Thomases : winemac: Track whether a view has ever had an OpenGL context attached.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: stable Commit: 17c4db48e2b355a7a1745e793ff226249a90affe URL: http://source.winehq.org/git/wine.git/?a=commit;h=17c4db48e2b355a7a1745e793… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon May 8 15:31:48 2017 -0500 winemac: Track whether a view has ever had an OpenGL context attached. ... rather than whether it currently has one. This is for OpenGLSurfaceMode=behind. In that mode, we need to make the window transparent wherever a GL-rendered view should not be clipped by GDI-rendered children or sibling views. Some apps attach a GL context to the view only temporarily, do some rendering, and then detach it. But the GL surface remains, with the rendered graphics. In order for those to show, the window needs to remain transparent even though none of its views has a GL context currently attached. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b6a4b2f593503a105dde01e7bd11ffdde243117a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index a68ba03..f951675 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -292,6 +292,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi { NSMutableArray* glContexts; NSMutableArray* pendingGlContexts; + BOOL _everHadGLContext; BOOL _cachedHasGLDescendant; BOOL _cachedHasGLDescendantValid; BOOL clearedGlSurface; @@ -302,6 +303,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi int backingSize[2]; } +(a)property (readonly, nonatomic) BOOL everHadGLContext; + - (void) addGLContext:(WineOpenGLContext*)context; - (void) removeGLContext:(WineOpenGLContext*)context; - (void) updateGLContexts; @@ -354,6 +357,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @implementation WineContentView +(a)synthesize everHadGLContext = _everHadGLContext; + - (void) dealloc { [markedText release]; @@ -463,7 +468,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) addGLContext:(WineOpenGLContext*)context { - BOOL hadContext = [self hasGLContext]; + BOOL hadContext = _everHadGLContext; if (!glContexts) glContexts = [[NSMutableArray alloc] init]; if (!pendingGlContexts) @@ -485,6 +490,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [self setNeedsDisplay:YES]; } + _everHadGLContext = YES; if (!hadContext) [self invalidateHasGLDescendant]; [(WineWindow*)[self window] updateForGLSubviews]; @@ -492,11 +498,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) removeGLContext:(WineOpenGLContext*)context { - BOOL hadContext = [self hasGLContext]; [glContexts removeObjectIdenticalTo:context]; [pendingGlContexts removeObjectIdenticalTo:context]; - if (hadContext && ![self hasGLContext]) - [self invalidateHasGLDescendant]; [(WineWindow*)[self window] updateForGLSubviews]; } @@ -506,16 +509,11 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi context.needsUpdate = TRUE; } - - (BOOL) hasGLContext - { - return [glContexts count] || [pendingGlContexts count]; - } - - (BOOL) _hasGLDescendant { if ([self isHidden]) return NO; - if ([self hasGLContext]) + if (_everHadGLContext) return YES; for (WineContentView* view in [self subviews]) { @@ -2337,7 +2335,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi NSRect contentRect = [[self contentView] frame]; BOOL coveredByGLView = FALSE; WineContentView* view = (WineContentView*)[[self contentView] hitTest:NSMakePoint(NSMidX(contentRect), NSMidY(contentRect))]; - if ([view isKindOfClass:[WineContentView class]] && [view hasGLContext]) + if ([view isKindOfClass:[WineContentView class]] && view.everHadGLContext) { NSRect frame = [view convertRect:[view bounds] toView:nil]; if (NSContainsRect(frame, contentRect))

1 0

Piotr Caban : msvcrt: Use temp directory when creating file in tmpfile.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: stable Commit: a310cdf4abee760be03ac45e2347337a597ab326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a310cdf4abee760be03ac45e2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 5 18:15:30 2017 +0200 msvcrt: Use temp directory when creating file in tmpfile. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e4c9a2ec81b8029876d588e09587db40ab65ee69) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 8965156..b1c66e5 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4970,7 +4970,7 @@ MSVCRT_wchar_t * CDECL MSVCRT__wtmpnam(MSVCRT_wchar_t *s) */ MSVCRT_FILE* CDECL MSVCRT_tmpfile(void) { - char *filename = MSVCRT_tmpnam(NULL); + char *filename = MSVCRT__tempnam(",", "t"); int fd; MSVCRT_FILE* file = NULL;

1 0

Alistair Leslie-Hughes : dplayx: Implement IDirectPlay4 EnumConnections.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: stable Commit: dc2d790deeba6c3b0b13f24c89ee1d26e4cdd461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc2d790deeba6c3b0b13f24c8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 8 05:37:40 2017 +0000 dplayx: Implement IDirectPlay4 EnumConnections. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2ef274b6087feeefdeb2750bf119a58b50c64046) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dplayx/dplay.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 92062d3..845c840 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -4482,8 +4482,8 @@ static HRESULT WINAPI IDirectPlay4Impl_EnumConnections( IDirectPlay4 *iface, const GUID *application, LPDPENUMCONNECTIONSCALLBACK enumcb, void *context, DWORD flags ) { IDirectPlayImpl *This = impl_from_IDirectPlay4( iface ); - FIXME( "(%p)->(%p,%p,%p,0x%08x): stub\n", This, application, enumcb, context, flags ); - return DP_OK; + return IDirectPlayX_EnumConnections( &This->IDirectPlay4A_iface, application, enumcb, context, + flags ); } static HRESULT WINAPI IDirectPlay3AImpl_EnumGroupsInGroup( IDirectPlay3A *iface, DPID group,

1 0

Austin English : ntoskrnl.exe: Add KeReleaseSpinLock stub.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: stable Commit: 87498d362da1796af34510f3f707a2380a26d1b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87498d362da1796af34510f3f… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jun 21 13:29:37 2017 -0500 ntoskrnl.exe: Add KeReleaseSpinLock stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 362ceb2e5625c2a2162c6c5b432a36fc45b7ca1c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hal/hal.spec | 2 +- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 414e49b..ae706e0 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -76,7 +76,7 @@ @ stub KeRaiseIrql @ stub KeRaiseIrqlToDpcLevel @ stub KeRaiseIrqlToSynchLevel -@ stub KeReleaseSpinLock +@ stdcall KeReleaseSpinLock(ptr long) ntoskrnl.exe.KeReleaseSpinLock @ stub KeStallExecutionProcessor @ stub READ_PORT_BUFFER_UCHAR @ stub READ_PORT_BUFFER_ULONG diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 5a7f348..3f945b6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3228,3 +3228,11 @@ void WINAPI KeReleaseInStackQueuedSpinLock( KLOCK_QUEUE_HANDLE *handle ) { FIXME( "stub: %p\n", handle); } + +/*********************************************************************** + * KeReleaseSpinLock (NTOSKRNL.EXE.@) + */ +VOID WINAPI KeReleaseSpinLock( KSPIN_LOCK *spinlock, KIRQL irql ) +{ + FIXME( "stub: %p %u\n", spinlock, irql ); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 53e3c94..20dadbc 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -591,6 +591,7 @@ @ stub KeReleaseMutant @ stdcall KeReleaseMutex(ptr long) @ stdcall KeReleaseSemaphore(ptr long long long) +@ stdcall KeReleaseSpinLock(ptr long) @ stub KeReleaseSpinLockFromDpcLevel @ stub KeRemoveByKeyDeviceQueue @ stub KeRemoveByKeyDeviceQueueIfBusy

1 0

Henri Verbeet : ddraw/tests: Add a test for the alpha and z-buffer blit flags.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: stable Commit: f6fd4013fbed40f90c2e2c1857e4ee37490fe697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6fd4013fbed40f90c2e2c185… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 24 23:31:29 2017 +0200 ddraw/tests: Add a test for the alpha and z-buffer blit flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 45b01908da378f16a2612a012c52205daca0bbb1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 400 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6fd4013fbed40f90c2e2…

1 0

Akihiro Sagawa : oleaut32: Fix parse error when converting non-ascii string to VT_DATE.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: stable Commit: 4c8624fd93cdb5ba9c08b0fd320eaa4b5a23f6ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c8624fd93cdb5ba9c08b0fd3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 17 00:00:07 2017 +0900 oleaut32: Fix parse error when converting non-ascii string to VT_DATE. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit efc86ec175fa2f67c649299f48ac96d1af9a1fa9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 7 +++++++ dlls/oleaut32/vartype.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index ff495bd..0f39043 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3410,6 +3410,8 @@ static void test_VarDateFromStr(void) SYSTEMTIME st; OLECHAR buff[128]; size_t i; + OLECHAR with_ideographic_spaceW[] = { '6','/','3','0','/','2','0','1','1',0x3000, + '1',':','2','0',':','3','4',0 }; lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); @@ -3533,6 +3535,11 @@ static void test_VarDateFromStr(void) DFS("6/30/2011 01:20:34 PM"); EXPECT_DBL(40724.55594907407); /* Native fails "1999 January 3, 9AM". I consider that a bug in native */ + /* test a data with ideographic space */ + out = 0.0; + hres = pVarDateFromStr(with_ideographic_spaceW, lcid, LOCALE_NOUSEROVERRIDE, &out); + EXPECT_DBL(40724.05594907407); + /* test a non-english data string */ DFS("02.01.1970"); EXPECT_MISMATCH; DFS("02.01.1970 00:00:00"); EXPECT_MISMATCH; diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index fc5a025..000b66c 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -7679,7 +7679,7 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd dp.dwCount++; strIn--; } - else if (isalpha(*strIn)) + else if (isalphaW(*strIn)) { BOOL bFound = FALSE;

1 0

Fabian Maurer : user32: Don' t send WM_CHAR when a menu gets VK_ESCAPE and add tests.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: stable Commit: 695c91a78a67d7532a9fe1f4914d1698339f34c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=695c91a78a67d7532a9fe1f49… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Feb 2 16:33:54 2017 +0100 user32: Don't send WM_CHAR when a menu gets VK_ESCAPE and add tests. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 115bbf424cc0f5ea325e3052aed8ad8106045294) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/menu.c | 2 +- dlls/user32/tests/msg.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 59fcd9c..827bee7 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3077,7 +3077,6 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, break; } - TranslateMessage( &msg ); mt.pt = msg.pt; if ( (msg.hwnd==menu->hWnd) || (msg.message!=WM_TIMER) ) @@ -3206,6 +3205,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, } default: + TranslateMessage( &msg ); break; } break; /* WM_KEYDOWN */ diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index eba949b..51009ad 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1942,6 +1942,10 @@ static const struct message WmTrackPopupMenu[] = { { 0 } }; +static const struct message WmTrackPopupMenuEsc[] = { + { 0 } +}; + static const struct message WmTrackPopupMenuCapture[] = { { HCBT_CREATEWND, hook }, { WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 }, @@ -16071,6 +16075,7 @@ static LRESULT WINAPI cancel_init_proc(HWND hwnd, UINT message, WPARAM wParam, L static void test_TrackPopupMenu(void) { + MSG msg; HWND hwnd; BOOL ret; @@ -16093,6 +16098,20 @@ static void test_TrackPopupMenu(void) ok_sequence(WmTrackPopupMenu, "TrackPopupMenu", TRUE); ok(ret == 1, "TrackPopupMenu failed with error %i\n", GetLastError()); + /* Test popup closing with an ESC-press */ + flush_events(); + PostMessageW(hwnd, WM_KEYDOWN, VK_ESCAPE, 0); + ret = TrackPopupMenu(hpopupmenu, 0, 100,100, 0, hwnd, NULL); + ok(ret == 1, "TrackPopupMenu failed with error %i\n", GetLastError()); + PostQuitMessage(0); + flush_sequence(); + while ( PeekMessageA(&msg, 0, 0, 0, PM_REMOVE) ) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + ok_sequence(WmTrackPopupMenuEsc, "TrackPopupMenuEsc", FALSE); /* Shouldn't get any message */ + SetWindowLongPtrA( hwnd, GWLP_WNDPROC, (LONG_PTR)cancel_init_proc); flush_events();

1 0

Francois Gouget : testbot: Remove LibvirtDomain::_UpdateStatus().
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: tools Branch: master Commit: 604683507c18dbd865730b32d4d5deae9bf21cc2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=604683507c18dbd865730b32… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 19 14:54:35 2017 +0200 testbot: Remove LibvirtDomain::_UpdateStatus(). It was needed to resynchronize the VM status field during the Engine initialization. However nowadays the Engine delegates this to LibvirtTool which does not want the VM status to be changed behind this back and thus bypasses _UpdateStatus(). The bypass is explicit in the case of PowerOff(), $NoStatus=1, and implicit in the RevertToSnapshot() case: _UpdateStatus() does nothing if get_state() == STATE_RUNNING (which is the case for our VMs) and $VM->Status ne "off". Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 4 ++-- testbot/lib/WineTestBot/LibvirtDomain.pm | 35 ++++---------------------------- 2 files changed, 6 insertions(+), 33 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index ab97261..51f03b4 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -305,7 +305,7 @@ sub PowerOff() { # Power off VMs no matter what their initial status is $CurrentStatus = $VM->Status; - my $ErrMessage = $VM->GetDomain()->PowerOff(1); + my $ErrMessage = $VM->GetDomain()->PowerOff(); FatalError("$ErrMessage\n") if (defined $ErrMessage); return ChangeStatus(undef, "off", "done"); @@ -338,7 +338,7 @@ sub Revert() # Some QEmu/KVM versions are buggy and cannot revert a running VM Debug(Elapsed($Start), " Powering off the VM\n"); my $Domain = $VM->GetDomain(); - my $ErrMessage = $Domain->PowerOff(1); + my $ErrMessage = $Domain->PowerOff(); if (defined $ErrMessage) { LogMsg "Could not power off $VMKey: $ErrMessage\n"; diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index 1b74315..f8caffa 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -151,32 +151,6 @@ sub _GetDomain($) return (undef, $Domain); } -sub _UpdateStatus($$) -{ - my ($self, $Domain) = @_; - - return undef if ($self->{VM}->Status eq "offline"); - - my ($State, $Reason); - eval { ($State, $Reason) = $Domain->get_state() }; - return $self->_Reset(_eval_err()) if ($@); - - if ($State == Sys::Virt::Domain::STATE_SHUTDOWN or - $State == Sys::Virt::Domain::STATE_SHUTOFF or - $State == Sys::Virt::Domain::STATE_CRASHED) - { - $self->{VM}->Status("off"); - $self->{VM}->Save(); - } - elsif ($self->{VM}->Status eq "off") - { - $self->{VM}->Status("dirty"); - $self->{VM}->Save(); - } - - return undef; -} - sub _GetSnapshot($$) { my ($self, $SnapshotName) = @_; @@ -233,7 +207,7 @@ sub RevertToSnapshot($) # Note that if the snapshot was of a powered off domain, this boots it up eval { $Snapshot->revert_to(Sys::Virt::DomainSnapshot::REVERT_RUNNING) }; - return $@ ? $self->_Reset(_eval_err()) : $self->_UpdateStatus($Domain); + return $@ ? $self->_Reset(_eval_err()) : undef; } sub CreateSnapshot($) @@ -279,9 +253,9 @@ sub IsPoweredOn($) return ($State == Sys::Virt::Domain::STATE_RUNNING); } -sub PowerOff($$) +sub PowerOff($) { - my ($self, $NoStatus) = @_; + my ($self) = @_; my ($ErrMessage, $Domain) = $self->_GetDomain(); return $ErrMessage if (defined $ErrMessage); @@ -298,9 +272,8 @@ sub PowerOff($$) $ErrMessage = "The VM is still active"; } } - $ErrMessage ||= $self->_UpdateStatus($Domain) if (!$NoStatus); - return undef if (!defined $ErrMessage); + return undef if (!defined $ErrMessage); return $self->_Reset("Could not power off ". $self->{VM}->Name .": $ErrMessage"); }

1 0

Francois Gouget : testbot: Monitor offline VMs and automatically put them back online.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: tools Branch: master Commit: 51b379e666f7962a00d143208f1384282dfd1306 URL: http://source.winehq.org/git/tools.git/?a=commit;h=51b379e666f7962a00d14320… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 19 14:53:27 2017 +0200 testbot: Monitor offline VMs and automatically put them back online. When a VM goes offline, start a LibvirtTool process to monitor it and put it back online as soon as we can access it again. This makes the TestBot resilient to temporary network outages and VM host reboots. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 4 ++- testbot/bin/LibvirtTool.pl | 60 ++++++++++++++++++++++++++++++++++++++--- testbot/lib/WineTestBot/Jobs.pm | 18 ++++++++----- testbot/lib/WineTestBot/VMs.pm | 31 ++++++++++++++++++--- 4 files changed, 100 insertions(+), 13 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 02c361c..e6755bc 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -181,7 +181,9 @@ sub Cleanup(;$$) if ($KillVMs) { $VM->KillChild(); - $VM->RunPowerOff(); + # $KillVMs is normally used on shutdown so don't start a process that + # will get stuck 'forever' waiting for an offline VM. + $VM->RunPowerOff() if ($VM->Status ne "offline"); } elsif (!$VM->CanHaveChild()) { diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index fcc0e81..ab97261 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -Tw # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # -# Performs poweroff and revert operations on the specified VM. +# Performs poweroff, revert and other operations on the specified VM. # These operations can take quite a bit of time, particularly in case of # network trouble, and thus are best performed in a separate process. # @@ -104,7 +104,7 @@ while (@ARGV) { $LogOnly = 1; } - elsif ($Arg =~ /^(?:checkidle|poweroff|revert)$/) + elsif ($Arg =~ /^(?:checkidle|monitor|poweroff|revert)$/) { $Action = $Arg; } @@ -163,7 +163,7 @@ if (!defined $Usage) } if (defined $Usage) { - print "Usage: $Name0 [--debug] [--log-only] [--help] (checkidle|poweroff|revert) VMName\n"; + print "Usage: $Name0 [--debug] [--log-only] [--help] (checkidle|monitor|poweroff|revert) VMName\n"; exit $Usage; } @@ -251,6 +251,56 @@ sub ChangeStatus($$;$) return 0; } +sub Monitor() +{ + $CurrentStatus = "offline"; + while (1) + { + # Get a fresh status + $VM = CreateVMs()->GetItem($VMKey); + if (!defined $VM or $VM->Role eq "retired" or $VM->Role eq "deleted" or + $VM->Status eq "maintenance") + { + my $Reason = $VM ? "Role=". $VM->Role ."\nStatus=". $VM->Status : + "$VMKey does not exist anymore"; + NotifyAdministrator("The $VMKey VM is not relevant anymore", + "The $VMKey VM was offline but ceased to be relevant after ". + Elapsed($Start). " seconds:\n\n$Reason\n"); + return 1; + } + if ($VM->Status ne "offline") + { + NotifyAdministrator("The $VMKey VM is working again (". $VM->Status .")", + "The status of the $VMKey VM unexpectedly switched from offline\n". + "to ". $VM->Status ." after ". Elapsed($Start) + ." seconds."); + return 0; + } + + my $IsPoweredOn = $VM->GetDomain()->IsPoweredOn(); + if ($IsPoweredOn) + { + my $ErrMessage = $VM->GetDomain()->PowerOff(1); + if (defined $ErrMessage) + { + Error "$ErrMessage\n"; + $IsPoweredOn = undef; + } + } + if (defined $IsPoweredOn) + { + return 1 if (ChangeStatus("offline", "off", "done")); + NotifyAdministrator("The $VMKey VM is working again", + "The $VMKey VM started working again after ". + Elapsed($Start) ." seconds."); + return 0; + } + + Debug(Elapsed($Start), " $VMKey is still unreachable\n"); + sleep(60); + } +} + sub PowerOff() { # Power off VMs no matter what their initial status is @@ -336,6 +386,10 @@ if ($Action eq "checkidle") { $Rc = CheckIdle(); } +elsif ($Action eq "monitor") +{ + $Rc = Monitor(); +} elsif ($Action eq "poweroff") { $Rc = PowerOff(); diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 6e7937f..de639c7 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -215,24 +215,23 @@ sub Cancel($) $Tasks->AddFilter("Status", ["queued", "running"]); foreach my $Task (@{$Tasks->GetItems()}) { + my $VM = $Task->VM; if ($Task->Status eq "queued") { $Task->Status("skipped"); my ($EProperty, $EMessage) = $Task->Save(); $ErrMessage ||= "$EMessage ($EProperty)" if ($EMessage); } - elsif (defined $Task->ChildPid) + elsif (defined $VM->ChildPid) { require WineTestBot::Log; WineTestBot::Log::LogMsg("Canceling the " . join("/", $self->Id, $Step->No, $Task->No) . " task\n"); - kill("TERM", $Task->ChildPid); $Task->Status("canceled"); - $Task->ChildPid(undef); my ($EProperty, $EMessage) = $Task->Save(); $ErrMessage ||= "$EMessage ($EProperty)" if ($EMessage); - my $VM = $Task->VM; $VM->Status('dirty'); + $VM->KillChild(); ($EProperty, $EMessage) = $VM->Save(); $ErrMessage ||= "$EMessage ($EProperty)" if ($EMessage); } @@ -285,7 +284,6 @@ sub Restart($) system("rm", "-rf", "$JobDir/" . $Step->No . "/" . $Task->No); } $Task->Status("queued"); - $Task->ChildPid(undef); $Task->Started(undef); $Task->Ended(undef); $Task->TestFailures(undef); @@ -493,6 +491,14 @@ sub ScheduleOnHost($$$) { $RunningCount++; } + elsif ($VMStatus eq "offline") + { + if (!$VM->HasRunningChild()) + { + my $ErrMessage = $VM->RunMonitor(); + return $ErrMessage if (defined $ErrMessage); + } + } else { my $Priority = $VM->Type eq "build" ? 10 : @@ -617,7 +623,7 @@ sub ScheduleOnHost($$$) next if (exists $VMsToRevert{$VMKey}); my $VM = $HostVMs->GetItem($VMKey); - next if ($VM->Status ne "dirty" or defined $VM->ChildPid); + next if ($VM->Status ne "dirty" or $VM->HasRunningChild()); my $ErrMessage = $VM->RunPowerOff(); return $ErrMessage if (defined $ErrMessage); diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 377eb0a..e71ad21 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -241,7 +241,7 @@ Returns true if the VM status is compatible with ChildPid being set. sub CanHaveChild($) { my ($self) = @_; - return ($self->Status =~ /^(?:dirty|reverting|sleeping)$/); + return ($self->Status =~ /^(?:dirty|reverting|sleeping|offline)$/); } =pod @@ -416,6 +416,31 @@ sub RunCheckIdle($) return $self->_RunVMTool("dirty", ["--log-only", "checkidle", $self->GetKey()]); } +=pod +=over 12 + +=item C<RunMonitor()> + +Monitors an offline VM to detect when it becomes accessible again. +When the VM can again be accessed through the hypervisor it is powered off and +its status is set to 'off'. + +This operation can obviously take a long time so it is performed in a separate +process. + +=back +=cut + +sub RunMonitor($) +{ + my ($self) = @_; + # In fact the status is already set + return $self->_RunVMTool("offline", ["--log-only", "monitor", $self->GetKey()]); +} + +=pod +=over 12 + =item C<RunPowerOff()> Powers off the VM so that it stops using resources. @@ -547,8 +572,8 @@ sub FilterEnabledRole($) sub FilterEnabledStatus($) { my ($self) = @_; - # Filter out the disabled VMs, that is the offline and maintenance ones - $self->AddFilter("Status", ["dirty", "reverting", "sleeping", "idle", "running", "off"]); + # Filter out the maintenance VMs + $self->AddFilter("Status", ["dirty", "reverting", "sleeping", "idle", "running", "off", "offline"]); } sub FilterHypervisors($$)

1 0

Francois Gouget : testbot: Power off Libvirt domains in one operation.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: tools Branch: master Commit: ccf23fd22fa8491a6abf026a989c855669cac2d8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ccf23fd22fa8491a6abf026a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 19 14:54:41 2017 +0200 testbot: Power off Libvirt domains in one operation. When all goes well. In case of trouble use get_state() to check if the virtual machine is powered off anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LibvirtDomain.pm | 48 +++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index f8caffa..9ca98eb 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -253,6 +253,23 @@ sub IsPoweredOn($) return ($State == Sys::Virt::Domain::STATE_RUNNING); } +sub _GetStateName($) +{ + my ($State) = @_; + + my %StateNames = { + Sys::Virt::Domain::STATE_NOSTATE => "no state", + Sys::Virt::Domain::STATE_RUNNING => "running", + Sys::Virt::Domain::STATE_BLOCKED => "blocked", + Sys::Virt::Domain::STATE_PAUSED => "paused", + Sys::Virt::Domain::STATE_SHUTDOWN => "shutdown", + Sys::Virt::Domain::STATE_SHUTOFF => "shutoff", + Sys::Virt::Domain::STATE_CRASHED => "crashed", + Sys::Virt::Domain::STATE_PMSUSPENDED => "pmsuspended", + }; + return $StateNames{$State} || "unknown"; +} + sub PowerOff($) { my ($self) = @_; @@ -260,21 +277,26 @@ sub PowerOff($) my ($ErrMessage, $Domain) = $self->_GetDomain(); return $ErrMessage if (defined $ErrMessage); - if ($self->IsPoweredOn()) + eval { $Domain->destroy() }; + return undef if (!$@); # Success + $ErrMessage = _eval_err(); + + # 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() }; + if ($@) { - eval { $Domain->destroy() }; - if ($@) - { - $ErrMessage = _eval_err(); - } - elsif ($self->IsPoweredOn()) - { - $ErrMessage = "The VM is still active"; - } + # Only return the initial error + return $self->_Reset("Could not power off ". $self->{VM}->Name .": $ErrMessage"); } - - return undef if (!defined $ErrMessage); - return $self->_Reset("Could not power off ". $self->{VM}->Name .": $ErrMessage"); + if ($State == Sys::Virt::Domain::STATE_SHUTOFF) + { + # This is what we wanted so ignore past errors + return undef; + } + return $self->_Reset($self->{VM}->Name ." is not off (". _GetStateName($State) ."): $ErrMessage"); } my %_StreamData;

1 0