diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-03-19 16:14:01 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-03-19 16:14:01 +0100 |
| commit | 85f603090be497aba01dd74cef844b65cc60372d (patch) | |
| tree | 1a7adbbea2768c48ab375d2a0598798242abcb0e | |
| parent | ef489d7fff600ac45024512d998f04bc81a5dca7 (diff) | |
| download | exchange-85f603090be497aba01dd74cef844b65cc60372d.tar.gz exchange-85f603090be497aba01dd74cef844b65cc60372d.tar.bz2 exchange-85f603090be497aba01dd74cef844b65cc60372d.zip | |
have benchmark driver also launch auditor
| m--------- | doc/prebuilt | 0 | ||||
| -rw-r--r-- | src/benchmark/taler-exchange-benchmark.c | 42 | ||||
| -rw-r--r-- | src/lib/auditor_api_handle.c | 1 |
3 files changed, 43 insertions, 0 deletions
diff --git a/doc/prebuilt b/doc/prebuilt -Subproject ca53235ccfa0458ebf11c204888ca370e20ec3f +Subproject 934a6a18301e81c4fd1b3a8cda2dc13dca4741c diff --git a/src/benchmark/taler-exchange-benchmark.c b/src/benchmark/taler-exchange-benchmark.c index fa2e34ff0..5deb5f582 100644 --- a/src/benchmark/taler-exchange-benchmark.c +++ b/src/benchmark/taler-exchange-benchmark.c @@ -475,6 +475,7 @@ parallel_benchmark (TALER_TESTING_Main main_cb, pid_t cpids[howmany_clients]; pid_t fakebank = -1; int wstatus; + struct GNUNET_OS_Process *auditord = NULL; struct GNUNET_OS_Process *exchanged = NULL; struct GNUNET_OS_Process *wirewatch = NULL; struct GNUNET_OS_Process *exchange_slave = NULL; @@ -522,6 +523,30 @@ parallel_benchmark (TALER_TESTING_Main main_cb, 0); return 77; } + /* start auditor */ + auditord = GNUNET_OS_start_process (GNUNET_NO, + GNUNET_OS_INHERIT_STD_ALL, + NULL, NULL, NULL, + "taler-auditor-httpd", + "taler-auditor-httpd", + "-c", config_file, + NULL); + if (NULL == auditord) + { + GNUNET_OS_process_kill (exchanged, + SIGTERM); + if (MODE_BOTH == mode) + { + GNUNET_assert (-1 != fakebank); + kill (fakebank, + SIGTERM); + waitpid (fakebank, + &wstatus, + 0); + } + GNUNET_OS_process_destroy (exchanged); + return 77; + } /* start exchange wirewatch */ wirewatch = GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_ALL, @@ -532,6 +557,8 @@ parallel_benchmark (TALER_TESTING_Main main_cb, NULL); if (NULL == wirewatch) { + GNUNET_OS_process_kill (auditord, + SIGTERM); GNUNET_OS_process_kill (exchanged, SIGTERM); if (MODE_BOTH == mode) @@ -607,6 +634,13 @@ parallel_benchmark (TALER_TESTING_Main main_cb, GNUNET_OS_process_wait (wirewatch); GNUNET_OS_process_destroy (wirewatch); } + if (NULL != auditord) + { + GNUNET_OS_process_kill (auditord, + SIGTERM); + GNUNET_OS_process_wait (auditord); + GNUNET_OS_process_destroy (auditord); + } return 77; } if ( (MODE_CLIENT == mode) || (MODE_BOTH == mode) ) @@ -696,6 +730,7 @@ parallel_benchmark (TALER_TESTING_Main main_cb, { GNUNET_assert (NULL != wirewatch); GNUNET_assert (NULL != exchanged); + GNUNET_assert (NULL != auditord); /* stop wirewatch */ GNUNET_break (0 == GNUNET_OS_process_kill (wirewatch, @@ -703,6 +738,13 @@ parallel_benchmark (TALER_TESTING_Main main_cb, GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (wirewatch)); GNUNET_OS_process_destroy (wirewatch); + /* stop auditor */ + GNUNET_break (0 == + GNUNET_OS_process_kill (auditord, + SIGTERM)); + GNUNET_break (GNUNET_OK == + GNUNET_OS_process_wait (auditord)); + GNUNET_OS_process_destroy (auditord); /* stop exchange */ GNUNET_break (0 == GNUNET_OS_process_kill (exchanged, diff --git a/src/lib/auditor_api_handle.c b/src/lib/auditor_api_handle.c index 85f42c3f6..bc36fc910 100644 --- a/src/lib/auditor_api_handle.c +++ b/src/lib/auditor_api_handle.c @@ -470,6 +470,7 @@ request_version (void *cls) struct VersionRequest *vr; CURL *eh; + abort (); auditor->retry_task = NULL; GNUNET_assert (NULL == auditor->vr); vr = GNUNET_new (struct VersionRequest); |