wine-commits September 2019

wine-commits@winehq.org

2 participants
629 discussions

Zebediah Figura : wineqtdecoder: Use BasePinImpl_QueryAccept() and BasePinImpl_EnumMediaTypes().
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: wine Branch: master Commit: 55b30a0481df54cd60785abed873af8cb8346f2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=55b30a0481df54cd60785abe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 23 19:33:20 2019 -0500 wineqtdecoder: Use BasePinImpl_QueryAccept() and BasePinImpl_EnumMediaTypes(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 56 +++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 30 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 599407d4ca..d713cd14bd 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -199,6 +199,11 @@ static inline QTSplitter *impl_from_IBaseFilter( IBaseFilter *iface ) return CONTAINING_RECORD(iface, QTSplitter, filter.IBaseFilter_iface); } +static inline QTInPin *impl_from_IPin(IPin *iface) +{ + return CONTAINING_RECORD(iface, QTInPin, pin.IPin_iface); +} + /* * Base Filter */ @@ -285,6 +290,24 @@ static const struct strmbase_filter_ops filter_ops = .filter_destroy = qt_splitter_destroy, }; +static HRESULT WINAPI sink_CheckMediaType(BasePin *iface, const AM_MEDIA_TYPE *mt) +{ + QTInPin *pin = impl_from_IPin(&iface->IPin_iface); + + if (IsEqualGUID(&mt->majortype, &MEDIATYPE_Stream)) + { + pin->subType = mt->subtype; + return S_OK; + } + return S_FALSE; +} + +static const BasePinFuncTable sink_ops = +{ + .pfnCheckMediaType = sink_CheckMediaType, + .pfnGetMediaType = BasePinImpl_GetMediaType, +}; + IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) { QTSplitter *This; @@ -318,6 +341,7 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) lstrcpynW(This->pInputPin.pin.name, wcsInputPinName, ARRAY_SIZE(This->pInputPin.pin.name)); This->pInputPin.pin.IPin_iface.lpVtbl = &QT_InputPin_Vtbl; This->pInputPin.pin.pConnectedTo = NULL; + This->pInputPin.pin.pFuncsTable = &sink_ops; SourceSeeking_Init(&This->sourceSeeking, &QT_Seeking_Vtbl, QTSplitter_ChangeStop, QTSplitter_ChangeStart, QTSplitter_ChangeRate, &This->filter.csFilter); @@ -812,11 +836,6 @@ static HRESULT QT_RemoveOutputPins(QTSplitter *This) return S_OK; } -static inline QTInPin *impl_from_IPin( IPin *iface ) -{ - return CONTAINING_RECORD(iface, QTInPin, pin.IPin_iface); -} - static HRESULT QT_Process_Video_Track(QTSplitter* filter, Track trk) { AM_MEDIA_TYPE amt; @@ -1154,20 +1173,6 @@ static HRESULT WINAPI QTInPin_Disconnect(IPin *iface) return hr; } -static HRESULT WINAPI QTInPin_QueryAccept(IPin *iface, const AM_MEDIA_TYPE *pmt) -{ - QTInPin *This = impl_from_IPin(iface); - - TRACE("(%p)->(%p)\n", This, pmt); - - if (IsEqualIID(&pmt->majortype, &MEDIATYPE_Stream)) - { - This->subType = pmt->subtype; - return S_OK; - } - return S_FALSE; -} - static HRESULT WINAPI QTInPin_EndOfStream(IPin *iface) { FIXME("iface %p, stub!\n", iface); @@ -1219,15 +1224,6 @@ static HRESULT WINAPI QTInPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * return E_NOINTERFACE; } -static HRESULT WINAPI QTInPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppEnum) -{ - QTInPin *This = impl_from_IPin(iface); - - TRACE("(%p/%p)->(%p)\n", This, iface, ppEnum); - - return EnumMediaTypes_Construct(&This->pin, BasePinImpl_GetMediaType, BasePinImpl_GetMediaTypeVersion, ppEnum); -} - static const IPinVtbl QT_InputPin_Vtbl = { QTInPin_QueryInterface, BasePinImpl_AddRef, @@ -1240,8 +1236,8 @@ static const IPinVtbl QT_InputPin_Vtbl = { BasePinImpl_QueryPinInfo, BasePinImpl_QueryDirection, BasePinImpl_QueryId, - QTInPin_QueryAccept, - QTInPin_EnumMediaTypes, + BasePinImpl_QueryAccept, + BasePinImpl_EnumMediaTypes, BasePinImpl_QueryInternalConnections, QTInPin_EndOfStream, QTInPin_BeginFlush,

1 0

Zebediah Figura : strmbase: Don't expose EnumMediaTypes_Construct().
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: wine Branch: master Commit: b68498c875f7db2969ff4fbaeaa5b2e4db5a3163 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b68498c875f7db2969ff4fba… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 23 19:33:21 2019 -0500 strmbase: Don't expose EnumMediaTypes_Construct(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/strmbase_private.h | 2 ++ include/wine/strmbase.h | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index 9904754e4a..4b94735eb6 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -63,6 +63,8 @@ void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME s void QualityControlRender_EndRender(QualityControlImpl *This); HRESULT enum_pins_create(struct strmbase_filter *filter, IEnumPins **enum_pins); +HRESULT WINAPI EnumMediaTypes_Construct(BasePin *pin, BasePin_GetMediaType enumFunc, + BasePin_GetMediaTypeVersion versionFunc, IEnumMediaTypes **enum_media_types) DECLSPEC_HIDDEN; HRESULT WINAPI RendererPosPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_TIME start); HRESULT WINAPI RendererPosPassThru_ResetMediaTime(IUnknown *iface); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 85801ebabc..169046d64d 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -199,9 +199,6 @@ void strmbase_filter_init(struct strmbase_filter *filter, const IBaseFilterVtbl const CLSID *clsid, const struct strmbase_filter_ops *func_table); void strmbase_filter_cleanup(struct strmbase_filter *filter); -/* Enums */ -HRESULT WINAPI EnumMediaTypes_Construct(BasePin *iface, BasePin_GetMediaType enumFunc, BasePin_GetMediaTypeVersion versionFunc, IEnumMediaTypes ** ppEnum); - /* Transform Filter */ typedef struct TransformFilter {

1 0

Francois Gouget : testbot/LibvirtTool: Wait for the X session for live Wine snapshots.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: tools Branch: master Commit: 6a5e1e87900c85bd0fc60841170c8d520af0ab48 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6a5e1e87900c85bd0fc6084… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 11:10:08 2019 +0200 testbot/LibvirtTool: Wait for the X session for live Wine snapshots. The TestAgentd server may start before the X session. But we need the latter to run the Wine tests so make sure the X session has started before creating the live snapshot. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 72075ae..d1402bc 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -386,6 +386,29 @@ sub CreateSnapshot($$) { my ($Domain, $SnapshotName) = @_; + if ($VM->Type eq "wine") + { + # Make sure an X session has started before taking the snapshot + Debug(Elapsed($Start), " Waiting for the X session\n"); + LogMsg "Waiting for the $VMKey X session\n"; + my $TA = $VM->GetAgent(); + my $Pid = $TA->Run(["sh", "-c", "while ! xset -display :0.0 q >/dev/null; do sleep 1; done"], 0); + if (!$Pid) + { + FatalError("Could not check for the X session on the $VMKey VM\n"); + } + if (!defined $TA->Wait($Pid, $SleepAfterBoot)) + { + my $ErrMessage = $TA->GetLastError(); + if ($ErrMessage =~ /timed out waiting for the child process/) + { + FatalError("Timed out waiting for the X session\n"); + } + FatalError("An error occurred while waiting for the X session: $ErrMessage\n"); + } + $TA->Disconnect(); + } + if ($SleepAfterBoot != 0) { Debug(Elapsed($Start), " Sleeping for the $SnapshotName snapshot\n");

1 0

Francois Gouget : testbot/LibvirtTool: Create live snapshots as needed.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: tools Branch: master Commit: 6c6525ed9cae006e82196c35d0ac29e583356c84 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6c6525ed9cae006e82196c3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 11:10:05 2019 +0200 testbot/LibvirtTool: Create live snapshots as needed. Live snapshots have to save the content of the VM's memory which takes space in the disk image. They may also be specific to the host they are running on (e.g. AMD vs. Intel CPU). And they may need to be recreated after QEmu upgrades. So VMs always have a powered off snapshot as reference and backups made from the powered off state. With VMs that are configured for autologin and autostart of TestAgentd this patch removes the need for the administrator to manually recreate the live snapshots. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 85 +++++++++++++++++++++++++++----- testbot/lib/WineTestBot/Config.pm | 7 ++- testbot/lib/WineTestBot/LibvirtDomain.pm | 5 +- 3 files changed, 79 insertions(+), 18 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index dd330a5..72075ae 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -6,7 +6,7 @@ # network trouble, and thus are best performed in a separate process. # # Copyright 2009 Ge van Geldorp -# Copyright 2012-2017 Francois Gouget +# Copyright 2012-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 @@ -382,6 +382,25 @@ sub SetupTestAgentd($$) $TA->Disconnect(); } +sub CreateSnapshot($$) +{ + my ($Domain, $SnapshotName) = @_; + + if ($SleepAfterBoot != 0) + { + Debug(Elapsed($Start), " Sleeping for the $SnapshotName snapshot\n"); + LogMsg "Letting $VMKey settle down for the $SnapshotName snapshot\n"; + sleep($SleepAfterBoot); + } + + Debug(Elapsed($Start), " Creating the $SnapshotName snapshot\n"); + my $ErrMessage = $Domain->CreateSnapshot($SnapshotName); + if (defined $ErrMessage) + { + FatalError("Could not recreate the $SnapshotName snapshot on $VMKey: $ErrMessage\n"); + } +} + sub Revert() { my $VM = CreateVMs()->GetItem($VMKey); @@ -391,11 +410,34 @@ sub Revert() return 1; } $CurrentStatus = "reverting"; + my $DomainSnapshot = $VM->IdleSnapshot; + my $ExtraTimeout = 0; + my $CreateSnapshot; - # Revert the VM (and power it on if necessary) my $Domain = $VM->GetDomain(); - Debug(Elapsed($Start), " Reverting $VMKey to ", $VM->IdleSnapshot, "\n"); - my ($ErrMessage, $Booting) = $Domain->RevertToSnapshot(); + if (!$Domain->HasSnapshot($DomainSnapshot) and $DomainSnapshot =~ s/-live$//) + { + # Add some extra time to boot the VM and create the live snapshot + $ExtraTimeout += $WaitForBoot + $VMToolTimeout / 2; + $CreateSnapshot = 1; + Debug(Elapsed($Start), " $VMKey does not yet have a $DomainSnapshot-live snapshot\n"); + } + if (!$Domain->HasSnapshot($DomainSnapshot)) + { + FatalError("Could not find $VMKey\'s $DomainSnapshot snapshot\n"); + } + if ($ExtraTimeout) + { + Debug(Elapsed($Start), " Extend the $VMKey revert deadline by $ExtraTimeout\n"); + my $Deadline = $VM->Status eq "maintenance" ? (time() + $VMToolTimeout) : + $VM->ChildDeadline; + $VM->ChildDeadline($Deadline + $ExtraTimeout); + $VM->Save(); + } + + # Revert the VM (and power it on if necessary) + Debug(Elapsed($Start), " Reverting $VMKey to $DomainSnapshot\n"); + my ($ErrMessage, $Booting) = $Domain->RevertToSnapshot($DomainSnapshot); if (defined $ErrMessage) { # Libvirt/QEmu is buggy and cannot revert a running VM from one hardware @@ -408,28 +450,45 @@ sub Revert() FatalError("Could not power off $VMKey: $ErrMessage\n"); } - Debug(Elapsed($Start), " Reverting $VMKey to ", $VM->IdleSnapshot, "... again\n"); - ($ErrMessage, $Booting) = $Domain->RevertToSnapshot(); + Debug(Elapsed($Start), " Reverting $VMKey to $DomainSnapshot... again\n"); + ($ErrMessage, $Booting) = $Domain->RevertToSnapshot($DomainSnapshot); } if (defined $ErrMessage) { - FatalError("Could not revert $VMKey to ". $VM->IdleSnapshot .": $ErrMessage\n"); + FatalError("Could not revert $VMKey to $DomainSnapshot: $ErrMessage\n"); } - # The VM is now sleeping which may allow some tasks to run - return 1 if (ChangeStatus("reverting", "sleeping")); + # Mark the VM as sleeping which allows the scheduler to abort the revert in + # favor of higher priority tasks. But don't allow interruptions in the + # middle of snapshot creation! + if (!$CreateSnapshot) + { + return 1 if (ChangeStatus("reverting", "sleeping")); + } # Set up the TestAgent server SetupTestAgentd($VM, $Booting); - if ($SleepAfterRevert != 0) + if ($CreateSnapshot) { + CreateSnapshot($Domain, $VM->IdleSnapshot); + } + else + { + my $Sleep = ($Booting and $SleepAfterBoot > $SleepAfterRevert) ? + $SleepAfterBoot : $SleepAfterRevert; Debug(Elapsed($Start), " Sleeping\n"); - LogMsg "Letting ". $VM->Name ." settle down for ${SleepAfterRevert}s\n"; - sleep($SleepAfterRevert); + LogMsg "Letting $VMKey settle down for ${Sleep}s\n"; + sleep($Sleep); + } + + if ($CreateSnapshot) + { + # The activity monitor does not like it when VMs skip the sleeping step + return 1 if (ChangeStatus("reverting", "sleeping")); } - return ChangeStatus("sleeping", "idle", "done"); + return ChangeStatus($CurrentStatus, "idle", "done"); } diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 27e863c..56971b7 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -28,7 +28,7 @@ WineTestBot::Config - Site-independent configuration settings use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir %RepoURLs $DbDataSource $DbUsername $DbPassword $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs - $MaxVMsWhenIdle $SleepAfterRevert $WaitForBoot + $MaxVMsWhenIdle $WaitForBoot $SleepAfterBoot $SleepAfterRevert $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $ExeBuildNativeTimeout $ExeBuildTestTimeout $ExeModuleTimeout @@ -44,7 +44,8 @@ require Exporter; @ISA = qw(Exporter); @EXPORT = qw($UseSSL $LogDir $DataDir $BinDir %RepoURLs $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs - $MaxRunningVMs $MaxVMsWhenIdle $SleepAfterRevert $WaitForBoot + $MaxRunningVMs $MaxVMsWhenIdle $WaitForBoot $SleepAfterBoot + $SleepAfterRevert $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout $ExeBuildNativeTimeout $ExeBuildTestTimeout $ExeModuleTimeout @@ -92,6 +93,8 @@ $MaxVMsWhenIdle = undef; # How long to attempt to connect to the TestAgent while the VM is booting. $WaitForBoot = 90; +# How long to let the VM settle down after booting it before taking a snapshot. +$SleepAfterBoot = 30; # How long to let the VM settle down after a revert before starting a task on # it (in seconds). $SleepAfterRevert = 0; diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index 1f70c97..14bf71d 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -307,11 +307,10 @@ sub GetSnapshotName($) return (undef, $SnapshotName); } -sub RevertToSnapshot($) +sub RevertToSnapshot($$) { - my ($self) = @_; + my ($self, $SnapshotName) = @_; - my $SnapshotName = $self->{VM}->IdleSnapshot; my ($ErrMessage, $Domain, $Snapshot) = $self->_GetSnapshot($SnapshotName); return ($ErrMessage, undef) if (defined $ErrMessage);

1 0

Francois Gouget : testbot/LibvirtTool: Move the TestAgentd check to a separate function.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: tools Branch: master Commit: 51f44f2c29d396162aa175f12394ba28e9236dc6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=51f44f2c29d396162aa175f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 11:09:49 2019 +0200 testbot/LibvirtTool: Move the TestAgentd check to a separate function. GetVersion() is equivalent to Ping() but can be used to perform version checks. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 4635443..dd330a5 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -365,6 +365,23 @@ sub CheckOff() return ChangeStatus("dirty", "off", "done"); } +sub SetupTestAgentd($$) +{ + my ($VM, $Booting) = @_; + + Debug(Elapsed($Start), " Setting up the $VMKey TestAgent server\n"); + LogMsg "Setting up the $VMKey TestAgent server\n"; + my $TA = $VM->GetAgent(); + $TA->SetConnectTimeout(undef, undef, $WaitForBoot) if ($Booting); + my $Version = $TA->GetVersion(); + if (!$Version) + { + my $ErrMessage = $TA->GetLastError(); + FatalError("Could not connect to the $VMKey TestAgent: $ErrMessage\n"); + } + $TA->Disconnect(); +} + sub Revert() { my $VM = CreateVMs()->GetItem($VMKey); @@ -402,18 +419,8 @@ sub Revert() # The VM is now sleeping which may allow some tasks to run return 1 if (ChangeStatus("reverting", "sleeping")); - # Verify that the TestAgent server accepts connections - Debug(Elapsed($Start), " Verifying the TestAgent server\n"); - LogMsg "Verifying the $VMKey TestAgent server\n"; - my $TA = $VM->GetAgent(); - $TA->SetConnectTimeout(undef, undef, $WaitForBoot) if ($Booting); - my $Success = $TA->Ping(); - $TA->Disconnect(); - if (!$Success) - { - $ErrMessage = $TA->GetLastError(); - FatalError("Cannot connect to the $VMKey TestAgent: $ErrMessage\n"); - } + # Set up the TestAgent server + SetupTestAgentd($VM, $Booting); if ($SleepAfterRevert != 0) {

1 0

Francois Gouget : testbot/TestAgent: Add the restart RPC.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: tools Branch: master Commit: 28c6aeaf86ddf6b8454d6ce59b5f1f16f50f4b82 URL: https://source.winehq.org/git/tools.git/?a=commit;h=28c6aeaf86ddf6b8454d6ce… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 11:06:43 2019 +0200 testbot/TestAgent: Add the restart RPC. This is similar to the upgrade RPC but leaves out sending the new server binary and allows changing the server command line which makes it more flexible. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 52 ++++++++ testbot/scripts/TestAgent | 14 ++- testbot/src/testagentd/platform.h | 2 +- testbot/src/testagentd/platform_unix.c | 45 +++++-- testbot/src/testagentd/platform_windows.c | 199 ++++++++++++++++++++++++++++-- testbot/src/testagentd/testagentd.c | 72 ++++++++++- 6 files changed, 356 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=28c6aeaf86ddf6b8454…

1 0

Francois Gouget : testbot/testagentd: Fix upgrades when there is more than one server running.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: tools Branch: master Commit: 2d8e40dad69c325415f927d37970a7849942f6b0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2d8e40dad69c325415f927d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 11:04:13 2019 +0200 testbot/testagentd: Fix upgrades when there is more than one server running. On Windows the second server will keep the old executable busy, preventing its deletion. So give up after a while. Usually the second server will be running with --set-time-only so upgrading it is not as important. If necessary this condition can be detected on the client by attempting to delete the old executable and checking for an error. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/testagentd/platform_windows.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index bb52a02..2d971a4 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -532,17 +532,20 @@ int platform_init(void) { /* This also serves to ensure the old server has released the port * before we attempt to open our own. + * But if a second server is running the deletion will never work so + * give up after a while. */ + int attempt = 0; do { if (!DeleteFileA(oldtestagentd)) Sleep(500); + attempt++; } - while (GetLastError() == ERROR_ACCESS_DENIED); + while (GetLastError() == ERROR_ACCESS_DENIED && attempt < 20); free(oldtestagentd); } - wVersionRequested = MAKEWORD(2, 2); rc = WSAStartup(wVersionRequested, &wsaData); if (rc)

1 0

Francois Gouget : testbot/WineRunReconfig: Notify the administrator if recreating the snapshot failed.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: tools Branch: master Commit: 51503c04fea1dd065f35b921b9a3e19dc0cd3d20 URL: https://source.winehq.org/git/tools.git/?a=commit;h=51503c04fea1dd065f35b92… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 11:01:12 2019 +0200 testbot/WineRunReconfig: Notify the administrator if recreating the snapshot failed. It's possible that the connection to the hypervisor was lost right when the snapshot was being recreated. The TestBot may also be able to recreate the snapshot from the powered off base snapshot. But such failures are rare enough to warrant an investigation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 063bab2..bfbc5ab 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -518,6 +518,11 @@ if ($NewStatus eq 'completed') # Without the snapshot the VM is not usable anymore but FatalError() will # just mark it as 'dirty'. It's only the next time it is used that the # problem will be noticed and that it will be taken offline. + NotifyAdministrator("The ". $VM->Name ." update failed", + "Could not recreate the $IdleSnapshot snapshot:\n\n". + "$ErrMessage\n\n". + "See the link below for more details:\n". + MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n"); FatalError("Could not recreate the $IdleSnapshot snapshot: $ErrMessage\n"); }

1 0

Francois Gouget : testbot/WineRunReconfig: Notify the administrator if the build fails.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: tools Branch: master Commit: df877ab52c672562541f78fba602ea1bf123e5b0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=df877ab52c672562541f78f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 11:00:40 2019 +0200 testbot/WineRunReconfig: Notify the administrator if the build fails. Build failures prevent the TestBot snapshot from being updated (leading to an out-of-date Wine and patches that fail to apply) and can typically only be fixed manually. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index fe36ad0..063bab2 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -438,6 +438,11 @@ if ($TA->GetFile("Reconfig.log", "$TaskDir/log")) { # We should not have badpatch errors and if the result line is missing we # probably already have an error message that explains why. + NotifyAdministrator("The ". $VM->Name ." build failed", + "The ". $VM->Name ." build failed:\n\n". + "$Summary->{Task}\n\n". + "See the link below for more details:\n". + MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n"); $NewStatus = "badbuild"; } }

1 0

Francois Gouget : testbot: SetupRedirects() should not depend on prior logging.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: tools Branch: master Commit: b360a0b5e2b0099e8ba3b326ccb9905aa3d4ff6a URL: https://source.winehq.org/git/tools.git/?a=commit;h=b360a0b5e2b0099e8ba3b32… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 24 11:00:15 2019 +0200 testbot: SetupRedirects() should not depend on prior logging. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Log.pm | 59 +++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index c39a557..7ac4dab 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -33,26 +33,28 @@ use WineTestBot::Config; my $logfile; my $logprefix; -sub LogMsg(@) +sub SetupLogging() { - if (!defined $logfile) + require File::Basename; + $logprefix = File::Basename::basename($0); + $logprefix =~ s/\.[^.]*$//; + my $oldumask = umask(002); + if (!open($logfile, ">>", "$LogDir/log")) { - require File::Basename; - $logprefix = File::Basename::basename($0); - $logprefix =~ s/\.[^.]*$//; - my $oldumask = umask(002); - if (!open($logfile, ">>", "$LogDir/log")) - { - print STDERR "$logprefix:warning: could not open '$LogDir/log' for writing: $!\n"; - open($logfile, ">>&=", 2); - } - umask($oldumask); - - # Flush after each print - my $tmp=select($logfile); - $| = 1; - select($tmp); + print STDERR "$logprefix:warning: could not open '$LogDir/log' for writing: $!\n"; + open($logfile, ">>&=", 2); } + umask($oldumask); + + # Flush after each print + my $tmp=select($logfile); + $| = 1; + select($tmp); +} + +sub LogMsg(@) +{ + SetupLogging() if (!defined $logfile); print $logfile scalar localtime, " ", $logprefix, "[$$]: ", @_ if ($logfile); } @@ -75,19 +77,18 @@ exec()-ing external tools so their error messages are not lost. sub SetupRedirects() { - if (defined $logfile) + SetupLogging() if (!defined $logfile); + + if (open(STDERR, ">>&", $logfile)) + { + # Make sure stderr still flushes after each print + my $tmp = select(STDERR); + $| = 1; + select($tmp); + } + else { - if (open(STDERR, ">>&", $logfile)) - { - # Make sure stderr still flushes after each print - my $tmp=select(STDERR); - $| = 1; - select($tmp); - } - else - { - LogMsg "unable to redirect stderr to '$logfile': $!\n"; - } + LogMsg "unable to redirect stderr to '$logfile': $!\n"; } }

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
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