From ca2aaf09a2e72d13d3324cfef9ea86ff5b2fb648 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 29 Apr 2011 19:23:05 +0000 Subject: [PATCH] 2011-04-29 Andrew Gontarek * valprint.c (val_print_array_elements): Fixed poor performance of printing very large arrays with repeat_count_threshold set to unlimited. New comment. --- gdb/ChangeLog | 6 ++++++ gdb/valprint.c | 22 ++++++++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9910084b30e..4d33271890c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2011-04-29 Andrew Gontarek + + * valprint.c (val_print_array_elements): Fixed poor performance + of printing very large arrays with repeat_count_threshold set + to unlimited. New comment. + 2011-04-29 Pedro Alves * linux-nat.c (linux_child_remove_fork_catchpoint) diff --git a/gdb/valprint.c b/gdb/valprint.c index 286ef9e74cd..9bf19f4b469 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -1247,15 +1247,21 @@ val_print_array_elements (struct type *type, rep1 = i + 1; reps = 1; - while (rep1 < len - && value_available_contents_eq (val, - embedded_offset + i * eltlen, - val, - embedded_offset + rep1 * eltlen, - eltlen)) + /* Only check for reps if repeat_count_threshold is not set to + UINT_MAX (unlimited). */ + if (options->repeat_count_threshold < UINT_MAX) { - ++reps; - ++rep1; + while (rep1 < len + && value_available_contents_eq (val, + embedded_offset + i * eltlen, + val, + (embedded_offset + + rep1 * eltlen), + eltlen)) + { + ++reps; + ++rep1; + } } if (reps > options->repeat_count_threshold) -- 2.47.2