Intermediate changes

commit_hash:202dcb59cc75c6a8ee553d57ceb11687cdf21151

Author: robot-piglet

contrib/python/psutil/py3/.dist-info/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: psutil
-Version: 7.1.3
+Version: 7.2.0
 Summary: Cross-platform lib for process and system monitoring.
 Home-page: https://github.com/giampaolo/psutil
 Author: Giampaolo Rodola
@@ -55,7 +55,6 @@ License-File: LICENSE
 Provides-Extra: dev
 Requires-Dist: pytest ; extra == 'dev'
 Requires-Dist: pytest-instafail ; extra == 'dev'
-Requires-Dist: pytest-subtests ; extra == 'dev'
 Requires-Dist: pytest-xdist ; extra == 'dev'
 Requires-Dist: setuptools ; extra == 'dev'
 Requires-Dist: abi3audit ; extra == 'dev'
@@ -78,20 +77,11 @@ Requires-Dist: validate-pyproject[all] ; extra == 'dev'
 Requires-Dist: virtualenv ; extra == 'dev'
 Requires-Dist: vulture ; extra == 'dev'
 Requires-Dist: wheel ; extra == 'dev'
-Requires-Dist: colorama ; (os_name == "nt") and extra == 'dev'
-Requires-Dist: pyreadline ; (os_name == "nt") and extra == 'dev'
-Requires-Dist: pywin32 ; (os_name == "nt" and platform_python_implementation != "PyPy") and extra == 'dev'
-Requires-Dist: wheel ; (os_name == "nt" and platform_python_implementation != "PyPy") and extra == 'dev'
-Requires-Dist: wmi ; (os_name == "nt" and platform_python_implementation != "PyPy") and extra == 'dev'
 Provides-Extra: test
 Requires-Dist: pytest ; extra == 'test'
 Requires-Dist: pytest-instafail ; extra == 'test'
-Requires-Dist: pytest-subtests ; extra == 'test'
 Requires-Dist: pytest-xdist ; extra == 'test'
 Requires-Dist: setuptools ; extra == 'test'
-Requires-Dist: pywin32 ; (os_name == "nt" and platform_python_implementation != "PyPy") and extra == 'test'
-Requires-Dist: wheel ; (os_name == "nt" and platform_python_implementation != "PyPy") and extra == 'test'
-Requires-Dist: wmi ; (os_name == "nt" and platform_python_implementation != "PyPy") and extra == 'test'
 
 |  |downloads| |stars| |forks| |contributors| |coverage|
 |  |version| |packages| |license|
@@ -508,6 +498,16 @@ Further process APIs
     >>> gone, alive = psutil.wait_procs(procs_list, timeout=3, callback=on_terminate)
     >>>
 
+Heap info
+---------
+
+.. code-block:: python
+
+    >>> import psutil
+    >>> psutil.heap_info()
+    pheap(heap_used=5177792, mmap_used=819200)
+    >>> psutil.heap_trim()
+
 Windows services
 ----------------
 

contrib/python/psutil/py3/README.rst

@@ -454,6 +454,16 @@ Further process APIs
     >>> gone, alive = psutil.wait_procs(procs_list, timeout=3, callback=on_terminate)
     >>>
 
+Heap info
+---------
+
+.. code-block:: python
+
+    >>> import psutil
+    >>> psutil.heap_info()
+    pheap(heap_used=5177792, mmap_used=819200)
+    >>> psutil.heap_trim()
+
 Windows services
 ----------------
 

contrib/python/psutil/py3/patches/99-fix-ya.make.patch

@@ -8,7 +8,7 @@
 -    -DPSUTIL_WINDOWS=1
 -    -DPSUTIL_SIZEOF_PID_T=4
 -    -DPSUTIL_MAYBE_EXTERN=extern
-@@ -42,50 +33,4 @@ SRCS(
+@@ -42,53 +33,4 @@ SRCS(
 -    psutil/_psutil_linux.c
 -    psutil/_psutil_osx.c
 -    psutil/_psutil_windows.c
@@ -17,11 +17,13 @@
      psutil/arch/all/pids.c
      psutil/arch/all/str.c
 -    psutil/arch/linux/disk.c
+-    psutil/arch/linux/heap.c
 -    psutil/arch/linux/mem.c
 -    psutil/arch/linux/net.c
 -    psutil/arch/linux/proc.c
 -    psutil/arch/osx/cpu.c
 -    psutil/arch/osx/disk.c
+-    psutil/arch/osx/heap.c
 -    psutil/arch/osx/init.c
 -    psutil/arch/osx/mem.c
 -    psutil/arch/osx/net.c
@@ -45,6 +47,7 @@
 -    psutil/arch/sunos/sys.c
 -    psutil/arch/windows/cpu.c
 -    psutil/arch/windows/disk.c
+-    psutil/arch/windows/heap.c
 -    psutil/arch/windows/init.c
 -    psutil/arch/windows/mem.c
 -    psutil/arch/windows/net.c
@@ -59,7 +62,7 @@
 -    psutil/arch/windows/socks.c
 -    psutil/arch/windows/sys.c
 -    psutil/arch/windows/wmi.c
-@@ -74,5 +36,99 @@ SRCS(
+@@ -74,5 +36,102 @@ SRCS(
 -PY_REGISTER(
 -    psutil._psutil_linux
 -    psutil._psutil_osx
@@ -74,6 +77,7 @@
 +    SRCS(
 +        psutil/_psutil_linux.c
 +        psutil/arch/linux/disk.c
++        psutil/arch/linux/heap.c
 +        psutil/arch/linux/mem.c
 +        psutil/arch/linux/net.c
 +        psutil/arch/linux/proc.c
@@ -105,6 +109,7 @@
 +        psutil/_psutil_osx.c
 +        psutil/arch/osx/cpu.c
 +        psutil/arch/osx/disk.c
++        psutil/arch/osx/heap.c
 +        psutil/arch/osx/init.c
 +        psutil/arch/osx/mem.c
 +        psutil/arch/osx/net.c
@@ -144,6 +149,7 @@
 +        psutil/_psutil_windows.c
 +        psutil/arch/windows/cpu.c
 +        psutil/arch/windows/disk.c
++        psutil/arch/windows/heap.c
 +        psutil/arch/windows/init.c
 +        psutil/arch/windows/mem.c
 +        psutil/arch/windows/net.c

contrib/python/psutil/py3/psutil/__init__.py

@@ -36,6 +36,7 @@
     pwd = None
 
 from . import _common
+from . import _ntuples as _ntp
 from ._common import AIX
 from ._common import BSD
 from ._common import CONN_CLOSE
@@ -203,7 +204,7 @@
 AF_LINK = _psplatform.AF_LINK
 
 __author__ = "Giampaolo Rodola'"
-__version__ = "7.1.3"
+__version__ = "7.2.0"
 version_info = tuple(int(num) for num in __version__.split('.'))
 
 _timer = getattr(time, 'monotonic', time.time)
@@ -1162,7 +1163,7 @@ def memory_percent(self, memtype="rss"):
         >>> psutil.Process().memory_info()._fields
         ('rss', 'vms', 'shared', 'text', 'lib', 'data', 'dirty', 'uss', 'pss')
         """
-        valid_types = list(_psplatform.pfullmem._fields)
+        valid_types = list(_ntp.pfullmem._fields)
         if memtype not in valid_types:
             msg = (
                 f"invalid memtype {memtype!r}; valid types are"
@@ -1171,7 +1172,7 @@ def memory_percent(self, memtype="rss"):
             raise ValueError(msg)
         fun = (
             self.memory_info
-            if memtype in _psplatform.pmem._fields
+            if memtype in _ntp.pmem._fields
             else self.memory_full_info
         )
         metrics = fun()
@@ -1211,11 +1212,9 @@ def memory_maps(self, grouped=True):
                         d[path] = list(map(lambda x, y: x + y, d[path], nums))
                     except KeyError:
                         d[path] = nums
-                nt = _psplatform.pmmap_grouped
-                return [nt(path, *d[path]) for path in d]
+                return [_ntp.pmmap_grouped(path, *d[path]) for path in d]
             else:
-                nt = _psplatform.pmmap_ext
-                return [nt(*x) for x in it]
+                return [_ntp.pmmap_ext(*x) for x in it]
 
     def open_files(self):
         """Return files opened by process as a list of
@@ -1751,7 +1750,7 @@ def _cpu_busy_time(times):
 def _cpu_times_deltas(t1, t2):
     assert t1._fields == t2._fields, (t1, t2)
     field_deltas = []
-    for field in _psplatform.scputimes._fields:
+    for field in _ntp.scputimes._fields:
         field_delta = getattr(t2, field) - getattr(t1, field)
         # CPU times are always supposed to increase over time
         # or at least remain the same and that's because time
@@ -1766,7 +1765,7 @@ def _cpu_times_deltas(t1, t2):
         # https://gitlab.com/procps-ng/procps/blob/v3.3.12/top/top.c#L5063
         field_delta = max(0, field_delta)
         field_deltas.append(field_delta)
-    return _psplatform.scputimes(*field_deltas)
+    return _ntp.scputimes(*field_deltas)
 
 
 def cpu_percent(interval=None, percpu=False):
@@ -1885,7 +1884,7 @@ def calculate(t1, t2):
             # make sure we don't return negative values or values over 100%
             field_perc = min(max(0.0, field_perc), 100.0)
             nums.append(field_perc)
-        return _psplatform.scputimes(*nums)
+        return _ntp.scputimes(*nums)
 
     # system-wide usage
     if not percpu:
@@ -1955,7 +1954,7 @@ def cpu_freq(percpu=False):
                     min_ = mins / num_cpus
                     max_ = maxs / num_cpus
 
-                return _common.scpufreq(current, min_, max_)
+                return _ntp.scpufreq(current, min_, max_)
 
     __all__.append("cpu_freq")
 
@@ -2114,13 +2113,12 @@ def disk_io_counters(perdisk=False, nowrap=True):
         return {} if perdisk else None
     if nowrap:
         rawdict = _wrap_numbers(rawdict, 'psutil.disk_io_counters')
-    nt = getattr(_psplatform, "sdiskio", _common.sdiskio)
     if perdisk:
         for disk, fields in rawdict.items():
-            rawdict[disk] = nt(*fields)
+            rawdict[disk] = _ntp.sdiskio(*fields)
         return rawdict
     else:
-        return nt(*(sum(x) for x in zip(*rawdict.values())))
+        return _ntp.sdiskio(*(sum(x) for x in zip(*rawdict.values())))
 
 
 disk_io_counters.cache_clear = functools.partial(
@@ -2167,10 +2165,10 @@ def net_io_counters(pernic=False, nowrap=True):
         rawdict = _wrap_numbers(rawdict, 'psutil.net_io_counters')
     if pernic:
         for nic, fields in rawdict.items():
-            rawdict[nic] = _common.snetio(*fields)
+            rawdict[nic] = _ntp.snetio(*fields)
         return rawdict
     else:
-        return _common.snetio(*[sum(x) for x in zip(*rawdict.values())])
+        return _ntp.snetio(*[sum(x) for x in zip(*rawdict.values())])
 
 
 net_io_counters.cache_clear = functools.partial(
@@ -2252,7 +2250,7 @@ def net_if_addrs():
             while addr.count(separator) < 5:
                 addr += f"{separator}00"
 
-        nt = _common.snicaddr(fam, addr, mask, broadcast, ptp)
+        nt = _ntp.snicaddr(fam, addr, mask, broadcast, ptp)
 
         # On Windows broadcast is None, so we determine it via
         # ipaddress module.
@@ -2321,9 +2319,7 @@ def convert(n):
                 elif critical and not high:
                     high = critical
 
-                ret[name].append(
-                    _common.shwtemp(label, current, high, critical)
-                )
+                ret[name].append(_ntp.shwtemp(label, current, high, critical))
 
         return dict(ret)
 
@@ -2409,6 +2405,52 @@ def win_service_get(name):
         return _psplatform.win_service_get(name)
 
 
+# =====================================================================
+# --- malloc / heap
+# =====================================================================
+
+
+# Linux + glibc, Windows, macOS, FreeBSD, NetBSD
+if hasattr(_psplatform, "heap_info"):
+
+    def heap_info():
+        """Return low-level heap statistics from the C heap allocator
+        (glibc).
+
+        - `heap_used`: the total number of bytes allocated via
+          malloc/free. These are typically allocations smaller than
+          MMAP_THRESHOLD.
+
+        - `mmap_used`: the total number of bytes allocated via `mmap()`
+          or via large ``malloc()`` allocations.
+
+        - `heap_count` (Windows only): number of private heaps created
+          via `HeapCreate()`.
+        """
+        return _ntp.pheap(*_psplatform.heap_info())
+
+    def heap_trim():
+        """Request that the underlying allocator free any unused memory
+        it's holding in the heap (typically small `malloc()`
+        allocations).
+
+        In practice, modern allocators rarely comply, so this is not a
+        general-purpose memory-reduction tool and won't meaningfully
+        shrink RSS in real programs. Its primary value is in **leak
+        detection tools**.
+
+        Calling `heap_trim()` before taking measurements helps reduce
+        allocator noise, giving you a cleaner baseline so that changes
+        in `heap_used` come from the code you're testing, not from
+        internal allocator caching or fragmentation. Its effectiveness
+        depends on allocator behavior and fragmentation patterns.
+        """
+        _psplatform.heap_trim()
+
+    __all__.append("heap_info")
+    __all__.append("heap_trim")
+
+
 # =====================================================================