Skip to content

gh-150114: Use get_process_memory_usage() in memory watchdog #150402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 4 commits into from
May 25, 2026
Merged

gh-150114: Use get_process_memory_usage() in memory watchdog #150402

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a72e31
gh-150114: Use get_process_memory_usage() in memory watchdog
vstinner May 25, 2026
26ef459
Fix Lint: remove now unused import (get_pagesize)
vstinner May 25, 2026
f523453
Fix memory_watchdog.py usage
vstinner May 25, 2026
3a13b66
Add a comment to explain why sys.stdout.write() is used
vstinner May 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 32 additions & 12 deletions Lib/test/memory_watchdog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,35 @@

Comment thread
vstinner marked this conversation as resolved.
import sys
import time
from test.support import get_pagesize


while True:
page_size = get_pagesize()
sys.stdin.seek(0)
statm = sys.stdin.read()
data = int(statm.split()[5])
sys.stdout.write(" ... process data size: {data:.1f}G\n"
.format(data=data * page_size / (1024 ** 3)))
sys.stdout.flush()
time.sleep(1)
from test.libregrtest.utils import get_process_memory_usage


ONE_GIB = (1024 ** 3)


def watchdog(pid):
while True:
mem = get_process_memory_usage(pid)
if mem is None:
# get_process_memory_usage() is not supported on the platform,
# or something went wrong. Exit since the next call is likely to
# fail the same way.
return

sys.stdout.write(f" ... process data size: {mem / ONE_GIB:.1f} GiB\n")
Comment thread
cmaloney marked this conversation as resolved.
sys.stdout.flush()
time.sleep(1)

def main():
if len(sys.argv) != 2:
print("usage: python {sys.argv[0]) pid")
Comment thread
vstinner marked this conversation as resolved.
Outdated
sys.exit(1)
pid = int(sys.argv[1])

try:
watchdog(pid)
except KeyboardInterrupt:
pass

if __name__ == "__main__":
Comment thread
cmaloney marked this conversation as resolved.
main()
27 changes: 9 additions & 18 deletions Lib/test/support/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1241,29 +1241,20 @@ class _MemoryWatchdog:
"""

def __init__(self):
self.procfile = '/proc/{pid}/statm'.format(pid=os.getpid())
self.started = False

def start(self):
try:
f = open(self.procfile, 'r')
except OSError as e:
logging.getLogger(__name__).warning('/proc not available for stats: %s', e, exc_info=e)
sys.stderr.flush()
return

import subprocess
with f:
watchdog_script = findfile("memory_watchdog.py")
self.mem_watchdog = subprocess.Popen([sys.executable, watchdog_script],
stdin=f,
stderr=subprocess.DEVNULL)
watchdog_script = findfile("memory_watchdog.py")
cmd = [sys.executable, watchdog_script, str(os.getpid())]
self.mem_watchdog = subprocess.Popen(cmd)
self.started = True

def stop(self):
if self.started:
self.mem_watchdog.terminate()
self.mem_watchdog.wait()
if not self.started:
return
self.mem_watchdog.terminate()
self.mem_watchdog.wait()


def bigmemtest(size, memuse, dry_run=True):
Expand Down Expand Up @@ -1296,8 +1287,8 @@ def wrapper(self):

if real_max_memuse and verbose:
print()
print(" ... expected peak memory use: {peak:.1f}G"
.format(peak=size * memuse / (1024 ** 3)))
peak = (size * memuse) / (1024 ** 3)
print(f" ... expected peak memory use: {peak:.1f} GiB")
watchdog = _MemoryWatchdog()
watchdog.start()
else:
Expand Down
Loading