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.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.c')
-rw-r--r-- | src/fs/test_fs_search.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/fs/test_fs_search.c b/src/fs/test_fs_search.c index 98315ac5c..515730689 100644 --- a/src/fs/test_fs_search.c +++ b/src/fs/test_fs_search.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 | ||
@@ -191,7 +191,7 @@ setup_peer (struct PeerContext *p, const char *cfgname) | |||
191 | { | 191 | { |
192 | p->cfg = GNUNET_CONFIGURATION_create (); | 192 | p->cfg = GNUNET_CONFIGURATION_create (); |
193 | #if START_ARM | 193 | #if START_ARM |
194 | p->arm_pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", | 194 | p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", |
195 | "gnunet-service-arm", | 195 | "gnunet-service-arm", |
196 | #if VERBOSE | 196 | #if VERBOSE |
197 | "-L", "DEBUG", | 197 | "-L", "DEBUG", |
@@ -206,12 +206,14 @@ static void | |||
206 | stop_arm (struct PeerContext *p) | 206 | stop_arm (struct PeerContext *p) |
207 | { | 207 | { |
208 | #if START_ARM | 208 | #if START_ARM |
209 | if (0 != PLIBC_KILL (p->arm_pid, SIGTERM)) | 209 | if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) |
210 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 210 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
211 | if (GNUNET_OS_process_wait(p->arm_pid) != GNUNET_OK) | 211 | if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK) |
212 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 212 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
213 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 213 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
214 | "ARM process %u stopped\n", p->arm_pid); | 214 | "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); |
215 | GNUNET_OS_process_close (p->arm_proc); | ||
216 | p->arm_proc = NULL; | ||
215 | #endif | 217 | #endif |
216 | GNUNET_CONFIGURATION_destroy (p->cfg); | 218 | GNUNET_CONFIGURATION_destroy (p->cfg); |
217 | } | 219 | } |