[PR #3188] [MERGED] Core: Fix tracy memory tracking #3295

New issue

Closed

opened 2026-02-27 22:03:10 +03:00 by kerem · 0 comments

kerem commented

2026-02-27 22:03:10 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/shadps4-emu/shadPS4/pull/3188
Author: @StevenMiller123
Created: 7/3/2025
Status: ✅ Merged
Merged: 7/3/2025
Merged by: @georgemoralis

Base: main ← Head: fix-tracy

📝 Commits (2)

b0b01b0 Only use TRACK_ALLOC for non-reserved mappings
688ee12 Merge branch 'shadps4-emu:main' into fix-tracy

📊 Changes

1 file changed (+2 additions, -1 deletions)

View changed files

📝 src/core/memory.cpp (+2 -1)

📄 Description

Fixes a bug left by #2997, which caused tracy to track memory reserves, and as a result crash from tracking an already tracked memory address.

Fixes an issue brought up by @Fire-Cube on the Discord server.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/shadps4-emu/shadPS4/pull/3188 **Author:** [@StevenMiller123](https://github.com/StevenMiller123) **Created:** 7/3/2025 **Status:** ✅ Merged **Merged:** 7/3/2025 **Merged by:** [@georgemoralis](https://github.com/georgemoralis) **Base:** `main` ← **Head:** `fix-tracy` --- ### 📝 Commits (2) - [`b0b01b0`](https://github.com/shadps4-emu/shadPS4/commit/b0b01b0865a62d325baf9b284856259a69ae1943) Only use TRACK_ALLOC for non-reserved mappings - [`688ee12`](https://github.com/shadps4-emu/shadPS4/commit/688ee12a078e792a5fe8a795a174ba7ba0355bc0) Merge branch 'shadps4-emu:main' into fix-tracy ### 📊 Changes **1 file changed** (+2 additions, -1 deletions) <details> <summary>View changed files</summary> 📝 `src/core/memory.cpp` (+2 -1) </details> ### 📄 Description Fixes a bug left by #2997, which caused tracy to track memory reserves, and as a result crash from tracking an already tracked memory address. Fixes an issue brought up by @Fire-Cube on the Discord server. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>