From 16546613251edfcd595e4f584b1a2d2a414d0b1a Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Tue, 8 May 2012 17:10:10 +0000 Subject: [PATCH] Renamed GNUNET_OS_process_close to GNUNET_OS_process_destroy --- src/arm/gnunet-service-arm.c | 2 +- src/ats/test_ats_api_bandwidth_consumption.c | 2 +- src/ats/test_ats_api_scheduling.c | 2 +- src/chat/test_chat.c | 2 +- src/chat/test_chat_private.c | 2 +- src/core/test_core_api.c | 2 +- src/core/test_core_api_reliability.c | 2 +- src/core/test_core_api_send_to_self.c | 2 +- src/core/test_core_api_start_only.c | 2 +- src/core/test_core_quota_compliance.c | 2 +- src/datastore/perf_datastore_api.c | 2 +- src/datastore/test_datastore_api.c | 2 +- src/datastore/test_datastore_api_management.c | 2 +- src/dht/test_dht_api.c | 2 +- src/fs/test_fs.c | 2 +- src/fs/test_fs_download.c | 2 +- src/fs/test_fs_download_indexed.c | 2 +- src/fs/test_fs_download_persistence.c | 2 +- src/fs/test_fs_download_recursive.c | 2 +- src/fs/test_fs_list_indexed.c | 2 +- src/fs/test_fs_namespace.c | 2 +- src/fs/test_fs_namespace_list_updateable.c | 2 +- src/fs/test_fs_publish.c | 2 +- src/fs/test_fs_publish_persistence.c | 2 +- src/fs/test_fs_search.c | 2 +- src/fs/test_fs_search_persistence.c | 2 +- src/fs/test_fs_search_probes.c | 2 +- src/fs/test_fs_search_ranking.c | 2 +- src/fs/test_fs_start_stop.c | 2 +- src/fs/test_fs_unindex.c | 2 +- src/fs/test_fs_unindex_persistence.c | 2 +- src/hostlist/test_gnunet_daemon_hostlist.c | 2 +- src/hostlist/test_gnunet_daemon_hostlist_learning.c | 4 ++-- src/hostlist/test_gnunet_daemon_hostlist_reconnect.c | 2 +- src/include/gnunet_os_lib.h | 2 +- src/lockmanager/test_lockmanager_api.c | 2 +- src/mesh/test_mesh_api.c | 2 +- src/mesh/test_mesh_local_1.c | 2 +- src/mesh/test_mesh_local_2.c | 2 +- src/namestore/test_namestore_api.c | 2 +- src/namestore/test_namestore_api_create.c | 2 +- src/namestore/test_namestore_api_create_update.c | 2 +- src/namestore/test_namestore_api_lookup.c | 2 +- .../test_namestore_api_lookup_specific_type.c | 2 +- src/namestore/test_namestore_api_put.c | 2 +- src/namestore/test_namestore_api_remove.c | 2 +- .../test_namestore_api_remove_not_existing_record.c | 2 +- src/namestore/test_namestore_api_zone_iteration.c | 2 +- ...test_namestore_api_zone_iteration_specific_zone.c | 2 +- .../test_namestore_api_zone_iteration_stop.c | 2 +- src/namestore/test_namestore_api_zone_to_name.c | 2 +- src/nat/nat.c | 6 +++--- src/nat/nat_mini.c | 2 +- src/nat/test_nat_test.c | 2 +- src/nse/test_nse_api.c | 2 +- src/peerinfo/perf_peerinfo_api.c | 2 +- src/peerinfo/test_peerinfo_api.c | 2 +- src/statistics/test_statistics_api.c | 4 ++-- src/statistics/test_statistics_api_loop.c | 2 +- src/statistics/test_statistics_api_watch.c | 2 +- .../test_statistics_api_watch_zero_value.c | 2 +- src/stream/test_stream_api.c | 2 +- src/stream/test_stream_local.c | 2 +- src/testing/test_testing_large_topology.c | 2 +- src/testing/test_testing_topology.c | 2 +- src/testing/testing.c | 8 ++++---- src/testing/testing_group.c | 12 ++++++------ .../gnunet-transport-certificate-creation.c | 4 ++-- src/transport/gnunet-transport.c | 2 +- src/transport/plugin_transport_http_server.c | 2 +- src/transport/plugin_transport_wlan.c | 2 +- src/transport/transport-testing.c | 4 ++-- src/util/crypto_random.c | 6 +++--- src/util/helper.c | 2 +- src/util/os_priority.c | 4 ++-- src/util/test_common_logging_runtime_loglevels.c | 2 +- src/util/test_os_start_process.c | 6 +++--- src/util/test_resolver_api.c | 2 +- src/vpn/test_gnunet_vpn.c | 2 +- 79 files changed, 98 insertions(+), 98 deletions(-) diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c index 663a8e51a..45650188f 100644 --- a/src/arm/gnunet-service-arm.c +++ b/src/arm/gnunet-service-arm.c @@ -987,7 +987,7 @@ maint_child_death (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) pos->name, GNUNET_TIME_absolute_get_duration (pos->killed_at).rel_value); } - GNUNET_OS_process_close (pos->proc); + GNUNET_OS_process_destroy (pos->proc); pos->proc = NULL; if (NULL != pos->killing_client) { diff --git a/src/ats/test_ats_api_bandwidth_consumption.c b/src/ats/test_ats_api_bandwidth_consumption.c index c28364713..01321e147 100644 --- a/src/ats/test_ats_api_bandwidth_consumption.c +++ b/src/ats/test_ats_api_bandwidth_consumption.c @@ -78,7 +78,7 @@ stop_arm () if (0 != GNUNET_OS_process_kill (arm_proc, SIGTERM)) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); GNUNET_OS_process_wait (arm_proc); - GNUNET_OS_process_close (arm_proc); + GNUNET_OS_process_destroy (arm_proc); arm_proc = NULL; } diff --git a/src/ats/test_ats_api_scheduling.c b/src/ats/test_ats_api_scheduling.c index 686916597..c9d2206b3 100644 --- a/src/ats/test_ats_api_scheduling.c +++ b/src/ats/test_ats_api_scheduling.c @@ -77,7 +77,7 @@ stop_arm () if (0 != GNUNET_OS_process_kill (arm_proc, SIGTERM)) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); GNUNET_OS_process_wait (arm_proc); - GNUNET_OS_process_close (arm_proc); + GNUNET_OS_process_destroy (arm_proc); arm_proc = NULL; } diff --git a/src/chat/test_chat.c b/src/chat/test_chat.c index fec5db02a..2e8272def 100644 --- a/src/chat/test_chat.c +++ b/src/chat/test_chat.c @@ -140,7 +140,7 @@ stop_arm (struct PeerContext *p) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; #endif GNUNET_CONFIGURATION_destroy (p->cfg); diff --git a/src/chat/test_chat_private.c b/src/chat/test_chat_private.c index cbc90656f..8b61392ca 100644 --- a/src/chat/test_chat_private.c +++ b/src/chat/test_chat_private.c @@ -154,7 +154,7 @@ stop_arm (struct PeerContext *p) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; #endif GNUNET_CONFIGURATION_destroy (p->cfg); diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c index 271c2ce08..37d166983 100644 --- a/src/core/test_core_api.c +++ b/src/core/test_core_api.c @@ -362,7 +362,7 @@ stop_arm (struct PeerContext *p) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; #endif GNUNET_CONFIGURATION_destroy (p->cfg); diff --git a/src/core/test_core_api_reliability.c b/src/core/test_core_api_reliability.c index 645b27e74..0c6a39ffb 100644 --- a/src/core/test_core_api_reliability.c +++ b/src/core/test_core_api_reliability.c @@ -482,7 +482,7 @@ stop_arm (struct PeerContext *p) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; #endif GNUNET_CONFIGURATION_destroy (p->cfg); diff --git a/src/core/test_core_api_send_to_self.c b/src/core/test_core_api_send_to_self.c index 4fa73d951..b1340dcfb 100644 --- a/src/core/test_core_api_send_to_self.c +++ b/src/core/test_core_api_send_to_self.c @@ -81,7 +81,7 @@ cleanup (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tskctx) GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (arm_proc)); - GNUNET_OS_process_close (arm_proc); + GNUNET_OS_process_destroy (arm_proc); arm_proc = NULL; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Ending test.\n"); diff --git a/src/core/test_core_api_start_only.c b/src/core/test_core_api_start_only.c index 2eca57512..8c8132043 100644 --- a/src/core/test_core_api_start_only.c +++ b/src/core/test_core_api_start_only.c @@ -208,7 +208,7 @@ stop_arm (struct PeerContext *p) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; #endif GNUNET_CONFIGURATION_destroy (p->cfg); diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c index 636520e69..dc345ba2b 100644 --- a/src/core/test_core_quota_compliance.c +++ b/src/core/test_core_quota_compliance.c @@ -642,7 +642,7 @@ stop_arm (struct PeerContext *p) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; #endif GNUNET_CONFIGURATION_destroy (p->cfg); diff --git a/src/datastore/perf_datastore_api.c b/src/datastore/perf_datastore_api.c index 296853ab4..cdbd6ae9c 100644 --- a/src/datastore/perf_datastore_api.c +++ b/src/datastore/perf_datastore_api.c @@ -360,7 +360,7 @@ check () ok = 1; } GNUNET_OS_process_wait (proc); - GNUNET_OS_process_close (proc); + GNUNET_OS_process_destroy (proc); proc = NULL; return ok; } diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c index f6945ed2e..4c0736619 100644 --- a/src/datastore/test_datastore_api.c +++ b/src/datastore/test_datastore_api.c @@ -546,7 +546,7 @@ check () ok = 1; } GNUNET_OS_process_wait (proc); - GNUNET_OS_process_close (proc); + GNUNET_OS_process_destroy (proc); proc = NULL; #endif if (ok != 0) diff --git a/src/datastore/test_datastore_api_management.c b/src/datastore/test_datastore_api_management.c index bd0b2418c..bb3898e08 100644 --- a/src/datastore/test_datastore_api_management.c +++ b/src/datastore/test_datastore_api_management.c @@ -329,7 +329,7 @@ check () ok = 1; } GNUNET_OS_process_wait (proc); - GNUNET_OS_process_close (proc); + GNUNET_OS_process_destroy (proc); proc = NULL; if (ok != 0) FPRINTF (stderr, "Missed some testcases: %u\n", ok); diff --git a/src/dht/test_dht_api.c b/src/dht/test_dht_api.c index 4f96cb82b..9c6231561 100644 --- a/src/dht/test_dht_api.c +++ b/src/dht/test_dht_api.c @@ -121,7 +121,7 @@ stop_arm (struct PeerContext *p) if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); GNUNET_OS_process_wait (p->arm_proc); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; #endif GNUNET_CONFIGURATION_destroy (p->cfg); diff --git a/src/fs/test_fs.c b/src/fs/test_fs.c index 5ec5ab053..8df9662a1 100644 --- a/src/fs/test_fs.c +++ b/src/fs/test_fs.c @@ -241,7 +241,7 @@ FAILURE: #if START_DAEMON GNUNET_GE_ASSERT (NULL, GNUNET_OK == GNUNET_daemon_stop (NULL, daemon)); - GNUNET_OS_process_close (daemon); + GNUNET_OS_process_destroy (daemon); #endif GNUNET_GC_free (cfg); diff --git a/src/fs/test_fs_download.c b/src/fs/test_fs_download.c index 198a8154e..278197478 100644 --- a/src/fs/test_fs_download.c +++ b/src/fs/test_fs_download.c @@ -268,7 +268,7 @@ stop_arm (struct PeerContext *p) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; } #endif diff --git a/src/fs/test_fs_download_indexed.c b/src/fs/test_fs_download_indexed.c index 5b56ed787..d16aa97f1 100644 --- a/src/fs/test_fs_download_indexed.c +++ b/src/fs/test_fs_download_indexed.c @@ -270,7 +270,7 @@ stop_arm (struct PeerContext *p) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; } #endif diff --git a/src/fs/test_fs_download_persistence.c b/src/fs/test_fs_download_persistence.c index 3a6d9553e..ba776dd03 100644 --- a/src/fs/test_fs_download_persistence.c +++ b/src/fs/test_fs_download_persistence.c @@ -318,7 +318,7 @@ stop_arm (struct PeerContext *p) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; } #endif diff --git a/src/fs/test_fs_download_recursive.c b/src/fs/test_fs_download_recursive.c index bd99f0600..bcbfe2b2a 100644 --- a/src/fs/test_fs_download_recursive.c +++ b/src/fs/test_fs_download_recursive.c @@ -365,7 +365,7 @@ FAILURE: #if START_DAEMON GNUNET_GE_BREAK (NULL, GNUNET_OK == GNUNET_daemon_stop (NULL, daemon)); - GNUNET_OS_process_close (daemon); + GNUNET_OS_process_destroy (daemon); daemon = NULL; #endif GNUNET_GC_free (cfg); diff --git a/src/fs/test_fs_list_indexed.c b/src/fs/test_fs_list_indexed.c index 535f8ef58..d046a20c6 100644 --- a/src/fs/test_fs_list_indexed.c +++ b/src/fs/test_fs_list_indexed.c @@ -211,7 +211,7 @@ stop_arm (struct PeerContext *p) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; } #endif diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c index d25fd6f83..9305a501f 100644 --- a/src/fs/test_fs_namespace.c +++ b/src/fs/test_fs_namespace.c @@ -90,7 +90,7 @@ stop_arm (struct PeerContext *p) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; } #endif diff --git a/src/fs/test_fs_namespace_list_updateable.c b/src/fs/test_fs_namespace_list_updateable.c index 44775ac0e..2cec67ddc 100644 --- a/src/fs/test_fs_namespace_list_updateable.c +++ b/src/fs/test_fs_namespace_list_updateable.c @@ -94,7 +94,7 @@ stop_arm (struct PeerContext *p) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; } #endif diff --git a/src/fs/test_fs_publish.c b/src/fs/test_fs_publish.c index e52743876..1560f4ea3 100644 --- a/src/fs/test_fs_publish.c +++ b/src/fs/test_fs_publish.c @@ -196,7 +196,7 @@ stop_arm (struct PeerContext *p) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; } #endif diff --git a/src/fs/test_fs_publish_persistence.c b/src/fs/test_fs_publish_persistence.c index 7707eac32..7d3bc32ae 100644 --- a/src/fs/test_fs_publish_persistence.c +++ b/src/fs/test_fs_publish_persistence.c @@ -259,7 +259,7 @@ stop_arm (struct PeerContext *p) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; } #endif diff --git a/src/fs/test_fs_search.c b/src/fs/test_fs_search.c index f6c8f00f8..a3a9b5444 100644 --- a/src/fs/test_fs_search.c +++ b/src/fs/test_fs_search.c @@ -197,7 +197,7 @@ stop_arm (struct PeerContext *p) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; } #endif diff --git a/src/fs/test_fs_search_persistence.c b/src/fs/test_fs_search_persistence.c index 38f88a82a..d18b50eb5 100644 --- a/src/fs/test_fs_search_persistence.c +++ b/src/fs/test_fs_search_persistence.c @@ -259,7 +259,7 @@ stop_arm (struct PeerContext *p) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; } #endif diff --git a/src/fs/test_fs_search_probes.c b/src/fs/test_fs_search_probes.c index c1022b9aa..6f57ea8b0 100644 --- a/src/fs/test_fs_search_probes.c +++ b/src/fs/test_fs_search_probes.c @@ -200,7 +200,7 @@ stop_arm (struct PeerContext *p) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; } #endif diff --git a/src/fs/test_fs_search_ranking.c b/src/fs/test_fs_search_ranking.c index af4e56aef..5ad7da224 100644 --- a/src/fs/test_fs_search_ranking.c +++ b/src/fs/test_fs_search_ranking.c @@ -236,7 +236,7 @@ FAILURE: #if START_DAEMON GNUNET_GE_ASSERT (NULL, GNUNET_OK == GNUNET_daemon_stop (NULL, daemon)); - GNUNET_OS_process_close (daemon); + GNUNET_OS_process_destroy (daemon); daemon = NULL; #endif GNUNET_GC_free (cfg); diff --git a/src/fs/test_fs_start_stop.c b/src/fs/test_fs_start_stop.c index 0ef0723f9..6bd698a43 100644 --- a/src/fs/test_fs_start_stop.c +++ b/src/fs/test_fs_start_stop.c @@ -80,7 +80,7 @@ stop_arm (struct PeerContext *p) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; } #endif diff --git a/src/fs/test_fs_unindex.c b/src/fs/test_fs_unindex.c index a8b68a3cf..ee76bf9f3 100644 --- a/src/fs/test_fs_unindex.c +++ b/src/fs/test_fs_unindex.c @@ -210,7 +210,7 @@ stop_arm (struct PeerContext *p) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; } #endif diff --git a/src/fs/test_fs_unindex_persistence.c b/src/fs/test_fs_unindex_persistence.c index 575e1715f..c6b1062e1 100644 --- a/src/fs/test_fs_unindex_persistence.c +++ b/src/fs/test_fs_unindex_persistence.c @@ -272,7 +272,7 @@ stop_arm (struct PeerContext *p) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; } #endif diff --git a/src/hostlist/test_gnunet_daemon_hostlist.c b/src/hostlist/test_gnunet_daemon_hostlist.c index da3ab8b58..a81a7f7a4 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist.c +++ b/src/hostlist/test_gnunet_daemon_hostlist.c @@ -168,7 +168,7 @@ waitpid_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; #endif GNUNET_CONFIGURATION_destroy (p->cfg); diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c index 409a3ed70..5fcbd538b 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c +++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c @@ -156,7 +156,7 @@ shutdown_testcase () GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); if (GNUNET_OS_process_wait (adv_peer.arm_proc) != GNUNET_OK) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); - GNUNET_OS_process_close (adv_peer.arm_proc); + GNUNET_OS_process_destroy (adv_peer.arm_proc); adv_peer.arm_proc = NULL; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Killing hostlist client ARM process.\n"); @@ -164,7 +164,7 @@ shutdown_testcase () GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); if (GNUNET_OS_process_wait (learn_peer.arm_proc) != GNUNET_OK) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); - GNUNET_OS_process_close (learn_peer.arm_proc); + GNUNET_OS_process_destroy (learn_peer.arm_proc); learn_peer.arm_proc = NULL; #endif GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown complete....\n"); diff --git a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c index a9915574b..ff6e4177d 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c +++ b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c @@ -172,7 +172,7 @@ waitpid_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; #endif GNUNET_CONFIGURATION_destroy (p->cfg); diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h index d42a5c521..67b6cce0c 100644 --- a/src/include/gnunet_os_lib.h +++ b/src/include/gnunet_os_lib.h @@ -227,7 +227,7 @@ GNUNET_OS_process_kill (struct GNUNET_OS_Process *proc, int sig); * @param proc pointer to process structure */ void -GNUNET_OS_process_close (struct GNUNET_OS_Process *proc); +GNUNET_OS_process_destroy (struct GNUNET_OS_Process *proc); /** diff --git a/src/lockmanager/test_lockmanager_api.c b/src/lockmanager/test_lockmanager_api.c index 9edb7bdae..a5877af7e 100644 --- a/src/lockmanager/test_lockmanager_api.c +++ b/src/lockmanager/test_lockmanager_api.c @@ -90,7 +90,7 @@ do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc) "Kill gnunet-service-arm manually\n"); } GNUNET_OS_process_wait (arm_pid); - GNUNET_OS_process_close (arm_pid); + GNUNET_OS_process_destroy (arm_pid); if (NULL != config) GNUNET_CONFIGURATION_destroy (config); diff --git a/src/mesh/test_mesh_api.c b/src/mesh/test_mesh_api.c index fbc1fbaff..1e12e9b82 100644 --- a/src/mesh/test_mesh_api.c +++ b/src/mesh/test_mesh_api.c @@ -85,7 +85,7 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); } GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid)); - GNUNET_OS_process_close (arm_pid); + GNUNET_OS_process_destroy (arm_pid); } static void diff --git a/src/mesh/test_mesh_local_1.c b/src/mesh/test_mesh_local_1.c index 73e2bdc13..d80bee8aa 100644 --- a/src/mesh/test_mesh_local_1.c +++ b/src/mesh/test_mesh_local_1.c @@ -77,7 +77,7 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Wait\n"); GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid)); - GNUNET_OS_process_close (arm_pid); + GNUNET_OS_process_destroy (arm_pid); } diff --git a/src/mesh/test_mesh_local_2.c b/src/mesh/test_mesh_local_2.c index b185f1b84..d495b7161 100644 --- a/src/mesh/test_mesh_local_2.c +++ b/src/mesh/test_mesh_local_2.c @@ -76,7 +76,7 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Wait\n"); GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid)); - GNUNET_OS_process_close (arm_pid); + GNUNET_OS_process_destroy (arm_pid); } diff --git a/src/namestore/test_namestore_api.c b/src/namestore/test_namestore_api.c index 7e8de7374..c28220fb7 100644 --- a/src/namestore/test_namestore_api.c +++ b/src/namestore/test_namestore_api.c @@ -66,7 +66,7 @@ stop_arm () if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); GNUNET_OS_process_wait (arm); - GNUNET_OS_process_close (arm); + GNUNET_OS_process_destroy (arm); arm = NULL; } } diff --git a/src/namestore/test_namestore_api_create.c b/src/namestore/test_namestore_api_create.c index 7d60d8951..8a2c8a903 100644 --- a/src/namestore/test_namestore_api_create.c +++ b/src/namestore/test_namestore_api_create.c @@ -79,7 +79,7 @@ stop_arm () if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); GNUNET_OS_process_wait (arm); - GNUNET_OS_process_close (arm); + GNUNET_OS_process_destroy (arm); arm = NULL; } } diff --git a/src/namestore/test_namestore_api_create_update.c b/src/namestore/test_namestore_api_create_update.c index a4f454974..d11c894cc 100644 --- a/src/namestore/test_namestore_api_create_update.c +++ b/src/namestore/test_namestore_api_create_update.c @@ -79,7 +79,7 @@ stop_arm () if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); GNUNET_OS_process_wait (arm); - GNUNET_OS_process_close (arm); + GNUNET_OS_process_destroy (arm); arm = NULL; } } diff --git a/src/namestore/test_namestore_api_lookup.c b/src/namestore/test_namestore_api_lookup.c index b6b681566..3857ca141 100644 --- a/src/namestore/test_namestore_api_lookup.c +++ b/src/namestore/test_namestore_api_lookup.c @@ -73,7 +73,7 @@ stop_arm () if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); GNUNET_OS_process_wait (arm); - GNUNET_OS_process_close (arm); + GNUNET_OS_process_destroy (arm); arm = NULL; } } diff --git a/src/namestore/test_namestore_api_lookup_specific_type.c b/src/namestore/test_namestore_api_lookup_specific_type.c index 3cc2ad7ba..03a6887c6 100644 --- a/src/namestore/test_namestore_api_lookup_specific_type.c +++ b/src/namestore/test_namestore_api_lookup_specific_type.c @@ -76,7 +76,7 @@ stop_arm () if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); GNUNET_OS_process_wait (arm); - GNUNET_OS_process_close (arm); + GNUNET_OS_process_destroy (arm); arm = NULL; } } diff --git a/src/namestore/test_namestore_api_put.c b/src/namestore/test_namestore_api_put.c index 8941b6b6d..cdec716da 100644 --- a/src/namestore/test_namestore_api_put.c +++ b/src/namestore/test_namestore_api_put.c @@ -68,7 +68,7 @@ stop_arm () if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); GNUNET_OS_process_wait (arm); - GNUNET_OS_process_close (arm); + GNUNET_OS_process_destroy (arm); arm = NULL; } } diff --git a/src/namestore/test_namestore_api_remove.c b/src/namestore/test_namestore_api_remove.c index 89a6fab17..d1b566659 100644 --- a/src/namestore/test_namestore_api_remove.c +++ b/src/namestore/test_namestore_api_remove.c @@ -77,7 +77,7 @@ stop_arm () if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); GNUNET_OS_process_wait (arm); - GNUNET_OS_process_close (arm); + GNUNET_OS_process_destroy (arm); arm = NULL; } } diff --git a/src/namestore/test_namestore_api_remove_not_existing_record.c b/src/namestore/test_namestore_api_remove_not_existing_record.c index c0ace7a20..68920cb96 100644 --- a/src/namestore/test_namestore_api_remove_not_existing_record.c +++ b/src/namestore/test_namestore_api_remove_not_existing_record.c @@ -77,7 +77,7 @@ stop_arm () if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); GNUNET_OS_process_wait (arm); - GNUNET_OS_process_close (arm); + GNUNET_OS_process_destroy (arm); arm = NULL; } } diff --git a/src/namestore/test_namestore_api_zone_iteration.c b/src/namestore/test_namestore_api_zone_iteration.c index 50aaeb470..6743146e0 100644 --- a/src/namestore/test_namestore_api_zone_iteration.c +++ b/src/namestore/test_namestore_api_zone_iteration.c @@ -81,7 +81,7 @@ stop_arm () if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); GNUNET_OS_process_wait (arm); - GNUNET_OS_process_close (arm); + GNUNET_OS_process_destroy (arm); arm = NULL; } } diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c index 4291b0630..192853e5a 100644 --- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c +++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c @@ -81,7 +81,7 @@ stop_arm () if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); GNUNET_OS_process_wait (arm); - GNUNET_OS_process_close (arm); + GNUNET_OS_process_destroy (arm); arm = NULL; } } diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c index b48ab0781..f5f2e3a34 100644 --- a/src/namestore/test_namestore_api_zone_iteration_stop.c +++ b/src/namestore/test_namestore_api_zone_iteration_stop.c @@ -81,7 +81,7 @@ stop_arm () if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); GNUNET_OS_process_wait (arm); - GNUNET_OS_process_close (arm); + GNUNET_OS_process_destroy (arm); arm = NULL; } } diff --git a/src/namestore/test_namestore_api_zone_to_name.c b/src/namestore/test_namestore_api_zone_to_name.c index be90663f0..6efbaf534 100644 --- a/src/namestore/test_namestore_api_zone_to_name.c +++ b/src/namestore/test_namestore_api_zone_to_name.c @@ -77,7 +77,7 @@ stop_arm () if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); GNUNET_OS_process_wait (arm); - GNUNET_OS_process_close (arm); + GNUNET_OS_process_destroy (arm); arm = NULL; } } diff --git a/src/nat/nat.c b/src/nat/nat.c index 1b6556cbf..79604da7d 100644 --- a/src/nat/nat.c +++ b/src/nat/nat.c @@ -753,7 +753,7 @@ nat_server_read (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) if (0 != GNUNET_OS_process_kill (h->server_proc, SIGTERM)) GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_WARNING, "nat", "kill"); GNUNET_OS_process_wait (h->server_proc); - GNUNET_OS_process_close (h->server_proc); + GNUNET_OS_process_destroy (h->server_proc); h->server_proc = NULL; GNUNET_DISK_pipe_close (h->server_stdout); h->server_stdout = NULL; @@ -1263,7 +1263,7 @@ GNUNET_NAT_unregister (struct GNUNET_NAT_Handle *h) if (0 != GNUNET_OS_process_kill (h->server_proc, SIGTERM)) GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_WARNING, "nat", "kill"); GNUNET_OS_process_wait (h->server_proc); - GNUNET_OS_process_close (h->server_proc); + GNUNET_OS_process_destroy (h->server_proc); h->server_proc = NULL; GNUNET_DISK_pipe_close (h->server_stdout); h->server_stdout = NULL; @@ -1341,7 +1341,7 @@ GNUNET_NAT_run_client (struct GNUNET_NAT_Handle *h, /* we know that the gnunet-helper-nat-client will terminate virtually * instantly */ GNUNET_OS_process_wait (proc); - GNUNET_OS_process_close (proc); + GNUNET_OS_process_destroy (proc); return GNUNET_OK; } diff --git a/src/nat/nat_mini.c b/src/nat/nat_mini.c index 864a7f04e..82697a971 100644 --- a/src/nat/nat_mini.c +++ b/src/nat/nat_mini.c @@ -202,7 +202,7 @@ void GNUNET_NAT_mini_get_external_ipv4_cancel (struct GNUNET_NAT_ExternalHandle *eh) { (void) GNUNET_OS_process_kill (eh->eip, SIGKILL); - GNUNET_OS_process_close (eh->eip); + GNUNET_OS_process_destroy (eh->eip); GNUNET_DISK_pipe_close (eh->opipe); if (GNUNET_SCHEDULER_NO_TASK != eh->task) GNUNET_SCHEDULER_cancel (eh->task); diff --git a/src/nat/test_nat_test.c b/src/nat/test_nat_test.c index 64617880a..846d9b08e 100644 --- a/src/nat/test_nat_test.c +++ b/src/nat/test_nat_test.c @@ -129,7 +129,7 @@ main (int argc, char *const argv[]) NULL); GNUNET_break (0 == GNUNET_OS_process_kill (gns, SIGTERM)); GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (gns)); - GNUNET_OS_process_close (gns); + GNUNET_OS_process_destroy (gns); return ret; } diff --git a/src/nse/test_nse_api.c b/src/nse/test_nse_api.c index 658c8b9a5..f99cb3b03 100644 --- a/src/nse/test_nse_api.c +++ b/src/nse/test_nse_api.c @@ -53,7 +53,7 @@ stop_arm (struct PeerContext *p) if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); GNUNET_OS_process_wait (p->arm_proc); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; #endif GNUNET_CONFIGURATION_destroy (p->cfg); diff --git a/src/peerinfo/perf_peerinfo_api.c b/src/peerinfo/perf_peerinfo_api.c index aa32a2f09..34888fada 100755 --- a/src/peerinfo/perf_peerinfo_api.c +++ b/src/peerinfo/perf_peerinfo_api.c @@ -166,7 +166,7 @@ check () ok = 1; } GNUNET_OS_process_wait (proc); - GNUNET_OS_process_close (proc); + GNUNET_OS_process_destroy (proc); proc = NULL; #endif return ok; diff --git a/src/peerinfo/test_peerinfo_api.c b/src/peerinfo/test_peerinfo_api.c index 57402a0b1..e66878ea6 100644 --- a/src/peerinfo/test_peerinfo_api.c +++ b/src/peerinfo/test_peerinfo_api.c @@ -188,7 +188,7 @@ check () ok = 1; } GNUNET_OS_process_wait (proc); - GNUNET_OS_process_close (proc); + GNUNET_OS_process_destroy (proc); proc = NULL; return ok; } diff --git a/src/statistics/test_statistics_api.c b/src/statistics/test_statistics_api.c index 84d3f5a23..11f02b817 100644 --- a/src/statistics/test_statistics_api.c +++ b/src/statistics/test_statistics_api.c @@ -153,7 +153,7 @@ check () ok = 1; } GNUNET_OS_process_wait (proc); - GNUNET_OS_process_close (proc); + GNUNET_OS_process_destroy (proc); proc = NULL; #endif if (ok != 0) @@ -175,7 +175,7 @@ check () ok = 1; } GNUNET_OS_process_wait (proc); - GNUNET_OS_process_close (proc); + GNUNET_OS_process_destroy (proc); proc = NULL; #endif return ok; diff --git a/src/statistics/test_statistics_api_loop.c b/src/statistics/test_statistics_api_loop.c index 32b176caa..58114f278 100644 --- a/src/statistics/test_statistics_api_loop.c +++ b/src/statistics/test_statistics_api_loop.c @@ -114,7 +114,7 @@ check () ok = 1; } GNUNET_OS_process_wait (proc); - GNUNET_OS_process_close (proc); + GNUNET_OS_process_destroy (proc); proc = NULL; #endif return ok; diff --git a/src/statistics/test_statistics_api_watch.c b/src/statistics/test_statistics_api_watch.c index 979b5610e..e976bd473 100644 --- a/src/statistics/test_statistics_api_watch.c +++ b/src/statistics/test_statistics_api_watch.c @@ -145,7 +145,7 @@ check () ok = 1; } GNUNET_OS_process_wait (proc); - GNUNET_OS_process_close (proc); + GNUNET_OS_process_destroy (proc); proc = NULL; #endif return ok; diff --git a/src/statistics/test_statistics_api_watch_zero_value.c b/src/statistics/test_statistics_api_watch_zero_value.c index 9df09e45a..9fadf6a6c 100644 --- a/src/statistics/test_statistics_api_watch_zero_value.c +++ b/src/statistics/test_statistics_api_watch_zero_value.c @@ -179,7 +179,7 @@ check () ok = 1; } GNUNET_OS_process_wait (proc); - GNUNET_OS_process_close (proc); + GNUNET_OS_process_destroy (proc); proc = NULL; #endif if ((0 == ok) && (0 == ok2)) diff --git a/src/stream/test_stream_api.c b/src/stream/test_stream_api.c index 2eeedeec5..84c486763 100644 --- a/src/stream/test_stream_api.c +++ b/src/stream/test_stream_api.c @@ -101,7 +101,7 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) /* Free the duplicated configuration */ GNUNET_CONFIGURATION_destroy (config); GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid)); - GNUNET_OS_process_close (arm_pid); + GNUNET_OS_process_destroy (arm_pid); } diff --git a/src/stream/test_stream_local.c b/src/stream/test_stream_local.c index 3bc7731b2..63a67ac3f 100644 --- a/src/stream/test_stream_local.c +++ b/src/stream/test_stream_local.c @@ -181,7 +181,7 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_CONFIGURATION_destroy (config_peer1); GNUNET_CONFIGURATION_destroy (config_peer2); GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid)); - GNUNET_OS_process_close (arm_pid); + GNUNET_OS_process_destroy (arm_pid); } diff --git a/src/testing/test_testing_large_topology.c b/src/testing/test_testing_large_topology.c index ad6d973d2..d126ab940 100644 --- a/src/testing/test_testing_large_topology.c +++ b/src/testing/test_testing_large_topology.c @@ -192,7 +192,7 @@ gather_log_data () GNUNET_OS_start_process (NULL, NULL, "./memsize.pl", "memsize.pl", "totals.txt", peer_number, connect_number, NULL); GNUNET_OS_process_wait (mem_process); - GNUNET_OS_process_close (mem_process); + GNUNET_OS_process_destroy (mem_process); mem_process = NULL; } diff --git a/src/testing/test_testing_topology.c b/src/testing/test_testing_topology.c index ab6644c10..b21654483 100644 --- a/src/testing/test_testing_topology.c +++ b/src/testing/test_testing_topology.c @@ -197,7 +197,7 @@ gather_log_data () GNUNET_OS_start_process (NULL, NULL, "./memsize.pl", "memsize.pl", "totals.txt", peer_number, connect_number, NULL); GNUNET_OS_process_wait (mem_process); - GNUNET_OS_process_close (mem_process); + GNUNET_OS_process_destroy (mem_process); mem_process = NULL; } #endif diff --git a/src/testing/testing.c b/src/testing/testing.c index 7fed33206..4b640c8e5 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c @@ -214,7 +214,7 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) cb (d->cb_cls, NULL, d->cfg, d, _("`scp' did not complete cleanly.\n")); return; } - GNUNET_OS_process_close (d->proc_arm_copying); + GNUNET_OS_process_destroy (d->proc_arm_copying); d->proc_arm_copying = NULL; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Successfully copied configuration file.\n"); @@ -362,7 +362,7 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) d->pipe_stdout = NULL; (void) GNUNET_OS_process_kill (d->proc_arm_peerinfo, SIGKILL); GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (d->proc_arm_peerinfo)); - GNUNET_OS_process_close (d->proc_arm_peerinfo); + GNUNET_OS_process_destroy (d->proc_arm_peerinfo); d->proc_arm_peerinfo = NULL; if (NULL != cb) cb (d->cb_cls, NULL, d->cfg, d, _("Failed to get hostkey!\n")); @@ -373,7 +373,7 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) d->pipe_stdout = NULL; (void) GNUNET_OS_process_kill (d->proc_arm_peerinfo, SIGKILL); GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (d->proc_arm_peerinfo)); - GNUNET_OS_process_close (d->proc_arm_peerinfo); + GNUNET_OS_process_destroy (d->proc_arm_peerinfo); d->proc_arm_peerinfo = NULL; d->have_hostkey = GNUNET_YES; if (d->hostkey_callback != NULL) @@ -1414,7 +1414,7 @@ kill_and_close_process (struct GNUNET_OS_Process *proc) { (void) GNUNET_OS_process_kill (proc, SIGKILL); GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (proc)); - GNUNET_OS_process_close (proc); + GNUNET_OS_process_destroy (proc); } diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c index 29e87f6cf..d8e969461 100644 --- a/src/testing/testing_group.c +++ b/src/testing/testing_group.c @@ -2911,7 +2911,7 @@ create_and_copy_friend_files (struct GNUNET_TESTING_PeerGroup *pg) GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "scp", "scp", mytemp, arg, NULL); GNUNET_assert (procarr[pg_iter] != NULL); ret = GNUNET_OS_process_wait (procarr[pg_iter]); /* FIXME: schedule this, throttle! */ - GNUNET_OS_process_close (procarr[pg_iter]); + GNUNET_OS_process_destroy (procarr[pg_iter]); if (ret != GNUNET_OK) { /* FIXME: free contents of 'procarr' array */ @@ -2953,7 +2953,7 @@ create_and_copy_friend_files (struct GNUNET_TESTING_PeerGroup *pg) } else { - GNUNET_OS_process_close (procarr[pg_iter]); + GNUNET_OS_process_destroy (procarr[pg_iter]); procarr[pg_iter] = NULL; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "File %d copied\n", pg_iter); } @@ -3128,7 +3128,7 @@ create_and_copy_blacklist_files (struct GNUNET_TESTING_PeerGroup *pg, } else { - GNUNET_OS_process_close (procarr[pg_iter]); + GNUNET_OS_process_destroy (procarr[pg_iter]); procarr[pg_iter] = NULL; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "File %d copied\n", pg_iter); } @@ -5672,7 +5672,7 @@ check_peers_started (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) } } - GNUNET_OS_process_close (helper->proc); + GNUNET_OS_process_destroy (helper->proc); } static void @@ -5935,7 +5935,7 @@ GNUNET_TESTING_daemons_start (const struct GNUNET_CONFIGURATION_Handle *cfg, GNUNET_free (tmpdir); GNUNET_free (arg); GNUNET_OS_process_wait (proc); - GNUNET_OS_process_close (proc); + GNUNET_OS_process_destroy (proc); } GNUNET_free (baseservicehome); baseservicehome = NULL; @@ -6161,7 +6161,7 @@ GNUNET_TESTING_daemons_start (const struct GNUNET_CONFIGURATION_Handle *cfg, GNUNET_assert (0); } GNUNET_OS_process_wait (proc); - GNUNET_OS_process_close (proc); + GNUNET_OS_process_destroy (proc); } /* Now all the configuration files and hostkeys are copied to the remote host. Call the hostkey callback for each peer! */ GNUNET_SCHEDULER_add_now (&call_hostkey_callbacks, pg); diff --git a/src/transport/gnunet-transport-certificate-creation.c b/src/transport/gnunet-transport-certificate-creation.c index 2ec8d36a6..c4c13dc2a 100644 --- a/src/transport/gnunet-transport-certificate-creation.c +++ b/src/transport/gnunet-transport-certificate-creation.c @@ -62,7 +62,7 @@ main (int argc, char **argv) if (openssl == NULL) return 2; GNUNET_assert (GNUNET_OS_process_wait (openssl) == GNUNET_OK); - GNUNET_OS_process_close (openssl); + GNUNET_OS_process_destroy (openssl); /* Create a self-signed certificate in batch mode using rsa key */ /* openssl req -batch -days 365 -out $2 -new -x509 -key $1 2> /dev/null */ @@ -73,7 +73,7 @@ main (int argc, char **argv) if (openssl == NULL) return 3; GNUNET_assert (GNUNET_OS_process_wait (openssl) == GNUNET_OK); - GNUNET_OS_process_close (openssl); + GNUNET_OS_process_destroy (openssl); CHMOD (argv[1], S_IRUSR); CHMOD (argv[2], S_IRUSR); return 0; diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c index ee23189a8..3b6b7e4c5 100644 --- a/src/transport/gnunet-transport.c +++ b/src/transport/gnunet-transport.c @@ -197,7 +197,7 @@ display_test_result (struct TestContext *tc, int result) if ((0 == resolver_users) && (NULL != resolver)) { GNUNET_break (0 == GNUNET_OS_process_kill (resolver, SIGTERM)); - GNUNET_OS_process_close (resolver); + GNUNET_OS_process_destroy (resolver); resolver = NULL; } } diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c index 96b465291..0ec26c88b 100644 --- a/src/transport/plugin_transport_http_server.c +++ b/src/transport/plugin_transport_http_server.c @@ -203,7 +203,7 @@ server_load_certificate (struct Plugin *plugin) return GNUNET_SYSERR; } GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (cert_creation)); - GNUNET_OS_process_close (cert_creation); + GNUNET_OS_process_destroy (cert_creation); plugin->key = server_load_file (key_file); plugin->cert = server_load_file (cert_file); diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c index a6da2f688..7711dec06 100644 --- a/src/transport/plugin_transport_wlan.c +++ b/src/transport/plugin_transport_wlan.c @@ -1480,7 +1480,7 @@ wlan_transport_stop_wlan_helper (struct Plugin *plugin) GNUNET_DISK_pipe_close (plugin->server_stdin); GNUNET_OS_process_kill (plugin->server_proc, SIGKILL); GNUNET_OS_process_wait (plugin->server_proc); - GNUNET_OS_process_close (plugin->server_proc); + GNUNET_OS_process_destroy (plugin->server_proc); plugin->helper_is_running = GNUNET_NO; return GNUNET_YES; } diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c index ec0800842..695c04810 100644 --- a/src/transport/transport-testing.c +++ b/src/transport/transport-testing.c @@ -377,7 +377,7 @@ GNUNET_TRANSPORT_TESTING_restart_peer (struct GNUNET_TRANSPORT_TESTING_handle if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); GNUNET_OS_process_wait (p->arm_proc); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; } if (p->hello != NULL) @@ -467,7 +467,7 @@ GNUNET_TRANSPORT_TESTING_stop_peer (struct GNUNET_TRANSPORT_TESTING_handle *tth, if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); GNUNET_OS_process_wait (p->arm_proc); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; } if (p->hostkeyfile != NULL) diff --git a/src/util/crypto_random.c b/src/util/crypto_random.c index 25226a3b4..35d3c41e9 100644 --- a/src/util/crypto_random.c +++ b/src/util/crypto_random.c @@ -256,7 +256,7 @@ entropy_generator (void *cls, const char *what, int printchar, int current, if (0 != GNUNET_OS_process_kill (genproc, SIGTERM)) LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "kill"); GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (genproc)); - GNUNET_OS_process_close (genproc); + GNUNET_OS_process_destroy (genproc); genproc = NULL; } return; @@ -274,7 +274,7 @@ entropy_generator (void *cls, const char *what, int printchar, int current, if (0 != GNUNET_OS_process_kill (genproc, SIGTERM)) LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "kill"); GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (genproc)); - GNUNET_OS_process_close (genproc); + GNUNET_OS_process_destroy (genproc); genproc = NULL; } LOG (GNUNET_ERROR_TYPE_INFO, _("Starting `%s' process to generate entropy\n"), @@ -293,7 +293,7 @@ killfind () if (genproc != NULL) { GNUNET_OS_process_kill (genproc, SIGKILL); - GNUNET_OS_process_close (genproc); + GNUNET_OS_process_destroy (genproc); genproc = NULL; } } diff --git a/src/util/helper.c b/src/util/helper.c index 1eaadfa78..9cf39bbfd 100644 --- a/src/util/helper.c +++ b/src/util/helper.c @@ -154,7 +154,7 @@ stop_helper (struct GNUNET_HELPER_Handle *h) { GNUNET_break (0 == GNUNET_OS_process_kill (h->helper_proc, SIGTERM)); GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (h->helper_proc)); - GNUNET_OS_process_close (h->helper_proc); + GNUNET_OS_process_destroy (h->helper_proc); h->helper_proc = NULL; } if (GNUNET_SCHEDULER_NO_TASK != h->restart_task) diff --git a/src/util/os_priority.c b/src/util/os_priority.c index cabce94f1..f374ca56d 100644 --- a/src/util/os_priority.c +++ b/src/util/os_priority.c @@ -492,7 +492,7 @@ GNUNET_OS_process_get_pid (struct GNUNET_OS_Process * proc) * @param proc pointer to process structure */ void -GNUNET_OS_process_close (struct GNUNET_OS_Process *proc) +GNUNET_OS_process_destroy (struct GNUNET_OS_Process *proc) { if (NULL != proc->control_pipe) GNUNET_DISK_file_close (proc->control_pipe); @@ -1723,7 +1723,7 @@ GNUNET_OS_command_stop (struct GNUNET_OS_CommandHandle *cmd) } (void) GNUNET_OS_process_kill (cmd->eip, SIGKILL); GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (cmd->eip)); - GNUNET_OS_process_close (cmd->eip); + GNUNET_OS_process_destroy (cmd->eip); GNUNET_DISK_pipe_close (cmd->opipe); GNUNET_free (cmd); } diff --git a/src/util/test_common_logging_runtime_loglevels.c b/src/util/test_common_logging_runtime_loglevels.c index cdf1f660d..b914ae1c6 100644 --- a/src/util/test_common_logging_runtime_loglevels.c +++ b/src/util/test_common_logging_runtime_loglevels.c @@ -55,7 +55,7 @@ end_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); } GNUNET_OS_process_wait (proc); - GNUNET_OS_process_close (proc); + GNUNET_OS_process_destroy (proc); proc = NULL; GNUNET_DISK_pipe_close (pipe_stdout); if (ok == 1) diff --git a/src/util/test_os_start_process.c b/src/util/test_os_start_process.c index 3bcd636d3..0d1481857 100644 --- a/src/util/test_os_start_process.c +++ b/src/util/test_os_start_process.c @@ -56,7 +56,7 @@ end_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); } GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (proc)); - GNUNET_OS_process_close (proc); + GNUNET_OS_process_destroy (proc); proc = NULL; GNUNET_DISK_pipe_close (hello_pipe_stdout); GNUNET_DISK_pipe_close (hello_pipe_stdin); @@ -196,7 +196,7 @@ check_kill () GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); } GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (proc)); - GNUNET_OS_process_close (proc); + GNUNET_OS_process_destroy (proc); proc = NULL; GNUNET_DISK_pipe_close (hello_pipe_stdout); GNUNET_DISK_pipe_close (hello_pipe_stdin); @@ -224,7 +224,7 @@ check_instant_kill () GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); } GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (proc)); - GNUNET_OS_process_close (proc); + GNUNET_OS_process_destroy (proc); proc = NULL; GNUNET_DISK_pipe_close (hello_pipe_stdout); GNUNET_DISK_pipe_close (hello_pipe_stdin); diff --git a/src/util/test_resolver_api.c b/src/util/test_resolver_api.c index fedbe8340..4a3a20375 100644 --- a/src/util/test_resolver_api.c +++ b/src/util/test_resolver_api.c @@ -384,7 +384,7 @@ check () ok = 1; } GNUNET_OS_process_wait (proc); - GNUNET_OS_process_close (proc); + GNUNET_OS_process_destroy (proc); proc = NULL; if (ok != 0) FPRINTF (stderr, "Missed some resolutions: %u\n", ok); diff --git a/src/vpn/test_gnunet_vpn.c b/src/vpn/test_gnunet_vpn.c index 52e2f3fa2..4c941bd92 100644 --- a/src/vpn/test_gnunet_vpn.c +++ b/src/vpn/test_gnunet_vpn.c @@ -462,7 +462,7 @@ stop_peer (struct PeerContext *p) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; } #endif -- 2.25.1