Skip to content

Commit

Permalink
Add thread_start_times to Session.from_json and Session.combine
Browse files Browse the repository at this point in the history
  • Loading branch information
georgeharker committed Jan 15, 2025
1 parent 6fa7e01 commit 88d77a5
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions pyinstrument/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ def from_json(json_dict: dict[str, Any]):
return Session(
frame_records=json_dict["frame_records"],
start_time=json_dict["start_time"],
thread_start_times=json_dict["thread_start_times"],
min_interval=json_dict.get("min_interval", 0.001),
max_interval=json_dict.get("max_interval", 0.001),
duration=json_dict["duration"],
Expand Down Expand Up @@ -130,6 +131,7 @@ def combine(session1: Session, session2: Session) -> Session:
return Session(
frame_records=session1.frame_records + session2.frame_records,
start_time=session1.start_time,
thread_start_times=session1.thread_start_times | session2.thread_start_times,
min_interval=min(session1.min_interval, session2.min_interval),
max_interval=max(session1.max_interval, session2.max_interval),
duration=session1.duration + session2.duration,
Expand Down

0 comments on commit 88d77a5

Please sign in to comment.