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_namespace.c | |
| parent | db90fb75efb404b6006a0e7cbf27f00fa931d860 (diff) | |
| download | gnunet-a62cd21e71caa9c19078fa89364dc819536f6ffd.tar.gz gnunet-a62cd21e71caa9c19078fa89364dc819536f6ffd.zip | |
check
Diffstat (limited to 'src/fs/test_fs_namespace.c')
| -rw-r--r-- | src/fs/test_fs_namespace.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c index 02bb62807..b4d487ddc 100644 --- a/src/fs/test_fs_namespace.c +++ b/src/fs/test_fs_namespace.c | |||
| @@ -81,14 +81,17 @@ static void | |||
| 81 | stop_arm (struct PeerContext *p) | 81 | stop_arm (struct PeerContext *p) |
| 82 | { | 82 | { |
| 83 | #if START_ARM | 83 | #if START_ARM |
| 84 | if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) | 84 | if (NULL != p->arm_proc) |
| 85 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 85 | { |
| 86 | if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK) | 86 | if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) |
| 87 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 87 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
| 88 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 88 | if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK) |
| 89 | "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); | 89 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
| 90 | GNUNET_OS_process_close (p->arm_proc); | 90 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
| 91 | p->arm_proc = NULL; | 91 | "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); |
| 92 | GNUNET_OS_process_close (p->arm_proc); | ||
| 93 | p->arm_proc = NULL; | ||
| 94 | } | ||
| 92 | #endif | 95 | #endif |
| 93 | GNUNET_CONFIGURATION_destroy (p->cfg); | 96 | GNUNET_CONFIGURATION_destroy (p->cfg); |
| 94 | } | 97 | } |