February 2018 - Wine-commits

Henri Verbeet : wined3d: Update the depth/ stencil resource location for stencil clears as well.
by Alexandre Julliard 09 Feb '18

09 Feb '18

Module: wine Branch: master Commit: 1b7f06acb121fe90dd694ea5508d6050cc3df23c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b7f06acb121fe90dd694ea5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 9 01:46:45 2018 +0330 wined3d: Update the depth/stencil resource location for stencil clears as well. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 78610fc..7881bca 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -288,16 +288,22 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c depth_stencil->texture_level); } - if (depth_stencil && render_offscreen) - wined3d_texture_prepare_location(depth_stencil->container, - dsv->sub_resource_idx, context, dsv->resource->draw_binding); - - if (flags & WINED3DCLEAR_ZBUFFER) + if (depth_stencil) { - DWORD location = render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; + DWORD ds_location = render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; + struct wined3d_texture *ds = wined3d_texture_from_resource(dsv->resource); + + if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL) + && !is_full_clear(depth_stencil, draw_rect, rect_count ? clear_rect : NULL)) + wined3d_texture_load_location(ds, dsv->sub_resource_idx, context, ds_location); + else + wined3d_texture_prepare_location(ds, dsv->sub_resource_idx, context, ds_location); - wined3d_texture_load_location(depth_stencil->container, - dsv->sub_resource_idx, context, location); + if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) + { + wined3d_texture_validate_location(ds, dsv->sub_resource_idx, ds_location); + wined3d_texture_invalidate_location(ds, dsv->sub_resource_idx, ~ds_location); + } } if (!context_apply_clear_state(context, state, rt_count, fb)) @@ -324,11 +330,6 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c if (flags & WINED3DCLEAR_ZBUFFER) { - DWORD location = render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; - - wined3d_texture_validate_location(depth_stencil->container, dsv->sub_resource_idx, location); - wined3d_texture_invalidate_location(depth_stencil->container, dsv->sub_resource_idx, ~location); - gl_info->gl_ops.gl.p_glDepthMask(GL_TRUE); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_ZWRITEENABLE)); gl_info->gl_ops.gl.p_glClearDepth(depth);

1 0

Henri Verbeet : wined3d: Explicitly check for dynamic usage in wined3d_texture_use_pbo().
by Alexandre Julliard 09 Feb '18

09 Feb '18

Module: wine Branch: master Commit: a93120c340431e65e44385d94b3420ee60ec24ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=a93120c340431e65e44385d9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 9 01:46:46 2018 +0330 wined3d: Explicitly check for dynamic usage in wined3d_texture_use_pbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ed1ca21..116b8db 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -32,8 +32,8 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); static BOOL wined3d_texture_use_pbo(const struct wined3d_texture *texture, const struct wined3d_gl_info *gl_info) { - return (texture->resource.access & (WINED3D_RESOURCE_ACCESS_CPU - | WINED3D_RESOURCE_ACCESS_MAP)) == WINED3D_RESOURCE_ACCESS_MAP + return !(texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) + && texture->resource.usage & WINED3DUSAGE_DYNAMIC && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] && !texture->resource.format->conv_byte_count && !(texture->flags & (WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_COND_NP2_EMULATED));

1 0

Henri Verbeet : d3drm: Use the global memory allocation helpers.
by Alexandre Julliard 09 Feb '18

09 Feb '18

Module: wine Branch: master Commit: 8cfa75f176dc35793eae7c47d346b59c0b95919e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cfa75f176dc35793eae7c47… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 9 01:46:47 2018 +0330 d3drm: Use the global memory allocation helpers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 4 +- dlls/d3drm/d3drm_main.c | 13 +++--- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/device.c | 4 +- dlls/d3drm/face.c | 4 +- dlls/d3drm/frame.c | 52 +++++++++++------------ dlls/d3drm/light.c | 4 +- dlls/d3drm/material.c | 4 +- dlls/d3drm/meshbuilder.c | 103 +++++++++++++++++++++------------------------ dlls/d3drm/texture.c | 4 +- dlls/d3drm/viewport.c | 4 +- 11 files changed, 94 insertions(+), 103 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8cfa75f176dc35793eae…

1 0

Nikolay Sivov : comctl32/pager: Use the global HeapAlloc() helpers.
by Alexandre Julliard 09 Feb '18

09 Feb '18

Module: wine Branch: master Commit: 0e403837ff8f980196936749f3456fad85957c18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e403837ff8f980196936749… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 9 09:41:23 2018 +0300 comctl32/pager: Use the global HeapAlloc() helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/pager.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index e9bcbe8..fe68515 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -62,6 +62,7 @@ #include "commctrl.h" #include "comctl32.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(pager); @@ -556,7 +557,7 @@ PAGER_Create (HWND hwnd, const CREATESTRUCTW *lpcs) PAGER_INFO *infoPtr; /* allocate memory for info structure */ - infoPtr = Alloc (sizeof(PAGER_INFO)); + infoPtr = heap_alloc_zero (sizeof(*infoPtr)); if (!infoPtr) return -1; SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); @@ -588,7 +589,7 @@ static LRESULT PAGER_Destroy (PAGER_INFO *infoPtr) { SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); - Free (infoPtr); /* free pager info data */ + heap_free (infoPtr); return 0; }

1 0

Nikolay Sivov : comctl32/progress: Use the global HeapAlloc() helpers.
by Alexandre Julliard 09 Feb '18

09 Feb '18

Module: wine Branch: master Commit: cfac6021e9b8ae9c9a061894ee2c657c23b80843 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfac6021e9b8ae9c9a061894… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 9 09:41:24 2018 +0300 comctl32/progress: Use the global HeapAlloc() helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/progress.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index 4638ffc..62234b9 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -46,6 +46,7 @@ #include "uxtheme.h" #include "vssym32.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(progress); @@ -562,7 +563,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, SWP_FRAMECHANGED | SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); /* allocate memory for info struct */ - infoPtr = Alloc (sizeof(PROGRESS_INFO)); + infoPtr = heap_alloc_zero (sizeof(*infoPtr)); if (!infoPtr) return -1; SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); @@ -584,7 +585,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, case WM_DESTROY: TRACE("Progress Ctrl destruction, hwnd=%p\n", hwnd); - Free (infoPtr); + heap_free (infoPtr); SetWindowLongPtrW(hwnd, 0, 0); theme = GetWindowTheme (hwnd); CloseThemeData (theme);

1 0

Nikolay Sivov : comctl32/ipaddress: Use the global HeapAlloc() helpers.
by Alexandre Julliard 09 Feb '18

09 Feb '18

Module: wine Branch: master Commit: bd4193ef9f0c08ecfa51a7d3e0740ff1eef7011d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd4193ef9f0c08ecfa51a7d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 9 09:41:25 2018 +0300 comctl32/ipaddress: Use the global HeapAlloc() helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/ipaddress.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 98e7259..6c1edf9 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -50,6 +50,7 @@ #include "vssym32.h" #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(ipaddress); @@ -228,7 +229,7 @@ static LRESULT IPADDRESS_Create (HWND hwnd, const CREATESTRUCTA *lpCreate) SetWindowLongW (hwnd, GWL_STYLE, GetWindowLongW(hwnd, GWL_STYLE) & ~WS_BORDER); - infoPtr = Alloc (sizeof(IPADDRESS_INFO)); + infoPtr = heap_alloc_zero (sizeof(*infoPtr)); if (!infoPtr) return -1; SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); @@ -287,7 +288,7 @@ static LRESULT IPADDRESS_Destroy (IPADDRESS_INFO *infoPtr) } SetWindowLongPtrW (infoPtr->Self, 0, 0); - Free (infoPtr); + heap_free (infoPtr); return 0; }

1 0

Józef Kucia : include: Cleanup d3d12 header files.
by Alexandre Julliard 09 Feb '18

09 Feb '18

Module: vkd3d Branch: master Commit: 70493640e3a93726bdc308bbb60aef9e686d28f2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=70493640e3a93726bdc308b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 9 13:45:09 2018 +0100 include: Cleanup d3d12 header files. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 3 + include/.gitignore | 1 + include/vkd3d_d3d12.idl | 154 +++++++++++++++++++++++++++++++------------- include/vkd3d_d3dcommon.idl | 49 ++++++++++++++ 4 files changed, 164 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=70493640e3a93726bdc…

1 0

Józef Kucia : build: Use shared SPIRV-Tools library.
by Alexandre Julliard 09 Feb '18

09 Feb '18

Module: vkd3d Branch: master Commit: 389c18272f988b88ef881923195082ac113e6110 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=389c18272f988b88ef88192… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 7 21:27:11 2018 +0100 build: Use shared SPIRV-Tools library. SPIRV-Tools are now also built as a shared library. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + configure.ac | 16 ++++------------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/Makefile.am b/Makefile.am index aeb66eb..260641b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,6 +70,7 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/vkd3d_shader.map \ libs/vkd3d-shader/vkd3d_shader_main.c \ libs/vkd3d-shader/vkd3d_shader_private.h +libvkd3d_shader_la_CFLAGS = @SPIRV_TOOLS_CFLAGS@ libvkd3d_shader_la_LIBADD = @SPIRV_TOOLS_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_shader_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map diff --git a/configure.ac b/configure.ac index 8a39fef..f9616e3 100644 --- a/configure.ac +++ b/configure.ac @@ -54,9 +54,6 @@ AS_IF([test "x$ac_cv_header_vulkan_vulkan_h" != "xyes"], [AC_MSG_ERROR([vulkan.h AS_IF([test "x$ac_cv_header_spirv_1_0_spirv_h" != "xyes"], [AC_MSG_ERROR([spirv.h not found.])]) AS_IF([test "x$ac_cv_header_spirv_1_0_GLSL_std_450_h" != "xyes"], [AC_MSG_ERROR([GLSL.std.450.h not found.])]) -AS_IF([test "x$with_spirv_tools" = "xyes"], - [AC_CHECK_HEADERS([spirv-tools/libspirv.h], [], [AC_MSG_ERROR([spirv-tools/libspirv.h not found.])])]) - dnl Check for libraries m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG], [m4_fatal([pkg-config autoconf macros not found.])]) @@ -77,11 +74,11 @@ AC_CHECK_LIB([vulkan], [vkGetInstanceProcAddr], [VULKAN_LIBS="-lvulkan"], [AC_MSG_ERROR([libvulkan not found.])]) -AC_SUBST([SPIRV_TOOLS_LIBS]) +HAVE_SPIRV_TOOLS=no AS_IF([test "x$with_spirv_tools" = "xyes"], - [AC_CHECK_LIB([SPIRV-Tools], [spvTextToBinary], - [SPIRV_TOOLS_LIBS="-lstdc++ -lSPIRV-Tools"], - [AC_MSG_ERROR([libSPIRV-Tools not found.])], [-lstdc++])]) + [PKG_CHECK_MODULES([SPIRV_TOOLS], [SPIRV-Tools-shared], + [AC_DEFINE([HAVE_SPIRV_TOOLS], [1], [Define to 1 if you have SPIRV-Tools.]) + HAVE_SPIRV_TOOLS=yes])]) PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms]) @@ -94,11 +91,6 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_ AM_CONDITIONAL([HAS_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) AM_CONDITIONAL([HAS_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"]) -AS_IF([test "x$ac_cv_header_spirv_tools_libspirv_h" = "xyes" -a "x$ac_cv_lib_SPIRV_Tools_spvTextToBinary" = "xyes"], - [AC_DEFINE([HAVE_SPIRV_TOOLS], [1], [Define to 1 if you have SPIRV-Tools.]) - HAVE_SPIRV_TOOLS=yes], - [HAVE_SPIRV_TOOLS=no]) - AC_CONFIG_FILES([Makefile]) AC_OUTPUT

1 0

Francois Gouget : testbot: Allow restricting the statistics to the recent past.
by Alexandre Julliard 09 Feb '18

09 Feb '18

Module: tools Branch: master Commit: f421e67ed2239b5f519db69dbcf903fa6428ad7e URL: https://source.winehq.org/git/tools.git/?a=commit;h=f421e67ed2239b5f519db69… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 9 03:22:44 2018 +0100 testbot: Allow restricting the statistics to the recent past. Over long periods of time (days) and as long as the TestBot can keep up, the job & task creation rate should be almost identical to the job and task completion rate (modulo build errors for tasks). But for short periods (under an hour) they can be significantly different. Specifically the job and task completion rates are capped by the TestBot's processing speed, while the job and task creation rates are not. This means jobs must be filtered based on their Submitted field when counting new jobs, and on their Ended field when dealing with completed jobs. Rename the job and task counters to newjobs and newtasks to emphasize that they count new jobs and tasks. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 32 +++++++++++++++++++++----------- testbot/web/Stats.pl | 12 ++++++------ 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 5122dc3..df1cc59 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -43,6 +43,12 @@ sub _UpdateMin($$) $_[0] = $_[1] if (!defined $_[0] or $_[1] < $_[0]); } +sub max($$) +{ + my ($a, $b) = @_; + return $a > $b ? $a : $b; +} + =pod =over 12 @@ -336,18 +342,20 @@ sub _AddFullStat($$$$;$) } } -sub GetStatistics($) +sub GetStatistics($;$) { - my ($VMs) = @_; + my ($VMs, $Seconds) = @_; my ($GlobalStats, $HostsStats, $VMsStats) = ({}, {}, {}); my @JobTimes; my $Jobs = CreateJobs(); + my $Cutoff = $Seconds ? (time() - $Seconds) : 0; foreach my $Job (@{$Jobs->GetItems()}) { - $GlobalStats->{"jobs.count"}++; - _UpdateMin($GlobalStats->{start}, $Job->Submitted); + my $CountsAsNew = ($Job->Submitted >= $Cutoff); + $GlobalStats->{"newjobs.count"}++ if ($CountsAsNew); + _UpdateMin($GlobalStats->{start}, max($Cutoff, $Job->Submitted)); my $IsSpecialJob; my $Steps = $Job->Steps; @@ -359,9 +367,11 @@ sub GetStatistics($) my $Tasks = $Step->Tasks; foreach my $Task (@{$Tasks->GetItems()}) { - $GlobalStats->{"tasks.count"}++; - if ($Task->Started and $Task->Ended and - $Task->Status !~ /^(?:queued|running|canceled)$/) + $GlobalStats->{"newtasks.count"}++ if ($CountsAsNew); + next if (!$Task->Ended or $Task->Ended < $Cutoff); + + # $Task->Started should really be set since $Task->Ended is + if ($Task->Started and $Task->Status !~ /^(?:queued|running|canceled)$/) { my $Time = $Task->Ended - $Task->Started; _AddFullStat($GlobalStats, "$StepType.time", $Time, undef, $Task); @@ -383,7 +393,7 @@ sub GetStatistics($) } } - if (!$IsSpecialJob and$Job->Ended and + if (!$IsSpecialJob and $Job->Ended and $Job->Ended >= $Cutoff and $Job->Status !~ /^(?:queued|running|canceled)$/) { my $Time = $Job->Ended - $Job->Submitted; @@ -402,7 +412,7 @@ sub GetStatistics($) @JobTimes = (); # free early } - my ($Activity, $Counters) = GetActivity($VMs); + my ($Activity, $Counters) = GetActivity($VMs, $Seconds); $GlobalStats->{"recordgroups.count"} = $Counters->{recordgroups}; $GlobalStats->{"records.count"} = $Counters->{records}; foreach my $Group (@$Activity) @@ -456,14 +466,14 @@ sub GetStatistics($) # Note that we cannot simply sum the VMs busy wall clock times to get # the host busy wall clock time because this would count periods where # more than one VM is busy multiple times. - $HostStats->{"busy.elapsed"} += $Group->{end} - $Group->{start}; + $HostStats->{"busy.elapsed"} += $Group->{end} - max($Cutoff, $Group->{start}); $IsHostBusy{$Host} = 1; $IsGroupBusy = 1; } } if ($IsGroupBusy) { - $GlobalStats->{"busy.elapsed"} += $Group->{end} - $Group->{start}; + $GlobalStats->{"busy.elapsed"} += $Group->{end} - max($Cutoff, $Group->{start}); } } diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 9db2ad3..51a7227 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -206,12 +206,12 @@ sub GenerateBody($) _GenGlobalLine($GlobalStats, "elapsed", "Job history", "How far back the job history goes."); - _GenGlobalLine($GlobalStats, "jobs.count", "Job count", "The number of jobs in the job history."); - _AddRate($GlobalStats, "jobs.count"); - _GenGlobalLine($GlobalStats, "jobs.rate", "Job rate", "How fast new jobs are coming in."); - _GenGlobalLine($GlobalStats, "tasks.count", "Task count", "The number of tasks."); - _AddRate($GlobalStats, "tasks.count"); - _GenGlobalLine($GlobalStats, "tasks.rate", "Task rate", "How fast new tasks are coming in."); + _GenGlobalLine($GlobalStats, "newjobs.count", "Job count", "The number of jobs in the job history."); + _AddRate($GlobalStats, "newjobs.count"); + _GenGlobalLine($GlobalStats, "newjobs.rate", "Job rate", "How fast new jobs are coming in."); + _GenGlobalLine($GlobalStats, "newtasks.count", "Task count", "The number of tasks."); + _AddRate($GlobalStats, "newtasks.count"); + _GenGlobalLine($GlobalStats, "newtasks.rate", "Task rate", "How fast new tasks are coming in."); _GenGlobalLine($GlobalStats, "busy.elapsed", "Busy time", "How much wall clock time was spent running jobs.", $NO_PERCENTAGE); _GenGlobalLine($GlobalStats, "busy.elapsed", "Busy \%", "The percentage of wall clock time where the TestBot was busy running jobs.");

1 0

Francois Gouget : testbot: Fix activity statistics for short periods of time.
by Alexandre Julliard 09 Feb '18

09 Feb '18

Module: tools Branch: master Commit: c40e81b67b22353b285edbebdbe3c00f3d3da6f3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c40e81b67b22353b285edbe… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 9 03:23:47 2018 +0100 testbot: Fix activity statistics for short periods of time. When looking at the activity for a VM we get an initial 'unknown' segment that goes up to the first record for that VM. This is because we don't know what the state of the VM was before that first record. For long periods it does not matter much but for short ones, say 5 minutes, an unknown segment could be all we have if the VM has been in the same state for more than 5 minutes, for instance while running a task. So analyze the activity beyond the specified period, up to the largest amount of time a task can take so we are sure to get the VM's 'previous' record. Then, when computing the statistics, ignore any data that falls outside the period under consideration. Of course this only works for statistics about VM operations and running tasks (so running.time, reverting.time, etc) not for those about idle or off VMs (idle.time, etc.). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index df1cc59..4aed4ed 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -412,11 +412,33 @@ sub GetStatistics($;$) @JobTimes = (); # free early } - my ($Activity, $Counters) = GetActivity($VMs, $Seconds); + my $ActivitySeconds; + if ($Seconds) + { + # When looking at the activity for a VM we get an initial 'unknown' segment + # that goes up to the first record for that VM. This is because we don't + # know what the state of the VM was before that first record. + # For long periods it does not matter much but for short ones, say 5 + # minutes, an unknown segment could be all we have if the VM has been in + # the same state for more than 5 minutes, for instance while running a + # task. + # So analyze the activity beyond the specified period, up to the largest + # amount of time a task can take so are sure to get the VM's 'previous' + # record. Then when computing the statistics, ignore any data that falls + # outside the period under consideration. + # Of course this only works for statistics about VM operations and running + # tasks (so running.time, reverting.time, etc) not for those about idle or + # off VMs (idle.time, etc.). + $ActivitySeconds = $Seconds + 60 + + ($SuiteTimeout > $ReconfigTimeout ? $SuiteTimeout : $ReconfigTimeout); + } + my ($Activity, $Counters) = GetActivity($VMs, $ActivitySeconds); $GlobalStats->{"recordgroups.count"} = $Counters->{recordgroups}; $GlobalStats->{"records.count"} = $Counters->{records}; foreach my $Group (@$Activity) { + next if ($Group->{end} < $Cutoff); + _UpdateMin($VMsStats->{start}, $Group->{start}); next if (!$Group->{statusvms});

1 0