diff --git a/src/pt_snap_cli/snapshot/PROVENANCE.md b/src/pt_snap_cli/snapshot/PROVENANCE.md index 8707b8a..4f63406 100644 --- a/src/pt_snap_cli/snapshot/PROVENANCE.md +++ b/src/pt_snap_cli/snapshot/PROVENANCE.md @@ -134,6 +134,10 @@ The upstream standalone split frontend is deliberately excluded, not deferred: warn and stop later groups. `workspace_flag` remains a fallback for unmatched workspace traces. Audited upstream source mappings and license terms are unchanged. +- On 2026-08-19, issue #97 made OOM trace loading tolerate missing `addr`/`stream`, + read `device_free`, and mapped `"oom"` to action value `8` so import persists the + event as an integer. Replay still skips OOM. This is a local first-party bugfix; + audited upstream mappings and licensing evidence are unchanged. ## Migration toolchain diff --git a/src/pt_snap_cli/snapshot/base/entities.py b/src/pt_snap_cli/snapshot/base/entities.py index 04facaf..fe4f8ac 100644 --- a/src/pt_snap_cli/snapshot/base/entities.py +++ b/src/pt_snap_cli/snapshot/base/entities.py @@ -87,9 +87,10 @@ def from_dict(cls, trace_dict: dict, _raw_frames: bool = False): _validate_raw_frames(frame_dicts) trace_entry = cls( action=trace_dict["action"], - addr=int(trace_dict["addr"]), - size=int(trace_dict["size"]), - stream=int(trace_dict["stream"]), + addr=int(trace_dict.get("addr", -1)), + size=int(trace_dict.get("size", 0)), + stream=int(trace_dict.get("stream", 0)), + device_free=int(trace_dict.get("device_free", -1)), _origin=trace_dict, frames=[] if _raw_frames else [Frame.from_dict(frame) for frame in frame_dicts], _raw_frames=frame_dicts if _raw_frames else None, diff --git a/src/pt_snap_cli/snapshot/tools/adaptors/database/snapshot_db.py b/src/pt_snap_cli/snapshot/tools/adaptors/database/snapshot_db.py index ef18173..a18dbd5 100644 --- a/src/pt_snap_cli/snapshot/tools/adaptors/database/snapshot_db.py +++ b/src/pt_snap_cli/snapshot/tools/adaptors/database/snapshot_db.py @@ -10,6 +10,7 @@ "free_requested": 5, "free_completed": 6, "workspace_snapshot": 7, + "oom": 8, } BLOCK_STATE_VALUE_MAP = { diff --git a/tests/snapshot/golden_observations.py b/tests/snapshot/golden_observations.py index ef19442..7cc11b8 100644 --- a/tests/snapshot/golden_observations.py +++ b/tests/snapshot/golden_observations.py @@ -148,6 +148,7 @@ "free_requested": 5, "free_completed": 6, "workspace_snapshot": 7, + "oom": 8, } BLOCK_STATE_VALUE_MAP = { diff --git a/tests/snapshot/test_entities.py b/tests/snapshot/test_entities.py index d152d41..4b9ac9e 100644 --- a/tests/snapshot/test_entities.py +++ b/tests/snapshot/test_entities.py @@ -75,6 +75,21 @@ def test_from_dict_without_frames(self): self.assertEqual(trace.size, 2048) self.assertEqual(len(trace.frames), 0) + def test_from_dict_loads_oom_without_addr_or_stream(self): + trace = TraceEntry.from_dict( + {"action": "oom", "size": 1024, "device_free": 2048, "frames": []} + ) + self.assertEqual(trace.action, "oom") + self.assertEqual(trace.addr, -1) + self.assertEqual(trace.size, 1024) + self.assertEqual(trace.stream, 0) + self.assertEqual(trace.device_free, 2048) + self.assertEqual(trace.frames, []) + + def test_from_dict_requires_action(self): + with self.assertRaises(KeyError): + TraceEntry.from_dict({"size": 1024, "frames": []}) + def test_get_callstack(self): trace = TraceEntry.from_dict( { @@ -395,7 +410,6 @@ def test_from_dict(self): self.assertEqual(snapshot.total_activated, 2048) self.assertEqual(snapshot.trace_entries[0].idx, 0) self.assertEqual(snapshot.trace_entries[1].idx, 1) - self.assertTrue( all( isinstance(frame, Frame) @@ -404,6 +418,21 @@ def test_from_dict(self): ) ) + def test_from_dict_loads_oom_trace_without_addr(self): + snapshot = DeviceSnapshot.from_dict( + { + "segments": [], + "device_traces": [ + [{"action": "oom", "size": 1024, "device_free": 2048, "frames": []}] + ], + }, + 0, + ) + self.assertEqual(len(snapshot.trace_entries), 1) + self.assertEqual(snapshot.trace_entries[0].action, "oom") + self.assertEqual(snapshot.trace_entries[0].addr, -1) + self.assertEqual(snapshot.trace_entries[0].device_free, 2048) + def test_find_overlapping_segment_returns_idx_and_matches_containing_segment(self): snapshot = DeviceSnapshot() snapshot.segments = [ diff --git a/tests/snapshot/test_simulate.py b/tests/snapshot/test_simulate.py index e26135a..bb4171a 100644 --- a/tests/snapshot/test_simulate.py +++ b/tests/snapshot/test_simulate.py @@ -489,3 +489,18 @@ def test_workspace_adapt_skips_when_segment_still_has_live_blocks(caplog): assert segment.allocated_size == 1024 assert snapshot.device_snapshot.total_allocated == 1024 assert "still has 1 live block" in caplog.text + + +def test_simulate_replay_skips_oom_event_loaded_without_addr(): + snapshot = SimulateDeviceSnapshot( + { + "segments": [], + "device_traces": [[{"action": "oom", "size": 1024, "device_free": 2048, "frames": []}]], + }, + 0, + ) + + assert [event.action for event in snapshot.device_snapshot.trace_entries] == ["oom"] + assert snapshot.device_snapshot.trace_entries[0].addr == -1 + assert snapshot.replay() is True + assert snapshot.device_snapshot.trace_entries == [] diff --git a/tests/snapshot/test_snapshot2db_runtime.py b/tests/snapshot/test_snapshot2db_runtime.py index 67e13f5..8eb6f36 100644 --- a/tests/snapshot/test_snapshot2db_runtime.py +++ b/tests/snapshot/test_snapshot2db_runtime.py @@ -280,6 +280,36 @@ def test_empty_device_snapshot(tmp_path: Path): assert not database.exists() +def test_snapshot2db_dumps_oom_event_without_addr(tmp_path: Path): + snapshot_file = tmp_path / "oom.pkl" + snapshot_file.write_bytes( + pickle.dumps( + { + "segments": [], + "device_traces": [ + [{"action": "oom", "size": 1024, "device_free": 2048, "frames": []}] + ], + } + ) + ) + database = tmp_path / "oom.db" + suppress_logs() + try: + result = snapshot2db.dump(snapshot_file, database, 0) + finally: + restore_logs() + + assert result is True + with sqlite3.connect(database) as connection: + action, address, size = connection.execute( + "SELECT action, address, size FROM trace_entry_0" + ).fetchone() + + assert action == RUNTIME_ACTION_VALUE_MAP["oom"] + assert address == -1 + assert size == 1024 + + def test_dump_all_multiple_device_snapshot(dump_database): result, database = dump_database("snapshot_with_multi_devices.pkl")