April 2022 - Wine-Devel - list.winehq.org

[tools] testbot: Filter the jobs in GetStatistics().
by Francois Gouget April 14, 2022

April 14, 2022

This reduces the number of Tasks that need to be loaded from the database and processed in order to collect the statistics for short periods of time. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I guess this was not done initially because FilterNull() and FilterOr() were added after the stats code. A big source of inefficiency is the loading of the Tasks a handful at a time. But fixing that requires a bigger code reorganisation. There are some smaller optimisations that can provide 10-20% speedups like caching some object properties to avoid the AUTOLOAD performance penalty. But whether they make sense depends on how the performance of that mechanism evolves. --- testbot/lib/WineTestBot/Activity.pm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index f7579057e..d395a12a8 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -31,6 +31,8 @@ our @EXPORT = qw(GetActivity GetStatistics); use List::Util qw(max); use Scalar::Util qw(weaken); +use ObjectModel::Collection; + use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::RecordGroups; @@ -342,9 +344,12 @@ sub GetStatistics($;$) my ($GlobalStats, $HostsStats, $VMsStats) = ({}, {}, {}); - my @JobTimes; my $Jobs = CreateJobs(); my $Cutoff = $Seconds ? (time() - $Seconds) : 0; + $Jobs->AddFilter(FilterOr(FilterNull("Ended"), + FilterValue("Ended", ">=", [$Cutoff]))); + + my @JobTimes; foreach my $Job (@{$Jobs->GetItems()}) { my $CountsAsNew = ($Job->Submitted >= $Cutoff); @@ -372,6 +377,7 @@ sub GetStatistics($;$) $GlobalStats->{"newtasks.count"}++; $HostStats->{"newtasks.count"}++ if ($HostStats); } + # The Task may have ended much earlier than the Job next if (!$Task->Ended or $Task->Ended < $Cutoff); $GlobalStats->{"donetasks.count"}++; $HostStats->{"donetasks.count"}++ if ($HostStats); -- 2.30.2

1 0

[tools 1/2] testbot: Collect some more job.time percentile values.
by Francois Gouget April 14, 2022

April 14, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Activity.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 53aff0582..f7579057e 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -415,9 +415,11 @@ sub GetStatistics($;$) if ($JobCount) { @JobTimes = sort { $a <=> $b } @JobTimes; - $GlobalStats->{"jobs.time.p10"} = $JobTimes[int($JobCount * 0.1)]; - $GlobalStats->{"jobs.time.p50"} = $JobTimes[int($JobCount * 0.5)]; - $GlobalStats->{"jobs.time.p90"} = $JobTimes[int($JobCount * 0.9)]; + for (my $P = 10; $P < 100; $P += 10) + { + my $Name = sprintf("jobs.time.p%02d", $P); + $GlobalStats->{$Name} = $JobTimes[int($JobCount * $P / 100)]; + } @JobTimes = (); # free early } -- 2.30.2

1 1

[PATCH 8/8] winex11: Directly use win32u for user functions in opengl.c.
by Jacek Caban April 14, 2022

April 14, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/opengl.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-)

2 1

[PATCH 7/8] winex11: Directly use win32u for user functions in mouse.c.
by Jacek Caban April 14, 2022

April 14, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/mouse.c | 86 ++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 43 deletions(-)

2 1

[PATCH 6/8] win32u: Introduce NtUserGetMessagePos.
by Jacek Caban April 14, 2022

April 14, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/sysparams.c | 3 +++ include/ntuser.h | 6 ++++++ 2 files changed, 9 insertions(+)

2 1

[PATCH 4/8] win32u: Introduce NtUserMapWindowPoints.
by Jacek Caban April 14, 2022

April 14, 2022

And use it in user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winpos.c | 22 ++-------------------- dlls/win32u/window.c | 7 +++++++ include/ntuser.h | 18 ++++++++++++++++++ 3 files changed, 27 insertions(+), 20 deletions(-)

2 1

[PATCH 3/8] win32u: Move EnableWindow implementation from user32.
by Jacek Caban April 14, 2022

April 14, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 30 +----------------------------- dlls/win32u/window.c | 37 +++++++++++++++++++++++++++++++++++++ include/ntuser.h | 6 ++++++ 3 files changed, 44 insertions(+), 29 deletions(-)

2 1

[PATCH 2/8] win32u: Move NtUserChildWindowFromPointEx implementation from user32.
by Jacek Caban April 14, 2022

April 14, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winpos.c | 42 +++++++---------------------------------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 37 ++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 10 ++++++++++ include/ntuser.h | 1 + 7 files changed, 58 insertions(+), 36 deletions(-)

2 1

[PATCH 1/8] win32u: Move NtUserExcludeUpdateRgn implementation from user32.
by Jacek Caban April 14, 2022

April 14, 2022

2 1

[PATCH 01/12] regedit: Use wide character string literals in childwnd.c
by Hugh McMaster April 14, 2022

April 14, 2022

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/childwnd.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 582f3c0c177..704299be837 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -32,12 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(regedit); ChildWnd* g_pChildWnd; static int last_split; -static const WCHAR wszLastKey[] = {'L','a','s','t','K','e','y',0}; -static const WCHAR wszKeyName[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'A','p','p','l','e','t','s','\\','R','e','g','e','d','i','t',0}; +static const WCHAR wszLastKey[] = L"LastKey"; +static const WCHAR wszKeyName[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Regedit"; /******************************************************************************* * Local module support methods @@ -58,11 +54,7 @@ static LPCWSTR GetRootKeyName(HKEY hRootKey) if(hRootKey == HKEY_DYN_DATA) return reg_class_namesW[INDEX_HKEY_DYN_DATA]; else - { - static const WCHAR unknown_key[] = {'U','N','K','N','O','W','N',' ','H','K','E','Y',',',' ', - 'P','L','E','A','S','E',' ','R','E','P','O','R','T',0}; - return unknown_key; - } + return L"Unknown HKEY. Please report."; } static void draw_splitbar(HWND hWnd, int x) -- 2.35.2

1 11