From patchwork Thu May 19 22:17:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Goldstein X-Patchwork-Id: 54242 X-Patchwork-Delegate: siddhesh@gotplt.org Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 767F5383983F for ; Thu, 19 May 2022 22:18:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 767F5383983F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1652998723; bh=MWQzwOlIK8JBZjW+HJ1uMlp0f3K543cxeTLoMrDlMhM=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=ivmfx16/DCh30606E67H+0P1Z2CxHKZas6SN2eXuaU4Umf3UUQQzE2YibGRjuc0Os ooDozwapwvHvc4jVvmcbjSepDMpxe5LCqy1LjQbpBTFlLZMgr0lX8FdxX+h6EbEt09 diVFqyuDAT8feV5vz1Z+9uPAKfKbPONCyKsn3gvQ= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-io1-xd36.google.com (mail-io1-xd36.google.com [IPv6:2607:f8b0:4864:20::d36]) by sourceware.org (Postfix) with ESMTPS id 3F73A383983F; Thu, 19 May 2022 22:18:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3F73A383983F Received: by mail-io1-xd36.google.com with SMTP id e194so7130990iof.11; Thu, 19 May 2022 15:18:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MWQzwOlIK8JBZjW+HJ1uMlp0f3K543cxeTLoMrDlMhM=; b=1m7WE54nejQvqE5DZA55bsv+ZR28HB4LKBzmQDcLVHj7awgXumFOtG1tHWUJ7VQlo2 QI9Vy9tJEFuEk2A048C2rJRdS5fJLVIUSKkEzagfWnVz/UrVPPDQiTmfzflurkAHkMms I3wx/XTfsankAVAuc2HSoAsdPub8c8+i1mgguhw5TweTlixFQwSgVlKODhG816Q9XNbe 4GuCWlxXjGC+/ARjsoKyQu0D+QgPaLPcFV65lZl6dtI7ZMYhQImhJ7IZw3LN01sKasL0 7/T3rARAH6Cn1SkoVyXu9ghTh9v1Migi12KqEL/HxboiCjPpJ1WLHMpYvBzb3J30Tv9b tB/g== X-Gm-Message-State: AOAM531KpuWwlVd06D7MihxuiH2HdnEzy+ZrTIGsIl7cdzLks+W2SBl2 B3sWkeTSNNrt5vboSVFYIkpRxRTxc7Q= X-Google-Smtp-Source: ABdhPJyNH7y1SYhRQ8urcGoqehWSKMB7GfBNhpfjz+jZ5Gstu+xJtiBTEJr1QDrZvOdYj4c6rS/q9w== X-Received: by 2002:a5d:8b45:0:b0:641:2e54:7367 with SMTP id c5-20020a5d8b45000000b006412e547367mr3540106iot.20.1652998691248; Thu, 19 May 2022 15:18:11 -0700 (PDT) Received: from noah-tgl.. (node-17-161.flex.volo.net. [76.191.17.161]) by smtp.gmail.com with ESMTPSA id b9-20020a026f49000000b0032e42cd4274sm221530jae.89.2022.05.19.15.18.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 May 2022 15:18:10 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v11 1/6] elf: Refactor dl_new_hash so it can be tested / benchmarked Date: Thu, 19 May 2022 17:17:58 -0500 Message-Id: <20220519221803.57957-1-goldstein.w.n@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220414041231.926415-1-goldstein.w.n@gmail.com> References: <20220414041231.926415-1-goldstein.w.n@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Noah Goldstein via Libc-alpha From: Noah Goldstein Reply-To: Noah Goldstein Cc: Siddhesh Poyarekar Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" No change to the code other than moving the function to dl-new-hash.h. Changed name so its now in the reserved namespace. Reviewed-by: Siddhesh Poyarekar --- elf/dl-lookup.c | 13 ++----------- elf/dl-new-hash.h | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 11 deletions(-) create mode 100644 elf/dl-new-hash.h diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c index 989b073e4f..a42f6d5390 100644 --- a/elf/dl-lookup.c +++ b/elf/dl-lookup.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -558,16 +559,6 @@ skip: } -static uint32_t -dl_new_hash (const char *s) -{ - uint32_t h = 5381; - for (unsigned char c = *s; c != '\0'; c = *++s) - h = h * 33 + c; - return h; -} - - /* Add extra dependency on MAP to UNDEF_MAP. */ static int add_dependency (struct link_map *undef_map, struct link_map *map, int flags) @@ -816,7 +807,7 @@ _dl_lookup_symbol_x (const char *undef_name, struct link_map *undef_map, const struct r_found_version *version, int type_class, int flags, struct link_map *skip_map) { - const unsigned int new_hash = dl_new_hash (undef_name); + const unsigned int new_hash = _dl_new_hash (undef_name); unsigned long int old_hash = 0xffffffff; struct sym_val current_value = { NULL, NULL }; struct r_scope_elem **scope = symbol_scope; diff --git a/elf/dl-new-hash.h b/elf/dl-new-hash.h new file mode 100644 index 0000000000..8641bb4196 --- /dev/null +++ b/elf/dl-new-hash.h @@ -0,0 +1,40 @@ +/* _dl_new_hash for elf symbol lookup + Copyright (C) 2022 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _DL_NEW_HASH_H +#define _DL_NEW_HASH_H 1 + +#include +/* For __always_inline. */ +#include + +static __always_inline uint32_t +__attribute__ ((unused)) +_dl_new_hash (const char *s) +{ + uint32_t h = 5381; + for (unsigned char c = *s; c != '\0'; c = *++s) + h = h * 33 + c; + return h; +} + +/* For testing/benchmarking purposes. */ +#define __simple_dl_new_hash _dl_new_hash + + +#endif /* dl-new-hash.h */