February 2018 - Wine-Commits

Nikolay Sivov : comctl32/button: Invalidate on BM_SETSTATE.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: f8eb74e10c450335eac706818df95d42514a7322 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8eb74e10c450335eac70681… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 11 19:19:54 2018 +0300 comctl32/button: Invalidate on BM_SETSTATE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 22 +++++++++++++++------- dlls/comctl32/tests/button.c | 10 +++------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index c8f85d9..85aa47f 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -305,7 +305,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L POINT pt; LONG style = GetWindowLongW( hWnd, GWL_STYLE ); UINT btn_type = get_button_type( style ); - LONG state; + LONG state, new_state; HANDLE oldHbitmap; HTHEME theme; @@ -674,12 +674,21 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L case BM_SETSTATE: state = get_button_state( hWnd ); - if (wParam) - set_button_state( hWnd, state | BST_PUSHED ); - else - set_button_state( hWnd, state & ~BST_PUSHED ); + new_state = wParam ? BST_PUSHED : 0; + + if ((state ^ new_state) & BST_PUSHED) + { + if (wParam) + state |= BST_PUSHED; + else + state &= ~BST_PUSHED; - paint_button( hWnd, btn_type, ODA_SELECT ); + if (btn_type == BS_USERBUTTON) + BUTTON_NOTIFY_PARENT( hWnd, (state & BST_PUSHED) ? BN_HILITE : BN_UNHILITE ); + set_button_state( hWnd, state ); + + InvalidateRect( hWnd, NULL, FALSE ); + } break; case WM_NCHITTEST: @@ -1206,7 +1215,6 @@ static void UB_Paint( HWND hwnd, HDC hDC, UINT action ) break; default: - BUTTON_NOTIFY_PARENT( hwnd, BN_PAINT ); break; } } diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 425e145..38446aa 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -350,8 +350,6 @@ static const struct message setstate_seq[] = { BM_SETSTATE, sent }, { WM_APP, sent|wparam|lparam, 0, 0 }, { WM_PAINT, sent }, - { WM_NCPAINT, sent|optional }, /* FIXME: Wine sends it */ - { WM_ERASEBKGND, sent|defwinproc|optional }, { WM_PAINT, sent|optional }, { 0 } }; @@ -372,8 +370,6 @@ static const struct message setstate_user_seq[] = { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_HILITE) }, { WM_APP, sent|wparam|lparam, 0, 0 }, { WM_PAINT, sent }, - { WM_NCPAINT, sent|optional }, /* FIXME: Wine sends it */ - { WM_ERASEBKGND, sent|defwinproc|optional }, { 0 } }; @@ -596,7 +592,7 @@ static void test_button_messages(void) SendMessageA(hwnd, BM_SETSTYLE, button[i].style | BS_BOTTOM, TRUE); SendMessageA(hwnd, WM_APP, 0, 0); /* place a separator mark here */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - todo = button[i].style == BS_USERBUTTON || button[i].style == BS_OWNERDRAW; + todo = button[i].style == BS_OWNERDRAW; ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].setstyle, "BM_SETSTYLE on a button", todo); style = GetWindowLongA(hwnd, GWL_STYLE); @@ -612,7 +608,7 @@ static void test_button_messages(void) SendMessageA(hwnd, BM_SETSTATE, TRUE, 0); SendMessageA(hwnd, WM_APP, 0, 0); /* place a separator mark here */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].setstate, "BM_SETSTATE/TRUE on a button", TRUE); + ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].setstate, "BM_SETSTATE/TRUE on a button", FALSE); state = SendMessageA(hwnd, BM_GETSTATE, 0, 0); ok(state == BST_PUSHED, "expected state 0x0004, got %04x\n", state); @@ -626,7 +622,7 @@ static void test_button_messages(void) SendMessageA(hwnd, BM_SETSTATE, FALSE, 0); SendMessageA(hwnd, WM_APP, 0, 0); /* place a separator mark here */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].clearstate, "BM_SETSTATE/FALSE on a button", TRUE); + ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].clearstate, "BM_SETSTATE/FALSE on a button", FALSE); state = SendMessageA(hwnd, BM_GETSTATE, 0, 0); ok(state == 0, "expected state 0, got %04x\n", state);

1 0

Zebediah Figura : winedbg: Remove a misplaced \n.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 67d7eb980e0d3caf98b9cc62437dfa854d467240 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67d7eb980e0d3caf98b9cc62… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Feb 10 10:46:06 2018 -0600 winedbg: Remove a misplaced \n. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 78a0493..970e81a 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -581,7 +581,7 @@ void print_bare_address(const ADDRESS64* addr) memory_offset_to_string(hexbuf, addr->Offset, 32)); break; default: - dbg_printf("Unknown mode %x\n", addr->Mode); + dbg_printf("Unknown mode %x", addr->Mode); break; } }

1 0

Zebediah Figura : msvfw32/tests: Simplify swapped-case test.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: f4ebb7d57d7f6a3870e4a40b6e2efbbc3c6748e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4ebb7d57d7f6a3870e4a40b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 9 10:16:10 2018 -0600 msvfw32/tests: Simplify swapped-case test. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/tests/msvfw.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 3fe6702..c6fe0f2 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -303,18 +303,9 @@ static void test_ICInfo(void) found++; /* Test getting info with a different case - bug 41602 */ - if (fcc[0] & 0x20) - { - fcc[0] &= ~0x20; - ok(ICInfo(info.fccType, info.fccHandler, &info2), - "ICInfo failed on fcc 0x%08x using lowercase fccHandler\n", info.fccHandler); - } - else - { - fcc[0] |= 0x20; - ok(ICInfo(info.fccType, info.fccHandler, &info2), - "ICInfo failed on fcc 0x%08x using uppercase fccHandler\n", info.fccHandler); - } + fcc[0] ^= 0x20; + ok(ICInfo(info.fccType, info.fccHandler, &info2), + "ICInfo failed on fcc 0x%08x\n", info.fccHandler); } ok(found != 0, "expected at least one codec\n"); }

1 0

Henri Verbeet : ddraw: Set WINED3D_RESOURCE_ACCESS_MAP on textures.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 46f20e419890b988a55089dc291d00221ff449ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=46f20e419890b988a55089dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Feb 10 01:00:40 2018 +0330 ddraw: Set WINED3D_RESOURCE_ACCESS_MAP on textures. Like buffers, WINED3D_RESOURCE_ACCESS_MAP is not currently enforced on 2D textures in wined3d. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e51f9d8..009ccc0 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6011,7 +6011,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; wined3d_desc.usage = 0; - wined3d_desc.access = WINED3D_RESOURCE_ACCESS_GPU; + wined3d_desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP; wined3d_desc.width = desc->dwWidth; wined3d_desc.height = desc->dwHeight; wined3d_desc.depth = 1;

1 0

Henri Verbeet : ddraw: Set WINED3D_RESOURCE_ACCESS_MAP on buffers.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 3bb34ac938e525497e55cb51016025259d00585f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bb34ac938e525497e55cb51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Feb 10 01:00:39 2018 +0330 ddraw: Set WINED3D_RESOURCE_ACCESS_MAP on buffers. Since ddraw buffers can always be mapped. WINED3D_RESOURCE_ACCESS_MAP is currently not enforced on buffers in wined3d, but we'd like to change that. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/executebuffer.c | 2 +- dlls/ddraw/vertexbuffer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index d710b34..59ff83b 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -632,7 +632,7 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * desc.byte_width = new_size * sizeof(D3DTLVERTEX); desc.usage = WINED3DUSAGE_STATICDECL; - desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP; if (FAILED(hr = wined3d_buffer_create(buffer->d3ddev->wined3d_device, &desc, NULL, NULL, &ddraw_null_wined3d_parent_ops, &dst_buffer))) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index df8531d..0ce5446 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -127,7 +127,7 @@ static HRESULT d3d_vertex_buffer_create_wined3d_buffer(struct d3d_vertex_buffer if (buffer->Caps & D3DVBCAPS_SYSTEMMEMORY) desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; else - desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP; desc.misc_flags = 0; desc.structure_byte_stride = 0;

1 0

Nikolay Sivov : comctl32/static: Reuse existing system colors helper.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 1d5cc6efdfef9737d86d2ebfc588b821bab986ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d5cc6efdfef9737d86d2ebf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 11 19:19:56 2018 +0300 comctl32/static: Reuse existing system colors helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/static.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index 49127fa..d9e2fe3 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -55,8 +55,6 @@ static void STATIC_PaintBitmapfn( HWND hwnd, HDC hdc, DWORD style ); static void STATIC_PaintEnhMetafn( HWND hwnd, HDC hdc, DWORD style ); static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ); -static COLORREF color_3dshadow, color_3ddkshadow, color_3dhighlight; - /* offsets for GetWindowLong for static private information */ #define HFONT_GWL_OFFSET 0 #define HICON_GWL_OFFSET (sizeof(HFONT)) @@ -292,13 +290,6 @@ static HBRUSH STATIC_SendWmCtlColorStatic(HWND hwnd, HDC hdc) return hBrush; } -static VOID STATIC_InitColours(void) -{ - color_3ddkshadow = GetSysColor(COLOR_3DDKSHADOW); - color_3dshadow = GetSysColor(COLOR_3DSHADOW); - color_3dhighlight = GetSysColor(COLOR_3DHIGHLIGHT); -} - /*********************************************************************** * hasTextStyle * @@ -336,7 +327,6 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, ERR("Unknown style 0x%02x\n", style ); return -1; } - STATIC_InitColours(); break; case WM_NCDESTROY: @@ -391,7 +381,7 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, break; case WM_SYSCOLORCHANGE: - STATIC_InitColours(); + COMCTL32_RefreshSysColors(); STATIC_TryPaintFcn( hwnd, full_style ); break; @@ -644,27 +634,27 @@ static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, DWORD style ) switch (style & SS_TYPEMASK) { case SS_BLACKRECT: - hBrush = CreateSolidBrush(color_3ddkshadow); + hBrush = CreateSolidBrush(comctl32_color.clr3dDkShadow); FillRect( hdc, &rc, hBrush ); break; case SS_GRAYRECT: - hBrush = CreateSolidBrush(color_3dshadow); + hBrush = CreateSolidBrush(comctl32_color.clr3dShadow); FillRect( hdc, &rc, hBrush ); break; case SS_WHITERECT: - hBrush = CreateSolidBrush(color_3dhighlight); + hBrush = CreateSolidBrush(comctl32_color.clr3dHilight); FillRect( hdc, &rc, hBrush ); break; case SS_BLACKFRAME: - hBrush = CreateSolidBrush(color_3ddkshadow); + hBrush = CreateSolidBrush(comctl32_color.clr3dDkShadow); FrameRect( hdc, &rc, hBrush ); break; case SS_GRAYFRAME: - hBrush = CreateSolidBrush(color_3dshadow); + hBrush = CreateSolidBrush(comctl32_color.clr3dShadow); FrameRect( hdc, &rc, hBrush ); break; case SS_WHITEFRAME: - hBrush = CreateSolidBrush(color_3dhighlight); + hBrush = CreateSolidBrush(comctl32_color.clr3dHilight); FrameRect( hdc, &rc, hBrush ); break; default:

1 0

Nikolay Sivov : comctl32/button: Invalidate on BM_SETCHECK.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: wine Branch: master Commit: 287c5a25b6ea35830bcb4b21b2a2adb8e2853232 URL: https://source.winehq.org/git/wine.git/?a=commit;h=287c5a25b6ea35830bcb4b21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 11 19:19:55 2018 +0300 comctl32/button: Invalidate on BM_SETCHECK. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 2 +- dlls/comctl32/tests/button.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 85aa47f..2f5a5b3 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -663,7 +663,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L if ((state & 3) != wParam) { set_button_state( hWnd, (state & ~3) | wParam ); - paint_button( hWnd, btn_type, ODA_SELECT ); + InvalidateRect( hWnd, NULL, FALSE ); } if ((btn_type == BS_AUTORADIOBUTTON) && (wParam == BST_CHECKED) && (style & WS_CHILD)) BUTTON_CheckAutoRadioButton( hWnd ); diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 38446aa..96b8bea 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -440,8 +440,7 @@ static const struct message setcheck_radio_redraw_seq[] = { WM_STYLECHANGED, sent|wparam|defwinproc, GWL_STYLE }, { WM_APP, sent|wparam|lparam, 0, 0 }, { WM_PAINT, sent }, - { WM_NCPAINT, sent|optional }, /* FIXME: Wine sends it */ - { WM_ERASEBKGND, sent|defwinproc|optional }, + { WM_NCPAINT, sent|defwinproc|optional }, /* FIXME: Wine sends it */ { 0 } }; @@ -661,7 +660,9 @@ static void test_button_messages(void) SendMessageA(hwnd, BM_SETCHECK, BST_CHECKED, 0); SendMessageA(hwnd, WM_APP, 0, 0); /* place a separator mark here */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].setcheck, "BM_SETCHECK on a button", FALSE); + state = SendMessageA(hwnd, BM_GETCHECK, 0, 0); if (button[i].style == BS_PUSHBUTTON || button[i].style == BS_DEFPUSHBUTTON || button[i].style == BS_GROUPBOX || @@ -672,16 +673,10 @@ static void test_button_messages(void) button[i].style == BS_COMMANDLINK || button[i].style == BS_DEFCOMMANDLINK) { - ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].setcheck, "BM_SETCHECK on a button", FALSE); - state = SendMessageA(hwnd, BM_GETCHECK, 0, 0); ok(state == BST_UNCHECKED, "expected check BST_UNCHECKED, got %04x\n", state); } else - { - ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].setcheck, "BM_SETCHECK on a button", TRUE); - state = SendMessageA(hwnd, BM_GETCHECK, 0, 0); ok(state == BST_CHECKED, "expected check BST_CHECKED, got %04x\n", state); - } style = GetWindowLongA(hwnd, GWL_STYLE); style &= ~(WS_CHILD | BS_NOTIFY | WS_VISIBLE);

1 0

Francois Gouget : testbot: Add a Munin plugin to monitor the TestBot activity.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: tools Branch: master Commit: cb517f81bb7ac31c101b9bfdf38ecba7ccadc7b7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=cb517f81bb7ac31c101b9bf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 12 01:34:29 2018 +0100 testbot: Add a Munin plugin to monitor the TestBot activity. This will make it possible to compare current data to historic data for crucial parameters like the number of jobs and tasks per hour, the job completion time, each VM host's busy rate, etc. It will also make it possible to see if the reverts are progressively getting slower, or if on the contrary they got slower on a specific date, which would point to some change on the host, etc. Note that access to the new Munin web page requires an API key to limit who can query these statistics. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Config.pm | 4 +- testbot/lib/WineTestBot/ConfigLocalTemplate.pl | 4 + testbot/scripts/MuninPlugin | 146 ++++++++ testbot/web/Munin.pl | 496 +++++++++++++++++++++++++ 4 files changed, 648 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=cb517f81bb7ac31c101…

1 0

Francois Gouget : testbot: Explicitly track new tasks on a per VM host basis.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: tools Branch: master Commit: 6e8fd898fef19fde281f78353a31bef84886bc05 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6e8fd898fef19fde281f783… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 12 01:34:25 2018 +0100 testbot: Explicitly track new tasks on a per VM host basis. The number of tasks that got run on a VM host (running.time.count) is not a proxy for the number of tasks that got created for that VM host since not all tasks get run, for instance if the build fails. Furthermore, when computing rates over short periods, the rate at which tasks get completed on a given VM host is not the same as the rate at which they get created, just as it is for jobs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 14 ++++++++++++-- testbot/web/Stats.pl | 6 +++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index c76b21e..3016b14 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -367,10 +367,20 @@ sub GetStatistics($;$) my $Tasks = $Step->Tasks; foreach my $Task (@{$Tasks->GetItems()}) { - $GlobalStats->{"newtasks.count"}++ if ($CountsAsNew); - + my $HostStats; + if ($VMs->ItemExists($Task->VM->GetKey())) + { + my $Host = $Task->VM->GetHost(); + $HostStats = ($HostsStats->{items}->{$Host} ||= {}); + } + if ($CountsAsNew) + { + $GlobalStats->{"newtasks.count"}++; + $HostStats->{"newtasks.count"}++ if ($HostStats); + } next if (!$Task->Ended or $Task->Ended < $Cutoff); $GlobalStats->{"donetasks.count"}++; + $HostStats->{"donetasks.count"}++ if ($HostStats); # $Task->Started should really be set since $Task->Ended is if ($Task->Started and $Task->Status !~ /^(?:queued|running|canceled)$/) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 51a7227..806a366 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -264,15 +264,15 @@ sub GenerateBody($) print "<th>$DisplayHost</th>\n"; _AddRate($HostsStats->{items}->{$Host}, "reverting.time.count", $HostsStats); - _AddRate($HostsStats->{items}->{$Host}, "running.time.count", $HostsStats); + _AddRate($HostsStats->{items}->{$Host}, "newtasks.count", $HostsStats); } print "</tr></thead>\n"; print "<tbody>\n"; _GenStatsLine($HostsStats, "reverting.time.count", "Revert count", $SortedHosts); _GenStatsLine($HostsStats, "reverting.rate", "Revert rate", $SortedHosts); - _GenStatsLine($HostsStats, "running.time.count", "Task count", $SortedHosts); - _GenStatsLine($HostsStats, "running.rate", "Task rate", $SortedHosts); + _GenStatsLine($HostsStats, "newtasks.count", "Task count", $SortedHosts); + _GenStatsLine($HostsStats, "newtasks.rate", "Task rate", $SortedHosts); _GenStatsLine($HostsStats, "busy.elapsed", "Busy time", $SortedHosts, $NO_PERCENTAGE); _GenStatsLine($HostsStats, "busy.elapsed", "Busy \%", $SortedHosts);

1 0

Francois Gouget : testbot: Keep track of the completed jobs and tasks.
by Alexandre Julliard Feb. 12, 2018

Feb. 12, 2018

Module: tools Branch: master Commit: c4b0e7ba117abd4ae8a5fafb19c203cb183f1063 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c4b0e7ba117abd4ae8a5faf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 12 01:33:59 2018 +0100 testbot: Keep track of the completed jobs and tasks. Over short periods the rate at which jobs and tasks are created does not necessarily match the one at which they are completed. We are already tracking the creation rates so we should track the completion rates too so they can be compared. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 4aed4ed..c76b21e 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -368,7 +368,9 @@ sub GetStatistics($;$) foreach my $Task (@{$Tasks->GetItems()}) { $GlobalStats->{"newtasks.count"}++ if ($CountsAsNew); + next if (!$Task->Ended or $Task->Ended < $Cutoff); + $GlobalStats->{"donetasks.count"}++; # $Task->Started should really be set since $Task->Ended is if ($Task->Started and $Task->Status !~ /^(?:queued|running|canceled)$/) @@ -393,12 +395,15 @@ sub GetStatistics($;$) } } - if (!$IsSpecialJob and $Job->Ended and $Job->Ended >= $Cutoff and - $Job->Status !~ /^(?:queued|running|canceled)$/) + if ($Job->Ended and $Job->Ended >= $Cutoff) { - my $Time = $Job->Ended - $Job->Submitted; - _AddFullStat($GlobalStats, "jobs.time", $Time, undef, $Job); - push @JobTimes, $Time; + $GlobalStats->{"donejobs.count"}++; + if (!$IsSpecialJob and $Job->Status !~ /^(?:queued|running|canceled)$/) + { + my $Time = $Job->Ended - $Job->Submitted; + _AddFullStat($GlobalStats, "jobs.time", $Time, undef, $Job); + push @JobTimes, $Time; + } } }

1 0