Plugins-Commits February 2016

plugins-commits@lists.geany.org

1 participants
90 discussions

[geany/geany-plugins] dc049f: debugger: Report the signal name when the process received one
by Colomban Wendling 07 Feb '16

07 Feb '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 07 Feb 2016 13:55:31 UTC Commit: dc049f4cf8ed3263d3da56f2d95c667edffb4468 https://github.com/geany/geany-plugins/commit/dc049f4cf8ed3263d3da56f2d95c6… Log Message: ----------- debugger: Report the signal name when the process received one Modified Paths: -------------- debugger/src/dbm_gdb.c Modified: debugger/src/dbm_gdb.c 9 lines changed, 8 insertions(+), 1 deletions(-) =================================================================== @@ -519,7 +519,14 @@ static gboolean on_read_from_gdb(GIOChannel * src, GIOCondition cond, gpointer d else { if (!requested_interrupt) - dbg_cbs->report_error(_("Program received a signal")); + { + gchar *msg = g_strdup_printf(_("Program received signal %s (%s)"), + (gchar *) gdb_mi_result_var(record->first, "signal-name", GDB_MI_VAL_STRING), + (gchar *) gdb_mi_result_var(record->first, "signal-meaning", GDB_MI_VAL_STRING)); + + dbg_cbs->report_error(msg); + g_free(msg); + } else requested_interrupt = FALSE; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 4940e3: debugger: Use an enumeration for markers
by Colomban Wendling 07 Feb '16

07 Feb '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 07 Feb 2016 13:55:31 UTC Commit: 4940e36291671fbcd0be96af763ec342374e4986 https://github.com/geany/geany-plugins/commit/4940e36291671fbcd0be96af763ec… Log Message: ----------- debugger: Use an enumeration for markers Modified Paths: -------------- debugger/src/markers.c Modified: debugger/src/markers.c 17 lines changed, 10 insertions(+), 7 deletions(-) =================================================================== @@ -40,13 +40,16 @@ extern GeanyData *geany_data; #include "xpm/frame_current.xpm" /* markers identifiers */ -#define M_FIRST 12 -#define M_BP_ENABLED M_FIRST -#define M_BP_DISABLED (M_FIRST + 1) -#define M_BP_CONDITIONAL (M_FIRST + 2) -#define M_CI_BACKGROUND (M_FIRST + 3) -#define M_CI_ARROW (M_FIRST + 4) -#define M_FRAME (M_FIRST + 5) +#define M_FIRST 12 +enum +{ + M_BP_ENABLED = M_FIRST, + M_BP_DISABLED, + M_BP_CONDITIONAL, + M_CI_BACKGROUND, + M_CI_ARROW, + M_FRAME +}; #define MARKER_PRESENT(mask, marker) (mask && (0x01 << marker)) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 186d3f: debugger: Fix marker for current frame
by Colomban Wendling 07 Feb '16

07 Feb '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 07 Feb 2016 13:55:31 UTC Commit: 186d3fa45dbc5d0e1a93811e3443344c928eb326 https://github.com/geany/geany-plugins/commit/186d3fa45dbc5d0e1a93811e34433… Log Message: ----------- debugger: Fix marker for current frame Display the correct marker for the current frame when there is several frames at the same location (e.g. from recursion). As Scintilla markers are drawn in their ID order, the marker one wants to see "on top" should have the highest ID. So, make the current frame marker (M_CI_ARROW) have a higher ID than the generic frame one (M_FRAME) so if both are set on the same line the current frame one is the one on top (e.g. visible, as they have the exact same shape). Modified Paths: -------------- debugger/src/markers.c Modified: debugger/src/markers.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -46,9 +46,9 @@ enum M_BP_ENABLED = M_FIRST, M_BP_DISABLED, M_BP_CONDITIONAL, + M_FRAME, M_CI_BACKGROUND, - M_CI_ARROW, - M_FRAME + M_CI_ARROW }; #define MARKER_PRESENT(mask, marker) (mask && (0x01 << marker)) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] a61742: debugger: Remove an unused and incorrect macro
by Colomban Wendling 07 Feb '16

07 Feb '16

1 0

[geany/geany-plugins] df0853: debugger: Avoid potential NULL dereference
by Colomban Wendling 07 Feb '16

07 Feb '16

1 0

[geany/geany-plugins] 3e56ba: debugger: Fix a few memory leaks
by Colomban Wendling 07 Feb '16

07 Feb '16

1 0

[geany/geany-plugins] 081c66: debugger: Remove some unnecessary uses of GString wrappers
by Colomban Wendling 07 Feb '16

07 Feb '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 07 Feb 2016 13:55:30 UTC Commit: 081c6640cabbdf1adb90dbf619b17e9c15ccdde9 https://github.com/geany/geany-plugins/commit/081c6640cabbdf1adb90dbf619b17… Log Message: ----------- debugger: Remove some unnecessary uses of GString wrappers Modified Paths: -------------- debugger/src/dbm_gdb.c Modified: debugger/src/dbm_gdb.c 118 lines changed, 49 insertions(+), 69 deletions(-) =================================================================== @@ -60,9 +60,9 @@ typedef enum _result_class { /* structure to keep async command data (command line, messages) */ typedef struct _queue_item { - GString *message; - GString *command; - GString *error_message; + gchar *message; + gchar *command; + gchar *error_message; gboolean format_error_message; } queue_item; @@ -261,11 +261,9 @@ static void gdb_input_write_line(const gchar *line) */ static void free_queue_item(queue_item *item) { - if (item->message) - g_string_free(item->message, TRUE); - g_string_free(item->command, TRUE); - if (item->error_message) - g_string_free(item->error_message, TRUE); + g_free(item->message); + g_free(item->command); + g_free(item->error_message); g_free(item); } @@ -289,15 +287,9 @@ static GList* add_to_queue(GList* queue, const gchar *message, const gchar *comm memset((void*)item, 0, sizeof(queue_item)); - if (message) - { - item->message = g_string_new(message); - } - item->command = g_string_new(command); - if (error_message) - { - item->error_message = g_string_new(error_message); - } + item->message = g_strdup(message); + item->command = g_strdup(command); + item->error_message = g_strdup(error_message); item->format_error_message = format_error_message; return g_list_append(queue, (gpointer)item); @@ -351,10 +343,10 @@ static gboolean on_read_async_output(GIOChannel * src, GIOCondition cond, gpoint /* send message to debugger messages window */ if (item->message) { - dbg_cbs->send_message(item->message->str, "grey"); + dbg_cbs->send_message(item->message, "grey"); } - gdb_input_write_line(item->command->str); + gdb_input_write_line(item->command); gdb_id_out = g_io_add_watch(gdb_ch_out, G_IO_IN, on_read_async_output, commands); } @@ -385,16 +377,14 @@ static gboolean on_read_async_output(GIOChannel * src, GIOCondition cond, gpoint if (item->format_error_message) { const gchar* gdb_msg = gdb_mi_result_var(record->first, "msg", GDB_MI_VAL_STRING); + gchar *msg = g_strdup_printf(item->error_message, gdb_msg); - GString *msg = g_string_new(""); - g_string_printf(msg, item->error_message->str, gdb_msg); - dbg_cbs->report_error(msg->str); - - g_string_free(msg, TRUE); + dbg_cbs->report_error(msg); + g_free(msg); } else { - dbg_cbs->report_error(item->error_message->str); + dbg_cbs->report_error(item->error_message); } } @@ -696,7 +686,7 @@ static gboolean run(const gchar* file, const gchar* commandline, GList* env, GLi gchar *working_directory = g_path_get_dirname(file); GList *lines, *iter; GList *commands = NULL; - GString *command; + gchar *command; int bp_index; queue_item *item; @@ -752,10 +742,9 @@ static gboolean run(const gchar* file, const gchar* commandline, GList* env, GLi /* collect commands */ /* loading file */ - command = g_string_new(""); - g_string_printf(command, "-file-exec-and-symbols \"%s\"", file); - commands = add_to_queue(commands, _("~\"Loading target file.\\n\""), command->str, _("Error loading file"), FALSE); - g_string_free(command, TRUE); + command = g_strdup_printf("-file-exec-and-symbols \"%s\"", file); + commands = add_to_queue(commands, _("~\"Loading target file.\\n\""), command, _("Error loading file"), FALSE); + g_free(command); /* setting asyncronous mode */ commands = add_to_queue(commands, NULL, "-gdb-set target-async 1", _("Error configuring GDB"), FALSE); @@ -767,16 +756,14 @@ static gboolean run(const gchar* file, const gchar* commandline, GList* env, GLi commands = add_to_queue(commands, NULL, "-enable-pretty-printing", _("Error configuring GDB"), FALSE); /* set locale */ - command = g_string_new(""); - g_string_printf(command, "-gdb-set environment LANG=%s", g_getenv("LANG")); - commands = add_to_queue(commands, NULL, command->str, NULL, FALSE); - g_string_free(command, TRUE); + command = g_strdup_printf("-gdb-set environment LANG=%s", g_getenv("LANG")); + commands = add_to_queue(commands, NULL, command, NULL, FALSE); + g_free(command); /* set arguments */ - command = g_string_new(""); - g_string_printf(command, "-exec-arguments %s", commandline); - commands = add_to_queue(commands, NULL, command->str, NULL, FALSE); - g_string_free(command, TRUE); + command = g_strdup_printf("-exec-arguments %s", commandline); + commands = add_to_queue(commands, NULL, command, NULL, FALSE); + g_free(command); /* set passed evironment */ iter = env; @@ -788,11 +775,9 @@ static gboolean run(const gchar* file, const gchar* commandline, GList* env, GLi iter = iter->next; value = (gchar*)iter->data; - command = g_string_new(""); - g_string_printf(command, "-gdb-set environment %s=%s", name, value); - - commands = add_to_queue(commands, NULL, command->str, NULL, FALSE); - g_string_free(command, TRUE); + command = g_strdup_printf("-gdb-set environment %s=%s", name, value); + commands = add_to_queue(commands, NULL, command, NULL, FALSE); + g_free(command); iter = iter->next; } @@ -802,50 +787,45 @@ static gboolean run(const gchar* file, const gchar* commandline, GList* env, GLi while (biter) { breakpoint *bp = (breakpoint*)biter->data; - GString *error_message = g_string_new(""); + gchar *error_message; - command = g_string_new(""); - g_string_printf(command, "-break-insert -f \"\\\"%s\\\":%i\"", bp->file, bp->line); + command = g_strdup_printf("-break-insert -f \"\\\"%s\\\":%i\"", bp->file, bp->line); - g_string_printf(error_message, _("Breakpoint at %s:%i cannot be set\nDebugger message: %s"), bp->file, bp->line, "%s"); - - commands = add_to_queue(commands, NULL, command->str, error_message->str, TRUE); + error_message = g_strdup_printf(_("Breakpoint at %s:%i cannot be set\nDebugger message: %s"), bp->file, bp->line, "%s"); + + commands = add_to_queue(commands, NULL, command, error_message, TRUE); - g_string_free(command, TRUE); + g_free(command); if (bp->hitscount) { - command = g_string_new(""); - g_string_printf(command, "-break-after %i %i", bp_index, bp->hitscount); - commands = add_to_queue(commands, NULL, command->str, error_message->str, TRUE); - g_string_free(command, TRUE); + command = g_strdup_printf("-break-after %i %i", bp_index, bp->hitscount); + commands = add_to_queue(commands, NULL, command, error_message, TRUE); + g_free(command); } if (strlen(bp->condition)) { - command = g_string_new(""); - g_string_printf (command, "-break-condition %i %s", bp_index, bp->condition); - commands = add_to_queue(commands, NULL, command->str, error_message->str, TRUE); - g_string_free(command, TRUE); + command = g_strdup_printf ("-break-condition %i %s", bp_index, bp->condition); + commands = add_to_queue(commands, NULL, command, error_message, TRUE); + g_free(command); } if (!bp->enabled) { - command = g_string_new(""); - g_string_printf (command, "-break-disable %i", bp_index); - commands = add_to_queue(commands, NULL, command->str, error_message->str, TRUE); - g_string_free(command, TRUE); + command = g_strdup_printf ("-break-disable %i", bp_index); + commands = add_to_queue(commands, NULL, command, error_message, TRUE); + g_free(command); } - g_string_free(error_message, TRUE); + g_free(error_message); bp_index++; biter = biter->next; } /* set debugging terminal */ - command = g_string_new("-inferior-tty-set "); - g_string_append(command, terminal_device); - commands = add_to_queue(commands, NULL, command->str, NULL, FALSE); - g_string_free(command, TRUE); + command = g_strconcat("-inferior-tty-set ", terminal_device, NULL); + commands = add_to_queue(commands, NULL, command, NULL, FALSE); + g_free(command); /* connect read callback to the output chanel */ gdb_id_out = g_io_add_watch(gdb_ch_out, G_IO_IN, on_read_async_output, commands); @@ -855,11 +835,11 @@ static gboolean run(const gchar* file, const gchar* commandline, GList* env, GLi /* send message to debugger messages window */ if (item->message) { - dbg_cbs->send_message(item->message->str, "grey"); + dbg_cbs->send_message(item->message, "grey"); } /* send first command */ - gdb_input_write_line(item->command->str); + gdb_input_write_line(item->command); return TRUE; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 138e3d: Merge branch 'debugger/frame-speedup' into debugger/master
by Colomban Wendling 07 Feb '16

07 Feb '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 07 Feb 2016 13:54:51 UTC Commit: 138e3d3f5b9339a7dd9607d1f9bc7e709ae56429 https://github.com/geany/geany-plugins/commit/138e3d3f5b9339a7dd9607d1f9bc7… Log Message: ----------- Merge branch 'debugger/frame-speedup' into debugger/master Closes #347. Modified Paths: -------------- debugger/src/breakpoints.c debugger/src/dbm_gdb.c debugger/src/debug.c debugger/src/debug_module.c debugger/src/debug_module.h debugger/src/envtree.c debugger/src/gdb_mi.c debugger/src/stree.c debugger/src/stree.h debugger/src/watch_model.c Modified: debugger/src/breakpoints.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -70,7 +70,7 @@ static void hash_table_foreach_call_function(gpointer key, gpointer value, gpoin static gboolean tree_foreach_add_to_list(gpointer key, gpointer value, gpointer data) { GList **list = (GList**)data; - *list = g_list_append(*list, value); + *list = g_list_prepend(*list, value); return FALSE; } @@ -675,7 +675,7 @@ GList* breaks_get_for_document(const char* file) { g_tree_foreach(tree, tree_foreach_add_to_list, &breaks); } - return breaks; + return g_list_reverse(breaks); } /* @@ -702,5 +702,5 @@ GList* breaks_get_all(void) { GList *breaks = NULL; g_hash_table_foreach(files, hash_table_foreach_add_to_list, &breaks); - return breaks; + return g_list_reverse(breaks); } Modified: debugger/src/dbm_gdb.c 14 lines changed, 8 insertions(+), 6 deletions(-) =================================================================== @@ -213,10 +213,10 @@ static GList* read_until_prompt(void) break; line[terminator] = '\0'; - lines = g_list_append (lines, line); + lines = g_list_prepend (lines, line); } - return lines; + return g_list_reverse(lines); } /* @@ -1129,11 +1129,11 @@ static GList* get_stack(void) /* line */ f->line = line ? atoi(line) : 0; - stack = g_list_append(stack, f); + stack = g_list_prepend(stack, f); } gdb_mi_record_free(record); - return stack; + return g_list_reverse(stack); } /* @@ -1293,8 +1293,9 @@ static void update_watches(void) var->evaluated = name != NULL; /* add to updating list */ - updating = g_list_append(updating, var); + updating = g_list_prepend(updating, var); } + updating = g_list_reverse(updating); /* update watches */ get_variables(updating); @@ -1465,11 +1466,12 @@ static GList* get_children (gchar* path) var = variable_new2(name, internal, VT_CHILD); var->evaluated = TRUE; - children = g_list_append(children, var); + children = g_list_prepend(children, var); } } gdb_mi_record_free(record); + children = g_list_reverse(children); get_variables(children); return children; Modified: debugger/src/debug.c 20 lines changed, 8 insertions(+), 12 deletions(-) =================================================================== @@ -418,13 +418,13 @@ static gboolean on_watch_key_pressed_callback(GtkWidget *widget, GdkEvent *even /* add path reference if it's not an empty row*/ if (gtk_tree_path_compare(path, empty_path)) - references = g_list_append(references, gtk_tree_row_reference_new(wmodel, path)); + references = g_list_prepend(references, gtk_tree_row_reference_new(wmodel, path)); iter = iter->next; } /* iterate through references and remove */ - iter = references; + iter = g_list_reverse(references); while (iter) { GtkTreeRowReference *reference = (GtkTreeRowReference*)iter->data; @@ -640,7 +640,7 @@ static void on_debugger_run (void) if (stack) { remove_stack_markers(); - g_list_foreach(stack, (GFunc)frame_free, NULL); + g_list_foreach(stack, (GFunc)frame_unref, NULL); g_list_free(stack); stack = NULL; @@ -700,11 +700,7 @@ static void on_debugger_stopped (int thread_id) /* get current stack trace and put in the tree view */ stack = active_module->get_stack(); - for (iter = stack; iter; iter = iter->next) - { - frame *f = (frame*)iter->data; - stree_add(f); - } + stree_add (stack); stree_select_first_frame(TRUE); /* files */ @@ -799,7 +795,7 @@ static void on_debugger_exited (int code) if (stack) { remove_stack_markers(); - g_list_foreach(stack, (GFunc)frame_free, NULL); + g_list_foreach(stack, (GFunc)frame_unref, NULL); g_list_free(stack); stack = NULL; } @@ -1075,7 +1071,7 @@ void debug_destroy(void) if (stack) { remove_stack_markers(); - g_list_foreach(stack, (GFunc)frame_free, NULL); + g_list_foreach(stack, (GFunc)frame_unref, NULL); g_list_free(stack); stack = NULL; } @@ -1126,11 +1122,11 @@ GList* debug_get_modules(void) module_description *desc = modules; while (desc->title) { - mods = g_list_append(mods, (gpointer)desc->title); + mods = g_list_prepend(mods, (gpointer)desc->title); desc++; } - return mods; + return g_list_reverse(mods); } /* Modified: debugger/src/debug_module.c 28 lines changed, 15 insertions(+), 13 deletions(-) =================================================================== @@ -79,26 +79,28 @@ void variable_reset(variable *var) /* creates new frame */ frame* frame_new(void) { - frame *f = (frame*)malloc(sizeof(frame)); - memset((void*)f, 0, sizeof(frame)); + frame *f = g_malloc0(sizeof *f); + f->ref_count = 1; return f; } -/* frees a frame */ -void frame_free(frame* f) +/* refs a frame */ +frame* frame_ref(frame* f) { - if (f->address) + f->ref_count++; + return f; +} + +/* unrefs a frame */ +void frame_unref(frame* f) +{ + if (f->ref_count > 1) + f->ref_count--; + else { g_free(f->address); - } - if (f->function) - { g_free(f->function); - } - if (f->file) - { g_free(f->file); + g_free(f); } - - g_free(f); } Modified: debugger/src/debug_module.h 6 lines changed, 4 insertions(+), 2 deletions(-) =================================================================== @@ -79,6 +79,7 @@ typedef struct _variable { /* type to hold information about a stack frame */ typedef struct _frame { + gint ref_count; gchar *address; gchar *function; gchar *file; @@ -170,7 +171,8 @@ variable* variable_new(const gchar *name, variable_type vt); variable* variable_new2(const gchar *name, const gchar *internal, variable_type vt); void variable_reset(variable *var); -frame* frame_new(void); -void frame_free(frame* f); +frame* frame_new(void); +frame* frame_ref(frame* f); +void frame_unref(frame* f); #endif /* guard */ Modified: debugger/src/envtree.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -135,7 +135,7 @@ static void delete_selected_rows(void) } if (gtk_tree_path_compare(path, empty_path)) - references = g_list_append(references, gtk_tree_row_reference_new(model, path)); + references = g_list_prepend(references, gtk_tree_row_reference_new(model, path)); iter = iter->next; } @@ -145,7 +145,7 @@ static void delete_selected_rows(void) if (!reference_to_select) reference_to_select = gtk_tree_row_reference_copy (empty_row); - iter = references; + iter = g_list_reverse(references); while (iter) { GtkTreeIter titer; Modified: debugger/src/gdb_mi.c 51 lines changed, 36 insertions(+), 15 deletions(-) =================================================================== @@ -98,13 +98,17 @@ static gchar *parse_cstring(const gchar **p) if (**p == '"') { + const gchar *base; + (*p)++; + base = *p; while (**p != '"') { gchar c = **p; /* TODO: check expansions here */ if (c == '\\') { + g_string_append_len(str, base, (*p) - base); (*p)++; c = **p; switch (g_ascii_tolower(c)) @@ -159,12 +163,14 @@ static gchar *parse_cstring(const gchar **p) } break; } + g_string_append_c(str, c); + base = (*p) + 1; } - if (**p == '\0') + else if (**p == '\0') break; - g_string_append_c(str, c); (*p)++; } + g_string_append_len(str, base, (*p) - base); if (**p == '"') (*p)++; } @@ -176,15 +182,15 @@ static gchar *parse_cstring(const gchar **p) * the docs aren't clear on this */ static gchar *parse_string(const gchar **p) { - GString *str = g_string_new(NULL); + const gchar *base = *p; if (g_ascii_isalpha(**p) || strchr("-_.", **p)) { - g_string_append_c(str, **p); for ((*p)++; g_ascii_isalnum(**p) || strchr("-_.", **p); (*p)++) - g_string_append_c(str, **p); + ; } - return g_string_free(str, FALSE); + + return g_strndup (base, *p - base); } /* parses: string "=" value */ @@ -205,15 +211,17 @@ static gboolean parse_result(struct gdb_mi_result *result, const gchar **p) * Actually, this is more permissive and allows mixed tuples/lists */ static struct gdb_mi_value *parse_value(const gchar **p) { - struct gdb_mi_value *val = g_malloc0(sizeof *val); + struct gdb_mi_value *val = NULL; if (**p == '"') { + val = g_malloc0(sizeof *val); val->type = GDB_MI_VAL_STRING; val->string = parse_cstring(p); } else if (**p == '{' || **p == '[') { struct gdb_mi_result *prev = NULL; + val = g_malloc0(sizeof *val); val->type = GDB_MI_VAL_LIST; gchar end = **p == '{' ? '}' : ']'; (*p)++; @@ -242,11 +250,6 @@ static struct gdb_mi_value *parse_value(const gchar **p) if (**p == end) (*p)++; } - else - { - gdb_mi_value_free(val); - val = NULL; - } return val; } @@ -479,17 +482,35 @@ static void gdb_mi_record_dump(const struct gdb_mi_record *record) gdb_mi_result_dump(record->first, TRUE, 2); } -int main(void) +static gchar *read_line(FILE *fp) { char buf[1024] = {0}; + GString *line = g_string_new(NULL); + + while (fgets(buf, sizeof buf, fp)) + { + g_string_append(line, buf); + if (line->len < 1 || line->str[line->len - 1] == '\n') + break; + } + + return g_string_free(line, line->len < 1); +} - while (fgets(buf, sizeof buf, stdin)) +int main(int argc, char **argv) +{ + gchar *line; + + while ((line = read_line(stdin)) != NULL) { - struct gdb_mi_record *record = gdb_mi_record_parse(buf); + struct gdb_mi_record *record = gdb_mi_record_parse(line); gdb_mi_record_dump(record); gdb_mi_record_free(record); + + g_free(line); } + return 0; } Modified: debugger/src/stree.c 301 lines changed, 150 insertions(+), 151 deletions(-) =================================================================== @@ -42,20 +42,12 @@ /* Tree view columns */ enum { - S_ADRESS, - S_FUNCTION, - S_FILEPATH, - S_LINE, - S_LAST_VISIBLE, - S_HAVE_SOURCE, + S_FRAME, /* the frame if it's a frame, or NULL if it's a thread */ S_THREAD_ID, S_ACTIVE, S_N_COLUMNS }; -/* hash table to keep thread nodes in the tree */ -static GHashTable *threads; - /* active thread and frame */ static glong active_thread_id = 0; static int active_frame_index = 0; @@ -69,9 +61,37 @@ static GtkWidget *tree = NULL; static GtkTreeModel *model = NULL; static GtkTreeStore *store = NULL; +static GtkTreeViewColumn *column_filepath = NULL; +static GtkTreeViewColumn *column_address = NULL; + /* cell renderer for a frame arrow */ static GtkCellRenderer *renderer_arrow = NULL; +static GType frame_get_type (void); +G_DEFINE_BOXED_TYPE(frame, frame, frame_ref, frame_unref) +#define STREE_TYPE_FRAME (frame_get_type ()) + +/* finds the iter for thread @thread_id */ +static gboolean find_thread_iter (gint thread_id, GtkTreeIter *iter) +{ + gboolean found = FALSE; + + if (gtk_tree_model_get_iter_first(model, iter)) + { + do + { + gint existing_thread_id; + + gtk_tree_model_get(model, iter, S_THREAD_ID, &existing_thread_id, -1); + if (existing_thread_id == thread_id) + found = TRUE; + } + while (! found && gtk_tree_model_iter_next(model, iter)); + } + + return found; +} + /* * frame arrow clicked callback */ @@ -80,10 +100,13 @@ static void on_frame_arrow_clicked(CellRendererFrameIcon *cell_renderer, gchar * GtkTreePath *new_active_frame = gtk_tree_path_new_from_string (path); if (gtk_tree_path_get_indices(new_active_frame)[1] != active_frame_index) { + GtkTreeIter thread_iter; GtkTreeIter iter; + GtkTreePath *old_active_frame; + + find_thread_iter (active_thread_id, &thread_iter); + old_active_frame = gtk_tree_model_get_path (model, &thread_iter); - GtkTreeRowReference *reference = (GtkTreeRowReference*)g_hash_table_lookup(threads, (gpointer)active_thread_id); - GtkTreePath *old_active_frame = gtk_tree_row_reference_get_path(reference); gtk_tree_path_append_index(old_active_frame, active_frame_index); gtk_tree_model_get_iter(model, &iter, old_active_frame); @@ -119,23 +142,23 @@ static gboolean on_query_tooltip(GtkWidget *widget, gint x, gint y, gboolean key gint start_pos, width; gtk_tree_view_column_cell_get_position(column, renderer_arrow, &start_pos, &width); - if (column == gtk_tree_view_get_column(GTK_TREE_VIEW(widget), S_FILEPATH)) + if (column == column_filepath) { - gchar *path = NULL; + frame *f; GtkTreeIter iter; gtk_tree_model_get_iter(model, &iter, tpath); - gtk_tree_model_get(model, &iter, S_FILEPATH, &path, -1); + gtk_tree_model_get(model, &iter, S_FRAME, &f, -1); - gtk_tooltip_set_text(tooltip, path); + gtk_tooltip_set_text(tooltip, f->file); gtk_tree_view_set_tooltip_row(GTK_TREE_VIEW(widget), tooltip, tpath); show = TRUE; - g_free(path); + frame_unref(f); } - else if (column == gtk_tree_view_get_column(GTK_TREE_VIEW(widget), S_ADRESS && bx >= start_pos && bx < start_pos + width)) + else if (column == column_address && bx >= start_pos && bx < start_pos + width) { gtk_tooltip_set_text(tooltip, gtk_tree_path_get_indices(tpath)[1] == active_frame_index ? _("Active frame") : _("Click an arrow to switch to a frame")); gtk_tree_view_set_tooltip_row(GTK_TREE_VIEW(widget), tooltip, tpath); @@ -165,14 +188,23 @@ static void on_render_arrow(GtkTreeViewColumn *tree_column, GtkCellRenderer *cel static void on_render_line(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data) { - GtkTreePath *tpath = gtk_tree_model_get_path(model, iter); + frame *f; - if (1 == gtk_tree_path_get_depth(tpath)) - { + gtk_tree_model_get (model, iter, S_FRAME, &f, -1); + + if (! f) g_object_set(cell, "text", "", NULL); - } + else + { + GValue value = {0}; - gtk_tree_path_free(tpath); + g_value_init(&value, G_TYPE_INT); + g_value_set_int (&value, f->line); + g_object_set_property (G_OBJECT (cell), "text", &value); + + g_value_unset (&value); + frame_unref (f); + } } /* @@ -181,28 +213,22 @@ static void on_render_line(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell static void on_render_filename(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data) { - GtkTreePath *tpath = gtk_tree_model_get_path(model, iter); - - if (1 != gtk_tree_path_get_depth(tpath)) - { - gchar *path = NULL, *name; - gtk_tree_model_get(model, iter, S_FILEPATH, &path, -1); + frame *f; - name = path ? g_path_get_basename(path) : NULL; - g_object_set(cell, "text", name ? name : path, NULL); + gtk_tree_model_get(model, iter, S_FRAME, &f, -1); - g_free(name); - if (path) - { - g_free(path); - } - } + if (! f) + g_object_set(cell, "text", "", NULL); else { - g_object_set(cell, "text", "", NULL); - } + gchar *name; - gtk_tree_path_free(tpath); + name = f->file ? g_path_get_basename(f->file) : NULL; + g_object_set(cell, "text", name ? name : f->file, NULL); + + g_free(name); + frame_unref (f); + } } /* @@ -224,34 +250,22 @@ static gboolean on_msgwin_button_press(GtkWidget *widget, GdkEventButton *event, if (!gtk_tree_path_compare(pressed_path, selected_path)) { - gboolean have_source; + frame *f; GtkTreeIter iter; gtk_tree_model_get_iter ( model, &iter, pressed_path); - gtk_tree_model_get ( - model, - &iter, - S_HAVE_SOURCE, &have_source, - -1); + gtk_tree_model_get (model, &iter, S_FRAME, &f, -1); /* check if file name is not empty and we have source files for the frame */ - if (have_source) + if (f->have_source) { - gchar *file; - gint line; - gtk_tree_model_get ( - model, - &iter, - S_FILEPATH, &file, - S_LINE, &line, - -1); - move_to_line(file, line); - - g_free(file); + move_to_line(f->file, f->line); } + + frame_unref(f); } g_list_foreach (rows, (GFunc) gtk_tree_path_free, NULL); @@ -283,7 +297,7 @@ static void on_selection_changed(GtkTreeSelection *treeselection, gpointer user_ if (2 == gtk_tree_path_get_depth(path)) { - gboolean have_source; + frame *f; GtkTreeIter iter; gtk_tree_model_get_iter ( @@ -293,30 +307,59 @@ static void on_selection_changed(GtkTreeSelection *treeselection, gpointer user_ gtk_tree_model_get ( gtk_tree_view_get_model(GTK_TREE_VIEW(tree)), &iter, - S_HAVE_SOURCE, &have_source, + S_FRAME, &f, -1); /* check if file name is not empty and we have source files for the frame */ - if (have_source) + if (f->have_source) { - gchar *file; - gint line; - gtk_tree_model_get ( - model, - &iter, - S_FILEPATH, &file, - S_LINE, &line, - -1); - - move_to_line(file, line); - g_free(file); + move_to_line(f->file, f->line); } + frame_unref(f); } g_list_foreach (rows, (GFunc)gtk_tree_path_free, NULL); g_list_free(rows); } +static void on_render_function (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, + GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data) +{ + frame *f; + + gtk_tree_model_get (tree_model, iter, S_FRAME, &f, -1); + if (! f) + g_object_set (cell, "text", "", NULL); + else + { + g_object_set (cell, "text", f->function, NULL); + frame_unref (f); + } +} + +static void on_render_address (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, + GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data) +{ + frame *f; + + gtk_tree_model_get (tree_model, iter, S_FRAME, &f, -1); + if (f) + { + g_object_set (cell, "text", f->address, NULL); + frame_unref (f); + } + else + { + gint thread_id; + gchar *thread_label; + + gtk_tree_model_get (model, iter, S_THREAD_ID, &thread_id, -1); + thread_label = g_strdup_printf(_("Thread %i"), thread_id); + g_object_set (cell, "text", thread_label, NULL); + g_free(thread_label); + } +} + /* * inits stack trace tree */ @@ -331,14 +374,9 @@ GtkWidget* stree_init(move_to_line_cb ml, select_frame_cb sf) /* create tree view */ store = gtk_tree_store_new ( S_N_COLUMNS, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_INT, - G_TYPE_STRING, - G_TYPE_INT, - G_TYPE_INT, - G_TYPE_INT); + STREE_TYPE_FRAME, /* frame */ + G_TYPE_INT /* thread ID */, + G_TYPE_BOOLEAN /* active */); model = GTK_TREE_MODEL(store); tree = gtk_tree_view_new_with_model (GTK_TREE_MODEL(store)); @@ -359,7 +397,7 @@ GtkWidget* stree_init(move_to_line_cb ml, select_frame_cb sf) /* creating columns */ /* address */ - column = gtk_tree_view_column_new(); + column_address = column = gtk_tree_view_column_new(); gtk_tree_view_column_set_title(column, _("Address")); renderer_arrow = cell_renderer_frame_icon_new (); @@ -372,67 +410,59 @@ GtkWidget* stree_init(move_to_line_cb ml, select_frame_cb sf) renderer = gtk_cell_renderer_text_new (); gtk_tree_view_column_pack_start(column, renderer, TRUE); - gtk_tree_view_column_set_attributes(column, renderer, "text", S_ADRESS, NULL); + gtk_tree_view_column_set_cell_data_func(column, renderer, on_render_address, NULL, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); /* function */ renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes (_("Function"), renderer, "text", S_FUNCTION, NULL); + column = gtk_tree_view_column_new_with_attributes (_("Function"), renderer, NULL); + gtk_tree_view_column_set_cell_data_func(column, renderer, on_render_function, NULL, NULL); gtk_tree_view_column_set_resizable (column, TRUE); gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); /* file */ renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes (_("File"), renderer, NULL); + column_filepath = column = gtk_tree_view_column_new_with_attributes (_("File"), renderer, NULL); gtk_tree_view_column_set_resizable (column, TRUE); gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); gtk_tree_view_column_set_cell_data_func(column, renderer, on_render_filename, NULL, NULL); /* line */ renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes (_("Line"), renderer, "text", S_LINE, NULL); + column = gtk_tree_view_column_new_with_attributes (_("Line"), renderer, NULL); gtk_tree_view_column_set_cell_data_func(column, renderer, on_render_line, NULL, NULL); gtk_tree_view_column_set_resizable (column, TRUE); gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); /* Last invisible column */ - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("", renderer, "text", S_LAST_VISIBLE, NULL); + column = gtk_tree_view_column_new (); gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); - /* create threads hash table */ - threads = g_hash_table_new_full( - g_direct_hash, - g_direct_equal, - NULL, - (GDestroyNotify)gtk_tree_row_reference_free - ); - return tree; } /* - * add frame to the tree view + * add frames to the tree view */ -void stree_add(frame *f) +void stree_add(GList *frames) { - GtkTreeRowReference *reference = (GtkTreeRowReference*)g_hash_table_lookup(threads, (gpointer)active_thread_id); - GtkTreeIter frame_iter; GtkTreeIter thread_iter; - GtkTreePath *path = gtk_tree_row_reference_get_path(reference); - gtk_tree_model_get_iter(model, &thread_iter, path); - gtk_tree_path_free(path); - - gtk_tree_store_insert_before(store, &frame_iter, &thread_iter, 0); - - gtk_tree_store_set (store, &frame_iter, - S_ADRESS, f->address, - S_FUNCTION, f->function, - S_FILEPATH, f->file, - S_LINE, f->line, - S_HAVE_SOURCE, f->have_source, - -1); + GList *item; + + g_object_ref (model); + gtk_tree_view_set_model (GTK_TREE_VIEW (tree), NULL); + + find_thread_iter (active_thread_id, &thread_iter); + /* prepending is a *lot* faster than appending, so prepend with a reversed data set */ + for (item = g_list_last (frames); item; item = item->prev) + { + gtk_tree_store_insert_with_values (store, NULL, &thread_iter, 0, + S_FRAME, item->data, -1); + } + + gtk_tree_view_set_model (GTK_TREE_VIEW (tree), model); + g_object_unref (model); } /* @@ -441,7 +471,6 @@ void stree_add(frame *f) void stree_clear(void) { gtk_tree_store_clear(store); - g_hash_table_remove_all(threads); } /* @@ -449,17 +478,12 @@ void stree_clear(void) */ void stree_select_first_frame(gboolean make_active) { - GtkTreeRowReference *reference; GtkTreeIter thread_iter, frame_iter; - GtkTreePath *active_path; gtk_tree_view_expand_all(GTK_TREE_VIEW(tree)); - - reference = (GtkTreeRowReference*)g_hash_table_lookup(threads, (gpointer)active_thread_id); - active_path = gtk_tree_row_reference_get_path(reference); - gtk_tree_model_get_iter(model, &thread_iter, active_path); - gtk_tree_path_free(active_path); - if(gtk_tree_model_iter_children(model, &frame_iter, &thread_iter)) + + if (find_thread_iter (active_thread_id, &thread_iter) && + gtk_tree_model_iter_children(model, &frame_iter, &thread_iter)) { GtkTreePath* path; @@ -484,11 +508,6 @@ void stree_select_first_frame(gboolean make_active) */ void stree_destroy(void) { - if (threads) - { - g_hash_table_destroy(threads); - threads = NULL; - } } /* @@ -496,9 +515,6 @@ void stree_destroy(void) */ void stree_add_thread(int thread_id) { - gchar *thread_label; - GtkTreePath *tpath; - GtkTreeRowReference *reference; GtkTreeIter thread_iter, new_thread_iter; if (gtk_tree_model_get_iter_first(model, &thread_iter)) @@ -507,7 +523,7 @@ void stree_add_thread(int thread_id) do { int existing_thread_id; - gtk_tree_model_get(model, &thread_iter, S_THREAD_ID, &existing_thread_id); + gtk_tree_model_get(model, &thread_iter, S_THREAD_ID, &existing_thread_id, -1); if (existing_thread_id > thread_id) { consecutive = &thread_iter; @@ -530,17 +546,10 @@ void stree_add_thread(int thread_id) gtk_tree_store_append (store, &new_thread_iter, NULL); } - thread_label = g_strdup_printf(_("Thread %i"), thread_id); gtk_tree_store_set (store, &new_thread_iter, - S_ADRESS, thread_label, + S_FRAME, NULL, S_THREAD_ID, thread_id, -1); - g_free(thread_label); - - tpath = gtk_tree_model_get_path(model, &new_thread_iter); - reference = gtk_tree_row_reference_new(model, tpath); - g_hash_table_insert(threads, (gpointer)(long)thread_id,(gpointer)reference); - gtk_tree_path_free(tpath); } /* @@ -548,17 +557,10 @@ void stree_add_thread(int thread_id) */ void stree_remove_thread(int thread_id) { - GtkTreeRowReference *reference = (GtkTreeRowReference*)g_hash_table_lookup(threads, (gpointer)(glong)thread_id); - GtkTreePath *tpath = gtk_tree_row_reference_get_path(reference); - GtkTreeIter iter; - gtk_tree_model_get_iter(model, &iter, tpath); - gtk_tree_store_remove(store, &iter); - - g_hash_table_remove(threads, (gpointer)(glong)thread_id); - - gtk_tree_path_free(tpath); + if (find_thread_iter (thread_id, &iter)) + gtk_tree_store_remove(store, &iter); } /* @@ -566,14 +568,11 @@ void stree_remove_thread(int thread_id) */ void stree_remove_frames(void) { - GtkTreeRowReference *reference = (GtkTreeRowReference*)g_hash_table_lookup(threads, (gpointer)active_thread_id); GtkTreeIter child; GtkTreeIter thread_iter; - GtkTreePath *tpath = gtk_tree_row_reference_get_path(reference); - gtk_tree_model_get_iter(model, &thread_iter, tpath); - gtk_tree_path_free(tpath); - if (gtk_tree_model_iter_children(model, &child, &thread_iter)) + if (find_thread_iter (active_thread_id, &thread_iter) && + gtk_tree_model_iter_children(model, &child, &thread_iter)) { while(gtk_tree_store_remove(GTK_TREE_STORE(model), &child)) ; Modified: debugger/src/stree.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -31,7 +31,7 @@ GtkWidget* stree_init(move_to_line_cb ml, select_frame_cb sf); void stree_destroy(void); -void stree_add(frame *f); +void stree_add(GList *frames); void stree_clear(void); void stree_add_thread(int thread_id); Modified: debugger/src/watch_model.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -476,9 +476,9 @@ GList *get_root_items(GtkTreeView *tree) -1); if (strlen(name)) - names = g_list_append(names, name); + names = g_list_prepend(names, name); } while (gtk_tree_model_iter_next(model, &child)); - return names; + return g_list_reverse(names); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 864206: debugger: stree: Don't maintain a table of thread row references
by Colomban Wendling 07 Feb '16

07 Feb '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 07 Feb 2016 03:43:24 UTC Commit: 86420621978d58d337e3b9abc3069966bf3959d7 https://github.com/geany/geany-plugins/commit/86420621978d58d337e3b9abc3069… Log Message: ----------- debugger: stree: Don't maintain a table of thread row references GtkTreeRowReferences are not free to maintain as they might get updated whenever a row is inserted or removed, and it's unlikely there would be a very large amount of threads requiring great scaling. So drop the reference logic for a simple search in the existing threads whenever we need to find one out, which doesn't happen that often anyways. Modified Paths: -------------- debugger/src/stree.c Modified: debugger/src/stree.c 88 lines changed, 35 insertions(+), 53 deletions(-) =================================================================== @@ -48,9 +48,6 @@ enum S_N_COLUMNS }; -/* hash table to keep thread nodes in the tree */ -static GHashTable *threads; - /* active thread and frame */ static glong active_thread_id = 0; static int active_frame_index = 0; @@ -74,6 +71,27 @@ static GType frame_get_type (void); G_DEFINE_BOXED_TYPE(frame, frame, frame_ref, frame_unref) #define STREE_TYPE_FRAME (frame_get_type ()) +/* finds the iter for thread @thread_id */ +static gboolean find_thread_iter (gint thread_id, GtkTreeIter *iter) +{ + gboolean found = FALSE; + + if (gtk_tree_model_get_iter_first(model, iter)) + { + do + { + gint existing_thread_id; + + gtk_tree_model_get(model, iter, S_THREAD_ID, &existing_thread_id, -1); + if (existing_thread_id == thread_id) + found = TRUE; + } + while (! found && gtk_tree_model_iter_next(model, iter)); + } + + return found; +} + /* * frame arrow clicked callback */ @@ -82,10 +100,13 @@ static void on_frame_arrow_clicked(CellRendererFrameIcon *cell_renderer, gchar * GtkTreePath *new_active_frame = gtk_tree_path_new_from_string (path); if (gtk_tree_path_get_indices(new_active_frame)[1] != active_frame_index) { + GtkTreeIter thread_iter; GtkTreeIter iter; + GtkTreePath *old_active_frame; + + find_thread_iter (active_thread_id, &thread_iter); + old_active_frame = gtk_tree_model_get_path (model, &thread_iter); - GtkTreeRowReference *reference = (GtkTreeRowReference*)g_hash_table_lookup(threads, (gpointer)active_thread_id); - GtkTreePath *old_active_frame = gtk_tree_row_reference_get_path(reference); gtk_tree_path_append_index(old_active_frame, active_frame_index); gtk_tree_model_get_iter(model, &iter, old_active_frame); @@ -418,14 +439,6 @@ GtkWidget* stree_init(move_to_line_cb ml, select_frame_cb sf) column = gtk_tree_view_column_new (); gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); - /* create threads hash table */ - threads = g_hash_table_new_full( - g_direct_hash, - g_direct_equal, - NULL, - (GDestroyNotify)gtk_tree_row_reference_free - ); - return tree; } @@ -434,16 +447,13 @@ GtkWidget* stree_init(move_to_line_cb ml, select_frame_cb sf) */ void stree_add(GList *frames) { - GList *item; - GtkTreeRowReference *reference = (GtkTreeRowReference*)g_hash_table_lookup(threads, (gpointer)active_thread_id); GtkTreeIter thread_iter; - GtkTreePath *path = gtk_tree_row_reference_get_path(reference); - gtk_tree_model_get_iter(model, &thread_iter, path); - gtk_tree_path_free(path); + GList *item; g_object_ref (model); gtk_tree_view_set_model (GTK_TREE_VIEW (tree), NULL); + find_thread_iter (active_thread_id, &thread_iter); /* prepending is a *lot* faster than appending, so prepend with a reversed data set */ for (item = g_list_last (frames); item; item = item->prev) { @@ -461,7 +471,6 @@ void stree_add(GList *frames) void stree_clear(void) { gtk_tree_store_clear(store); - g_hash_table_remove_all(threads); } /* @@ -469,17 +478,12 @@ void stree_clear(void) */ void stree_select_first_frame(gboolean make_active) { - GtkTreeRowReference *reference; GtkTreeIter thread_iter, frame_iter; - GtkTreePath *active_path; gtk_tree_view_expand_all(GTK_TREE_VIEW(tree)); - - reference = (GtkTreeRowReference*)g_hash_table_lookup(threads, (gpointer)active_thread_id); - active_path = gtk_tree_row_reference_get_path(reference); - gtk_tree_model_get_iter(model, &thread_iter, active_path); - gtk_tree_path_free(active_path); - if(gtk_tree_model_iter_children(model, &frame_iter, &thread_iter)) + + if (find_thread_iter (active_thread_id, &thread_iter) && + gtk_tree_model_iter_children(model, &frame_iter, &thread_iter)) { GtkTreePath* path; @@ -504,11 +508,6 @@ void stree_select_first_frame(gboolean make_active) */ void stree_destroy(void) { - if (threads) - { - g_hash_table_destroy(threads); - threads = NULL; - } } /* @@ -516,8 +515,6 @@ void stree_destroy(void) */ void stree_add_thread(int thread_id) { - GtkTreePath *tpath; - GtkTreeRowReference *reference; GtkTreeIter thread_iter, new_thread_iter; if (gtk_tree_model_get_iter_first(model, &thread_iter)) @@ -553,11 +550,6 @@ void stree_add_thread(int thread_id) S_FRAME, NULL, S_THREAD_ID, thread_id, -1); - - tpath = gtk_tree_model_get_path(model, &new_thread_iter); - reference = gtk_tree_row_reference_new(model, tpath); - g_hash_table_insert(threads, (gpointer)(long)thread_id,(gpointer)reference); - gtk_tree_path_free(tpath); } /* @@ -565,17 +557,10 @@ void stree_add_thread(int thread_id) */ void stree_remove_thread(int thread_id) { - GtkTreeRowReference *reference = (GtkTreeRowReference*)g_hash_table_lookup(threads, (gpointer)(glong)thread_id); - GtkTreePath *tpath = gtk_tree_row_reference_get_path(reference); - GtkTreeIter iter; - gtk_tree_model_get_iter(model, &iter, tpath); - - gtk_tree_store_remove(store, &iter); - g_hash_table_remove(threads, (gpointer)(glong)thread_id); - - gtk_tree_path_free(tpath); + if (find_thread_iter (thread_id, &iter)) + gtk_tree_store_remove(store, &iter); } /* @@ -583,14 +568,11 @@ void stree_remove_thread(int thread_id) */ void stree_remove_frames(void) { - GtkTreeRowReference *reference = (GtkTreeRowReference*)g_hash_table_lookup(threads, (gpointer)active_thread_id); GtkTreeIter child; GtkTreeIter thread_iter; - GtkTreePath *tpath = gtk_tree_row_reference_get_path(reference); - gtk_tree_model_get_iter(model, &thread_iter, tpath); - gtk_tree_path_free(tpath); - if (gtk_tree_model_iter_children(model, &child, &thread_iter)) + if (find_thread_iter (active_thread_id, &thread_iter) && + gtk_tree_model_iter_children(model, &child, &thread_iter)) { while(gtk_tree_store_remove(GTK_TREE_STORE(model), &child)) ; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 901847: Merge branch 'debugger/gdb_mi-speedup' into debugger/frame-speedup
by Colomban Wendling 07 Feb '16

07 Feb '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 07 Feb 2016 03:37:38 UTC Commit: 9018472988a8a438f6a47d267ccf11e8ebc8b34d https://github.com/geany/geany-plugins/commit/9018472988a8a438f6a47d267ccf1… Log Message: ----------- Merge branch 'debugger/gdb_mi-speedup' into debugger/frame-speedup Modified Paths: -------------- debugger/src/gdb_mi.c Modified: debugger/src/gdb_mi.c 51 lines changed, 36 insertions(+), 15 deletions(-) =================================================================== @@ -98,13 +98,17 @@ static gchar *parse_cstring(const gchar **p) if (**p == '"') { + const gchar *base; + (*p)++; + base = *p; while (**p != '"') { gchar c = **p; /* TODO: check expansions here */ if (c == '\\') { + g_string_append_len(str, base, (*p) - base); (*p)++; c = **p; switch (g_ascii_tolower(c)) @@ -159,12 +163,14 @@ static gchar *parse_cstring(const gchar **p) } break; } + g_string_append_c(str, c); + base = (*p) + 1; } - if (**p == '\0') + else if (**p == '\0') break; - g_string_append_c(str, c); (*p)++; } + g_string_append_len(str, base, (*p) - base); if (**p == '"') (*p)++; } @@ -176,15 +182,15 @@ static gchar *parse_cstring(const gchar **p) * the docs aren't clear on this */ static gchar *parse_string(const gchar **p) { - GString *str = g_string_new(NULL); + const gchar *base = *p; if (g_ascii_isalpha(**p) || strchr("-_.", **p)) { - g_string_append_c(str, **p); for ((*p)++; g_ascii_isalnum(**p) || strchr("-_.", **p); (*p)++) - g_string_append_c(str, **p); + ; } - return g_string_free(str, FALSE); + + return g_strndup (base, *p - base); } /* parses: string "=" value */ @@ -205,15 +211,17 @@ static gboolean parse_result(struct gdb_mi_result *result, const gchar **p) * Actually, this is more permissive and allows mixed tuples/lists */ static struct gdb_mi_value *parse_value(const gchar **p) { - struct gdb_mi_value *val = g_malloc0(sizeof *val); + struct gdb_mi_value *val = NULL; if (**p == '"') { + val = g_malloc0(sizeof *val); val->type = GDB_MI_VAL_STRING; val->string = parse_cstring(p); } else if (**p == '{' || **p == '[') { struct gdb_mi_result *prev = NULL; + val = g_malloc0(sizeof *val); val->type = GDB_MI_VAL_LIST; gchar end = **p == '{' ? '}' : ']'; (*p)++; @@ -242,11 +250,6 @@ static struct gdb_mi_value *parse_value(const gchar **p) if (**p == end) (*p)++; } - else - { - gdb_mi_value_free(val); - val = NULL; - } return val; } @@ -479,17 +482,35 @@ static void gdb_mi_record_dump(const struct gdb_mi_record *record) gdb_mi_result_dump(record->first, TRUE, 2); } -int main(void) +static gchar *read_line(FILE *fp) { char buf[1024] = {0}; + GString *line = g_string_new(NULL); + + while (fgets(buf, sizeof buf, fp)) + { + g_string_append(line, buf); + if (line->len < 1 || line->str[line->len - 1] == '\n') + break; + } + + return g_string_free(line, line->len < 1); +} - while (fgets(buf, sizeof buf, stdin)) +int main(int argc, char **argv) +{ + gchar *line; + + while ((line = read_line(stdin)) != NULL) { - struct gdb_mi_record *record = gdb_mi_record_parse(buf); + struct gdb_mi_record *record = gdb_mi_record_parse(line); gdb_mi_record_dump(record); gdb_mi_record_free(record); + + g_free(line); } + return 0; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits February 2016