From: Christian Grothoff Date: Tue, 8 Dec 2009 13:53:41 +0000 (+0000) Subject: fix X-Git-Tag: initial-import-from-subversion-38251~23008 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f6514765d7a45000172f6cfd176bd528ffbf8fea;p=oweals%2Fgnunet.git fix --- diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c index 01f7f5b8a..e60205cc8 100644 --- a/src/arm/gnunet-service-arm.c +++ b/src/arm/gnunet-service-arm.c @@ -844,7 +844,7 @@ maint_child_death (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) return; } /* consume the signal */ - GNUNET_DISK_file_read (pr, &c, sizeof (c)); + GNUNET_break (0 < GNUNET_DISK_file_read (pr, &c, sizeof (c))); /* check for services that died (WAITPID) */ prev = NULL; @@ -923,6 +923,8 @@ maint_child_death (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) #endif prev = pos; } + if (in_shutdown) + clean_up_running (); if ( (running == NULL) && (in_shutdown) ) { @@ -956,9 +958,10 @@ sighandler_child_death () { static char c; - GNUNET_DISK_file_write (GNUNET_DISK_pipe_handle - (sigpipe, GNUNET_DISK_PIPE_END_WRITE), &c, - sizeof (c)); + GNUNET_break (1 == + GNUNET_DISK_file_write (GNUNET_DISK_pipe_handle + (sigpipe, GNUNET_DISK_PIPE_END_WRITE), &c, + sizeof (c))); }