MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-16 08:13:30 +00:00
Code Issues Releases Wiki Activity

Fixed so current node can be removed while being dispatched

Browse Source
This commit is contained in:
Bryan Roe
2020-05-08 19:37:16 -07:00
parent dd0cd1af85
commit b2b78a3dbe
2 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
microstack/ILibProcessPipe.c
View File

@@ -767,24 +767,31 @@ void ILibProcessPipe_Process_ReadHandler(void* user)
int err=0;
#ifdef WIN32
BOOL result;
DWORD bytesRead;
int firstPass = 1;
DWORD bytesRead = 0;
UNREFERENCED_PARAMETER(event);
#else
int bytesRead;
int bytesRead = 0;
#endif
pipeObject->processingLoop = 1;
do
{
#ifdef WIN32
err = 0;
result = GetOverlappedResult(pipeObject->mPipe_ReadEnd, pipeObject->mOverlapped, &bytesRead, FALSE);
pipeObject->inProgress = 0;
//printf("Overlapped(%p): %d bytes\n", pipeObject->mPipe_ReadEnd, bytesRead);
if (result == FALSE || bytesRead == 0)
if (firstPass != 0)
{
err = GetLastError();
break;
firstPass = 0;
if (pipeObject->inProgress != 0)
{
if (GetOverlappedResult(pipeObject->mPipe_ReadEnd, pipeObject->mOverlapped, &bytesRead, FALSE) == 0 || bytesRead == 0)
{
pipeObject->inProgress = 0;
err = GetLastError();
if (err == ERROR_IO_PENDING) { return(TRUE); }
break;
}
pipeObject->inProgress = 0;
}
}
#else
bytesRead = (int)read(pipeObject->mPipe_ReadEnd, pipeObject->buffer + pipeObject->readOffset + pipeObject->totalRead, pipeObject->bufferSize - pipeObject->totalRead);
@@ -858,8 +865,9 @@ void ILibProcessPipe_Process_ReadHandler(void* user)
if (pipeObject->PAUSED == 0)
{
pipeObject->inProgress = 1;
if (ReadFile(pipeObject->mPipe_ReadEnd, pipeObject->buffer + pipeObject->readOffset + pipeObject->totalRead, pipeObject->bufferSize - pipeObject->totalRead, NULL, pipeObject->mOverlapped) != TRUE)
if (ReadFile(pipeObject->mPipe_ReadEnd, pipeObject->buffer + pipeObject->readOffset + pipeObject->totalRead, pipeObject->bufferSize - pipeObject->totalRead, &bytesRead, pipeObject->mOverlapped) != TRUE)
{
if (GetLastError() == ERROR_IO_PENDING) { return(TRUE); }
break;
}
}