From 8786ec74ca426983338c874436ea17e6b4e11029 Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Sat, 10 Aug 2013 20:54:55 -0700
Subject: [PATCH] Fix some potential threading probs with SymbolMap.

Got some strange crashes.
---
 Core/Debugger/SymbolMap.cpp | 18 +++++++++++++++---
 Core/Debugger/SymbolMap.h   |  4 +++-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Core/Debugger/SymbolMap.cpp b/Core/Debugger/SymbolMap.cpp
index c9a277e98b..ea23ca0fe2 100644
--- a/Core/Debugger/SymbolMap.cpp
+++ b/Core/Debugger/SymbolMap.cpp
@@ -52,7 +52,8 @@ static u32 ComputeHash(u32 start, u32 size)
 
 void SymbolMap::SortSymbols()
 {
-  std::sort(entries.begin(), entries.end());
+	lock_guard guard(lock_);
+	std::sort(entries.begin(), entries.end());
 }
 
 void SymbolMap::AnalyzeBackwards()
@@ -104,6 +105,7 @@ void SymbolMap::AnalyzeBackwards()
 
 void SymbolMap::ResetSymbolMap()
 {
+	lock_guard guard(lock_);
 #ifdef BWLINKS
 	for (int i=0; i<numEntries; i++)
 	{
@@ -118,6 +120,7 @@ void SymbolMap::ResetSymbolMap()
 
 void SymbolMap::AddSymbol(const char *symbolname, unsigned int vaddress, size_t size, SymbolType st)
 {
+	lock_guard guard(lock_);
 	MapEntry e;
 	strncpy(e.name, symbolname, 127);
 	e.name[127] = '\0';
@@ -134,6 +137,7 @@ void SymbolMap::AddSymbol(const char *symbolname, unsigned int vaddress, size_t
 
 bool SymbolMap::LoadSymbolMap(const char *filename)
 {
+	lock_guard guard(lock_);
 	SymbolMap::ResetSymbolMap();
 	FILE *f = fopen(filename,"r");
 	if (!f)
@@ -207,6 +211,7 @@ bool SymbolMap::LoadSymbolMap(const char *filename)
 
 void SymbolMap::SaveSymbolMap(const char *filename) const
 {
+	lock_guard guard(lock_);
 	FILE *f = fopen(filename,"w");
 	if (!f)
 		return;
@@ -221,6 +226,7 @@ void SymbolMap::SaveSymbolMap(const char *filename) const
 
 bool SymbolMap::LoadNocashSym(const char *filename)
 {
+	lock_guard guard(lock_);
 	FILE *f = fopen(filename,"r");
 	if (!f)
 		return false;
@@ -389,6 +395,8 @@ void SymbolMap::FillSymbolListBox(HWND listbox,SymbolType symmask) const
 		}
 	}
 
+	lock_guard guard(lock_);
+
 	SendMessage(listbox, WM_SETREDRAW, FALSE, 0);
 	SendMessage(listbox, LB_INITSTORAGE, (WPARAM)entries.size(), (LPARAM)entries.size() * 30);
 	for (auto it = entries.begin(), end = entries.end(); it != end; ++it)
@@ -427,11 +435,13 @@ void SymbolMap::FillSymbolComboBox(HWND listbox,SymbolType symmask) const
 	//ListBox_AddString(listbox,"(0x80002000)");
 	//ListBox_SetItemData(listbox,1,0x80002000);
 
+	lock_guard guard(lock_);
+
 	SendMessage(listbox, WM_SETREDRAW, FALSE, 0);
 	SendMessage(listbox, CB_INITSTORAGE, (WPARAM)entries.size(), (LPARAM)entries.size() * 30);
-	for (auto it = entries.begin(), end = entries.end(); it != end; ++it)
+	for (size_t i = 0, end = entries.size(); i < end; ++i)
 	{
-		const MapEntry &entry = *it;
+		const MapEntry &entry = entries[i];
 		if (entry.type & symmask)
 		{
 			char temp[256];
@@ -449,6 +459,8 @@ void SymbolMap::FillSymbolComboBox(HWND listbox,SymbolType symmask) const
 void SymbolMap::FillListBoxBLinks(HWND listbox, int num) const
 {	
 	ListBox_ResetContent(listbox);
+
+	lock_guard guard(lock_);
 		
 	int style = GetWindowLong(listbox,GWL_STYLE);
 
diff --git a/Core/Debugger/SymbolMap.h b/Core/Debugger/SymbolMap.h
index 8ea01a94e4..e1b9bb7e75 100644
--- a/Core/Debugger/SymbolMap.h
+++ b/Core/Debugger/SymbolMap.h
@@ -17,7 +17,8 @@
 
 #pragma once
 
-#include "../../Globals.h"
+#include "Globals.h"
+#include "native/base/mutex.h"
 #include <vector>
 #include <set>
 #include <map>
@@ -106,6 +107,7 @@ private:
 	std::set<MapEntryUniqueInfo> uniqueEntries;
 	std::vector<MapEntry> entries;
 	std::map<u32, u32> entryRanges;
+	mutable recursive_mutex lock_;
 };
 
 extern SymbolMap symbolMap;