Skip to content

Commit

Permalink
RunProcManager.cpp: WNOHANG added to waitpid
Browse files Browse the repository at this point in the history
svn path=/trunk/yarp2/; revision=9589
  • Loading branch information
ale-git committed Dec 11, 2012
1 parent 3f0b252 commit 4fca525
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2012-12-12 Alessandro Scalzo <[email protected]>
* src/libYARP_OS/src/RunProcManager.cpp
WNOHANG option added to waitpid.

2012-12-11 Paul Fitzpatrick <[email protected]>

* src/idls/thrift/src/t_yarp_generator.cc: fix representation
Expand Down
3 changes: 2 additions & 1 deletion src/libYARP_OS/src/RunProcManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
CHECK_ENTER("SIGNAL")
int ret=!kill(pid,signum);
CHECKPOINT()
if (wait) waitpid(pid,0,0);
if (wait) waitpid(pid,NULL,WNOHANG);
CHECK_EXIT()
return ret;
}
Expand Down Expand Up @@ -621,6 +621,7 @@ void YarpRunCmdWithStdioInfo::TerminateStdio()
CHECKPOINT()

mStdioVector->Signal(mAlias,SIGTERM);
//mStdioVector->Signal(mAlias,SIGKILL);
}
else
{
Expand Down

0 comments on commit 4fca525

Please sign in to comment.