From 62963ae4b36e88e8655d461646d85c211a3398d5 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 17 Jul 2020 22:18:57 +0200 Subject: [PATCH] adapt to change in GNUNET_OS_start_process() API (#6188) --- src/benchmark/taler-exchange-benchmark.c | 15 +++---- src/testing/test_auditor_api_version.c | 3 +- .../testing_api_cmd_auditor_exec_auditor.c | 3 +- ...ting_api_cmd_auditor_exec_auditor_dbinit.c | 3 +- src/testing/testing_api_cmd_exec_aggregator.c | 3 +- .../testing_api_cmd_exec_auditor-sign.c | 23 +++++------ src/testing/testing_api_cmd_exec_closer.c | 3 +- src/testing/testing_api_cmd_exec_keyup.c | 40 +++++++++--------- src/testing/testing_api_cmd_exec_transfer.c | 3 +- src/testing/testing_api_cmd_exec_wirewatch.c | 3 +- src/testing/testing_api_cmd_revoke.c | 3 +- .../testing_api_cmd_twister_exec_client.c | 41 ++++++++----------- src/testing/testing_api_helpers_exchange.c | 21 ++++------ src/testing/testing_api_twister_helpers.c | 6 +-- 14 files changed, 69 insertions(+), 101 deletions(-) diff --git a/src/benchmark/taler-exchange-benchmark.c b/src/benchmark/taler-exchange-benchmark.c index 7054e01e2..76ab1d561 100644 --- a/src/benchmark/taler-exchange-benchmark.c +++ b/src/benchmark/taler-exchange-benchmark.c @@ -599,8 +599,7 @@ parallel_benchmark (TALER_TESTING_Main main_cb, if ( (MODE_EXCHANGE == mode) || (MODE_BOTH == mode) ) { /* start exchange */ - exchanged = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + exchanged = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-exchange-httpd", "taler-exchange-httpd", @@ -626,8 +625,7 @@ parallel_benchmark (TALER_TESTING_Main main_cb, return 77; } /* start auditor */ - auditord = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + auditord = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-auditor-httpd", "taler-auditor-httpd", @@ -658,8 +656,7 @@ parallel_benchmark (TALER_TESTING_Main main_cb, return 77; } /* start exchange wirewatch */ - wirewatch = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + wirewatch = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-exchange-wirewatch", "taler-exchange-wirewatch", @@ -712,8 +709,7 @@ parallel_benchmark (TALER_TESTING_Main main_cb, GNUNET_YES, 0, 0))); - exchange_slave = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_OUT_AND_ERR, + exchange_slave = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR, exchange_slave_pipe, NULL, NULL, "ssh", "ssh", @@ -1087,8 +1083,7 @@ main (int argc, struct GNUNET_OS_Process *compute_wire_response; compute_wire_response - = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-exchange-wire", "taler-exchange-wire", diff --git a/src/testing/test_auditor_api_version.c b/src/testing/test_auditor_api_version.c index 204a0d506..7b96525ac 100644 --- a/src/testing/test_auditor_api_version.c +++ b/src/testing/test_auditor_api_version.c @@ -140,8 +140,7 @@ main (int argc, GNUNET_log_setup ("test-auditor-api-version", "INFO", NULL); - proc = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-auditor-httpd", "taler-auditor-httpd", diff --git a/src/testing/testing_api_cmd_auditor_exec_auditor.c b/src/testing/testing_api_cmd_auditor_exec_auditor.c index 13cf59df1..06dfe91bf 100644 --- a/src/testing/testing_api_cmd_auditor_exec_auditor.c +++ b/src/testing/testing_api_cmd_auditor_exec_auditor.c @@ -63,8 +63,7 @@ auditor_run (void *cls, (void) cmd; ks->auditor_proc - = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-auditor", "taler-auditor", diff --git a/src/testing/testing_api_cmd_auditor_exec_auditor_dbinit.c b/src/testing/testing_api_cmd_auditor_exec_auditor_dbinit.c index bc807feae..c09ec2918 100644 --- a/src/testing/testing_api_cmd_auditor_exec_auditor_dbinit.c +++ b/src/testing/testing_api_cmd_auditor_exec_auditor_dbinit.c @@ -63,8 +63,7 @@ auditor_dbinit_run (void *cls, (void) cmd; ks->auditor_dbinit_proc - = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-auditor-dbinit", "taler-auditor-dbinit", diff --git a/src/testing/testing_api_cmd_exec_aggregator.c b/src/testing/testing_api_cmd_exec_aggregator.c index f11671888..6ec56c175 100644 --- a/src/testing/testing_api_cmd_exec_aggregator.c +++ b/src/testing/testing_api_cmd_exec_aggregator.c @@ -62,8 +62,7 @@ aggregator_run (void *cls, (void) cmd; as->aggregator_proc - = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-exchange-aggregator", "taler-exchange-aggregator", diff --git a/src/testing/testing_api_cmd_exec_auditor-sign.c b/src/testing/testing_api_cmd_exec_auditor-sign.c index 82d7e6669..0b03e737e 100644 --- a/src/testing/testing_api_cmd_exec_auditor-sign.c +++ b/src/testing/testing_api_cmd_exec_auditor-sign.c @@ -121,18 +121,17 @@ auditor_sign_run (void *cls, GNUNET_CONFIGURATION_destroy (cfg); - ass->auditor_sign_proc = GNUNET_OS_start_process - (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, - NULL, NULL, NULL, - "taler-auditor-sign", - "taler-auditor-sign", - "-c", ass->config_filename, - "-u", "http://auditor/", - "-m", exchange_master_pub, - "-r", "auditor.in", - "-o", ass->signed_keys_out, - NULL); + ass->auditor_sign_proc + = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, + NULL, NULL, NULL, + "taler-auditor-sign", + "taler-auditor-sign", + "-c", ass->config_filename, + "-u", "http://auditor/", + "-m", exchange_master_pub, + "-r", "auditor.in", + "-o", ass->signed_keys_out, + NULL); GNUNET_free (exchange_master_pub); if (NULL == ass->auditor_sign_proc) { diff --git a/src/testing/testing_api_cmd_exec_closer.c b/src/testing/testing_api_cmd_exec_closer.c index d604ecec8..c1153babb 100644 --- a/src/testing/testing_api_cmd_exec_closer.c +++ b/src/testing/testing_api_cmd_exec_closer.c @@ -103,8 +103,7 @@ closer_run (void *cls, as->reserve_pub = *reserve_pubp; } as->closer_proc - = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-exchange-closer", "taler-exchange-closer", diff --git a/src/testing/testing_api_cmd_exec_keyup.c b/src/testing/testing_api_cmd_exec_keyup.c index 4283c7eae..7a0b36d17 100644 --- a/src/testing/testing_api_cmd_exec_keyup.c +++ b/src/testing/testing_api_cmd_exec_keyup.c @@ -76,28 +76,28 @@ keyup_run (void *cls, if (GNUNET_YES == ks->with_now) { - ks->keyup_proc = GNUNET_OS_start_process - (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, - NULL, NULL, NULL, - "taler-exchange-keyup", - "taler-exchange-keyup", - "-c", ks->config_filename, - "-o", "auditor.in", - "--time", - GNUNET_STRINGS_absolute_time_to_string (ks->now), - NULL); + ks->keyup_proc + = GNUNET_OS_start_process + (GNUNET_OS_INHERIT_STD_ALL, + NULL, NULL, NULL, + "taler-exchange-keyup", + "taler-exchange-keyup", + "-c", ks->config_filename, + "-o", "auditor.in", + "--time", + GNUNET_STRINGS_absolute_time_to_string (ks->now), + NULL); } else - ks->keyup_proc = GNUNET_OS_start_process - (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, - NULL, NULL, NULL, - "taler-exchange-keyup", - "taler-exchange-keyup", - "-c", ks->config_filename, - "-o", "auditor.in", - NULL); + ks->keyup_proc + = GNUNET_OS_start_process + (GNUNET_OS_INHERIT_STD_ALL, + NULL, NULL, NULL, + "taler-exchange-keyup", + "taler-exchange-keyup", + "-c", ks->config_filename, + "-o", "auditor.in", + NULL); if (NULL == ks->keyup_proc) { diff --git a/src/testing/testing_api_cmd_exec_transfer.c b/src/testing/testing_api_cmd_exec_transfer.c index c8764f93d..2db445bec 100644 --- a/src/testing/testing_api_cmd_exec_transfer.c +++ b/src/testing/testing_api_cmd_exec_transfer.c @@ -61,8 +61,7 @@ transfer_run (void *cls, struct TransferState *as = cls; as->transfer_proc - = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-exchange-transfer", "taler-exchange-transfer", diff --git a/src/testing/testing_api_cmd_exec_wirewatch.c b/src/testing/testing_api_cmd_exec_wirewatch.c index 7a1a27a51..eb6e16342 100644 --- a/src/testing/testing_api_cmd_exec_wirewatch.c +++ b/src/testing/testing_api_cmd_exec_wirewatch.c @@ -61,8 +61,7 @@ wirewatch_run (void *cls, struct WirewatchState *ws = cls; ws->wirewatch_proc - = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-exchange-wirewatch", "taler-exchange-wirewatch", diff --git a/src/testing/testing_api_cmd_revoke.c b/src/testing/testing_api_cmd_revoke.c index d9320865a..c43f53727 100644 --- a/src/testing/testing_api_cmd_revoke.c +++ b/src/testing/testing_api_cmd_revoke.c @@ -164,8 +164,7 @@ revoke_run (void *cls, &denom_pub->h_key, sizeof (struct GNUNET_HashCode)); - rs->revoke_proc = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + rs->revoke_proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-exchange-keyup", "taler-exchange-keyup", diff --git a/src/testing/testing_api_cmd_twister_exec_client.c b/src/testing/testing_api_cmd_twister_exec_client.c index 3f1fefabe..46265f772 100644 --- a/src/testing/testing_api_cmd_twister_exec_client.c +++ b/src/testing/testing_api_cmd_twister_exec_client.c @@ -232,15 +232,14 @@ hack_response_code_run (void *cls, GNUNET_asprintf (&http_status, "%u", hrcs->http_status); - hrcs->proc = GNUNET_OS_start_process - (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, - NULL, NULL, NULL, - "taler-twister", - "taler-twister", - "-c", hrcs->config_filename, - "--responsecode", http_status, - NULL); + hrcs->proc = GNUNET_OS_start_process ( + GNUNET_OS_INHERIT_STD_ALL, + NULL, NULL, NULL, + "taler-twister", + "taler-twister", + "-c", hrcs->config_filename, + "--responsecode", http_status, + NULL); if (NULL == hrcs->proc) { GNUNET_break (0); @@ -355,8 +354,7 @@ delete_object_run (void *cls, { struct DeleteObjectState *dos = cls; - dos->proc = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + dos->proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-twister", "taler-twister", @@ -443,8 +441,7 @@ modify_object_dl_run (void *cls, { struct ModifyObjectState *mos = cls; - mos->proc = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + mos->proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-twister", "taler-twister", @@ -476,8 +473,7 @@ modify_object_ul_run (void *cls, { struct ModifyObjectState *mos = cls; - mos->proc = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + mos->proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-twister", "taler-twister", @@ -509,8 +505,7 @@ modify_header_dl_run (void *cls, { struct ModifyObjectState *mos = cls; - mos->proc = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + mos->proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-twister", "taler-twister", @@ -631,8 +626,7 @@ flip_upload_run (void *cls, { struct FlipObjectState *fos = cls; - fos->proc = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + fos->proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-twister", "taler-twister", @@ -663,8 +657,7 @@ flip_download_run (void *cls, { struct FlipObjectState *fos = cls; - fos->proc = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + fos->proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-twister", "taler-twister", @@ -813,8 +806,7 @@ malform_request_run (void *cls, { struct MalformRequestState *mrs = cls; - mrs->proc = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + mrs->proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-twister", "taler-twister", @@ -900,8 +892,7 @@ malform_response_run (void *cls, { struct MalformResponseState *mrs = cls; - mrs->proc = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + mrs->proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-twister", "taler-twister", diff --git a/src/testing/testing_api_helpers_exchange.c b/src/testing/testing_api_helpers_exchange.c index 872d23b9b..6a26ef27c 100644 --- a/src/testing/testing_api_helpers_exchange.c +++ b/src/testing/testing_api_helpers_exchange.c @@ -110,8 +110,7 @@ TALER_TESTING_run_keyup (const char *config_filename, { struct GNUNET_OS_Process *proc; - proc = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-exchange-keyup", "taler-exchange-keyup", @@ -149,8 +148,7 @@ TALER_TESTING_run_auditor_sign (const char *config_filename, { struct GNUNET_OS_Process *proc; - proc = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-auditor-sign", "taler-auditor-sign", @@ -195,8 +193,7 @@ TALER_TESTING_run_auditor_exchange (const char *config_filename, exchange_base_url, exchange_master_pub); - proc = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-auditor-exchange", "taler-auditor-exchange", @@ -244,8 +241,7 @@ TALER_TESTING_exchange_db_reset (const char *config_filename) enum GNUNET_OS_ProcessStatusType type; unsigned long code; - proc = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-exchange-dbinit", "taler-exchange-dbinit", @@ -302,8 +298,7 @@ TALER_TESTING_auditor_db_reset (const char *config_filename) enum GNUNET_OS_ProcessStatusType type; unsigned long code; - proc = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-auditor-dbinit", "taler-auditor-dbinit", @@ -782,8 +777,7 @@ TALER_TESTING_setup_with_exchange_cfg (void *cls, } } GNUNET_free (serve); - exchanged = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + exchanged = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-exchange-httpd", "taler-exchange-httpd", @@ -887,8 +881,7 @@ TALER_TESTING_setup_with_auditor_and_exchange_cfg (void *cls, } } GNUNET_free (serve); - auditord = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + auditord = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-auditor-httpd", "taler-auditor-httpd", diff --git a/src/testing/testing_api_twister_helpers.c b/src/testing/testing_api_twister_helpers.c index 0406d7987..5f8663d46 100644 --- a/src/testing/testing_api_twister_helpers.c +++ b/src/testing/testing_api_twister_helpers.c @@ -93,8 +93,7 @@ TALER_TWISTER_run_twister (const char *config_filename) unsigned long code; enum GNUNET_OS_ProcessStatusType type; - proc = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-twister-service", "taler-twister-service", @@ -103,8 +102,7 @@ TALER_TWISTER_run_twister (const char *config_filename) if (NULL == proc) TWISTER_FAIL (); - client_proc = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + client_proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-twister", "taler-twister",