From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd2d.google.com (mail-io1-xd2d.google.com [IPv6:2607:f8b0:4864:20::d2d]) by sourceware.org (Postfix) with ESMTPS id 257853858C83 for ; Mon, 25 Apr 2022 16:36:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 257853858C83 Received: by mail-io1-xd2d.google.com with SMTP id g21so16441131iom.13 for ; Mon, 25 Apr 2022 09:36:08 -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=7GM1Rq2IbLJMjhqyRucTwXNdxplNPWQr8arKYO66Ego2Swq8y/IaX/cBdTioXjBHUV 4puHlxEaXmv97lnKmeulfXqsoQ8ifBEmSBnoam+dst/PRwdK7wm507Zta54HmJLwxnz0 T/PGwPt4HNLn7lGnsVKiBSqv0XZzXvEdW8BNhSGbgtdJzVjBT1DIwzxQFObwY5Yi3swd D4sQ7qd5mPTZnAT/90P5VUgnJPWngyoWAaej00UPlkbeBRLGrQWFq+PX2dlqx3nbcQUA DCl+HNmk+0rNZ4Iv/Q7xGoTYzrus0st/N9iFpQsx5ZAPai3csaX5D0GbwP4QK6ZO5Z0i C3oQ== X-Gm-Message-State: AOAM5302/6LfVI8KhzORPczTL9Yd5mLIIqYUpoMYSMSa+sfR39fmD0Rh WQNF6kPeHCdG8RB+8R/sC77kM9kxFSs= X-Google-Smtp-Source: ABdhPJylXqXpqXgZkt3dTFLte7Cjt0G2uBEcKk+Ch44pIof7nL2VZXOKOEPuwRUaL8uVvTVcaFcTIQ== X-Received: by 2002:a05:6602:2f12:b0:654:b304:b016 with SMTP id q18-20020a0566022f1200b00654b304b016mr7486367iow.60.1650904567404; Mon, 25 Apr 2022 09:36:07 -0700 (PDT) Received: from localhost.localdomain ([173.245.202.37]) by smtp.googlemail.com with ESMTPSA id p11-20020a056e0206cb00b002cc23fe596esm6567727ils.21.2022.04.25.09.36.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 09:36:07 -0700 (PDT) From: Noah Goldstein To: libc-alpha@sourceware.org Subject: [PATCH v3 1/6] elf: Refactor dl_new_hash so it can be tested / benchmarked Date: Mon, 25 Apr 2022 11:35:56 -0500 Message-Id: <20220425163601.3670626-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 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.9 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 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-List-Received-Date: Mon, 25 Apr 2022 16:36:11 -0000 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 */ -- 2.25.1