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/core/test_core_quota_compliance.c | |
parent | 37ac1b7c9e9e05f93d4100cfb53450ec2d370989 (diff) | |
download | gnunet-721e49caeea6ba5073f8bc5c6c08359295c02bb5.tar.gz gnunet-721e49caeea6ba5073f8bc5c6c08359295c02bb5.zip |
original patch from Mantis 1614
Diffstat (limited to 'src/core/test_core_quota_compliance.c')
-rw-r--r-- | src/core/test_core_quota_compliance.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c index d4df96611..99d9ed4ad 100644 --- a/src/core/test_core_quota_compliance.c +++ b/src/core/test_core_quota_compliance.c | |||
@@ -479,7 +479,7 @@ setup_peer (struct PeerContext *p, const char *cfgname) | |||
479 | { | 479 | { |
480 | p->cfg = GNUNET_CONFIGURATION_create (); | 480 | p->cfg = GNUNET_CONFIGURATION_create (); |
481 | #if START_ARM | 481 | #if START_ARM |
482 | p->arm_pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", | 482 | p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", |
483 | "gnunet-service-arm", | 483 | "gnunet-service-arm", |
484 | #if VERBOSE | 484 | #if VERBOSE |
485 | "-L", "DEBUG", | 485 | "-L", "DEBUG", |
@@ -539,10 +539,12 @@ static void | |||
539 | stop_arm (struct PeerContext *p) | 539 | stop_arm (struct PeerContext *p) |
540 | { | 540 | { |
541 | #if START_ARM | 541 | #if START_ARM |
542 | if (0 != PLIBC_KILL (p->arm_pid, SIGTERM)) | 542 | if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) |
543 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 543 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
544 | if (GNUNET_OS_process_wait(p->arm_pid) != GNUNET_OK) | 544 | if (GNUNET_OS_process_wait(p->arm_pid) != GNUNET_OK) |
545 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 545 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
546 | GNUNET_OS_process_close (p->arm_proc); | ||
547 | p->arm_proc = NULL; | ||
546 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 548 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
547 | "ARM process %u stopped\n", p->arm_pid); | 549 | "ARM process %u stopped\n", p->arm_pid); |
548 | #endif | 550 | #endif |