September 2019 - Wine-commits

Andrew Eikum : mmdevapi: Avoid reporting odd numbers of channels.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: wine Branch: master Commit: b56d19d3a0a69d17da220c5f1535a313e7874969 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b56d19d3a0a69d17da220c5f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Sep 10 10:55:16 2019 -0500 mmdevapi: Avoid reporting odd numbers of channels. Fixes sound in Touhou Luna Nights with some surround sound configurations. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 16 ++++ dlls/winecoreaudio.drv/mmdevdrv.c | 195 +++++++++++++++++++++++++++++++++----- dlls/wineoss.drv/mmdevdrv.c | 16 ++++ dlls/winepulse.drv/mmdevdrv.c | 97 +++++++++++++++++-- 4 files changed, 295 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b56d19d3a0a69d17da22…

1 0

Sven Baars : hidclass.sys: Fix some memory leaks on error path (Coverity).
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: wine Branch: master Commit: 1413f577c592cd4aaeb3dba1a8adbe3e04d62d29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1413f577c592cd4aaeb3dba1… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Sep 7 13:13:40 2019 +0200 hidclass.sys: Fix some memory leaks on error path (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 5db9c476a2..1c130e8dd8 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -123,6 +123,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { ERR("Minidriver AddDevice failed (%x)\n",status); HID_DeleteDevice(device); + HeapFree(GetProcessHeap(), 0, hiddev); return status; } @@ -133,6 +134,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { ERR("Minidriver failed to get Attributes(%x)\n",status); HID_DeleteDevice(device); + HeapFree(GetProcessHeap(), 0, hiddev); return status; } @@ -147,6 +149,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { ERR("Cannot get Device Descriptor(%x)\n",status); HID_DeleteDevice(device); + HeapFree(GetProcessHeap(), 0, hiddev); return status; } for (i = 0; i < descriptor.bNumDescriptors; i++) @@ -157,6 +160,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { ERR("No Report Descriptor found in reply\n"); HID_DeleteDevice(device); + HeapFree(GetProcessHeap(), 0, hiddev); return status; } @@ -168,6 +172,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) ERR("Cannot get Report Descriptor(%x)\n",status); HID_DeleteDevice(device); HeapFree(GetProcessHeap(), 0, reportDescriptor); + HeapFree(GetProcessHeap(), 0, hiddev); return status; } @@ -178,6 +183,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { ERR("Cannot parse Report Descriptor\n"); HID_DeleteDevice(device); + HeapFree(GetProcessHeap(), 0, hiddev); return STATUS_NOT_SUPPORTED; }

1 0

Alexandre Julliard : ntdll: Add partial implementation for IOCTL_SERIAL_GET_PROPERTIES.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: wine Branch: master Commit: 0617b490b339e7bcf7a17daa91c750bc601ee7a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0617b490b339e7bcf7a17daa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 9 21:04:49 2019 +0200 ntdll: Add partial implementation for IOCTL_SERIAL_GET_PROPERTIES. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/serial.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 66081d2865..66fb840167 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -338,6 +338,31 @@ static NTSTATUS get_modem_status(int fd, DWORD* lpModemStat) return status; } +static NTSTATUS get_properties(int fd, SERIAL_COMMPROP *prop) +{ + /* FIXME: get actual properties from the device */ + memset( prop, 0, sizeof(*prop) ); + prop->PacketLength = 1; + prop->PacketVersion = 1; + prop->ServiceMask = SP_SERIALCOMM; + prop->MaxTxQueue = 4096; + prop->MaxRxQueue = 4096; + prop->MaxBaud = BAUD_115200; + prop->ProvSubType = PST_RS232; + prop->ProvCapabilities = PCF_DTRDSR | PCF_PARITY_CHECK | PCF_RTSCTS | PCF_TOTALTIMEOUTS | PCF_INTTIMEOUTS; + prop->SettableParams = SP_BAUD | SP_DATABITS | SP_HANDSHAKING | + SP_PARITY | SP_PARITY_CHECK | SP_STOPBITS ; + prop->SettableBaud = BAUD_075 | BAUD_110 | BAUD_134_5 | BAUD_150 | + BAUD_300 | BAUD_600 | BAUD_1200 | BAUD_1800 | BAUD_2400 | BAUD_4800 | + BAUD_9600 | BAUD_19200 | BAUD_38400 | BAUD_57600 | BAUD_115200 ; + prop->SettableData = DATABITS_5 | DATABITS_6 | DATABITS_7 | DATABITS_8 ; + prop->SettableStopParity = STOPBITS_10 | STOPBITS_15 | STOPBITS_20 | + PARITY_NONE | PARITY_ODD |PARITY_EVEN | PARITY_MARK | PARITY_SPACE; + prop->CurrentTxQueue = prop->MaxTxQueue; + prop->CurrentRxQueue = prop->MaxRxQueue; + return STATUS_SUCCESS; +} + static NTSTATUS get_special_chars(int fd, SERIAL_CHARS* sc) { struct termios port; @@ -1193,6 +1218,14 @@ static inline NTSTATUS io_control(HANDLE hDevice, } else status = STATUS_INVALID_PARAMETER; break; + case IOCTL_SERIAL_GET_PROPERTIES: + if (lpOutBuffer && nOutBufferSize == sizeof(SERIAL_COMMPROP)) + { + if (!(status = get_properties(fd, lpOutBuffer))) + sz = sizeof(SERIAL_COMMPROP); + } + else status = STATUS_INVALID_PARAMETER; + break; case IOCTL_SERIAL_IMMEDIATE_CHAR: if (lpInBuffer && nInBufferSize == sizeof(CHAR)) status = xmit_immediate(hDevice, fd, lpInBuffer);

1 0

Alexandre Julliard : kernel32: Move ioctl functions to kernelbase.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: wine Branch: master Commit: f3960c32f18f97a7bf444c145089536135f7004e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3960c32f18f97a7bf444c14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 9 21:05:07 2019 +0200 kernel32: Move ioctl functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/comm.c | 702 ---------------------------------------- dlls/kernel32/kernel32.spec | 36 +-- dlls/kernelbase/file.c | 416 ++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 38 +-- 4 files changed, 453 insertions(+), 739 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f3960c32f18f97a7bf44…

1 0

Alexandre Julliard : kernel32: Move console functions to kernelbase.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: wine Branch: master Commit: 55e9b666a0f8918c2456f44856398f51c64d76bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=55e9b666a0f8918c2456f448… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 9 22:17:58 2019 +0200 kernel32: Move console functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 1759 +-------------------------------------- dlls/kernel32/kernel32.spec | 98 +-- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/console.c | 1533 ++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 100 +-- include/wincon.h | 2 +- 6 files changed, 1665 insertions(+), 1828 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=55e9b666a0f8918c2456…

1 0

Zebediah Figura : winegstreamer: Don't activate our source pad immediately after connecting.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: wine Branch: master Commit: 9e015a2ad17b98a2bedf076bd31c863e3e8a8d06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e015a2ad17b98a2bedf076b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 9 20:36:14 2019 -0500 winegstreamer: Don't activate our source pad immediately after connecting. There's not any reason to do this here; this should be handled with state change transitions. Since the pipeline is in the ready state, the only effect this will have is push_data() trying to run and failing since the decodebin sink pad isn't active. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 61e75b0923..727ffff8a6 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -66,7 +66,7 @@ typedef struct GSTImpl { GstBus *bus; guint64 start, nextofs, nextpullofs, stop; ALLOCATOR_PROPERTIES props; - HANDLE no_more_pads_event, push_event; + HANDLE no_more_pads_event; HANDLE push_thread; } GSTImpl; @@ -507,10 +507,6 @@ static DWORD CALLBACK push_data(LPVOID iface) else maxlen = This->stop; - TRACE("Waiting..\n"); - - WaitForSingleObject(This->push_event, INFINITE); - TRACE("Starting..\n"); for (;;) { REFERENCE_TIME tStart, tStop; @@ -1155,10 +1151,6 @@ static HRESULT GST_Connect(GSTImpl *This, IPin *pConnectPin, ALLOCATOR_PROPERTIE This->initial = FALSE; - /* don't set active during test-play, as we don't want to push/pull data - * from the source yet */ - gst_pad_set_active(This->my_src, 1); - This->nextofs = This->nextpullofs = 0; return S_OK; } @@ -1185,7 +1177,6 @@ static void gstdemux_destroy(struct strmbase_filter *iface) HRESULT hr; CloseHandle(filter->no_more_pads_event); - CloseHandle(filter->push_event); /* Don't need to clean up output pins, disconnecting input pin will do that */ if (filter->sink.pConnectedTo) @@ -1246,7 +1237,6 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *outer, HRESULT *phr) This->ppPins = NULL; This->push_thread = NULL; This->no_more_pads_event = CreateEventW(NULL, 0, 0, NULL); - This->push_event = CreateEventW(NULL, 0, 0, NULL); This->bus = NULL; This->sink.dir = PINDIR_INPUT; @@ -1864,7 +1854,6 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, filter->reader = NULL; filter->alloc = NULL; - ResetEvent(filter->push_event); if (SUCCEEDED(hr)) hr = IPin_QueryInterface(pReceivePin, &IID_IAsyncReader, (LPVOID *)&filter->reader); if (SUCCEEDED(hr)) @@ -1887,7 +1876,6 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, filter->sink.pConnectedTo = pReceivePin; IPin_AddRef(pReceivePin); hr = IMemAllocator_Commit(filter->alloc); - SetEvent(filter->push_event); } else { GST_RemoveOutputPins(filter); if (filter->reader)

1 0

Zebediah Figura : winegstreamer: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: wine Branch: master Commit: d9f218a33827a5b837e4bce1bd8f2888d96b7242 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9f218a33827a5b837e4bce1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 9 20:36:15 2019 -0500 winegstreamer: Use the global HeapAlloc() wrappers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 727ffff8a6..22eedfd426 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -131,7 +131,7 @@ static gboolean amt_from_gst_caps_audio(GstCaps *caps, AM_MEDIA_TYPE *amt) if (!gst_audio_info_from_caps (&ainfo, caps)) return FALSE; - wfe = CoTaskMemAlloc(sizeof(*wfe)); + wfe = heap_alloc(sizeof(*wfe)); wfx = (WAVEFORMATEX*)wfe; amt->majortype = MEDIATYPE_Audio; amt->subtype = MEDIASUBTYPE_PCM; @@ -196,7 +196,7 @@ static gboolean amt_from_gst_caps_video(GstCaps *caps, AM_MEDIA_TYPE *amt) nom = vinfo.fps_n; denom = vinfo.fps_d; - vih = CoTaskMemAlloc(sizeof(*vih)); + vih = heap_alloc(sizeof(*vih)); bih = &vih->bmiHeader; amt->formattype = FORMAT_VideoInfo; @@ -215,14 +215,14 @@ static gboolean amt_from_gst_caps_video(GstCaps *caps, AM_MEDIA_TYPE *amt) case 32: amt->subtype = MEDIASUBTYPE_RGB32; break; default: FIXME("Unknown bpp %u\n", bih->biBitCount); - CoTaskMemFree(vih); + heap_free(vih); return FALSE; } bih->biCompression = BI_RGB; } else { amt->subtype = MEDIATYPE_Video; if (!(amt->subtype.Data1 = gst_video_format_to_fourcc(vinfo.finfo->format))) { - CoTaskMemFree(vih); + heap_free(vih); return FALSE; } switch (amt->subtype.Data1) { @@ -1202,7 +1202,7 @@ static void gstdemux_destroy(struct strmbase_filter *iface) gst_object_unref(filter->bus); } strmbase_filter_cleanup(&filter->filter); - CoTaskMemFree(filter); + heap_free(filter); } static const struct strmbase_filter_ops filter_ops = @@ -1213,7 +1213,7 @@ static const struct strmbase_filter_ops filter_ops = IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *outer, HRESULT *phr) { - GSTImpl *This; + GSTImpl *object; if (!init_gstreamer()) { @@ -1223,30 +1223,23 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *outer, HRESULT *phr) mark_wine_thread(); - This = CoTaskMemAlloc(sizeof(*This)); - if (!This) + if (!(object = heap_alloc_zero(sizeof(*object)))) { *phr = E_OUTOFMEMORY; return NULL; } - memset(This, 0, sizeof(*This)); - strmbase_filter_init(&This->filter, &GST_Vtbl, outer, &CLSID_Gstreamer_Splitter, &filter_ops); + strmbase_filter_init(&object->filter, &GST_Vtbl, outer, &CLSID_Gstreamer_Splitter, &filter_ops); - This->cStreams = 0; - This->ppPins = NULL; - This->push_thread = NULL; - This->no_more_pads_event = CreateEventW(NULL, 0, 0, NULL); - This->bus = NULL; - - This->sink.dir = PINDIR_INPUT; - This->sink.filter = &This->filter; - lstrcpynW(This->sink.name, wcsInputPinName, ARRAY_SIZE(This->sink.name)); - This->sink.IPin_iface.lpVtbl = &GST_InputPin_Vtbl; + object->no_more_pads_event = CreateEventW(NULL, FALSE, FALSE, NULL); + object->sink.dir = PINDIR_INPUT; + object->sink.filter = &object->filter; + lstrcpynW(object->sink.name, wcsInputPinName, ARRAY_SIZE(object->sink.name)); + object->sink.IPin_iface.lpVtbl = &GST_InputPin_Vtbl; *phr = S_OK; - TRACE("Created GStreamer demuxer %p.\n", This); - return &This->filter.IUnknown_inner; + TRACE("Created GStreamer demuxer %p.\n", object); + return &object->filter.IUnknown_inner; } static HRESULT WINAPI GST_Stop(IBaseFilter *iface) @@ -1764,7 +1757,7 @@ static BOOL create_pin(GSTImpl *filter, const WCHAR *name, const AM_MEDIA_TYPE * { GSTOutPin *pin, **new_array; - if (!(new_array = CoTaskMemRealloc(filter->ppPins, (filter->cStreams + 1) * sizeof(*new_array)))) + if (!(new_array = heap_realloc(filter->ppPins, (filter->cStreams + 1) * sizeof(*new_array)))) return FALSE; filter->ppPins = new_array; @@ -1773,7 +1766,7 @@ static BOOL create_pin(GSTImpl *filter, const WCHAR *name, const AM_MEDIA_TYPE * strmbase_source_init(&pin->pin, &GST_OutputPin_Vtbl, &filter->filter, name, &output_BaseOutputFuncTable); - pin->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); + pin->pmt = heap_alloc(sizeof(AM_MEDIA_TYPE)); CopyMediaType(pin->pmt, mt); pin->caps_event = CreateEventW(NULL, FALSE, FALSE, NULL); pin->segment = gst_segment_new(); @@ -1805,7 +1798,7 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This) free_source_pin(This->ppPins[i]); This->cStreams = 0; - CoTaskMemFree(This->ppPins); + heap_free(This->ppPins); This->ppPins = NULL; gst_element_set_bus(This->container, NULL); gst_object_unref(This->container);

1 0

Francois Gouget : testbot/Engine: Make sure not to schedule jobs on VMs undergoing maintenance!.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: tools Branch: master Commit: faf695bc06e43191a6af80075c0eda859bdf7942 URL: https://source.winehq.org/git/tools.git/?a=commit;h=faf695bc06e43191a6af800… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 10 11:07:52 2019 +0200 testbot/Engine: Make sure not to schedule jobs on VMs undergoing maintenance!. After a series of revert failures the scheduler would put the VM in maintenance mode but still put it in the list of VMs that can be reverted to run a new task. Now such VMs are put in the busy list so no task is scheduled on them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 3ce9089..1b42ea9 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -274,15 +274,22 @@ sub _CheckAndClassifyVMs() { my $Errors = ($VM->Errors || 0) + 1; $VM->Errors($Errors); - $NewStatus = "maintenance" if ($Errors >= $MaxVMErrors); + if ($Errors >= $MaxVMErrors) + { + $NewStatus = "maintenance"; + $Sched->{busyvms}->{$VMKey} = 1; + } } $VM->Status($NewStatus); $VM->KillChild(); $VM->Save(); $VM->RecordResult($Sched->{records}, "boterror stuck process"); - $Sched->{lambvms}->{$VMKey} = 1; - $Host->{dirty}++; - $Host->{active}++; + if ($NewStatus eq "dirty") + { + $Sched->{lambvms}->{$VMKey} = 1; + $Host->{dirty}++; + $Host->{active}++; + } } elsif ($VM->Status =~ /^(?:dirty|running|reverting)$/) {

1 0

Francois Gouget : testbot/TestAgent: Give up early connecting to invalid hostnames / ports.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: tools Branch: master Commit: 68cdb4bfb942b0c98a3e65a8ddbf7e22f8a6ce18 URL: https://source.winehq.org/git/tools.git/?a=commit;h=68cdb4bfb942b0c98a3e65a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 10 11:01:27 2019 +0200 testbot/TestAgent: Give up early connecting to invalid hostnames / ports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index ca81283..a4a2f49 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -905,6 +905,11 @@ sub _Connect($) if (!$self->{fd}) { alarm(0); + if ($!{EINVAL}) + { + $self->_SetError($FATAL, "The '$self->{agenthost}' hostname or the '$self->{agentport}' port is invalid."); + die "socket"; + } $self->_SetError($FATAL, $!); return; # out of eval } @@ -930,12 +935,16 @@ sub _Connect($) $self->{rpc} = $OldRPC; return 1; } + if ($@) { - $self->_SetError($FATAL, "Timed out in $Step while connecting to $self->{connection}"); + if ($@ eq "timeout") + { + $self->_SetError($FATAL, "Timed out in $Step while connecting to $self->{connection}"); + } + last; } - # Ideally we should probably check the error and not retry if it is likely - # permanent, like a hostname that does not resolve. + my $Remaining = $Attempt * $self->{cinterval} - (time() - $Start); sleep($Remaining) if ($Remaining > 0); }

1 0

Francois Gouget : testbot: Always notify the administrator when putting a VM offline.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: tools Branch: master Commit: 48a24be93225a51f8caa4df6b10bf89096560e99 URL: https://source.winehq.org/git/tools.git/?a=commit;h=48a24be93225a51f8caa4df… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 10 11:07:57 2019 +0200 testbot: Always notify the administrator when putting a VM offline. Include the reason why the VM was put offline in the notification email. Add NotifyAdministrator() to the Utils module to simplify sending the notification. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 25 +-------------------- testbot/bin/WineRunBuild.pl | 6 ++++- testbot/bin/WineRunReconfig.pl | 6 ++++- testbot/bin/WineRunTask.pl | 6 ++++- testbot/bin/WineRunWineTest.pl | 6 ++++- testbot/lib/WineTestBot/Engine/Scheduler.pm | 5 +++++ testbot/lib/WineTestBot/Utils.pm | 34 ++++++++++++++++++++++++++++- testbot/lib/WineTestBot/VMs.pm | 5 +++++ 8 files changed, 64 insertions(+), 29 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 4000c14..e348834 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -43,6 +43,7 @@ $Name0 =~ s+^.*/++; use WineTestBot::Config; use WineTestBot::Log; +use WineTestBot::Utils; use WineTestBot::VMs; my $Debug; @@ -58,30 +59,6 @@ sub Error(@) LogMsg @_; } -sub NotifyAdministrator($$) -{ - my ($Subject, $Body) = @_; - - if (open(my $fh, "|/usr/sbin/sendmail -oi -t -odq")) - { - LogMsg "Notifying administrator: $Subject\n"; - print $fh <<"EOF"; -From: $RobotEMail -To: $AdminEMail -Subject: $Subject - -$Body -EOF - close($fh); - } - else - { - LogMsg "Could not send administrator notification: $!\n"; - LogMsg " Subject: $Subject\n"; - LogMsg " Body: $Body\n"; - } -} - # # Setup and command line processing diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index fdcf770..1d57c44 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -280,10 +280,14 @@ sub FatalTAError($$) my $IsPoweredOn = $VM->GetDomain()->IsPoweredOn(); if (!defined $IsPoweredOn) { - # The VM host is not accessible anymore so mark the VM as offline and + # The VM host is not accessible anymore so put the VM offline and # requeue the task. This does not count towards the task's tries limit # since neither the VM nor the task are at fault. Error("$ErrMessage\n"); + NotifyAdministrator("Putting the ". $VM->Name ." VM offline", + "A TestAgent operation to the ". $VM->Name ." VM failed:\n". + "\n$ErrMessage\n". + "So the VM has been put offline and the TestBot will try to regain access to it."); WrapUpAndExit('queued'); } diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 493ab10..bad5f76 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -282,10 +282,14 @@ sub FatalTAError($$) my $IsPoweredOn = $VM->GetDomain()->IsPoweredOn(); if (!defined $IsPoweredOn) { - # The VM host is not accessible anymore so mark the VM as offline and + # The VM host is not accessible anymore so put the VM offline and # requeue the task. This does not count towards the task's tries limit # since neither the VM nor the task are at fault. Error("$ErrMessage\n"); + NotifyAdministrator("Putting the ". $VM->Name ." VM offline", + "A TestAgent operation to the ". $VM->Name ." VM failed:\n". + "\n$ErrMessage\n". + "So the VM has been put offline and the TestBot will try to regain access to it."); WrapUpAndExit('queued'); } diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 6a71849..53e9e50 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -332,10 +332,14 @@ sub FatalTAError($$;$) my $IsPoweredOn = $VM->GetDomain()->IsPoweredOn(); if (!defined $IsPoweredOn) { - # The VM host is not accessible anymore so mark the VM as offline and + # The VM host is not accessible anymore so put the VM offline and # requeue the task. This does not count towards the task's tries limit # since neither the VM nor the task are at fault. Error("$ErrMessage\n"); + NotifyAdministrator("Putting the ". $VM->Name ." VM offline", + "A TestAgent operation to the ". $VM->Name ." VM failed:\n". + "\n$ErrMessage\n". + "So the VM has been put offline and the TestBot will try to regain access to it."); WrapUpAndExit('queued'); } diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 74b974a..508605b 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -332,10 +332,14 @@ sub FatalTAError($$;$) my $IsPoweredOn = $VM->GetDomain()->IsPoweredOn(); if (!defined $IsPoweredOn) { - # The VM host is not accessible anymore so mark the VM as offline and + # The VM host is not accessible anymore so put the VM offline and # requeue the task. This does not count towards the task's tries limit # since neither the VM nor the task are at fault. Error("$ErrMessage\n"); + NotifyAdministrator("Putting the ". $VM->Name ." VM offline", + "A TestAgent operation to the ". $VM->Name ." VM failed:\n". + "\n$ErrMessage\n". + "So the VM has been put offline and the TestBot will try to regain access to it."); WrapUpAndExit('queued'); } diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 1b42ea9..39d2342 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -37,6 +37,7 @@ use WineTestBot::Engine::Events; use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::RecordGroups; +use WineTestBot::Utils; use WineTestBot::VMs; @@ -277,6 +278,10 @@ sub _CheckAndClassifyVMs() if ($Errors >= $MaxVMErrors) { $NewStatus = "maintenance"; + NotifyAdministrator("Putting the $VMKey VM in maintenance mode", + "The last $Errors revert operations timed out.\n\n". + "No further operation will be attempted until an administrator has put\n". + "the VM back online."); $Sched->{busyvms}->{$VMKey} = 1; } } diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index e28a34b..83f60fa 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -30,7 +30,8 @@ use Exporter 'import'; our @EXPORT = qw(MakeSecureURL SecureConnection GenerateRandomString OpenNewFile CreateNewFile CreateNewLink CreateNewDir DurationToString BuildEMailRecipient IsValidFileName - BuildTag SanitizeTag LocaleName ShQuote ShArgv2Cmd); + BuildTag SanitizeTag LocaleName NotifyAdministrator + ShQuote ShArgv2Cmd); use Fcntl; @@ -276,6 +277,37 @@ sub BuildTag($;$) } +# +# EMail helper +# + +sub NotifyAdministrator($$) +{ + my ($Subject, $Body) = @_; + + if (open(my $fh, "|/usr/sbin/sendmail -oi -t -odq")) + { + require WineTestBot::Log; + WineTestBot::Log::LogMsg("Notifying administrator: $Subject\n"); + print $fh <<"EOF"; +From: $RobotEMail +To: $AdminEMail +Subject: $Subject + +$Body +EOF + close($fh); + } + else + { + require WineTestBot::Log; + WineTestBot::Log::LogMsg("Could not send administrator notification: $!\n"); + WineTestBot::Log::LogMsg(" Subject: $Subject\n"); + WineTestBot::Log::LogMsg(" Body: $Body\n"); + } +} + + # # Shell helpers # diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 5d738e2..78e066f 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -452,6 +452,11 @@ sub Run($$$$$$) # Reset the Status and ChildPid since the exec failed $self->Status("offline"); + NotifyAdministrator("Putting the ". $self->Name ." VM offline", + "Could not run $Tool on the ". $self->Name ." VM. The failed command is:\n\n". + ShArgv2Cmd(@$Args) ."\n\n". + "An administrator should investigate why the command failed but the\n". + "TestBot will still try to continue using the VM.\n"); $self->ChildDeadline(undef); $self->ChildPid(undef); my ($ErrProperty, $ErrMessage) = $self->Save();

1 0