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

launch wirewatch in the background for benchmarking

Browse Source
This commit is contained in:
Christian Grothoff 2018-08-10 13:09:12 +02:00
parent e17121fd1c
commit 9887077ea2
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
1 changed files with 68 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -351,10 +351,6 @@ run (void *cls,
CMD_TRANSFER_TO_EXCHANGE CMD_TRANSFER_TO_EXCHANGE
("create-reserve", ("create-reserve",
TALER_amount_to_string (&total_reserve_amount)), TALER_amount_to_string (&total_reserve_amount)),
/* FIXME: remove wirewatch here! */
TALER_TESTING_cmd_exec_wirewatch
("wirewatch",
cfg_filename),
TALER_TESTING_cmd_end () TALER_TESTING_cmd_end ()
}; };
@ -506,26 +502,8 @@ parallel_benchmark (TALER_TESTING_Main main_cb,
pid_t fakebank; pid_t fakebank;
int wstatus; int wstatus;
struct GNUNET_OS_Process *exchanged; struct GNUNET_OS_Process *exchanged;
struct GNUNET_OS_Process *wirewatch;
/* start exchange */
exchanged = GNUNET_OS_start_process (GNUNET_NO,
GNUNET_OS_INHERIT_STD_ALL,
NULL, NULL, NULL,
"taler-exchange-httpd",
"taler-exchange-httpd",
"-c", config_file,
"-i",
NULL);
if (NULL == exchanged)
return GNUNET_SYSERR;
if (0 != TALER_TESTING_wait_exchange_ready (exchange_url))
{
GNUNET_OS_process_kill (exchanged,
SIGTERM);
GNUNET_OS_process_wait (exchanged);
GNUNET_OS_process_destroy (exchanged);
return 77;
}
/* start fakebank */ /* start fakebank */
fakebank = fork (); fakebank = fork ();
if (0 == fakebank) if (0 == fakebank)
@ -538,13 +516,63 @@ parallel_benchmark (TALER_TESTING_Main main_cb,
{ {
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
"fork"); "fork");
result = GNUNET_SYSERR; return GNUNET_SYSERR;
}
/* start exchange */
exchanged = GNUNET_OS_start_process (GNUNET_NO,
GNUNET_OS_INHERIT_STD_ALL,
NULL, NULL, NULL,
"taler-exchange-httpd",
"taler-exchange-httpd",
"-c", config_file,
"-i",
NULL);
if (NULL == exchanged)
{
kill (fakebank,
SIGTERM);
waitpid (fakebank,
&wstatus,
0);
return 77;
}
/* start exchange */
wirewatch = GNUNET_OS_start_process (GNUNET_NO,
GNUNET_OS_INHERIT_STD_ALL,
NULL, NULL, NULL,
"taler-exchange-wirewatch",
"taler-exchange-wirewatch",
"-c", config_file,
NULL);
if (NULL == wirewatch)
{
GNUNET_OS_process_kill (exchanged,
SIGTERM);
kill (fakebank,
SIGTERM);
GNUNET_OS_process_wait (exchanged);
GNUNET_OS_process_destroy (exchanged);
waitpid (fakebank,
&wstatus,
0);
return 77;
}
if (0 != TALER_TESTING_wait_exchange_ready (exchange_url))
{
GNUNET_OS_process_kill (exchanged,
SIGTERM);
kill (fakebank,
SIGTERM);
GNUNET_OS_process_wait (exchanged);
GNUNET_OS_process_destroy (exchanged);
waitpid (fakebank,
&wstatus,
0);
return 77; return 77;
} }
sleep (1); /* make sure fakebank process is ready before continuing */ sleep (1); /* make sure fakebank process is ready before continuing */
/* FIXME: start wirewatch */
start_time = GNUNET_TIME_absolute_get (); start_time = GNUNET_TIME_absolute_get ();
result = GNUNET_OK; result = GNUNET_OK;
for (unsigned int i=0;i<howmany_clients;i++) for (unsigned int i=0;i<howmany_clients;i++)
@ -585,8 +613,21 @@ parallel_benchmark (TALER_TESTING_Main main_cb,
result = GNUNET_SYSERR; result = GNUNET_SYSERR;
} }
} }
/* FIXME: stop wirewatch */
/* stop wirewatch */
GNUNET_break (0 ==
GNUNET_OS_process_kill (wirewatch,
SIGTERM));
GNUNET_break (GNUNET_OK ==
GNUNET_OS_process_wait (wirewatch));
GNUNET_OS_process_destroy (wirewatch);
/* stop exchange */
GNUNET_break (0 ==
GNUNET_OS_process_kill (exchanged,
SIGTERM));
GNUNET_break (GNUNET_OK ==
GNUNET_OS_process_wait (exchanged));
GNUNET_OS_process_destroy (exchanged);
/* stop fakebank */ /* stop fakebank */
if (0 != kill (fakebank, if (0 != kill (fakebank,
SIGTERM)) SIGTERM))
@ -601,13 +642,6 @@ parallel_benchmark (TALER_TESTING_Main main_cb,
GNUNET_break (0); GNUNET_break (0);
result = GNUNET_SYSERR; result = GNUNET_SYSERR;
} }
/* stop exchange */
GNUNET_break (0 ==
GNUNET_OS_process_kill (exchanged,
SIGTERM));
GNUNET_break (GNUNET_OK ==
GNUNET_OS_process_wait (exchanged));
GNUNET_OS_process_destroy (exchanged);
return result; return result;
} }