From: OpenOCD-Gerrit <ope...@us...> - 2022-03-19 09:05:34
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Main OpenOCD repository". The branch, master has been updated via 15a72fa644739633ccd071fab840876971228f05 (commit) from be0d68eb66b513ef406ffa83102f89a8f4602914 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 15a72fa644739633ccd071fab840876971228f05 Author: Antonio Borneo <bor...@gm...> Date: Sun Jan 30 23:57:38 2022 +0100 server: fix: remove kept_alive() from server loop The kept_alive() action is specific of a server that enjoyed an unscheduled keep_alive and want to communicate it to the keep alive logic to reschedule next keep_alive(). In server loop we are not expected to call kept_alive(). Remove it! This call was erroneously added in commit 94e75e0c06c4. Later, commit 7442b26d45dc properly added the same call in gdb_put_packet(), but incorrectly left the older in place. Change-Id: If476410f870eebfbdaccdb1366ba2e9254e2fdf6 Signed-off-by: Antonio Borneo <bor...@gm...> Reviewed-on: https://review.openocd.org/c/openocd/+/6836 Reviewed-by: Tomas Vanek <va...@fb...> Tested-by: jenkins diff --git a/src/server/server.c b/src/server/server.c index 1569f5a2c..3f2970152 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -487,7 +487,6 @@ int server_loop(struct command_context *command_context) timeout_ms = polling_period; tv.tv_usec = timeout_ms * 1000; /* Only while we're sleeping we'll let others run */ - kept_alive(); retval = socket_select(fd_max + 1, &read_fds, NULL, NULL, &tv); } ----------------------------------------------------------------------- Summary of changes: src/server/server.c | 1 - 1 file changed, 1 deletion(-) hooks/post-receive -- Main OpenOCD repository |