]> git.gag.com Git - fw/openocd/commitdiff
server: fix: remove kept_alive() from server loop
authorAntonio Borneo <borneo.antonio@gmail.com>
Sun, 30 Jan 2022 22:57:38 +0000 (23:57 +0100)
committerAntonio Borneo <borneo.antonio@gmail.com>
Sat, 19 Mar 2022 09:04:19 +0000 (09:04 +0000)
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 <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/6836
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Tested-by: jenkins
src/server/server.c

index 1569f5a2caae330957eee40df3599fbfff6a4f1e..3f2970152a9e11a32710cc657e839a1fe88684ce 100644 (file)
@@ -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);
                }