aboutsummaryrefslogtreecommitdiff
path: root/src/fs/test_fs_unindex.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2010-11-03 21:26:40 +0000
committerChristian Grothoff <christian@grothoff.org>2010-11-03 21:26:40 +0000
commit721e49caeea6ba5073f8bc5c6c08359295c02bb5 (patch)
treee06e80ba90af91e9452a48a7a5782913199b4877 /src/fs/test_fs_unindex.c
parent37ac1b7c9e9e05f93d4100cfb53450ec2d370989 (diff)
downloadgnunet-721e49caeea6ba5073f8bc5c6c08359295c02bb5.tar.gz
gnunet-721e49caeea6ba5073f8bc5c6c08359295c02bb5.zip
original patch from Mantis 1614
Diffstat (limited to 'src/fs/test_fs_unindex.c')
-rw-r--r--src/fs/test_fs_unindex.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/fs/test_fs_unindex.c b/src/fs/test_fs_unindex.c
index 6fe47a6c4..0afed8f06 100644
--- a/src/fs/test_fs_unindex.c
+++ b/src/fs/test_fs_unindex.c
@@ -52,7 +52,7 @@ struct PeerContext
52{ 52{
53 struct GNUNET_CONFIGURATION_Handle *cfg; 53 struct GNUNET_CONFIGURATION_Handle *cfg;
54#if START_ARM 54#if START_ARM
55 pid_t arm_pid; 55 GNUNET_OS_Process *arm_proc;
56#endif 56#endif
57}; 57};
58 58
@@ -196,7 +196,7 @@ setup_peer (struct PeerContext *p, const char *cfgname)
196{ 196{
197 p->cfg = GNUNET_CONFIGURATION_create (); 197 p->cfg = GNUNET_CONFIGURATION_create ();
198#if START_ARM 198#if START_ARM
199 p->arm_pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", 199 p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
200 "gnunet-service-arm", 200 "gnunet-service-arm",
201#if VERBOSE 201#if VERBOSE
202 "-L", "DEBUG", 202 "-L", "DEBUG",
@@ -211,12 +211,14 @@ static void
211stop_arm (struct PeerContext *p) 211stop_arm (struct PeerContext *p)
212{ 212{
213#if START_ARM 213#if START_ARM
214 if (0 != PLIBC_KILL (p->arm_pid, SIGTERM)) 214 if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
215 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); 215 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
216 if (GNUNET_OS_process_wait(p->arm_pid) != GNUNET_OK) 216 if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
217 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); 217 GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
218 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 218 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
219 "ARM process %u stopped\n", p->arm_pid); 219 "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
220 GNUNET_OS_process_close (p->arm_proc);
221 p->arm_proc = NULL;
220#endif 222#endif
221 GNUNET_CONFIGURATION_destroy (p->cfg); 223 GNUNET_CONFIGURATION_destroy (p->cfg);
222} 224}