From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13011 invoked by alias); 12 Mar 2013 15:19:32 -0000 Received: (qmail 13002 invoked by uid 22791); 12 Mar 2013 15:19:31 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,RCVD_IN_HOSTKARMA_NO,TW_BJ X-Spam-Check-By: sourceware.org Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 12 Mar 2013 15:19:15 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id A46992E839; Tue, 12 Mar 2013 11:19:14 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 3kqMe+1r+GMe; Tue, 12 Mar 2013 11:19:14 -0400 (EDT) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id 733252E581; Tue, 12 Mar 2013 11:19:14 -0400 (EDT) Received: by joel.gnat.com (Postfix, from userid 1000) id C1908C15EE; Tue, 12 Mar 2013 11:19:12 -0400 (EDT) Date: Tue, 12 Mar 2013 15:19:00 -0000 From: Joel Brobecker To: Jan Kratochvil Cc: gdb-patches@sourceware.org, Doug Evans Subject: Re: [patch] Accelerate filenames matching Message-ID: <20130312151912.GJ3264@adacore.com> References: <20130312132640.GA21810@host2.jankratochvil.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20130312132640.GA21810@host2.jankratochvil.net> User-Agent: Mutt/1.5.21 (2010-09-15) Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2013-03/txt/msg00519.txt.bz2 > gdb/ > 2013-03-12 Doug Evans > Jan Kratochvil > > * dwarf2read.c (dw2_map_symtabs_matching_filename): Put continue after > any successful compare_filenames_for_search or FILENAME_CMP. > * psymtab.c (partial_map_symtabs_matching_filename): Likewise. > * symtab.c (iterate_over_some_symtabs): Likewise. Do we want this patch for 7.6? > diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c > index faee1a8..47e4958 100644 > --- a/gdb/dwarf2read.c > +++ b/gdb/dwarf2read.c > @@ -3079,6 +3079,7 @@ dw2_map_symtabs_matching_filename (struct objfile *objfile, const char *name, > if (dw2_map_expand_apply (objfile, per_cu, name, real_path, > callback, data)) > return 1; > + continue; > } > > /* Before we invoke realpath, which can get expensive when many > @@ -3093,6 +3094,7 @@ dw2_map_symtabs_matching_filename (struct objfile *objfile, const char *name, > if (dw2_map_expand_apply (objfile, per_cu, name, real_path, > callback, data)) > return 1; > + continue; > } > > if (real_path != NULL) > @@ -3105,6 +3107,7 @@ dw2_map_symtabs_matching_filename (struct objfile *objfile, const char *name, > if (dw2_map_expand_apply (objfile, per_cu, name, real_path, > callback, data)) > return 1; > + continue; > } > } > } > diff --git a/gdb/psymtab.c b/gdb/psymtab.c > index 2965e9f..7b118c5 100644 > --- a/gdb/psymtab.c > +++ b/gdb/psymtab.c > @@ -183,6 +183,7 @@ partial_map_symtabs_matching_filename (struct objfile *objfile, > if (partial_map_expand_apply (objfile, name, real_path, > pst, callback, data)) > return 1; > + continue; > } > > /* Before we invoke realpath, which can get expensive when many > @@ -196,6 +197,7 @@ partial_map_symtabs_matching_filename (struct objfile *objfile, > if (partial_map_expand_apply (objfile, name, real_path, > pst, callback, data)) > return 1; > + continue; > } > > /* If the user gave us an absolute path, try to find the file in > @@ -209,6 +211,7 @@ partial_map_symtabs_matching_filename (struct objfile *objfile, > if (partial_map_expand_apply (objfile, name, real_path, > pst, callback, data)) > return 1; > + continue; > } > } > } > diff --git a/gdb/symtab.c b/gdb/symtab.c > index c0e5884..c9dcf7a 100644 > --- a/gdb/symtab.c > +++ b/gdb/symtab.c > @@ -212,6 +212,7 @@ iterate_over_some_symtabs (const char *name, > { > if (callback (s, data)) > return 1; > + continue; > } > > /* Before we invoke realpath, which can get expensive when many > @@ -224,6 +225,7 @@ iterate_over_some_symtabs (const char *name, > { > if (callback (s, data)) > return 1; > + continue; > } > > /* If the user gave us an absolute path, try to find the file in > @@ -239,6 +241,7 @@ iterate_over_some_symtabs (const char *name, > { > if (callback (s, data)) > return 1; > + continue; > } > } > } -- Joel