gdb-server/rtos: Send correct answer to "qfThreadInfo" packet

[openocd.git] / src / rtos / rtos.c

diff --git a/src/rtos/rtos.c b/src/rtos/rtos.c
index 90763c23a9b3492c956ebb3b1c24e6e3b592fb6c..e9a17ea214750effb4432fa7695cbddf98b6f9b7 100644 (file)
--- a/src/rtos/rtos.c
+++ b/src/rtos/rtos.c
@@ -189,7 +189,7 @@ static char *next_symbol(struct rtos *os, char *cur_symbol, uint64_t cur_addr)
 int rtos_qsymbol(struct connection *connection, char *packet, int packet_size)
 {
        int rtos_detected = 0;
-       uint64_t addr;
+       uint64_t addr = 0;
        size_t reply_len;
        char reply[GDB_BUFFER_SIZE], cur_sym[GDB_BUFFER_SIZE / 2] = "", *next_sym;
        struct target *target = get_target_from_connection(connection);
@@ -212,8 +212,10 @@ int rtos_qsymbol(struct connection *connection, char *packet, int packet_size)
                        goto done;
                } else {
                        /* Autodetecting RTOS - try next RTOS */
-                       if (!rtos_try_next(target))
+                       if (!rtos_try_next(target)) {
+                               LOG_WARNING("No RTOS could be auto-detected!");
                                goto done;
+                       }
 
                        /* Next RTOS selected - invalidate current symbol */
                        cur_sym[0] = '\x00';
@@ -342,7 +344,7 @@ int rtos_thread_packet(struct connection *connection, char *packet, int packet_s
                                free(out_str);
                        }
                } else
-                       gdb_put_packet(connection, "", 0);
+                       gdb_put_packet(connection, "l", 1);
 
                return ERROR_OK;
        } else if (strncmp(packet, "qsThreadInfo", 12) == 0) {
@@ -511,3 +513,20 @@ int rtos_update_threads(struct target *target)
                target->rtos->type->update_threads(target->rtos);
        return ERROR_OK;
 }
+
+void rtos_free_threadlist(struct rtos *rtos)
+{
+       if (rtos->thread_details) {
+               int j;
+
+               for (j = 0; j < rtos->thread_count; j++) {
+                       struct thread_detail *current_thread = &rtos->thread_details[j];
+                       free(current_thread->display_str);
+                       free(current_thread->thread_name_str);
+                       free(current_thread->extra_info_str);
+               }
+               free(rtos->thread_details);
+               rtos->thread_details = NULL;
+               rtos->thread_count = 0;
+       }
+}