Implement getloadavg on Windows. Fixes #604 and #1484 #1485

ammaraskar · 2019-04-11T02:03:38Z

I added some guards for Vista+ since I realized PdhAddEnglishCounterW is not available on XP.

There's a choice between calling init_loadavg_counter on import or on the first getloadavg call. I'm inclined to say the latter is better since then we don't introduce overhead when it isn't needed.

Not sure how to test properly this properly on the windows CI since there's nothing built in we can test against. There might be some external programs we can use but I'd like to get your take on it.

giampaolo

Excellent code. I'll merge when you'll give me the OK.

psutil/tests/test_linux.py

psutil/tests/test_memory_leaks.py

psutil/tests/test_system.py

psutil/arch/windows/wmi.c

docs/index.rst

HISTORY.rst

docs/index.rst

psutil/_psutil_windows.c

psutil/_pswindows.py

psutil/arch/windows/wmi.c

giampaolo · 2019-04-11T03:03:40Z

There's a choice between calling init_loadavg_counter on import or on the first getloadavg call. I'm inclined to say the latter is better since then we don't introduce overhead when it isn't needed.

I agree

Not sure how to test properly this properly on the windows CI since there's nothing built in we can test against. There might be some external programs we can use but I'd like to get your take on it.

Probably there will be something in wmic but I wouldn't bother (too boring =)).

setup.py

psutil/tests/__init__.py

ammaraskar · 2019-04-11T06:45:39Z

I've gone ahead and incorporated the feedback from the code review along with updating install.sh to install a more recent version of python2 (the old one was incompatible with the latest openssl) in order to fix the CI.

giampaolo · 2019-04-11T09:34:03Z

Nice, thanks Ammar.

vstinner · 2019-04-11T10:58:34Z

Cool stuff 👍

vstinner · 2019-04-11T10:59:28Z

Python also got its toy: https://github.com/python/cpython/pull/8357/files

giampaolo · 2019-04-12T10:19:08Z

Cool stuff indeed. I had been floating around this for a while back in the days (the original proposal is old). There was/is a bunch of info on internet mentioning the bits with which it's theoretically possible to do this ("System Processor Queue Length") but I couldn't find any real implementation (e.g. knowing how to calculate LOADAVG_FACTOR_1F magic numbers is non trivial and requires some actual understanding of how this works).

@wiggin15

* origin/master: Fix giampaolo#1276: [AIX] use getargs to get process cmdline (giampaolo#1500) (patch by @wiggin15) Fix Process.ionice example using wrong keyword arg (giampaolo#1504) fix history syntax remove catching IOError; let the test fail and adjust it later Fix cpu freq (giampaolo#1496) pre release fix giampaolo#1493: [Linux] cpu_freq(): handle the case where /sys/devices/system/cpu/cpufreq/ exists but is empty. Revert "Fix cpu_freq (giampaolo#1493)" (giampaolo#1495) Fix cpu_freq (giampaolo#1493) Update cpu_freq to return 0 for max/min if not available (giampaolo#1487) give CREDITS to @agnewee for giampaolo#1491 SunOS / net_if_addrs(): free() ifap struct on error (giampaolo#1491) fix giampaolo#1486: add wraps() decorator around wrap_exceptions refactor/move some utilities into _common.py update doc update HISTORY Implement getloadavg on Windows. Fixes giampaolo#604 and giampaolo#1484 (giampaolo#1485) (patch by Ammar Askar) give credits to @amanusk for giampaolo#1472

Provide a way to report the process load average, via a new 'guest-get-load' command. This is only implemented for POSIX platforms providing 'getloadavg'. Example illustrated with qmp-shell: (QEMU) guest-get-load { "return": { "load15m": 1.546875, "load1m": 1.669921875, "load5m": 1.9306640625 } } Windows has no native equivalent API, but it would be possible to simulate it as illustrated here (BSD-3-Clause): giampaolo/psutil#1485 This is left as an exercise for future contributors. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

@Load1m

https://lore.kernel.org/qemu-devel/20241202121927.864335-1-berrange@redhat.com --- From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com> To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Konstantin Kostiuk <kkostiuk@redhat.com>, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>, Michael Roth <michael.roth@amd.com>, =?UTF-8?q?Jo=C3=A3o=20Vila=C3=A7a?= <jvilaca@redhat.com>, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com> Subject: [PATCH] qga: implement a 'guest-get-load' command Date: Mon, 2 Dec 2024 12:19:27 +0000 Message-ID: <20241202121927.864335-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.996, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Provide a way to report the process load average, via a new 'guest-get-load' command. This is only implemented for POSIX platforms providing 'getloadavg'. Example illustrated with qmp-shell: (QEMU) guest-get-load { "return": { "load15m": 1.546875, "load1m": 1.669921875, "load5m": 1.9306640625 } } Windows has no native equivalent API, but it would be possible to simulate it as illustrated here (BSD-3-Clause): giampaolo/psutil#1485 This is left as an exercise for future contributors. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- meson.build | 1 + qga/commands-posix.c | 20 ++++++++++++++++++++ qga/qapi-schema.json | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+) diff --git a/meson.build b/meson.build index a290dbfa33..9c65e56fff 100644 --- a/meson.build +++ b/meson.build @@ -2619,6 +2619,7 @@ config_host_data.set('CONFIG_SETNS', cc.has_function('setns') and cc.has_functio config_host_data.set('CONFIG_SYNCFS', cc.has_function('syncfs')) config_host_data.set('CONFIG_SYNC_FILE_RANGE', cc.has_function('sync_file_range')) config_host_data.set('CONFIG_TIMERFD', cc.has_function('timerfd_create')) +config_host_data.set('CONFIG_GETLOADAVG', cc.has_function('getloadavg')) config_host_data.set('HAVE_COPY_FILE_RANGE', cc.has_function('copy_file_range')) config_host_data.set('HAVE_GETIFADDRS', cc.has_function('getifaddrs')) config_host_data.set('HAVE_GLIB_WITH_SLICE_ALLOCATOR', glib_has_gslice) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 636307bedf..6e3c15f539 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -1368,3 +1368,23 @@ char *qga_get_host_name(Error **errp) return g_steal_pointer(&hostname); } + +#ifdef CONFIG_GETLOADAVG +GuestLoadAverage *qmp_guest_get_load(Error **errp) +{ + double loadavg[3]; + GuestLoadAverage *ret = NULL; + + if (getloadavg(loadavg, G_N_ELEMENTS(loadavg)) < 0) { + error_setg_errno(errp, errno, + "cannot query load average"); + return NULL; + } + + ret = g_new0(GuestLoadAverage, 1); + ret->load1m = loadavg[0]; + ret->load5m = loadavg[1]; + ret->load15m = loadavg[2]; + return ret; +} +#endif diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json index 0537bb7886..995594aaf4 100644 --- a/qga/qapi-schema.json +++ b/qga/qapi-schema.json @@ -1843,6 +1843,43 @@ 'if': 'CONFIG_LINUX' } + +## +# @GuestLoadAverage: +# +# Statistics about process load information +# +# @Load1m: 1-minute load avage +# +# @load5m: 5-minute load avage +# +# @load15m: 15-minute load avage +# +# Since: 10.0 +## +{ 'struct': 'GuestLoadAverage', + 'data': { + 'load1m': 'number', + 'load5m': 'number', + 'load15m': 'number' + }, + 'if': 'CONFIG_GETLOADAVG' +} + +## +# @guest-get-load: +# +# Retrieve CPU process load information +# +# Returns: load information +# +# Since: 10.0 +## +{ 'command': 'guest-get-load', + 'returns': 'GuestLoadAverage', + 'if': 'CONFIG_GETLOADAVG' +} + ## # @GuestNetworkRoute: # -- 2.46.0 Signed-off-by: GitHub Actions Bot <bot@github.com>

Provide a way to report the process load average, via a new 'guest-get-load' command. This is only implemented for POSIX platforms providing 'getloadavg'. Example illustrated with qmp-shell: (QEMU) guest-get-load { "return": { "load15m": 1.546875, "load1m": 1.669921875, "load5m": 1.9306640625 } } Windows has no native equivalent API, but it would be possible to simulate it as illustrated here (BSD-3-Clause): giampaolo/psutil#1485 This is left as an exercise for future contributors. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com> Message-ID: <20241202121927.864335-1-berrange@redhat.com> Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>

ammaraskar added 2 commits April 10, 2019 21:58

Implement getloadavg on Windows. Fixes giampaolo#604 and giampaolo#1484

02dd837

Add test for getloadavg in memory leak checker

4459ac6

ammaraskar force-pushed the master branch 2 times, most recently from 9fb91f3 to 0f16f77 Compare April 11, 2019 03:00

giampaolo approved these changes Apr 11, 2019

View reviewed changes

giampaolo reviewed Apr 11, 2019

View reviewed changes

setup.py Show resolved Hide resolved

giampaolo reviewed Apr 11, 2019

View reviewed changes

psutil/tests/__init__.py Outdated Show resolved Hide resolved

ammaraskar force-pushed the master branch 3 times, most recently from 3bb90fb to 3e82e54 Compare April 11, 2019 05:00

Address comments from review

8138249

ammaraskar force-pushed the master branch 4 times, most recently from 08d4ecb to 231ab22 Compare April 11, 2019 06:32

Try to fix the OSX build

01f138e

ammaraskar force-pushed the master branch from 231ab22 to 01f138e Compare April 11, 2019 06:44

giampaolo merged commit 921870d into giampaolo:master Apr 11, 2019

giampaolo mentioned this pull request Apr 11, 2019

Add Load Average (similar to Linux) on Windows nicolargo/glances#344

Closed

bmxp mentioned this pull request May 14, 2019

getloadavg() from psutil 5.6.2 crashes on Windows 10 with python 3.7.x #1510

Closed

giampaolo mentioned this pull request Aug 22, 2019

Python Triage Team Application: Ammar Askar python/core-workflow#355

Closed

rkttu mentioned this pull request Jan 29, 2020

Add system load average calculation gsass1/NTop#20

Open

robrwo mentioned this pull request Apr 3, 2020

Add getloadavg support for Windows robrwo/Sys-CpuLoad#6

Open

giampaolo added windows bug labels Nov 15, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement getloadavg on Windows. Fixes #604 and #1484 #1485

Implement getloadavg on Windows. Fixes #604 and #1484 #1485

ammaraskar commented Apr 11, 2019 •

edited by giampaolo

Loading

giampaolo left a comment

giampaolo commented Apr 11, 2019

ammaraskar commented Apr 11, 2019

giampaolo commented Apr 11, 2019

vstinner commented Apr 11, 2019

vstinner commented Apr 11, 2019

giampaolo commented Apr 12, 2019

Implement getloadavg on Windows. Fixes #604 and #1484 #1485

Implement getloadavg on Windows. Fixes #604 and #1484 #1485

Conversation

ammaraskar commented Apr 11, 2019 • edited by giampaolo Loading

giampaolo left a comment

Choose a reason for hiding this comment

giampaolo commented Apr 11, 2019

ammaraskar commented Apr 11, 2019

giampaolo commented Apr 11, 2019

vstinner commented Apr 11, 2019

vstinner commented Apr 11, 2019

giampaolo commented Apr 12, 2019

ammaraskar commented Apr 11, 2019 •

edited by giampaolo

Loading