ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server: Move the process pipe hangup handling into kill_process. 

This ensures that it's also done correctly when a read from the pipe
returns EOF.
This commit is contained in:
Alexandre Julliard 2008-06-20 20:42:51 +02:00
parent 56d5332285
commit 24ec4a6ed7
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
server/process.c
View File

@ -459,18 +459,7 @@ static void process_poll_event( struct fd *fd, int event )
struct process *process = get_fd_user( fd ); struct process *process = get_fd_user( fd );
assert( process->obj.ops == &process_ops ); assert( process->obj.ops == &process_ops );
if (event & (POLLERR | POLLHUP)) if (event & (POLLERR | POLLHUP)) kill_process( process, 0 );
{
release_object( process->msg_fd );
process->msg_fd = NULL;
if (process->sigkill_timeout) /* already waiting for it to die */
{
remove_timeout_user( process->sigkill_timeout );
process->sigkill_timeout = NULL;
process_died( process );
}
else kill_process( process, 0 );
}
else if (event & POLLIN) receive_fd( process ); else if (event & POLLIN) receive_fd( process );
} }
@ -736,6 +725,20 @@ void resume_process( struct process *process )
/* kill a process on the spot */ /* kill a process on the spot */
void kill_process( struct process *process, int violent_death ) void kill_process( struct process *process, int violent_death )
{ {
if (!violent_death && process->msg_fd) /* normal termination on pipe close */
{
release_object( process->msg_fd );
process->msg_fd = NULL;
}
if (process->sigkill_timeout) /* already waiting for it to die */
{
remove_timeout_user( process->sigkill_timeout );
process->sigkill_timeout = NULL;
process_died( process );
return;
}
if (violent_death) terminate_process( process, NULL, 1 ); if (violent_death) terminate_process( process, NULL, 1 );
else else
{ {