interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

break from long loops on shutdown request 

In loops that typically take longer time to complete, check if there is
a pending shutdown request. If so, terminate the loop.

This allows to respond to a signal requesting a shutdown during some
loops which do not return control to main OpenOCD loop.

Change-Id: Iace0b58eddde1237832d0f9333a7c7b930565674
Signed-off-by: Evgeniy Naydanov <evgeniy.naydanov@syntacore.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/8032
Reviewed-by: Jan Matyas <jan.matyas@codasip.com>
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
Evgeniy Naydanov 2023-11-22 18:10:27 +03:00 committed by Antonio Borneo
parent e8e09b1b55
commit 2e920a212f
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/server/server.h
View File

@ -118,5 +118,6 @@ COMMAND_HELPER(server_port_command, unsigned short *out);
#define ERROR_SERVER_REMOTE_CLOSED (-400) #define ERROR_SERVER_REMOTE_CLOSED (-400)
#define ERROR_CONNECTION_REJECTED (-401) #define ERROR_CONNECTION_REJECTED (-401)
#define ERROR_SERVER_INTERRUPTED (-402)
#endif /* OPENOCD_SERVER_SERVER_H */ #endif /* OPENOCD_SERVER_SERVER_H */

3
src/target/image.c
View File

@ -24,6 +24,7 @@
#include "image.h" #include "image.h"
#include "target.h" #include "target.h"
#include <helper/log.h> #include <helper/log.h>
#include <server/server.h>
/* convert ELF header field to host endianness */ /* convert ELF header field to host endianness */
#define field16(elf, field) \ #define field16(elf, field) \
@ -1295,6 +1296,8 @@ int image_calculate_checksum(const uint8_t *buffer, uint32_t nbytes, uint32_t *c
crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ *buffer++) & 255]; crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ *buffer++) & 255];
} }
keep_alive(); keep_alive();
if (openocd_is_shutdown_pending())
return ERROR_SERVER_INTERRUPTED;
} }
LOG_DEBUG("Calculating checksum done; checksum=0x%" PRIx32, crc); LOG_DEBUG("Calculating checksum done; checksum=0x%" PRIx32, crc);

20
src/target/target.c
View File

@ -1204,6 +1204,10 @@ int target_run_read_async_algorithm(struct target *target,
/* Avoid GDB timeouts */ /* Avoid GDB timeouts */
keep_alive(); keep_alive();
if (openocd_is_shutdown_pending()) {
retval = ERROR_SERVER_INTERRUPTED;
break;
}
} }
if (retval != ERROR_OK) { if (retval != ERROR_OK) {
@ -3224,8 +3228,11 @@ int target_wait_state(struct target *target, enum target_state state, unsigned i
nvp_value2name(nvp_target_state, state)->name); nvp_value2name(nvp_target_state, state)->name);
} }
if (cur-then > 500) if (cur - then > 500) {
keep_alive(); keep_alive();
if (openocd_is_shutdown_pending())
return ERROR_SERVER_INTERRUPTED;
}
if ((cur-then) > ms) { if ((cur-then) > ms) {
LOG_ERROR("timed out while waiting for target %s", LOG_ERROR("timed out while waiting for target %s",
@ -3507,6 +3514,11 @@ static int target_fill_mem(struct target *target,
break; break;
/* avoid GDB timeouts */ /* avoid GDB timeouts */
keep_alive(); keep_alive();
if (openocd_is_shutdown_pending()) {
retval = ERROR_SERVER_INTERRUPTED;
break;
}
} }
free(target_buf); free(target_buf);
@ -3849,6 +3861,12 @@ static COMMAND_HELPER(handle_verify_image_command_internal, enum verify_mode ver
} }
} }
keep_alive(); keep_alive();
if (openocd_is_shutdown_pending()) {
retval = ERROR_SERVER_INTERRUPTED;
free(data);
free(buffer);
goto done;
}
} }
} }
free(data); free(data);