omdev 0.0.0.dev286__tar.gz → 0.0.0.dev287__tar.gz

{omdev-0.0.0.dev286/omdev.egg-info → omdev-0.0.0.dev287}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev286
+Version: 0.0.0.dev287
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev286
+Requires-Dist: omlish==0.0.0.dev287
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev286 → omdev-0.0.0.dev287}/omdev/.manifests.json

@@ -168,14 +168,14 @@
     }
   },
   {
-    "module": ".py.scripts.execrss",
+    "module": ".py.scripts.execstat",
     "attr": "_CLI_MODULE",
-    "file": "omdev/py/scripts/execrss.py",
-    "line": 11,
+    "file": "omdev/py/scripts/execstat.py",
+    "line": 49,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "py/execrss",
-        "mod_name": "omdev.py.scripts.execrss"
+        "cmd_name": "py/execstat",
+        "mod_name": "omdev.py.scripts.execstat"
       }
     }
   },

omdev-0.0.0.dev287/omdev/py/scripts/execstat.py

@@ -0,0 +1,80 @@
+#!/usr/bin/env python3
+# @omlish-script
+import inspect
+import json
+import subprocess
+import sys
+
+
+##
+
+
+def _run(
+        src: str,
+        *,
+        pre: str | None = None,
+) -> dict:
+    import resource  # noqa
+    import sys  # noqa
+    import time  # noqa
+
+    def get_rss() -> int:
+        return resource.getrusage(resource.RUSAGE_SELF).ru_maxrss
+
+    if pre:
+        exec(pre)
+
+    start_modules = set(sys.modules)
+    start_rss = get_rss()
+    start_time = time.time()
+
+    exec(src)
+
+    end_time = time.time()
+    end_rss = get_rss()
+    end_modules = set(sys.modules)
+
+    return {
+        'time_ms': (time_ms := round((end_time - start_time) * 1000., 6)),
+        'time_ms_s': f'{time_ms:_}',
+        'rss': (rss := (end_rss - start_rss)),
+        'rss_s': f'{rss:_}',
+        'modules': sorted(end_modules - start_modules),
+    }
+
+
+#
+
+
+# @omlish-manifest
+_CLI_MODULE = {'$omdev.cli.types.CliModule': {
+    'cmd_name': 'py/execstat',
+    'mod_name': __name__,
+}}
+
+
+def _main() -> None:
+    if len(sys.argv) == 2:
+        pre = None
+        [src] = sys.argv[1:]
+    elif len(sys.argv) == 3:
+        [pre, src] = sys.argv[1:]
+    else:
+        raise Exception('Invalid arguments')
+
+    payload = '\n'.join([
+        inspect.getsource(_run),
+        f'dct = _run({src!r}, pre={pre!r})',
+        'import json',
+        'print(json.dumps(dct))',
+    ])
+
+    out_json = subprocess.check_output([sys.executable, '-c', payload])
+
+    dct = json.loads(out_json)
+
+    print(json.dumps(dct, indent=2))
+
+
+if __name__ == '__main__':
+    _main()

{omdev-0.0.0.dev286 → omdev-0.0.0.dev287/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev286
+Version: 0.0.0.dev287
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev286
+Requires-Dist: omlish==0.0.0.dev287
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev286 → omdev-0.0.0.dev287}/omdev.egg-info/SOURCES.txt

@@ -211,7 +211,7 @@ omdev/py/findimports.py
 omdev/py/srcheaders.py
 omdev/py/scripts/__init__.py
 omdev/py/scripts/bumpversion.py
-omdev/py/scripts/execrss.py
+omdev/py/scripts/execstat.py
 omdev/py/scripts/exectime.py
 omdev/py/scripts/importtrace.py
 omdev/py/tools/__init__.py

{omdev-0.0.0.dev286 → omdev-0.0.0.dev287}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev286
+omlish==0.0.0.dev287
 
 [all]
 black~=25.1

{omdev-0.0.0.dev286 → omdev-0.0.0.dev287}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev286'
+version = '0.0.0.dev287'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev286',
+    'omlish == 0.0.0.dev287',
 ]
 
 [project.optional-dependencies]

omdev-0.0.0.dev286/omdev/py/scripts/execrss.py

@@ -1,37 +0,0 @@
-#!/usr/bin/env python3
-# @omlish-script
-import resource
-import sys
-
-
-def _get_rss() -> int:
-    return resource.getrusage(resource.RUSAGE_SELF).ru_maxrss
-
-
-# @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'py/execrss',
-    'mod_name': __name__,
-}}
-
-
-def _main() -> None:
-    if len(sys.argv) == 2:
-        pre = None
-        [src] = sys.argv[1:]
-    elif len(sys.argv) == 3:
-        [pre, src] = sys.argv[1:]
-    else:
-        raise Exception('Invalid arguments')
-
-    if pre:
-        exec(pre)
-
-    start = _get_rss()
-    exec(src)
-    end = _get_rss()
-    print(end - start)
-
-
-if __name__ == '__main__':
-    _main()