From dc5f87d7ad5cb51f360ff58a8ef78a16517f82bd Mon Sep 17 00:00:00 2001 From: Greg Foss Date: Wed, 29 Jan 2020 17:35:44 -0500 Subject: [PATCH] Fixing breadcrumbs server after data sync thread changes --- breadcrumbs/src/comms/DataSyncThread.cpp | 8 +++++--- breadcrumbs/src/main/VirtualOutputProcessor.cpp | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/breadcrumbs/src/comms/DataSyncThread.cpp b/breadcrumbs/src/comms/DataSyncThread.cpp index 1c89fbc..5974754 100644 --- a/breadcrumbs/src/comms/DataSyncThread.cpp +++ b/breadcrumbs/src/comms/DataSyncThread.cpp @@ -54,8 +54,7 @@ void DataSyncThread::threadRuntime() attribMutex = NULL; } - WSACleanup(); - printf("Done running thread!"); + printf("Done running data sync thread!\n"); threadRunning = false; } @@ -69,7 +68,10 @@ bool DataSyncThread::readyToReceive(int interval) tv.tv_sec = interval; tv.tv_usec = 0; - return (select(sock + 1, &fds, 0, 0, &tv) == 1); + bool result = select(sock + 1, &fds, 0, 0, &tv) == 1; + if (FD_ISSET(sock, &fds)) + return true; + return result; } int DataSyncThread::recvBytes(void* buffer, size_t numBytes) diff --git a/breadcrumbs/src/main/VirtualOutputProcessor.cpp b/breadcrumbs/src/main/VirtualOutputProcessor.cpp index 7c5befc..50a181d 100644 --- a/breadcrumbs/src/main/VirtualOutputProcessor.cpp +++ b/breadcrumbs/src/main/VirtualOutputProcessor.cpp @@ -17,6 +17,7 @@ int main() } client.stopComms(); + WSACleanup(); return 0; }