From patchwork Thu Apr 14 14:55:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Goldstein X-Patchwork-Id: 52910 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 42D093857359 for ; Thu, 14 Apr 2022 14:56:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 42D093857359 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1649948168; bh=J4sEQHrShPaKJuxTrePMdayFSggo+GVOrwcVSe3S4uw=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=otYwDF4oJcDwGpRP7PuMg2TO1MB+H3p3Hy0Rm+ADX2VBCJ2rUzmr7b4WzmrLynpYj yh1pmcYzO5CthPn5vFw6c0Fdprc3NiatTB/BBxB/VdCePtG6R/VzhpO91MoZKTxp5H C/p1ZJY38G/TRYRdmL5kb7VJzsy7oe8JQC9z/Qjk= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) by sourceware.org (Postfix) with ESMTPS id 47E5B3858016 for ; Thu, 14 Apr 2022 14:55:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 47E5B3858016 Received: by mail-il1-x135.google.com with SMTP id d3so3241918ilr.10 for ; Thu, 14 Apr 2022 07:55:47 -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=J4sEQHrShPaKJuxTrePMdayFSggo+GVOrwcVSe3S4uw=; b=gtqV9CfRMUA+v1Q4lcl0qBLd47xO8CF6mTZiZA+H+Ft+ccZfvFLK3vJifHbbzzYODo U7vTzdgPpsBQ7VqH2u19dOqvV7ytEs89jyODIGLivevdV+9jj8x9NbXfF2ZhoaVBsfHZ gOcDwyDi69gq0RijMZu8D9JeKYRYMk70jGVTR3/5OZqkjmmHrbm+dOY9uTdtMAh9b1H4 /Of0sLTONEkQvlxllVOFy0ACGo84ra5anSM6ajrr9dHUAj3CvYVfHmTFlbvmopFwD1uR jUTki2EQYdiCAIM71zPQP9eg7PUT8ObAU6qCK0Bi9/JUwf+R7U3EmHqZZspOYVbSlw6T XxvQ== X-Gm-Message-State: AOAM533nEGNSJwLs9C85h4r4DLEqPQf9iM7Mho66pIZvpp8z7Rh+Lv5H Uketxtg2clUGgV1RhLX2y03QptZoLs4= X-Google-Smtp-Source: ABdhPJxBncMJBMQPklB76ELGLh8C6J8bRcAe9FDksgKoaUuY8Qm5dqDJtmjlQmIm4lo4BJydCUnT6w== X-Received: by 2002:a92:6512:0:b0:2ca:1e16:5751 with SMTP id z18-20020a926512000000b002ca1e165751mr1317069ilb.210.1649948146400; Thu, 14 Apr 2022 07:55:46 -0700 (PDT) Received: from localhost.localdomain (node-17-161.flex.volo.net. [76.191.17.161]) by smtp.googlemail.com with ESMTPSA id i12-20020a926d0c000000b002c9db5fdf66sm1216629ilc.15.2022.04.14.07.55.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Apr 2022 07:55:46 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v2 1/6] elf: Refactor dl_new_hash so it can be tested / benchmarked Date: Thu, 14 Apr 2022 09:55:35 -0500 Message-Id: <20220414145540.194794-1-goldstein.w.n@gmail.com> X-Mailer: git-send-email 2.25.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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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 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. --- elf/dl-lookup.c | 13 ++----------- elf/dl-new-hash.h | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 36 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..52eef4e417 --- /dev/null +++ b/elf/dl-new-hash.h @@ -0,0 +1,34 @@ +/* _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 + +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; +} + + +#endif /* dl-new-hash.h */