From patchwork Fri May 26 18:26:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kratochvil X-Patchwork-Id: 20608 Received: (qmail 90038 invoked by alias); 26 May 2017 18:26:14 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 89912 invoked by uid 89); 26 May 2017 18:26:12 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 26 May 2017 18:26:07 +0000 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 81A773D975; Fri, 26 May 2017 18:26:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 81A773D975 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=jan.kratochvil@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 81A773D975 Received: from host1.jankratochvil.net (ovpn-117-182.ams2.redhat.com [10.36.117.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id 89D9971C4E; Fri, 26 May 2017 18:26:08 +0000 (UTC) Subject: [PATCH 5/6] Refactor: Move some generic code out of .gdb_index code From: Jan Kratochvil To: gdb-patches@sourceware.org Cc: Victor Leschuk Date: Fri, 26 May 2017 20:26:07 +0200 Message-ID: <149582316767.15869.7404458720264311648.stgit@host1.jankratochvil.net> In-Reply-To: <149582312757.15869.18345460438195439402.stgit@host1.jankratochvil.net> References: <149582312757.15869.18345460438195439402.stgit@host1.jankratochvil.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Hi, just for the next patch. Jan gdb/ChangeLog 2017-05-26 Jan Kratochvil * dwarf2read.c (create_cu_from_index_list): New from ... (create_cus_from_index_list): ... this function, use it. (dw_expand_symtabs_matching_file_matcher) (dw2_expand_symtabs_matching_one): New from ... (dw2_expand_symtabs_matching): ... this function, use them. --- gdb/dwarf2read.c | 220 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 130 insertions(+), 90 deletions(-) diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index e7c3643..2823428 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -2939,6 +2939,28 @@ dw2_get_cu (int index) return dwarf2_per_objfile->all_comp_units[index]; } +// Return newly allocated dwarf2_per_cu_data from objfile_obstack +// with the specified field values. + +static dwarf2_per_cu_data * +create_cu_from_index_list (struct objfile *objfile, + struct dwarf2_section_info *section, + int is_dwz, + sect_offset sect_off, ULONGEST length) +{ + dwarf2_per_cu_data *the_cu + = OBSTACK_ZALLOC (&objfile->objfile_obstack, + struct dwarf2_per_cu_data); + the_cu->sect_off = sect_off; + the_cu->length = length; + the_cu->objfile = objfile; + the_cu->section = section; + the_cu->v.quick = OBSTACK_ZALLOC (&objfile->objfile_obstack, + struct dwarf2_per_cu_quick_data); + the_cu->is_dwz = is_dwz; + return the_cu; +} + /* A helper for create_cus_from_index that handles a given list of CUs. */ @@ -2960,17 +2982,8 @@ create_cus_from_index_list (struct objfile *objfile, ULONGEST length = extract_unsigned_integer (cu_list + 8, 8, BFD_ENDIAN_LITTLE); cu_list += 2 * 8; - dwarf2_per_cu_data *the_cu - = OBSTACK_ZALLOC (&objfile->objfile_obstack, - struct dwarf2_per_cu_data); - the_cu->sect_off = sect_off; - the_cu->length = length; - the_cu->objfile = objfile; - the_cu->section = section; - the_cu->v.quick = OBSTACK_ZALLOC (&objfile->objfile_obstack, - struct dwarf2_per_cu_quick_data); - the_cu->is_dwz = is_dwz; - dwarf2_per_objfile->all_comp_units[base_offset + i / 2] = the_cu; + dwarf2_per_objfile->all_comp_units[base_offset + i / 2] = + create_cu_from_index_list (objfile, section, is_dwz, sect_off, length); } } @@ -4013,96 +4026,135 @@ dw2_map_matching_symbols (struct objfile *objfile, does not look for non-Ada symbols this function should just return. */ } +// If FILE_MATCHER is non-zero set for current DWARF2_PER_OBJFILE all +// dwarf2_per_cu_quick_data::MARK matching FILE_MATCHER. + static void -dw2_expand_symtabs_matching - (struct objfile *objfile, - gdb::function_view file_matcher, - gdb::function_view symbol_matcher, - gdb::function_view expansion_notify, - enum search_domain kind) +dw_expand_symtabs_matching_file_matcher + (gdb::function_view file_matcher) { - int i; - offset_type iter; - struct mapped_index *index; + objfile *const objfile (dwarf2_per_objfile->objfile); - dw2_setup (objfile); - - /* index_table is NULL if OBJF_READNOW. */ - if (!dwarf2_per_objfile->index_table) + if (file_matcher == NULL) return; - index = dwarf2_per_objfile->index_table; - if (file_matcher != NULL) - { - htab_up visited_found (htab_create_alloc (10, htab_hash_pointer, + htab_up visited_found (htab_create_alloc (10, htab_hash_pointer, + htab_eq_pointer, + NULL, xcalloc, xfree)); + htab_up visited_not_found (htab_create_alloc (10, htab_hash_pointer, htab_eq_pointer, NULL, xcalloc, xfree)); - htab_up visited_not_found (htab_create_alloc (10, htab_hash_pointer, - htab_eq_pointer, - NULL, xcalloc, xfree)); - /* The rule is CUs specify all the files, including those used by - any TU, so there's no need to scan TUs here. */ + /* The rule is CUs specify all the files, including those used by + any TU, so there's no need to scan TUs here. */ - for (i = 0; i < dwarf2_per_objfile->n_comp_units; ++i) - { - int j; - struct dwarf2_per_cu_data *per_cu = dw2_get_cu (i); - struct quick_file_names *file_data; - void **slot; + for (int i = 0; i < dwarf2_per_objfile->n_comp_units; ++i) + { + int j; + struct dwarf2_per_cu_data *per_cu = dw2_get_cu (i); + struct quick_file_names *file_data; + void **slot; - QUIT; + QUIT; - per_cu->v.quick->mark = 0; + per_cu->v.quick->mark = 0; - /* We only need to look at symtabs not already expanded. */ - if (per_cu->v.quick->compunit_symtab) - continue; + /* We only need to look at symtabs not already expanded. */ + if (per_cu->v.quick->compunit_symtab) + continue; - file_data = dw2_get_file_names (per_cu); - if (file_data == NULL) - continue; + file_data = dw2_get_file_names (per_cu); + if (file_data == NULL) + continue; - if (htab_find (visited_not_found.get (), file_data) != NULL) - continue; - else if (htab_find (visited_found.get (), file_data) != NULL) + if (htab_find (visited_not_found.get (), file_data) != NULL) + continue; + else if (htab_find (visited_found.get (), file_data) != NULL) + { + per_cu->v.quick->mark = 1; + continue; + } + + for (j = 0; j < file_data->num_file_names; ++j) + { + const char *this_real_name; + + if (file_matcher (file_data->file_names[j], false)) { per_cu->v.quick->mark = 1; - continue; + break; } - for (j = 0; j < file_data->num_file_names; ++j) + /* Before we invoke realpath, which can get expensive when many + files are involved, do a quick comparison of the basenames. */ + if (!basenames_may_differ + && !file_matcher (lbasename (file_data->file_names[j]), + true)) + continue; + + this_real_name = dw2_get_real_path (objfile, file_data, j); + if (file_matcher (this_real_name, false)) { - const char *this_real_name; + per_cu->v.quick->mark = 1; + break; + } + } - if (file_matcher (file_data->file_names[j], false)) - { - per_cu->v.quick->mark = 1; - break; - } + slot = htab_find_slot (per_cu->v.quick->mark + ? visited_found.get () + : visited_not_found.get (), + file_data, INSERT); + *slot = file_data; + } +} - /* Before we invoke realpath, which can get expensive when many - files are involved, do a quick comparison of the basenames. */ - if (!basenames_may_differ - && !file_matcher (lbasename (file_data->file_names[j]), - true)) - continue; +// If FILE_MATCHER is zero +// or if PER_CU has dwarf2_per_cu_quick_data::MARK set +// (see dw_expand_symtabs_matching_file_matcher) expand the CU +// and call its EXPANSION_NOTIFY. - this_real_name = dw2_get_real_path (objfile, file_data, j); - if (file_matcher (this_real_name, false)) - { - per_cu->v.quick->mark = 1; - break; - } - } +static void +dw2_expand_symtabs_matching_one + (struct dwarf2_per_cu_data *per_cu, + gdb::function_view file_matcher, + gdb::function_view expansion_notify) +{ + if (file_matcher == NULL || per_cu->v.quick->mark) + { + int symtab_was_null = + (per_cu->v.quick->compunit_symtab == NULL); + + dw2_instantiate_symtab (per_cu); - slot = htab_find_slot (per_cu->v.quick->mark - ? visited_found.get () - : visited_not_found.get (), - file_data, INSERT); - *slot = file_data; + if (expansion_notify != NULL + && symtab_was_null + && per_cu->v.quick->compunit_symtab != NULL) + { + expansion_notify (per_cu->v.quick->compunit_symtab); } } +} + +static void +dw2_expand_symtabs_matching + (struct objfile *objfile, + gdb::function_view file_matcher, + gdb::function_view symbol_matcher, + gdb::function_view expansion_notify, + enum search_domain kind) +{ + int i; + offset_type iter; + struct mapped_index *index; + + dw2_setup (objfile); + + /* index_table is NULL if OBJF_READNOW. */ + if (!dwarf2_per_objfile->index_table) + return; + index = dwarf2_per_objfile->index_table; + + dw_expand_symtabs_matching_file_matcher (file_matcher); for (iter = 0; iter < index->symbol_table_slots; ++iter) { @@ -4185,20 +4237,8 @@ dw2_expand_symtabs_matching } per_cu = dw2_get_cutu (cu_index); - if (file_matcher == NULL || per_cu->v.quick->mark) - { - int symtab_was_null = - (per_cu->v.quick->compunit_symtab == NULL); - - dw2_instantiate_symtab (per_cu); - - if (expansion_notify != NULL - && symtab_was_null - && per_cu->v.quick->compunit_symtab != NULL) - { - expansion_notify (per_cu->v.quick->compunit_symtab); - } - } + dw2_expand_symtabs_matching_one (per_cu, file_matcher, + expansion_notify); } } }