From patchwork Mon Jun 28 09:09:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 44029 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 A760E395192B for ; Mon, 28 Jun 2021 09:10:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A760E395192B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1624871415; bh=fDOWr2dflipEO0KCJ/OnSVMSJ89eSilv/hkBgmg/UEA=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=ZJA0yTy35qes2kOHKfq8P1h93ztbUze58zYgP5AvPpcAZEbQWSN5cT2a9UAF2OPGA vhJTky58EvdlLigwzg/mNPjGDDHXdb+xSk+R3tJ1nhMI0kzGOypTYT4sGSc4xV6ng2 GfQMqaZ/4xTAPkwEY4cUb2tOkjF/v+ODErfls+vg= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id A7F3B39518AC for ; Mon, 28 Jun 2021 09:09:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A7F3B39518AC Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-17-KLE0flR-OeubN2wH7yjeRg-1; Mon, 28 Jun 2021 05:09:11 -0400 X-MC-Unique: KLE0flR-OeubN2wH7yjeRg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EA60B1835AC7 for ; Mon, 28 Jun 2021 09:09:10 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-112-228.ams2.redhat.com [10.36.112.228]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7B6DA60C9F for ; Mon, 28 Jun 2021 09:09:09 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 1/3] nptl_db: Clean up main/rtld variable handling In-Reply-To: References: X-From-Line: cd11e45467f47c8d12bb5c0d6e6a8638eb041032 Mon Sep 17 00:00:00 2001 Message-Id: Date: Mon, 28 Jun 2021 11:09:07 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Most symbols are now in libc.so.6. The "main" (exempted from coverage checks) status is therefore not necessary. Use DB_MAIN_VARIABLE for the remaining separate symbol, __nptl_initial_report_events. DB_RTLD_VARIABLE is now unused, so remove it. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- nptl_db/db-symbols.awk | 1 - nptl_db/structs.def | 14 +++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/nptl_db/db-symbols.awk b/nptl_db/db-symbols.awk index 6f326cf379..ef1d91b167 100644 --- a/nptl_db/db-symbols.awk +++ b/nptl_db/db-symbols.awk @@ -2,7 +2,6 @@ # we've just built. It checks for all the symbols used in td_symbol_list. BEGIN { -%define DB_RTLD_VARIABLE(name) /* Nothing. */ %define DB_MAIN_VARIABLE(name) /* Nothing. */ %define DB_MAIN_SYMBOL(name) /* Nothing. */ %define DB_MAIN_ARRAY_VARIABLE(name) /* Nothing. */ diff --git a/nptl_db/structs.def b/nptl_db/structs.def index 6a726f207e..fb7bb9367d 100644 --- a/nptl_db/structs.def +++ b/nptl_db/structs.def @@ -22,10 +22,6 @@ # define STRUCTS_DEF_DEFAULTS 1 #endif -#ifndef DB_RTLD_VARIABLE -# define DB_RTLD_VARIABLE(name) DB_VARIABLE (name) -#endif - /* DB_MAIN_VARIABLE, DB_MAIN_SYMBOL, DB_MAIN_ARRAY_VARIABLE are not covered by the libc symbol check in db-symbols.awk. */ #ifndef DB_MAIN_VARIABLE @@ -78,14 +74,14 @@ DB_STRUCT_FIELD (td_eventbuf_t, eventnum) DB_STRUCT_FIELD (td_eventbuf_t, eventdata) DB_SYMBOL (nptl_version) -DB_MAIN_SYMBOL (__nptl_create_event) -DB_MAIN_SYMBOL (__nptl_death_event) +DB_SYMBOL (__nptl_create_event) +DB_SYMBOL (__nptl_death_event) DB_SYMBOL (__nptl_threads_events) -DB_MAIN_VARIABLE (__nptl_nthreads) +DB_VARIABLE (__nptl_nthreads) DB_VARIABLE (__nptl_last_event) -DB_RTLD_VARIABLE (__nptl_initial_report_events) +DB_MAIN_VARIABLE (__nptl_initial_report_events) -DB_MAIN_ARRAY_VARIABLE (__pthread_keys) +DB_ARRAY_VARIABLE (__pthread_keys) DB_STRUCT (pthread_key_struct) DB_STRUCT_FIELD (pthread_key_struct, seq) DB_STRUCT_FIELD (pthread_key_struct, destr)