austin-python 2.1.0__py3-none-any.whl → 2.1.2__py3-none-any.whl

austin/events.py

@@ -1,10 +1,9 @@
 import typing as t
-from collections import namedtuple
 from dataclasses import dataclass
 
 
-ThreadName = namedtuple("ThreadName", ["thread", "iid"])
 ProcessId = int
+ThreadName = str
 InterpreterId = int
 MicroSeconds = int
 Bytes = int

austin/format/collapsed_stack.py

@@ -1,6 +1,6 @@
-import typing as t
 from functools import singledispatchmethod
 from pathlib import Path
+import typing as t
 
 from austin.events import AustinEvent
 from austin.events import AustinEventIterator
@@ -48,7 +48,7 @@ def parse_frame(frame: str) -> AustinFrame:
         filename, function, line = frame.rsplit(":", maxsplit=2)
     except ValueError:
         raise InvalidFrame(frame) from None
-    return AustinFrame(filename=filename, function=function, line=int(line))
+    return AustinFrame(filename=filename, function=function, line=int(line or 0))
 
 
 def parse_collapsed_stack(sample: str) -> AustinSample:

austin/format/mojo.py

@@ -277,7 +277,12 @@ def str_reader() -> t.Generator[t.Optional[str], bytes, str]:
             (b,) = yield bytes(buffer[:i]).decode(errors="replace")
             i = 0
         else:
-            buffer[i] = b
+            try:
+                buffer[i] = b
+            except IndexError:
+                # Expand the buffer if needed
+                buffer += bytearray(i - len(buffer) + 1)
+                buffer[i] = b
             (b,) = yield None
             i += 1
 
@@ -353,6 +358,14 @@ class BaseMojoStreamReader(AustinEventIterator):
 
         return metadata
 
+    @property
+    def mode(self) -> t.Optional[str]:
+        return self.metadata.get("mode")
+
+    @property
+    def gc(self) -> t.Optional[str]:
+        return self.metadata.get("gc")
+
     def _finalize_sample(self) -> AustinSample:
         """Finalize the current sample."""
         assert self._running_sample is not None, self._running_sample
@@ -395,7 +408,13 @@ class BaseMojoStreamReader(AustinEventIterator):
         if self._running_sample is not None:
             self._finalize_sample()
 
-        self._running_sample = _RunningSample(pid=pid, iid=iid, thread=thread)
+        self._running_sample = _RunningSample(
+            pid=pid,
+            iid=iid,
+            thread=thread,
+            idle=False if self.mode == "full" else None,
+            gc=False if self.gc is not None else None,
+        )
 
         return MojoStack(pid, iid if iid is not None else -1, thread)
 

austin/format/pprof/__main__.py

@@ -22,6 +22,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from argparse import ArgumentParser
+from pathlib import Path
 
 from austin.events import AustinMetadata
 from austin.events import AustinSample
@@ -41,19 +42,21 @@ def main() -> None:
 
     arg_parser.add_argument(
         "input",
-        type=str,
+        type=Path,
         help="The input file containing Austin samples.",
     )
     arg_parser.add_argument(
-        "output", type=str, help="The name of the output pprof file."
+        "output",
+        type=Path,
+        help="The name of the output pprof file.",
     )
 
-    arg_parser.add_argument("-V", "--version", action="version", version="0.2.0")
+    arg_parser.add_argument("-V", "--version", action="version", version="0.2.1")
 
     args = arg_parser.parse_args()
 
     try:
-        with AustinFileReader(args.input) as fin:
+        with args.input.open() as austin, AustinFileReader(austin) as fin:
             pprof = None
             for e in fin:
                 if isinstance(e, AustinMetadata) and e.name == "mode":

austin/format/speedscope.py

@@ -26,6 +26,7 @@ from dataclasses import asdict
 from dataclasses import dataclass
 from dataclasses import field
 from enum import Enum
+from pathlib import Path
 from typing import Dict
 from typing import List
 from typing import Optional
@@ -33,13 +34,14 @@ from typing import TextIO
 from typing import Union
 
 from austin.events import AustinFrame
+from austin.events import AustinMetadata
 from austin.events import AustinSample
 from austin.format import Mode
 from austin.format.collapsed_stack import AustinFileReader
 from austin.format.collapsed_stack import InvalidSample
 
 
-__version__ = "0.3.0"
+__version__ = "0.3.1"
 
 SpeedscopeJson = Dict
 SpeedscopeWeight = int
@@ -208,11 +210,11 @@ def main() -> None:
 
     arg_parser.add_argument(
         "input",
-        type=str,
+        type=Path,
         help="The input file containing Austin samples in normal format.",
     )
     arg_parser.add_argument(
-        "output", type=str, help="The name of the output Speedscope JSON file."
+        "output", type=Path, help="The name of the output Speedscope JSON file."
     )
     arg_parser.add_argument(
         "--indent", type=int, help="Give a non-null value to prettify the JSON output."
@@ -223,24 +225,30 @@ def main() -> None:
     args = arg_parser.parse_args()
 
     try:
-        with AustinFileReader(args.input) as fin:
-            mode = fin.metadata["mode"]
-            speedscope = Speedscope(os.path.basename(args.input), mode, args.indent)
+        with args.input.open() as austin, AustinFileReader(austin) as fin:
+            speedscope = None
             for event in fin:
-                if not isinstance(event, AustinSample):
-                    continue
-                try:
-                    speedscope.add_sample(event)
-                except InvalidSample:
-                    continue
+                if isinstance(event, AustinMetadata):
+                    if event.name == "mode":
+                        speedscope = Speedscope(
+                            os.path.basename(args.input), event.value, args.indent
+                        )
+                elif isinstance(event, AustinSample):
+                    if speedscope is not None:
+                        speedscope.add_sample(event)
+                else:
+                    raise ValueError("Invalid sample found in input file")
+
+        if speedscope is None:
+            raise RuntimeError("Invalid input file: no mode metadata found")
+
+        with args.output.open("w") as fout:
+            speedscope.dump(fout)
 
     except FileNotFoundError:
         print(f"No such input file: {args.input}")
         exit(1)
 
-    with open(args.output, "w") as fout:
-        speedscope.dump(fout)
-
 
 if __name__ == "__main__":
     main()

austin/stats.py

@@ -21,6 +21,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from collections import namedtuple
 from copy import deepcopy
 from dataclasses import dataclass
 from dataclasses import field
@@ -39,10 +40,12 @@ from austin.events import AustinMetadata
 from austin.events import AustinMetrics
 from austin.events import AustinSample
 from austin.events import ProcessId
-from austin.events import ThreadName
 from austin.format.collapsed_stack import AustinEventCollapsedStackFormatter
 
 
+ThreadInfo = namedtuple("ThreadInfo", ["thread", "iid"])
+
+
 COLLAPSED_STACK_FORMATTER = AustinEventCollapsedStackFormatter()
 
 
@@ -136,12 +139,12 @@ class FrameStats(HierarchicalStats):
 class ThreadStats(HierarchicalStats):
     """Thread statistics."""
 
-    label: ThreadName
+    label: ThreadInfo
     children: Dict[AustinFrame, FrameStats] = field(default_factory=dict)  # type: ignore[assignment]
 
     def collapse(
         self, stats_type: AustinStatsType
-    ) -> Generator[Tuple[ThreadName, List[AustinFrame], AustinMetrics], None, None]:
+    ) -> Generator[Tuple[ThreadInfo, List[AustinFrame], AustinMetrics], None, None]:
         """Collapse the hierarchical statistics."""
 
         if self.own:
@@ -166,7 +169,7 @@ class ProcessStats:
     """Process statistics."""
 
     pid: ProcessId
-    threads: Dict[ThreadName, ThreadStats] = field(default_factory=dict)
+    threads: Dict[ThreadInfo, ThreadStats] = field(default_factory=dict)
 
     def collapse(
         self, stats_type: AustinStatsType
@@ -175,22 +178,22 @@ class ProcessStats:
         yield from (
             AustinSample(
                 pid=self.pid,
-                iid=thread_name.iid,
-                thread=thread_name.thread,
+                iid=thread_info.iid,
+                thread=thread_info.thread,
                 frames=tuple(frames),
                 metrics=metric,
             )
             for thread in self.threads.values()
-            for thread_name, frames, metric in thread.collapse(stats_type)
+            for thread_info, frames, metric in thread.collapse(stats_type)
         )
 
-    def get_thread(self, thread_name: ThreadName) -> Optional[ThreadStats]:
+    def get_thread(self, thread_info: ThreadInfo) -> Optional[ThreadStats]:
         """Get thread statistics from this process by name.
 
         If the given thread name is not registered with this current process
         statistics, then ``None`` is returned.
         """
-        return self.threads.get(thread_name)
+        return self.threads.get(thread_info)
 
 
 @dataclass
@@ -286,8 +289,8 @@ class AustinStats:
             return
 
         pid = sample.pid
-        thread_name = ThreadName(sample.thread, sample.iid or 0)
-        thread_stats = ThreadStats(thread_name, own=0, total=metric)
+        thread_info = ThreadInfo(sample.thread, sample.iid or 0)
+        thread_stats = ThreadStats(thread_info, own=0, total=metric)
 
         # Convert the list of frames into a nested FrameStats instance
         stats: HierarchicalStats = thread_stats
@@ -300,15 +303,15 @@ class AustinStats:
 
         with self._lock:
             if pid not in self.processes:
-                self.processes[pid] = ProcessStats(pid, {thread_name: thread_stats})
+                self.processes[pid] = ProcessStats(pid, {thread_info: thread_stats})
                 return
 
             process = self.processes[pid]
-            if thread_name not in process.threads:
-                process.threads[thread_name] = thread_stats
+            if thread_info not in process.threads:
+                process.threads[thread_info] = thread_stats
                 return
 
-            process.threads[thread_name] << thread_stats
+            process.threads[thread_info] << thread_stats
 
     def flatten(self) -> Generator[AustinSample, None, None]:
         for process in self.processes.values():

{austin_python-2.1.0.dist-info → austin_python-2.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: austin-python
-Version: 2.1.0
+Version: 2.1.2
 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

{austin_python-2.1.0.dist-info → austin_python-2.1.2.dist-info}/RECORD

@@ -4,26 +4,26 @@ austin/base.py,sha256=wAYVZQi3hcgJA9cVg3mfc3f3E0qwFXmeX7UX6qgn2Pk,7554
 austin/cli.py,sha256=--PKm2I4NBBSSSBV5l-YC0mcmLjrvb1FHzxgY4dkby4,7826
 austin/config.py,sha256=PEwdG2Cy8ay1SrFr2N6YfQSZwseYBA1BA5dMfocKR3A,2091
 austin/errors.py,sha256=lCDSTANW_95Az_eDXbn__JRBllB9yw7tGnFo1-tw09Q,1046
-austin/events.py,sha256=39BHP-pUHotZZxJ-MbECFu5_QOAnRJP-_hFEdYPYwKY,2235
+austin/events.py,sha256=NppffZg_lbKIin2TyvIGgfJXnOmBKzB2e0nQV4_94JA,2160
 austin/simple.py,sha256=iTmJGAjSBeUv82SgdMTwdNlAQwuK33RyU8FkBCE8rRg,5579
-austin/stats.py,sha256=8cpuq3cyZUpGkm2VZS3j1Zpz-Yhr3i9Wg6bR-sGwWJM,10933
+austin/stats.py,sha256=4kVeZ5NJsoSEnogqiDyjAbLeuf5DPiELHfCEbjFb0zk,10990
 austin/threads.py,sha256=AvcoOkr3FeFAGBcqgXukNIt9xOZUipv7pXMqPIL_Qts,3649
 austin/format/__init__.py,sha256=ZtBJCLpTiZaLFwCN1UbMXLQvYjOSpwmtyGwqgK8yruQ,405
-austin/format/collapsed_stack.py,sha256=D1JaB3vREouVW_CcO_yY3IuuIRP3lhi2WXHr2AXxYZM,7241
+austin/format/collapsed_stack.py,sha256=VCkTJssgcF4IHGP6kzV5dT9AC9Qjbq8eGx9AVOp6cyU,7246
 austin/format/compress.py,sha256=YEceebWzVB7eSCntnJ89_rIcbzBskvZGy86D5QgZli0,3741
-austin/format/mojo.py,sha256=IlnFsH9gGofENWBMdbpAc0BrutNGvetk5JLLJeCHKuo,28294
-austin/format/speedscope.py,sha256=Ydfi02f90F9BZftA-tb5qSZO-zzbE-lKXPz3f6_YRUc,7981
+austin/format/mojo.py,sha256=mEcKgaZkVkH4YGVLj4m31_MAPKfYK-BNI7oWyiPub0U,28824
+austin/format/speedscope.py,sha256=RvlFugm0S3ATMf9lmzH8jrX4oBt8PJ0j9EsuXWayOQc,8381
 austin/format/pprof/__init__.py,sha256=DvY1CDnPqBc-GUv9fidtMplshIIXj_HWZ3SlWOJoLxc,6805
-austin/format/pprof/__main__.py,sha256=4O4gmVvw807A1Wmxajj7dGly0M9kd-NYhEq9m47Bjas,2583
+austin/format/pprof/__main__.py,sha256=pzWoSmlFrjfmAAq5I4SIIDmxavdLStCnlw3NlBxgyDo,2652
 austin/format/pprof/profile.proto,sha256=fPfBgzXIEmFdrrwgTQWs-9GwKjt-TShRmJq-eaxDx88,8840
 austin/format/pprof/profile_pb2.py,sha256=i_uM8lDExR95yz7qnEVikhpkpNvetKaYzoiH7AbMAt8,28214
 austin/tools/diff.py,sha256=KnY9kD5mmSKALCNxnSe-dSObC4LgkoxLGnoTiklKa5M,4821
 austin/tools/mojodbg.py,sha256=BGdngj-r1c-GAQDrs_oJ_x4QZxuL4t_OQ194fvJJm7A,2817
 austin/tools/resolve.py,sha256=pEOBiP8FNkaJqDTj3fOK8dx5-EocroqZDXLL3CzCWLY,7677
-austin_python-2.1.0.dist-info/METADATA,sha256=UCOkS9lMa0CGoSYeSPTzzFmSz_0Ac3bSE2XklGEytgo,7535
-austin_python-2.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-austin_python-2.1.0.dist-info/entry_points.txt,sha256=YatHOUQsHQ3WABcrNKPf4RWatQ0CzbR-1ClXjMjZys8,329
-austin_python-2.1.0.dist-info/licenses/AUTHORS,sha256=pARRmpJQYH8iWy_0SonXsxOiV02AFitowle4AtURxUI,45
-austin_python-2.1.0.dist-info/licenses/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-austin_python-2.1.0.dist-info/licenses/LICENSE.md,sha256=edVDhmEiPf2W5lWzqLkrj6EYLSrCeYg9MJy28YsiMFU,34937
-austin_python-2.1.0.dist-info/RECORD,,
+austin_python-2.1.2.dist-info/METADATA,sha256=wdZJGpu-uI1aH1NwbKstmCYnYdsXzX2UZ-6c-gFzjTg,7535
+austin_python-2.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+austin_python-2.1.2.dist-info/entry_points.txt,sha256=YatHOUQsHQ3WABcrNKPf4RWatQ0CzbR-1ClXjMjZys8,329
+austin_python-2.1.2.dist-info/licenses/AUTHORS,sha256=pARRmpJQYH8iWy_0SonXsxOiV02AFitowle4AtURxUI,45
+austin_python-2.1.2.dist-info/licenses/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+austin_python-2.1.2.dist-info/licenses/LICENSE.md,sha256=edVDhmEiPf2W5lWzqLkrj6EYLSrCeYg9MJy28YsiMFU,34937
+austin_python-2.1.2.dist-info/RECORD,,