austin-python 1.4.2__tar.gz → 1.5.1__tar.gz

{austin_python-1.4.2 → austin_python-1.5.1}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.1
 Name: austin-python
-Version: 1.4.2
+Version: 1.5.1
 Summary: Python wrapper for Austin, the CPython frame stack sampler.
 Project-URL: homepage, https://github.com/P403n1x87/austin-python
 Project-URL: documentation, https://austin-python.readthedocs.io
 Project-URL: repository, https://github.com/P403n1x87/austin-python
 Project-URL: issues, https://github.com/P403n1x87/austin-python/issues
 Author-email: "Gabriele N. Tornetta" <phoenix1987@gmail.com>
+License-Expression: GPL-3.0-or-later
 License-File: AUTHORS
 License-File: COPYING
 License-File: LICENSE.md
@@ -20,9 +21,9 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.7
-Requires-Dist: protobuf~=3.12.2
+Requires-Dist: protobuf~=3.12
 Requires-Dist: psutil>=5.7.0
-Requires-Dist: toml~=0.10.2
+Requires-Dist: toml~=0.10
 Description-Content-Type: text/markdown
 
 <p align="center">

{austin_python-1.4.2 → austin_python-1.5.1}/austin/format/mojo.py

@@ -93,7 +93,7 @@ class MojoEvent:
         return ""
 
 
-@dataclass
+@dataclass(frozen=True, eq=True)
 class MojoString(MojoEvent):
     """MOJO string."""
 
@@ -101,7 +101,7 @@ class MojoString(MojoEvent):
     value: str
 
 
-@dataclass
+@dataclass(frozen=True, eq=True)
 class MojoStringReference(MojoEvent):
     """MOJO string reference."""
 
@@ -118,7 +118,7 @@ class MojoIdle(MojoEvent):
     pass
 
 
-@dataclass
+@dataclass(frozen=True, eq=True)
 class MojoMetadata(MojoEvent):
     """MOJO metadata."""
 
@@ -130,7 +130,7 @@ class MojoMetadata(MojoEvent):
         return f"# {self.key}: {self.value}\n"
 
 
-@dataclass
+@dataclass(frozen=True, eq=True)
 class MojoStack(MojoEvent):
     """MOJO stack."""
 
@@ -142,7 +142,7 @@ class MojoStack(MojoEvent):
         return f"P{self.pid};T{int(self.tid, 16)}"
 
 
-@dataclass
+@dataclass(frozen=True, eq=True)
 class MojoFrame(MojoEvent):
     """MOJO frame."""
 
@@ -150,9 +150,12 @@ class MojoFrame(MojoEvent):
     filename: MojoStringReference
     scope: MojoStringReference
     line: int
+    line_end: int = 0
+    column: int = 0
+    column_end: int = 0
 
 
-@dataclass
+@dataclass(frozen=True, eq=True)
 class MojoKernelFrame(MojoEvent):
     """MOJO kernel frame."""
 
@@ -163,7 +166,7 @@ class MojoKernelFrame(MojoEvent):
         return f";kernel:{self.scope}:0"
 
 
-@dataclass
+@dataclass(frozen=True, eq=True)
 class MojoSpecialFrame(MojoEvent):
     """MOJO special frame."""
 
@@ -174,7 +177,7 @@ class MojoSpecialFrame(MojoEvent):
         return f";:{self.label}:"
 
 
-@dataclass
+@dataclass(frozen=True, eq=True)
 class MojoFrameReference(MojoEvent):
     """MOJO frame reference."""
 
@@ -185,7 +188,7 @@ class MojoFrameReference(MojoEvent):
         return f";{self.frame.filename.to_austin()}:{self.frame.scope.to_austin()}:{self.frame.line}"
 
 
-@dataclass
+@dataclass(frozen=True, eq=True)
 class MojoMetric(MojoEvent):
     """MOJO metric."""
 
@@ -197,7 +200,7 @@ class MojoMetric(MojoEvent):
         return f" {self.value}\n"
 
 
-@dataclass
+@dataclass(frozen=True, eq=True)
 class MojoFullMetrics(MojoEvent):
     """MOJO full metrics."""
 
@@ -339,7 +342,16 @@ class MojoFile:
         scope = MojoStringReference(self._lookup_string())
         line = self.read_int()
 
-        frame = MojoFrame(frame_key, filename, scope, line)
+        if self.mojo_version == 1:
+            line_end = column = column_end = 0
+        else:
+            line_end = self.read_int()
+            column = self.read_int()
+            column_end = self.read_int()
+
+        frame = MojoFrame(
+            frame_key, filename, scope, line, line_end, column, column_end
+        )
 
         self._frame_map[self.ref(frame_key)] = frame
 
@@ -421,7 +433,7 @@ class MojoFile:
 
         try:
             for event in t.cast(dict, self.__handlers__)[event_id](self):
-                event.raw = bytes(self._last_bytes)
+                object.__setattr__(event, "raw", bytes(self._last_bytes))
                 self._last_bytes.clear()
                 yield event
         except KeyError as exc:

{austin_python-1.4.2 → austin_python-1.5.1}/pyproject.toml

@@ -44,9 +44,9 @@ classifiers = [
 
 requires-python = ">=3.7"
 dependencies = [
-  "protobuf~=3.12.2",
+  "protobuf~=3.12",
   "psutil>=5.7.0",
-  "toml~=0.10.2",
+  "toml~=0.10",
 ]
 
 dynamic = ["version"]

austin_python-1.5.1/test/data/column.py

@@ -0,0 +1,20 @@
+from time import sleep
+
+def lazy(n):
+    for _ in range(n):
+        sleep(0.1)
+        yield _
+
+
+def fib(n):
+    a, b = 0, 1
+    for _ in range(n):
+        yield a
+        a, b = b, a + b
+
+a = [
+    list(fib(_))
+    for _ in lazy(30)
+]
+
+print(a)

austin_python-1.5.1/test/format/test_mojo.py

@@ -0,0 +1,160 @@
+# This file is part of "austin-python" which is released under GPL.
+#
+# See file LICENCE or go to http://www.gnu.org/licenses/ for full license
+# details.
+#
+# austin-python is a Python wrapper around Austin, the CPython frame stack
+# sampler.
+#
+# Copyright (c) 2018-2022 Gabriele N. Tornetta <phoenix1987@gmail.com>.
+# All rights reserved.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import sys
+import tempfile
+from io import BytesIO
+from pathlib import Path
+from random import randint
+
+import pytest
+
+from austin.format.mojo import MojoFile, MojoFrame, MojoString, MojoStringReference
+from austin.format.mojo import main
+from austin.format.mojo import to_varint
+
+
+HERE = Path(__file__).parent
+DATA = HERE.parent / "data"
+
+
+@pytest.mark.parametrize("case", ["test", "mp"])
+def test_mojo_snapshot(case):
+    input = (DATA / case).with_suffix(".mojo")
+    output = Path(tempfile.NamedTemporaryFile().name).with_suffix(".austin")
+    expected = (DATA / case).with_suffix(".austin")
+
+    sys.argv = ["mojo2austin", str(input), str(output)]
+
+    main()
+
+    assert expected.read_text() == output.read_text()
+
+
+def test_mojo_varint():
+    for _ in range(100_000):
+        n = randint(-4e9, 4e9)
+        buffer = BytesIO()
+        buffer.write(b"MOJ\0" + to_varint(n))
+        buffer.seek(0)
+        assert MojoFile(buffer).read_int() == n
+
+
+def test_mojo_column_info():
+    with (DATA / "column.mojo").open("rb") as stream:
+        frames = {
+            _
+            for _ in MojoFile(stream).parse()
+            if isinstance(_, MojoFrame) and _.filename.string.value == "/tmp/column.py"
+        }
+        assert frames == {
+            MojoFrame(
+                key=1289736945696,
+                filename=MojoStringReference(
+                    string=MojoString(key=20271280, value="/tmp/column.py")
+                ),
+                scope=MojoStringReference(
+                    string=MojoString(key=28930616, value="<module>")
+                ),
+                line=15,
+                line_end=18,
+                column=5,
+                column_end=2,
+            ),
+            MojoFrame(
+                key=1293162643485,
+                filename=MojoStringReference(
+                    string=MojoString(key=20271280, value="/tmp/column.py")
+                ),
+                scope=MojoStringReference(
+                    string=MojoString(key=20364976, value="lazy")
+                ),
+                line=5,
+                line_end=5,
+                column=9,
+                column_end=19,
+            ),
+            MojoFrame(
+                key=1293180469286,
+                filename=MojoStringReference(
+                    string=MojoString(key=20271280, value="/tmp/column.py")
+                ),
+                scope=MojoStringReference(string=MojoString(key=20357744, value="fib")),
+                line=11,
+                line_end=13,
+                column=5,
+                column_end=24,
+            ),
+            MojoFrame(
+                key=1276044640259,
+                filename=MojoStringReference(
+                    string=MojoString(key=20271280, value="/tmp/column.py")
+                ),
+                scope=MojoStringReference(
+                    string=MojoString(key=28930552, value="<listcomp>")
+                ),
+                line=15,
+                line_end=18,
+                column=5,
+                column_end=2,
+            ),
+            MojoFrame(
+                key=1289736945703,
+                filename=MojoStringReference(
+                    string=MojoString(key=20271280, value="/tmp/column.py")
+                ),
+                scope=MojoStringReference(
+                    string=MojoString(key=28930616, value="<module>")
+                ),
+                line=20,
+                line_end=20,
+                column=1,
+                column_end=9,
+            ),
+            MojoFrame(
+                key=1293162643483,
+                filename=MojoStringReference(
+                    string=MojoString(key=20271280, value="/tmp/column.py")
+                ),
+                scope=MojoStringReference(
+                    string=MojoString(key=20364976, value="lazy")
+                ),
+                line=5,
+                line_end=5,
+                column=9,
+                column_end=19,
+            ),
+            MojoFrame(
+                key=1276044640281,
+                filename=MojoStringReference(
+                    string=MojoString(key=20271280, value="/tmp/column.py")
+                ),
+                scope=MojoStringReference(
+                    string=MojoString(key=28930552, value="<listcomp>")
+                ),
+                line=16,
+                line_end=16,
+                column=5,
+                column_end=17,
+            ),
+        }

{austin_python-1.4.2 → austin_python-1.5.1}/test/test_threads.py

@@ -25,21 +25,9 @@ from pytest import raises
 
 from austin import AustinError
 from austin import AustinTerminated
-from austin.simple import SimpleAustin
 from austin.threads import ThreadedAustin
 
 
-def check_raises(exc):
-    def _check_raises_decorator(f):
-        def _check_raises_wrapper(*args, **kwargs):
-            with raises(exc):
-                f(*args, **kwargs)
-
-        return _check_raises_wrapper
-
-    return _check_raises_decorator
-
-
 class TestThreadedAustin(ThreadedAustin):
     __test__ = False
 
@@ -72,10 +60,6 @@ class TestThreadedAustin(ThreadedAustin):
 class InvalidBinaryThreadedAustin(ThreadedAustin):
     BINARY = "_austin"
 
-    @check_raises(AustinError)
-    def run(self, *args, **kwargs):
-        super().run(*args, **kwargs)
-
 
 def test_threaded():
     austin = TestThreadedAustin()
@@ -109,8 +93,10 @@ def test_threaded_terminate():
 
 
 def test_threaded_invalid_binary():
-    SimpleAustin.start = check_raises(AustinError)(SimpleAustin.start)
-    InvalidBinaryThreadedAustin(sample_callback=lambda x: None).start(["python"])
+    austin = InvalidBinaryThreadedAustin(sample_callback=lambda x: None)
+    austin.start(["python"])
+    with raises(AustinError):
+        austin.join()
 
 
 def test_threaded_no_sample_callback():
@@ -121,4 +107,5 @@ def test_threaded_no_sample_callback():
 def test_threaded_bad_options():
     austin = TestThreadedAustin(terminate_callback=lambda *args: None)
     austin.start(["-I", "1000", "python", "-c", "for i in range(1000000): print(i)"])
-    austin.join()
+    with raises(AustinError):
+        austin.join()

austin_python-1.4.2/test/format/test_mojo.py

@@ -1,60 +0,0 @@
-# This file is part of "austin-python" which is released under GPL.
-#
-# See file LICENCE or go to http://www.gnu.org/licenses/ for full license
-# details.
-#
-# austin-python is a Python wrapper around Austin, the CPython frame stack
-# sampler.
-#
-# Copyright (c) 2018-2022 Gabriele N. Tornetta <phoenix1987@gmail.com>.
-# All rights reserved.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import sys
-import tempfile
-from io import BytesIO
-from pathlib import Path
-from random import randint
-
-import pytest
-
-from austin.format.mojo import MojoFile
-from austin.format.mojo import main
-from austin.format.mojo import to_varint
-
-
-HERE = Path(__file__).parent
-DATA = HERE.parent / "data"
-
-
-@pytest.mark.parametrize("case", ["test", "mp"])
-def test_mojo_snapshot(case):
-    input = (DATA / case).with_suffix(".mojo")
-    output = Path(tempfile.NamedTemporaryFile().name).with_suffix(".austin")
-    expected = (DATA / case).with_suffix(".austin")
-
-    sys.argv = ["mojo2austin", str(input), str(output)]
-
-    main()
-
-    assert expected.read_text() == output.read_text()
-
-
-def test_mojo_varint():
-    for _ in range(100_000):
-        n = randint(-4e9, 4e9)
-        buffer = BytesIO()
-        buffer.write(b"MOJ\0" + to_varint(n))
-        buffer.seek(0)
-        assert MojoFile(buffer).read_int() == n