projects
/
oweals
/
gnunet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f738653
)
fix
author
Christian Grothoff
<christian@grothoff.org>
Tue, 8 Dec 2009 13:53:41 +0000
(13:53 +0000)
committer
Christian Grothoff
<christian@grothoff.org>
Tue, 8 Dec 2009 13:53:41 +0000
(13:53 +0000)
src/arm/gnunet-service-arm.c
patch
|
blob
|
history
diff --git
a/src/arm/gnunet-service-arm.c
b/src/arm/gnunet-service-arm.c
index 01f7f5b8a623adedeec73e232d62891ef987f647..e60205cc8fc5647f2c2008d615c8e105892a0da9 100644
(file)
--- 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 */
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;
/* 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;
}
#endif
prev = pos;
}
+ if (in_shutdown)
+ clean_up_running ();
if ( (running == NULL) &&
(in_shutdown) )
{
if ( (running == NULL) &&
(in_shutdown) )
{
@@
-956,9
+958,10
@@
sighandler_child_death ()
{
static char c;
{
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)));
}
}