diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-11-03 21:26:40 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-11-03 21:26:40 +0000 |
commit | 721e49caeea6ba5073f8bc5c6c08359295c02bb5 (patch) | |
tree | e06e80ba90af91e9452a48a7a5782913199b4877 /src/fs/test_fs_search_persistence.c | |
parent | 37ac1b7c9e9e05f93d4100cfb53450ec2d370989 (diff) | |
download | gnunet-721e49caeea6ba5073f8bc5c6c08359295c02bb5.tar.gz gnunet-721e49caeea6ba5073f8bc5c6c08359295c02bb5.zip |
original patch from Mantis 1614
Diffstat (limited to 'src/fs/test_fs_search_persistence.c')
-rw-r--r-- | src/fs/test_fs_search_persistence.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/fs/test_fs_search_persistence.c b/src/fs/test_fs_search_persistence.c index 97b7f656b..c2af22de4 100644 --- a/src/fs/test_fs_search_persistence.c +++ b/src/fs/test_fs_search_persistence.c | |||
@@ -53,7 +53,7 @@ struct PeerContext | |||
53 | struct GNUNET_CONFIGURATION_Handle *cfg; | 53 | struct GNUNET_CONFIGURATION_Handle *cfg; |
54 | struct GNUNET_PeerIdentity id; | 54 | struct GNUNET_PeerIdentity id; |
55 | #if START_ARM | 55 | #if START_ARM |
56 | pid_t arm_pid; | 56 | GNUNET_OS_Process *arm_proc; |
57 | #endif | 57 | #endif |
58 | }; | 58 | }; |
59 | 59 | ||
@@ -262,7 +262,7 @@ setup_peer (struct PeerContext *p, const char *cfgname) | |||
262 | { | 262 | { |
263 | p->cfg = GNUNET_CONFIGURATION_create (); | 263 | p->cfg = GNUNET_CONFIGURATION_create (); |
264 | #if START_ARM | 264 | #if START_ARM |
265 | p->arm_pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", | 265 | p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", |
266 | "gnunet-service-arm", | 266 | "gnunet-service-arm", |
267 | #if VERBOSE | 267 | #if VERBOSE |
268 | "-L", "DEBUG", | 268 | "-L", "DEBUG", |
@@ -277,12 +277,14 @@ static void | |||
277 | stop_arm (struct PeerContext *p) | 277 | stop_arm (struct PeerContext *p) |
278 | { | 278 | { |
279 | #if START_ARM | 279 | #if START_ARM |
280 | if (0 != PLIBC_KILL (p->arm_pid, SIGTERM)) | 280 | if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) |
281 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 281 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
282 | if (GNUNET_OS_process_wait(p->arm_pid) != GNUNET_OK) | 282 | if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK) |
283 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 283 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
284 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 284 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
285 | "ARM process %u stopped\n", p->arm_pid); | 285 | "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); |
286 | GNUNET_OS_process_close (p->arm_proc); | ||
287 | p->arm_proc = NULL; | ||
286 | #endif | 288 | #endif |
287 | GNUNET_CONFIGURATION_destroy (p->cfg); | 289 | GNUNET_CONFIGURATION_destroy (p->cfg); |
288 | } | 290 | } |