lock_gaurds in spaaaaaaaaaccccce.

dolphin-emu · Feb 1, 2013 · 6b8bb1b · 6b8bb1b
1 parent f43567e
commit 6b8bb1b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
@@ -697,7 +697,7 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtl(u32 CommandAddress)
 			u32 s = Memory::Read_U32(BufferIn);
 			_tSocket * sock = NULL;
 			{
-				std::unique_lock<std::mutex> lk(socketMapMutex);
+				std::lock_guard<std::mutex> lk(socketMapMutex);
 				if(socketMap.find(s) != socketMap.end())
 					sock = socketMap[s];
 			}
@@ -729,7 +729,7 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtl(u32 CommandAddress)
 
 			if (ReturnValue > 0)
 			{
-				std::unique_lock<std::mutex> lk(socketMapMutex);
+				std::lock_guard<std::mutex> lk(socketMapMutex);
 				_tSocket* sock = new _tSocket();
 				socketMap[s] = sock;
 				sock->thread = new std::thread([this, s]{this->socketProcessor(s);});
@@ -773,7 +773,7 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtl(u32 CommandAddress)
 
 			_tSocket * sock = NULL;
 			{
-				std::unique_lock<std::mutex> lk(socketMapMutex);
+				std::lock_guard<std::mutex> lk(socketMapMutex);
 				if(socketMap.find(s) != socketMap.end())
 					sock = socketMap[s];
 				if(sock)
@@ -1344,7 +1344,7 @@ void CWII_IPC_HLE_Device_net_ip_top::socketProcessor(u32 socket)
 	ERROR_LOG(WII_IPC_NET, "Socket %d has started a thread.... oh dear.", socket);
 	_tSocket* sock = NULL;
 	{
-		std::unique_lock<std::mutex> lk(socketMapMutex);
+		std::lock_guard<std::mutex> lk(socketMapMutex);
 		if(socketMap.find(socket) == socketMap.end())
 		{
 			ERROR_LOG(WII_IPC_NET, "Socket %d could not be found in the socket map.", socket);
@@ -1780,7 +1780,7 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtlV(u32 CommandAddress)
 
 		_tSocket * sock = NULL;
 		{
-			std::unique_lock<std::mutex> lk(socketMapMutex);
+			std::lock_guard<std::mutex> lk(socketMapMutex);
 			if(socketMap.find(s) != socketMap.end())
 				sock = socketMap[s];
 		}

diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h
@@ -583,7 +583,7 @@ class _tSocket
 
 	bool getCommand(u32& commandAddress)
 	{
-		std::unique_lock<std::mutex> lk(m_mutex);
+		std::lock_guard<std::mutex> lk(m_mutex);
 		if (commands.empty())
 			return false;
 		commandAddress = commands.front();
@@ -593,7 +593,7 @@ class _tSocket
 
 	void addCommand(u32 commandAddress)
 	{
-		std::unique_lock<std::mutex> lk(m_mutex);
+		std::lock_guard<std::mutex> lk(m_mutex);
 		commands.push(commandAddress);
 		event.Set();
 	}