kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: When killing a child all the pipe read ends should be closed. This will allow a child that is blocking while waiting to write to the pipe to wake up and receive the kill signal properly on cygwin.

This commit is contained in:
Brad King 2005-04-19 11:52:25 -04:00
parent f362d6e2ef
commit c98bd6249a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/kwsys/ProcessUNIX.c
View File

@ -905,7 +905,6 @@ int kwsysProcess_WaitForData(kwsysProcess* cp, char** data, int* length,
kwsysProcess_Kill(cp); kwsysProcess_Kill(cp);
cp->Killed = 0; cp->Killed = 0;
cp->SelectError = 1; cp->SelectError = 1;
cp->PipesLeft = 0;
} }
} }
@ -943,7 +942,6 @@ int kwsysProcess_WaitForData(kwsysProcess* cp, char** data, int* length,
kwsysProcess_Kill(cp); kwsysProcess_Kill(cp);
cp->Killed = 0; cp->Killed = 0;
cp->TimeoutExpired = 1; cp->TimeoutExpired = 1;
cp->PipesLeft = 0;
return kwsysProcess_Pipe_None; return kwsysProcess_Pipe_None;
} }
} }
@ -1076,6 +1074,13 @@ void kwsysProcess_Kill(kwsysProcess* cp)
kwsysProcessKill(cp->ForkPIDs[i]); kwsysProcessKill(cp->ForkPIDs[i]);
} }
} }
/* Close all the pipe read ends. */
for(i=0; i < KWSYSPE_PIPE_COUNT; ++i)
{
kwsysProcessCleanupDescriptor(&cp->PipeReadEnds[i]);
}
cp->PipesLeft = 0;
} }
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/