diff options
author | Christian Grothoff <christian@grothoff.org> | 2009-12-08 13:53:41 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2009-12-08 13:53:41 +0000 |
commit | f6514765d7a45000172f6cfd176bd528ffbf8fea (patch) | |
tree | bc9245607f00a9e44b067f21a6f2fc66d57255ed /src/arm | |
parent | f738653d179ec2f52e8d588fdd7396aaf39dcc7d (diff) | |
download | gnunet-f6514765d7a45000172f6cfd176bd528ffbf8fea.tar.gz gnunet-f6514765d7a45000172f6cfd176bd528ffbf8fea.zip |
fix
Diffstat (limited to 'src/arm')
-rw-r--r-- | src/arm/gnunet-service-arm.c | 11 |
1 files changed, 7 insertions, 4 deletions
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) | |||
844 | return; | 844 | return; |
845 | } | 845 | } |
846 | /* consume the signal */ | 846 | /* consume the signal */ |
847 | GNUNET_DISK_file_read (pr, &c, sizeof (c)); | 847 | GNUNET_break (0 < GNUNET_DISK_file_read (pr, &c, sizeof (c))); |
848 | 848 | ||
849 | /* check for services that died (WAITPID) */ | 849 | /* check for services that died (WAITPID) */ |
850 | prev = NULL; | 850 | prev = NULL; |
@@ -923,6 +923,8 @@ maint_child_death (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
923 | #endif | 923 | #endif |
924 | prev = pos; | 924 | prev = pos; |
925 | } | 925 | } |
926 | if (in_shutdown) | ||
927 | clean_up_running (); | ||
926 | if ( (running == NULL) && | 928 | if ( (running == NULL) && |
927 | (in_shutdown) ) | 929 | (in_shutdown) ) |
928 | { | 930 | { |
@@ -956,9 +958,10 @@ sighandler_child_death () | |||
956 | { | 958 | { |
957 | static char c; | 959 | static char c; |
958 | 960 | ||
959 | GNUNET_DISK_file_write (GNUNET_DISK_pipe_handle | 961 | GNUNET_break (1 == |
960 | (sigpipe, GNUNET_DISK_PIPE_END_WRITE), &c, | 962 | GNUNET_DISK_file_write (GNUNET_DISK_pipe_handle |
961 | sizeof (c)); | 963 | (sigpipe, GNUNET_DISK_PIPE_END_WRITE), &c, |
964 | sizeof (c))); | ||
962 | } | 965 | } |
963 | 966 | ||
964 | 967 | ||