diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-05-05 13:36:18 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-05-05 13:36:18 +0000 |
commit | a62cd21e71caa9c19078fa89364dc819536f6ffd (patch) | |
tree | cb88ac33fa986ca8f0bef59f00f5d991227f875e /src/fs/test_fs_publish_persistence.c | |
parent | db90fb75efb404b6006a0e7cbf27f00fa931d860 (diff) | |
download | gnunet-a62cd21e71caa9c19078fa89364dc819536f6ffd.tar.gz gnunet-a62cd21e71caa9c19078fa89364dc819536f6ffd.zip |
check
Diffstat (limited to 'src/fs/test_fs_publish_persistence.c')
-rw-r--r-- | src/fs/test_fs_publish_persistence.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/fs/test_fs_publish_persistence.c b/src/fs/test_fs_publish_persistence.c index 1610c25c1..fdb5beb7d 100644 --- a/src/fs/test_fs_publish_persistence.c +++ b/src/fs/test_fs_publish_persistence.c | |||
@@ -252,14 +252,17 @@ static void | |||
252 | stop_arm (struct PeerContext *p) | 252 | stop_arm (struct PeerContext *p) |
253 | { | 253 | { |
254 | #if START_ARM | 254 | #if START_ARM |
255 | if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) | 255 | if (NULL != p->arm_proc) |
256 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 256 | { |
257 | if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK) | 257 | if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) |
258 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 258 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
259 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 259 | if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK) |
260 | "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); | 260 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
261 | GNUNET_OS_process_close (p->arm_proc); | 261 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
262 | p->arm_proc = NULL; | 262 | "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); |
263 | GNUNET_OS_process_close (p->arm_proc); | ||
264 | p->arm_proc = NULL; | ||
265 | } | ||
263 | #endif | 266 | #endif |
264 | GNUNET_CONFIGURATION_destroy (p->cfg); | 267 | GNUNET_CONFIGURATION_destroy (p->cfg); |
265 | } | 268 | } |