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

Remove the now unneeded recv sleep hack and fixes game exit by implementing a timeout on read(2) calls in the read thread.

This commit is contained in:
Pierre Bourdon 2012-07-05 01:29:14 +02:00
parent bb84043de0
commit 5db70f452b
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/Core/Src/HW/BBA-TAP/TAP_Unix.cpp
View File

@ -25,6 +25,7 @@
#include <net/if.h> #include <net/if.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/select.h>
#include <sys/socket.h> #include <sys/socket.h>
#endif #endif
@ -78,8 +79,6 @@ void CEXIETHERNET::Deactivate()
close(fd); close(fd);
fd = -1; fd = -1;
// TODO: find a way to interrupt the read(2) in the readThread. Kill the
// thread maybe?
readEnabled = false; readEnabled = false;
if (readThread.joinable()) if (readThread.joinable())
readThread.join(); readThread.join();
@ -127,6 +126,16 @@ void ReadThreadHandler(CEXIETHERNET* self)
if (self->fd < 0) if (self->fd < 0)
return; return;
fd_set rfds;
FD_ZERO(&rfds);
FD_SET(self->fd, &rfds);
struct timeval timeout;
timeout.tv_sec = 0;
timeout.tv_usec = 50000;
if (select(self->fd + 1, &rfds, NULL, NULL, &timeout) <= 0)
continue;
int readBytes = read(self->fd, self->mRecvBuffer, BBA_RECV_SIZE); int readBytes = read(self->fd, self->mRecvBuffer, BBA_RECV_SIZE);
if (readBytes < 0) if (readBytes < 0)
{ {
@ -134,9 +143,6 @@ void ReadThreadHandler(CEXIETHERNET* self)
} }
else if (self->readEnabled) else if (self->readEnabled)
{ {
// HACK: This usleep is there to avoid BBA buffer overflow. Has to
// be replaced by a better throttling support at some point.
usleep(1000);
WARN_LOG(SP1, "Read data: %s", ArrayToString(self->mRecvBuffer, readBytes, 0x10).c_str()); WARN_LOG(SP1, "Read data: %s", ArrayToString(self->mRecvBuffer, readBytes, 0x10).c_str());
self->mRecvBufferLength = readBytes; self->mRecvBufferLength = readBytes;
self->RecvHandlePacket(); self->RecvHandlePacket();