提交 85f718f6 编写于 作者: S Simon Glass

sandbox: Support signal handling only when requested

At present if sandbox crashes it prints a message and tries to exit. But
with the recently introduced signal handler, it often seems to get stuck
in a loop until the stack overflows:

Segmentation violation

Segmentation violation

Segmentation violation

Segmentation violation

Segmentation violation

Segmentation violation

Segmentation violation
...

The signal handler is only useful for a few tests, as I understand it.
Make it optional.
Signed-off-by: NSimon Glass <sjg@chromium.org>
上级 1311dd37
...@@ -390,6 +390,16 @@ static int sandbox_cmdline_cb_select_unittests(struct sandbox_state *state, ...@@ -390,6 +390,16 @@ static int sandbox_cmdline_cb_select_unittests(struct sandbox_state *state,
} }
SANDBOX_CMDLINE_OPT_SHORT(select_unittests, 'k', 1, "Select unit tests to run"); SANDBOX_CMDLINE_OPT_SHORT(select_unittests, 'k', 1, "Select unit tests to run");
static int sandbox_cmdline_cb_signals(struct sandbox_state *state,
const char *arg)
{
state->handle_signals = true;
return 0;
}
SANDBOX_CMDLINE_OPT_SHORT(signals, 'S', 0,
"Handle signals (such as SIGSEGV) in sandbox");
static void setup_ram_buf(struct sandbox_state *state) static void setup_ram_buf(struct sandbox_state *state)
{ {
/* Zero the RAM buffer if we didn't read it, to keep valgrind happy */ /* Zero the RAM buffer if we didn't read it, to keep valgrind happy */
...@@ -476,9 +486,11 @@ int main(int argc, char *argv[]) ...@@ -476,9 +486,11 @@ int main(int argc, char *argv[])
if (ret) if (ret)
goto err; goto err;
ret = os_setup_signal_handlers(); if (state->handle_signals) {
if (ret) ret = os_setup_signal_handlers();
goto err; if (ret)
goto err;
}
#if CONFIG_VAL(SYS_MALLOC_F_LEN) #if CONFIG_VAL(SYS_MALLOC_F_LEN)
gd->malloc_base = CONFIG_MALLOC_F_ADDR; gd->malloc_base = CONFIG_MALLOC_F_ADDR;
......
...@@ -93,6 +93,7 @@ struct sandbox_state { ...@@ -93,6 +93,7 @@ struct sandbox_state {
bool ram_buf_read; /* true if we read the RAM buffer */ bool ram_buf_read; /* true if we read the RAM buffer */
bool run_unittests; /* Run unit tests */ bool run_unittests; /* Run unit tests */
const char *select_unittests; /* Unit test to run */ const char *select_unittests; /* Unit test to run */
bool handle_signals; /* Handle signals within sandbox */
/* Pointer to information for each SPI bus/cs */ /* Pointer to information for each SPI bus/cs */
struct sandbox_spi_info spi[CONFIG_SANDBOX_SPI_MAX_BUS] struct sandbox_spi_info spi[CONFIG_SANDBOX_SPI_MAX_BUS]
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册