summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorkc8apf <kc8apf@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-05-27 20:30:17 +0000
committerkc8apf <kc8apf@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-05-27 20:30:17 +0000
commit35d8b2bf77645cfc4bc89666640a2907449451ff (patch)
treebdf4c3b2a8d522054875c8a0d89482e38cdda42f /src
parentafa77f86726646d36c5670ed59f73201ca02e597 (diff)
downloadopenocd+libswd-35d8b2bf77645cfc4bc89666640a2907449451ff.tar.gz
openocd+libswd-35d8b2bf77645cfc4bc89666640a2907449451ff.tar.bz2
openocd+libswd-35d8b2bf77645cfc4bc89666640a2907449451ff.tar.xz
openocd+libswd-35d8b2bf77645cfc4bc89666640a2907449451ff.zip
Author: Nicolas Pitre <nico@cam.org>
- Silence errors about keep_alive() not being called frequently enough unless a gdb session is active or debugging is enabled git-svn-id: svn://svn.berlios.de/openocd/trunk@1933 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src')
-rw-r--r--src/helper/log.c14
-rw-r--r--src/server/gdb_server.c9
2 files changed, 22 insertions, 1 deletions
diff --git a/src/helper/log.c b/src/helper/log.c
index 4ba0dd6a..549d7127 100644
--- a/src/helper/log.c
+++ b/src/helper/log.c
@@ -385,7 +385,19 @@ void keep_alive()
current_time=timeval_ms();
if (current_time-last_time>1000)
{
- LOG_WARNING("keep_alive() was not invoked in the 1000ms timelimit. GDB alive packet not sent! (%lld). Workaround: increase \"set remotetimeout\" in GDB", current_time-last_time);
+ extern int gdb_actual_connections;
+
+ if (gdb_actual_connections)
+ LOG_WARNING("keep_alive() was not invoked in the "
+ "1000ms timelimit. GDB alive packet not "
+ "sent! (%lld). Workaround: increase "
+ "\"set remotetimeout\" in GDB",
+ current_time-last_time);
+ else
+ LOG_DEBUG("keep_alive() was not invoked in the "
+ "1000ms timelimit (%lld). This may cause "
+ "trouble with GDB connections.",
+ current_time-last_time);
}
if (current_time-last_time>500)
{
diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index f4e9c326..c0127388 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -61,6 +61,10 @@ enum gdb_detach_mode
/* target behaviour on gdb detach */
enum gdb_detach_mode detach_mode = GDB_DETACH_RESUME;
+/* number of gdb connections, mainly to supress gdb related debugging spam
+ * in helper/log.c when no gdb connections are actually active */
+int gdb_actual_connections;
+
/* set if we are sending a memory map to gdb
* via qXfer:memory-map:read packet */
/* enabled by default*/
@@ -797,6 +801,9 @@ int gdb_new_connection(connection_t *connection)
if (initial_ack != '+')
gdb_putback_char(connection, initial_ack);
target_call_event_callbacks(gdb_service->target, TARGET_EVENT_GDB_ATTACH );
+
+ gdb_actual_connections++;
+
return ERROR_OK;
}
@@ -805,6 +812,8 @@ int gdb_connection_closed(connection_t *connection)
gdb_service_t *gdb_service = connection->service->priv;
gdb_connection_t *gdb_connection = connection->priv;
+ gdb_actual_connections--;
+
/* see if an image built with vFlash commands is left */
if (gdb_connection->vflash_image)
{