taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

have benchmark driver also launch auditor

Browse Source
This commit is contained in:
Christian Grothoff 2020-03-19 16:14:01 +01:00
parent ef489d7fff
commit 85f603090b
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
3 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/prebuilt

@ -1 +1 @@
Subproject commit ca53235ccfa0458ebf11c204888ca370e20ec3f5 Subproject commit 934a6a18301e81c4fd1b3a8cda2dc13dca4741cc

42
src/benchmark/taler-exchange-benchmark.c
View File

@ -475,6 +475,7 @@ parallel_benchmark (TALER_TESTING_Main main_cb,
pid_t cpids[howmany_clients]; pid_t cpids[howmany_clients];
pid_t fakebank = -1; pid_t fakebank = -1;
int wstatus; int wstatus;
struct GNUNET_OS_Process *auditord = NULL;
struct GNUNET_OS_Process *exchanged = NULL; struct GNUNET_OS_Process *exchanged = NULL;
struct GNUNET_OS_Process *wirewatch = NULL; struct GNUNET_OS_Process *wirewatch = NULL;
struct GNUNET_OS_Process *exchange_slave = NULL; struct GNUNET_OS_Process *exchange_slave = NULL;
@ -522,6 +523,30 @@ parallel_benchmark (TALER_TESTING_Main main_cb,
0); 0);
return 77; 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 */ /* start exchange wirewatch */
wirewatch = GNUNET_OS_start_process (GNUNET_NO, wirewatch = GNUNET_OS_start_process (GNUNET_NO,
GNUNET_OS_INHERIT_STD_ALL, GNUNET_OS_INHERIT_STD_ALL,
@ -532,6 +557,8 @@ parallel_benchmark (TALER_TESTING_Main main_cb,
NULL); NULL);
if (NULL == wirewatch) if (NULL == wirewatch)
{ {
GNUNET_OS_process_kill (auditord,
SIGTERM);
GNUNET_OS_process_kill (exchanged, GNUNET_OS_process_kill (exchanged,
SIGTERM); SIGTERM);
if (MODE_BOTH == mode) if (MODE_BOTH == mode)
@ -607,6 +634,13 @@ parallel_benchmark (TALER_TESTING_Main main_cb,
GNUNET_OS_process_wait (wirewatch); GNUNET_OS_process_wait (wirewatch);
GNUNET_OS_process_destroy (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; return 77;
} }
if ( (MODE_CLIENT == mode) || (MODE_BOTH == mode) ) 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 != wirewatch);
GNUNET_assert (NULL != exchanged); GNUNET_assert (NULL != exchanged);
GNUNET_assert (NULL != auditord);
/* stop wirewatch */ /* stop wirewatch */
GNUNET_break (0 == GNUNET_break (0 ==
GNUNET_OS_process_kill (wirewatch, GNUNET_OS_process_kill (wirewatch,
@ -703,6 +738,13 @@ parallel_benchmark (TALER_TESTING_Main main_cb,
GNUNET_break (GNUNET_OK == GNUNET_break (GNUNET_OK ==
GNUNET_OS_process_wait (wirewatch)); GNUNET_OS_process_wait (wirewatch));
GNUNET_OS_process_destroy (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 */ /* stop exchange */
GNUNET_break (0 == GNUNET_break (0 ==
GNUNET_OS_process_kill (exchanged, GNUNET_OS_process_kill (exchanged,

1
src/lib/auditor_api_handle.c
View File

@ -470,6 +470,7 @@ request_version (void *cls)
struct VersionRequest *vr; struct VersionRequest *vr;
CURL *eh; CURL *eh;
abort ();
auditor->retry_task = NULL; auditor->retry_task = NULL;
GNUNET_assert (NULL == auditor->vr); GNUNET_assert (NULL == auditor->vr);
vr = GNUNET_new (struct VersionRequest); vr = GNUNET_new (struct VersionRequest);