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

benchmark: terminate exchange slave properly

Browse Source
This commit is contained in:
Florian Dold 2019-05-01 20:52:43 +02:00
parent 88f9e693f6
commit feec6e30e6
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -566,6 +566,7 @@ parallel_benchmark (TALER_TESTING_Main main_cb,
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;
struct GNUNET_DISK_PipeHandle *exchange_slave_pipe;
if ( (MODE_CLIENT == mode) || (MODE_BOTH == mode) ) if ( (MODE_CLIENT == mode) || (MODE_BOTH == mode) )
{ {
@ -650,9 +651,14 @@ parallel_benchmark (TALER_TESTING_Main main_cb,
"remote command: %s\n", "remote command: %s\n",
remote_cmd); remote_cmd);
GNUNET_assert (NULL != (exchange_slave_pipe =
GNUNET_DISK_pipe (GNUNET_YES,
GNUNET_YES,
0, 0)));
exchange_slave = GNUNET_OS_start_process (GNUNET_NO, exchange_slave = GNUNET_OS_start_process (GNUNET_NO,
GNUNET_OS_INHERIT_STD_ALL, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
NULL, NULL, NULL, exchange_slave_pipe, NULL, NULL,
"ssh", "ssh",
"ssh", "ssh",
/* Don't ask for pw/passphrase, rather fail */ /* Don't ask for pw/passphrase, rather fail */
@ -758,8 +764,17 @@ parallel_benchmark (TALER_TESTING_Main main_cb,
if (MODE_CLIENT == mode) if (MODE_CLIENT == mode)
{ {
char c = 'q';
GNUNET_assert (NULL != exchange_slave); GNUNET_assert (NULL != exchange_slave);
GNUNET_OS_process_kill (exchange_slave, SIGTERM);
/* Write a character to the pipe to end the exchange slave.
* We can't send a signal here, as it would just kill SSH and
* not necessarily the process on the other machine. */
GNUNET_DISK_file_write (GNUNET_DISK_pipe_handle
(exchange_slave_pipe, GNUNET_DISK_PIPE_END_WRITE),
&c, sizeof (c));
GNUNET_break (GNUNET_OK == GNUNET_break (GNUNET_OK ==
GNUNET_OS_process_wait (exchange_slave)); GNUNET_OS_process_wait (exchange_slave));
GNUNET_OS_process_destroy (exchange_slave); GNUNET_OS_process_destroy (exchange_slave);