diff options
| author | Paul Fertser <fercerpav@gmail.com> | 2015-03-13 16:32:53 +0300 |
|---|---|---|
| committer | Paul Fertser <fercerpav@gmail.com> | 2015-04-14 12:11:48 +0100 |
| commit | 19f219f731f29503c8e4d432935d3ea558cc1659 (patch) | |
| tree | d776e27c82b8c7f535c6043e5c275d733c7da019 /src/openocd.c | |
| parent | 33bb0fe6194b697bfc7e89338c0ffac1c54d09be (diff) | |
| download | riscv-openocd-19f219f731f29503c8e4d432935d3ea558cc1659.zip riscv-openocd-19f219f731f29503c8e4d432935d3ea558cc1659.tar.gz riscv-openocd-19f219f731f29503c8e4d432935d3ea558cc1659.tar.bz2 | |
Tcl exception codes cleanup, shutdown command amendments
This patch might influence openocd Tcl commands behaviour in subtle
ways, please give it a nice testing.
The idea is that if an OpenOCD Tcl command returns an error, an
exception is raised, and then the return code is propogated all the
way up (or to the "catch" if present). This allows to detect
"shutdown" which is not actually an error but has to raise an
exception to stop execution of the commands that follow it in the
script.
openocd_thread special-cases shutdown because it should then terminate
OpenOCD with a success error code, unless shutdown was called with an
optional "error" argument which means terminate with a non-zero exit
code.
Change-Id: I7b6fa8a2e24c947dc45d8def0008b4b007c478b3
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/2600
Tested-by: jenkins
Reviewed-by: Juha Niskanen <juha.niskanen@haltian.com>
Reviewed-by: Jens Bauer <jens@gpio.dk>
Reviewed-by: Oleksij Rempel <linux@rempel-privat.de>
Diffstat (limited to 'src/openocd.c')
| -rw-r--r-- | src/openocd.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/openocd.c b/src/openocd.c index b0dd21a..4d4dc2c 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -283,7 +283,9 @@ static int openocd_thread(int argc, char *argv[], struct command_context *cmd_ct return ERROR_FAIL; ret = parse_config_file(cmd_ctx); - if (ret != ERROR_OK) + if (ret == ERROR_COMMAND_CLOSE_CONNECTION) + return ERROR_OK; + else if (ret != ERROR_OK) return ERROR_FAIL; ret = server_init(cmd_ctx); @@ -296,9 +298,15 @@ static int openocd_thread(int argc, char *argv[], struct command_context *cmd_ct return ERROR_FAIL; } - server_loop(cmd_ctx); + ret = server_loop(cmd_ctx); + + int last_signal = server_quit(); + if (last_signal != ERROR_OK) + return last_signal; - return server_quit(); + if (ret != ERROR_OK) + return ERROR_FAIL; + return ERROR_OK; } /* normally this is the main() function entry, but if OpenOCD is linked |