ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lock_gaurds in spaaaaaaaaaccccce.

This commit is contained in:
Matthew Parlane 2013-02-01 20:27:22 +13:00
parent f43567e2b3
commit 6b8bb1b692
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
View File

@ -697,7 +697,7 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtl(u32 CommandAddress)
u32 s = Memory::Read_U32(BufferIn); u32 s = Memory::Read_U32(BufferIn);
_tSocket * sock = NULL; _tSocket * sock = NULL;
{ {
std::unique_lock<std::mutex> lk(socketMapMutex); std::lock_guard<std::mutex> lk(socketMapMutex);
if(socketMap.find(s) != socketMap.end()) if(socketMap.find(s) != socketMap.end())
sock = socketMap[s]; sock = socketMap[s];
} }
@ -729,7 +729,7 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtl(u32 CommandAddress)
if (ReturnValue > 0) if (ReturnValue > 0)
{ {
std::unique_lock<std::mutex> lk(socketMapMutex); std::lock_guard<std::mutex> lk(socketMapMutex);
_tSocket* sock = new _tSocket(); _tSocket* sock = new _tSocket();
socketMap[s] = sock; socketMap[s] = sock;
sock->thread = new std::thread([this, s]{this->socketProcessor(s);}); 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; _tSocket * sock = NULL;
{ {
std::unique_lock<std::mutex> lk(socketMapMutex); std::lock_guard<std::mutex> lk(socketMapMutex);
if(socketMap.find(s) != socketMap.end()) if(socketMap.find(s) != socketMap.end())
sock = socketMap[s]; sock = socketMap[s];
if(sock) 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); ERROR_LOG(WII_IPC_NET, "Socket %d has started a thread.... oh dear.", socket);
_tSocket* sock = NULL; _tSocket* sock = NULL;
{ {
std::unique_lock<std::mutex> lk(socketMapMutex); std::lock_guard<std::mutex> lk(socketMapMutex);
if(socketMap.find(socket) == socketMap.end()) if(socketMap.find(socket) == socketMap.end())
{ {
ERROR_LOG(WII_IPC_NET, "Socket %d could not be found in the socket map.", socket); 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; _tSocket * sock = NULL;
{ {
std::unique_lock<std::mutex> lk(socketMapMutex); std::lock_guard<std::mutex> lk(socketMapMutex);
if(socketMap.find(s) != socketMap.end()) if(socketMap.find(s) != socketMap.end())
sock = socketMap[s]; sock = socketMap[s];
} }

4
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h
View File

@ -583,7 +583,7 @@ public:
bool getCommand(u32& commandAddress) bool getCommand(u32& commandAddress)
{ {
std::unique_lock<std::mutex> lk(m_mutex); std::lock_guard<std::mutex> lk(m_mutex);
if (commands.empty()) if (commands.empty())
return false; return false;
commandAddress = commands.front(); commandAddress = commands.front();
@ -593,7 +593,7 @@ public:
void addCommand(u32 commandAddress) void addCommand(u32 commandAddress)
{ {
std::unique_lock<std::mutex> lk(m_mutex); std::lock_guard<std::mutex> lk(m_mutex);
commands.push(commandAddress); commands.push(commandAddress);
event.Set(); event.Set();
} }