[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-exchange] branch master updated (673e418 -> d09beec)
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [taler-exchange] branch master updated (673e418 -> d09beec) |
|
Date: |
Sun, 21 Jan 2018 18:51:46 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a change to branch master
in repository exchange.
from 673e418 forgotten file
new 41cb8b4 integrate sigpipe with ain loop
new d09beec integrate sigpipe with ain loop
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/exchange-lib/Makefile.am | 1 +
src/exchange-lib/test_exchange_api_new.c | 33 -------
src/exchange-lib/testing_api_loop.c | 108 ++++++++++++++++++++-
...ait_denom_sig.c => testing_api_trait_process.c} | 32 +++---
src/include/taler_testing_lib.h | 32 ++++++
5 files changed, 152 insertions(+), 54 deletions(-)
copy src/exchange-lib/{testing_api_trait_denom_sig.c =>
testing_api_trait_process.c} (56%)
diff --git a/src/exchange-lib/Makefile.am b/src/exchange-lib/Makefile.am
index 6cf7005..c8fc447 100644
--- a/src/exchange-lib/Makefile.am
+++ b/src/exchange-lib/Makefile.am
@@ -48,6 +48,7 @@ libtalertesting_la_SOURCES = \
testing_api_trait_coin_priv.c \
testing_api_trait_denom_pub.c \
testing_api_trait_denom_sig.c \
+ testing_api_trait_process.c \
testing_api_trait_reserve_priv.c
libtalertesting_la_LIBADD = \
diff --git a/src/exchange-lib/test_exchange_api_new.c
b/src/exchange-lib/test_exchange_api_new.c
index 573e900..4cf8423 100644
--- a/src/exchange-lib/test_exchange_api_new.c
+++ b/src/exchange-lib/test_exchange_api_new.c
@@ -51,12 +51,6 @@
*/
// static struct TALER_EXCHANGE_Handle *exchange;
-
-/**
- * Pipe used to communicate child death via signal.
- */
-static struct GNUNET_DISK_PipeHandle *sigpipe;
-
/**
* Handle to the exchange process.
*/
@@ -115,24 +109,6 @@ run (void *cls,
}
-/**
- * Signal handler called for SIGCHLD. Triggers the
- * respective handler by writing to the trigger pipe.
- */
-static void
-sighandler_child_death ()
-{
- static char c;
- int old_errno = errno; /* back-up errno */
-
- GNUNET_break (1 ==
- GNUNET_DISK_file_write (GNUNET_DISK_pipe_handle
- (sigpipe, GNUNET_DISK_PIPE_END_WRITE),
- &c, sizeof (c)));
- errno = old_errno; /* restore errno */
-}
-
-
/**
* Remove files from previous runs
@@ -311,17 +287,8 @@ main (int argc,
}
while (0 != system ("wget -q -t 1 -T 1 http://127.0.0.1:8081/keys -o
/dev/null -O /dev/null"));
fprintf (stderr, "\n");
- sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO,
- GNUNET_NO, GNUNET_NO);
- GNUNET_assert (NULL != sigpipe);
- shc_chld = GNUNET_SIGNAL_handler_install (GNUNET_SIGCHLD,
- &sighandler_child_death);
result = TALER_TESTING_setup (&run, NULL);
-
- GNUNET_SIGNAL_handler_uninstall (shc_chld);
- shc_chld = NULL;
- GNUNET_DISK_pipe_close (sigpipe);
GNUNET_break (0 ==
GNUNET_OS_process_kill (exchanged,
SIGTERM));
diff --git a/src/exchange-lib/testing_api_loop.c
b/src/exchange-lib/testing_api_loop.c
index d1e153a..22d7867 100644
--- a/src/exchange-lib/testing_api_loop.c
+++ b/src/exchange-lib/testing_api_loop.c
@@ -45,6 +45,12 @@ struct TALER_TESTING_Interpreter
struct GNUNET_SCHEDULER_Task *task;
/**
+ * ID of task called whenever we get a SIGCHILD.
+ * Used for #TALER_TESTING_wait_for_sigchld().
+ */
+ struct GNUNET_SCHEDULER_Task *child_death_task;
+
+ /**
* Main execution context for the main loop.
*/
struct GNUNET_CURL_Context *ctx;
@@ -70,15 +76,18 @@ struct TALER_TESTING_Interpreter
*/
int result;
- /**
- * Pipe used to communicate child death via signal.
- */
- struct GNUNET_DISK_PipeHandle *sigpipe;
-
};
/**
+ * Pipe used to communicate child death via signal.
+ * Must be global, as used in signal handler!
+ */
+static struct GNUNET_DISK_PipeHandle *sigpipe;
+
+
+
+/**
* Lookup command by label.
*
* @param is interpreter state to search
@@ -263,6 +272,67 @@ do_timeout (void *cls)
}
+/**
+ * Task triggered whenever we receive a SIGCHLD (child
+ * process died).
+ *
+ * @param cls closure
+ */
+static void
+maint_child_death (void *cls)
+{
+ struct TALER_TESTING_Interpreter *is = cls;
+ struct TALER_TESTING_Command *cmd = &is->commands[is->ip];
+ const struct GNUNET_DISK_FileHandle *pr;
+ struct GNUNET_OS_Process **processp;
+ char c[16];
+
+ is->child_death_task = NULL;
+ pr = GNUNET_DISK_pipe_handle (sigpipe,
+ GNUNET_DISK_PIPE_END_READ);
+ GNUNET_break (0 <
+ GNUNET_DISK_file_read (pr,
+ &c,
+ sizeof (c)));
+ if (GNUNET_OK !=
+ TALER_TESTING_get_trait_process (cmd,
+ NULL,
+ &processp))
+ {
+ GNUNET_break (0);
+ TALER_TESTING_interpreter_fail (is);
+ return;
+ }
+ GNUNET_OS_process_wait (*processp);
+ GNUNET_OS_process_destroy (*processp);
+ *processp = NULL;
+ TALER_TESTING_interpreter_next (is);
+}
+
+
+/**
+ * Wait until we receive SIGCHLD signal.
+ * Then obtain the process trait of the current
+ * command, wait on the the zombie and continue
+ * with the next command.
+ */
+void
+TALER_TESTING_wait_for_sigchld (struct TALER_TESTING_Interpreter *is)
+{
+ const struct GNUNET_DISK_FileHandle *pr;
+
+ GNUNET_assert (NULL == is->child_death_task);
+ pr = GNUNET_DISK_pipe_handle (sigpipe,
+ GNUNET_DISK_PIPE_END_READ);
+ is->child_death_task
+ = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
+ pr,
+ &maint_child_death,
+ is);
+
+}
+
+
void
TALER_TESTING_run (struct TALER_TESTING_Interpreter *is,
struct TALER_TESTING_Command *commands)
@@ -298,6 +368,25 @@ struct MainContext
};
+/**
+ * Signal handler called for SIGCHLD. Triggers the
+ * respective handler by writing to the trigger pipe.
+ */
+static void
+sighandler_child_death ()
+{
+ static char c;
+ int old_errno = errno; /* back-up errno */
+
+ GNUNET_break (1 ==
+ GNUNET_DISK_file_write (GNUNET_DISK_pipe_handle
+ (sigpipe,
+ GNUNET_DISK_PIPE_END_WRITE),
+ &c, sizeof (c)));
+ errno = old_errno; /* restore errno */
+}
+
+
static void
main_wrapper (void *cls)
{
@@ -326,12 +415,21 @@ TALER_TESTING_setup (TALER_TESTING_Main main_cb,
.main_cb_cls = main_cb_cls,
.is = &is
};
+ struct GNUNET_SIGNAL_Context *shc_chld;
memset (&is,
0,
sizeof (is));
+ sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO,
+ GNUNET_NO, GNUNET_NO);
+ GNUNET_assert (NULL != sigpipe);
+ shc_chld = GNUNET_SIGNAL_handler_install (GNUNET_SIGCHLD,
+ &sighandler_child_death);
GNUNET_SCHEDULER_run (&main_wrapper,
&main_ctx);
+ GNUNET_SIGNAL_handler_uninstall (shc_chld);
+ GNUNET_DISK_pipe_close (sigpipe);
+ sigpipe = NULL;
return is.result;
}
diff --git a/src/exchange-lib/testing_api_trait_denom_sig.c
b/src/exchange-lib/testing_api_trait_process.c
similarity index 56%
copy from src/exchange-lib/testing_api_trait_denom_sig.c
copy to src/exchange-lib/testing_api_trait_process.c
index 66785c7..877eca9 100644
--- a/src/exchange-lib/testing_api_trait_denom_sig.c
+++ b/src/exchange-lib/testing_api_trait_process.c
@@ -15,8 +15,8 @@
<http://www.gnu.org/licenses/>
*/
/**
- * @file exchange-lib/testing_api_trait_denom_sig.c
- * @brief main interpreter loop for testcases
+ * @file exchange-lib/testing_api_trait_process.c
+ * @brief trait for a command that launches a process
* @author Christian Grothoff
* @author Marcello Stanisci
*/
@@ -27,41 +27,41 @@
#include "taler_signatures.h"
#include "taler_testing_lib.h"
-#define TALER_TESTING_TRAIT_DENOM_SIG "denomination-signature"
+#define TALER_TESTING_TRAIT_PROCESS "process"
/**
- * Obtain a denomination signature from a @a cmd.
+ * Obtain location where a command stores a pointer to a process
*
* @param cmd command to extract trait from
- * @param selector which signature to pick if @a cmd has multiple on offer
- * @param denom_sig[out] set to the signature
+ * @param selector which process to pick if @a cmd has multiple on offer
+ * @param coin_priv[out] set to address of the pointer to the process
* @return #GNUNET_OK on success
*/
int
-TALER_TESTING_get_trait_denom_sig (const struct TALER_TESTING_Command *cmd,
- const char *selector,
- struct TALER_DenominationSignature
**denom_sig)
+TALER_TESTING_get_trait_process (const struct TALER_TESTING_Command *cmd,
+ const char *selector,
+ struct GNUNET_OS_Process ***processp)
{
return cmd->traits (cmd->cls,
- (void **) denom_sig,
- TALER_TESTING_TRAIT_DENOM_SIG,
+ (void **) processp,
+ TALER_TESTING_TRAIT_PROCESS,
selector);
}
struct TALER_TESTING_Trait
-TALER_TESTING_make_trait_denom_sig (const char *selector,
- const struct TALER_DenominationSignature
*denom_sig)
+TALER_TESTING_make_trait_process (const char *selector,
+ struct GNUNET_OS_Process **processp)
{
struct TALER_TESTING_Trait ret = {
.selector = selector,
- .trait_name = TALER_TESTING_TRAIT_DENOM_SIG,
- .ptr = (const void *) denom_sig
+ .trait_name = TALER_TESTING_TRAIT_PROCESS,
+ .ptr = (const void *) processp
};
return ret;
}
-/* end of testing_api_trait_denom_sig.c */
+/* end of testing_api_trait_process.c */
diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h
index 9492977..8e11916 100644
--- a/src/include/taler_testing_lib.h
+++ b/src/include/taler_testing_lib.h
@@ -162,6 +162,16 @@ struct TALER_TESTING_Command
TALER_TESTING_cmd_end (void);
+/**
+ * Wait until we receive SIGCHLD signal.
+ * Then obtain the process trait of the current
+ * command, wait on the the zombie and continue
+ * with the next command.
+ */
+void
+TALER_TESTING_wait_for_sigchld (struct TALER_TESTING_Interpreter *is);
+
+
void
TALER_TESTING_run (struct TALER_TESTING_Interpreter *is,
struct TALER_TESTING_Command *commands);
@@ -272,6 +282,28 @@ TALER_TESTING_get_trait_reserve_priv (const struct
TALER_TESTING_Command *cmd,
struct TALER_ReservePrivateKeyP
**reserve_priv);
+
+/**
+ * Obtain location where a command stores a pointer to a process
+ *
+ * @param cmd command to extract trait from
+ * @param selector which process to pick if @a cmd has multiple on offer
+ * @param coin_priv[out] set to address of the pointer to the process
+ * @return #GNUNET_OK on success
+ */
+int
+TALER_TESTING_get_trait_process (const struct TALER_TESTING_Command *cmd,
+ const char *selector,
+ struct GNUNET_OS_Process ***processp);
+
+
+
+
+struct TALER_TESTING_Trait
+TALER_TESTING_make_trait_process (const char *selector,
+ struct GNUNET_OS_Process **processp);
+
+
/**
* @param selector
*/
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [taler-exchange] branch master updated (673e418 -> d09beec),
gnunet <=