GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move static var to local.

Browse Source
This commit is contained in:
Jean-Baptiste Perrier
2021-01-26 15:48:48 +01:00
parent aaac0aec96
commit 54b9eaa969
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Engine/Platform/Win32/Win32Network.cpp
View File

@@ -294,7 +294,6 @@ bool Win32Network::Accept(NetworkSocket& serverSock, NetworkSocket& newSock, Net
return false; return false;
} }
static thread_local int32 error;
bool Win32Network::IsReadable(NetworkSocket& socket) bool Win32Network::IsReadable(NetworkSocket& socket)
{ {
pollfd entry; pollfd entry;
@@ -302,7 +301,7 @@ bool Win32Network::IsReadable(NetworkSocket& socket)
entry.events = POLLRDNORM; entry.events = POLLRDNORM;
if (WSAPoll(&entry, 1, 0) == SOCKET_ERROR) if (WSAPoll(&entry, 1, 0) == SOCKET_ERROR)
{ {
error = WSAGetLastError(); int32 error = WSAGetLastError();
if (error == WSAEWOULDBLOCK) if (error == WSAEWOULDBLOCK)
return false; return false;
LOG(Error, "Unable to poll socket! Socket : {0} Error : {1}", *(SOCKET*)socket.Data, GetErrorMessage(error).Get()); LOG(Error, "Unable to poll socket! Socket : {0} Error : {1}", *(SOCKET*)socket.Data, GetErrorMessage(error).Get());
@@ -320,7 +319,7 @@ bool Win32Network::IsWriteable(NetworkSocket& socket)
entry.events = POLLWRNORM; entry.events = POLLWRNORM;
if (WSAPoll(&entry, 1, 0) == SOCKET_ERROR) if (WSAPoll(&entry, 1, 0) == SOCKET_ERROR)
{ {
error = WSAGetLastError(); int32 error = WSAGetLastError();
if (error == WSAEWOULDBLOCK) if (error == WSAEWOULDBLOCK)
return false; return false;
LOG(Error, "Unable to poll socket! Socket : {0} Error : {1}", *(SOCKET*)socket.Data, GetErrorMessage(error).Get()); LOG(Error, "Unable to poll socket! Socket : {0} Error : {1}", *(SOCKET*)socket.Data, GetErrorMessage(error).Get());
@@ -331,21 +330,19 @@ bool Win32Network::IsWriteable(NetworkSocket& socket)
return false; return false;
} }
static thread_local int32 pollret;
int32 Win32Network::Poll(NetworkSocketGroup& group) int32 Win32Network::Poll(NetworkSocketGroup& group)
{ {
pollret = WSAPoll((pollfd*)group.Data, group.Count, 0); int32 pollret = WSAPoll((pollfd*)group.Data, group.Count, 0);
if (pollret == SOCKET_ERROR) if (pollret == SOCKET_ERROR)
LOG(Error, "Unable to poll socket group! Error : {0}", GetLastErrorMessage().Get()); LOG(Error, "Unable to poll socket group! Error : {0}", GetLastErrorMessage().Get());
return pollret; return pollret;
} }
static thread_local pollfd* pollptr;
bool Win32Network::GetSocketState(NetworkSocketGroup& group, uint32 index, NetworkSocketState& state) bool Win32Network::GetSocketState(NetworkSocketGroup& group, uint32 index, NetworkSocketState& state)
{ {
if (index >= SOCKGROUP_MAXCOUNT) if (index >= SOCKGROUP_MAXCOUNT)
return true; return true;
pollptr = (pollfd*)&group.Data[index * SOCKGROUP_ITEMSIZE]; pollfd* pollptr = (pollfd*)&group.Data[index * SOCKGROUP_ITEMSIZE];
if (pollptr->revents & POLLERR) if (pollptr->revents & POLLERR)
state.Error = true; state.Error = true;
if (pollptr->revents & POLLHUP) if (pollptr->revents & POLLHUP)
@@ -359,11 +356,11 @@ bool Win32Network::GetSocketState(NetworkSocketGroup& group, uint32 index, Netwo
return false; return false;
} }
static thread_local pollfd pollinfo;
int32 Win32Network::AddSocketToGroup(NetworkSocketGroup& group, NetworkSocket& socket) int32 Win32Network::AddSocketToGroup(NetworkSocketGroup& group, NetworkSocket& socket)
{ {
if (group.Count >= SOCKGROUP_MAXCOUNT) if (group.Count >= SOCKGROUP_MAXCOUNT)
return -1; return -1;
pollfd pollinfo;
pollinfo.fd = *(SOCKET*)socket.Data; pollinfo.fd = *(SOCKET*)socket.Data;
pollinfo.events = POLLRDNORM | POLLWRNORM; pollinfo.events = POLLRDNORM | POLLWRNORM;
*(pollfd*)&group.Data[group.Count * SOCKGROUP_ITEMSIZE] = pollinfo; *(pollfd*)&group.Data[group.Count * SOCKGROUP_ITEMSIZE] = pollinfo;