[GNUnet-SVN] [taler-exchange] branch master updated: benchmark: terminate exchange slave properly

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository exchange.

The following commit(s) were added to refs/heads/master by this push:
     new feec6e30 benchmark: terminate exchange slave properly
feec6e30 is described below

commit feec6e30e6a6732b3005305f80ecdc30b01f7e4e
Author: Florian Dold <address@hidden>
AuthorDate: Wed May 1 20:52:43 2019 +0200

    benchmark: terminate exchange slave properly
---
 src/benchmark/taler-exchange-benchmark.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/benchmark/taler-exchange-benchmark.c 
b/src/benchmark/taler-exchange-benchmark.c
index 3f3854a5..eed8f80d 100644
--- a/src/benchmark/taler-exchange-benchmark.c
+++ b/src/benchmark/taler-exchange-benchmark.c
@@ -566,6 +566,7 @@ parallel_benchmark (TALER_TESTING_Main main_cb,
   struct GNUNET_OS_Process *exchanged = NULL;
   struct GNUNET_OS_Process *wirewatch = NULL;
   struct GNUNET_OS_Process *exchange_slave = NULL;
+  struct GNUNET_DISK_PipeHandle *exchange_slave_pipe;
 
   if ( (MODE_CLIENT == mode) || (MODE_BOTH == mode) )
   {
@@ -650,9 +651,14 @@ parallel_benchmark (TALER_TESTING_Main main_cb,
                 "remote command: %s\n",
                 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,
-                                              GNUNET_OS_INHERIT_STD_ALL,
-                                              NULL, NULL, NULL,
+                                              
GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+                                              exchange_slave_pipe, NULL, NULL,
                                               "ssh",
                                               "ssh",
                                               /* Don't ask for pw/passphrase, 
rather fail */
@@ -758,8 +764,17 @@ parallel_benchmark (TALER_TESTING_Main main_cb,
 
   if (MODE_CLIENT == mode)
   {
+    char c = 'q';
+
     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_OS_process_wait (exchange_slave));
     GNUNET_OS_process_destroy (exchange_slave);

-- 
To stop receiving notification emails like this one, please contact
address@hidden