From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by sourceware.org (Postfix) with ESMTP id 90A253854808 for ; Wed, 17 Feb 2021 17:20:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 90A253854808 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-370-LkFaSuboMJKnwDvLM_oWGg-1; Wed, 17 Feb 2021 12:20:50 -0500 X-MC-Unique: LkFaSuboMJKnwDvLM_oWGg-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 762CF107ACF3 for ; Wed, 17 Feb 2021 17:20:49 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-113-131.ams2.redhat.com [10.36.113.131]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CA78B60C61 for ; Wed, 17 Feb 2021 17:20:48 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH 0/6] More libpthread removal preparations Message-Id: Date: Wed, 17 Feb 2021 18:21:20 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (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 Content-Type: text/plain X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, 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-List-Received-Date: Wed, 17 Feb 2021 17:20:54 -0000 These commits clean up some things and move low-level libpthread infrastructure into libc. The final patch consolidates the elision infrastructure, except the actual elision implementation routines. It looks like a reasonable cleanup to me. Thanks, Florian Florian Weimer (6): nptl: Split libpthread-routines into one routine per line nptl: Reformat Versions nptl: Move futex-internal.c into main nptl directory nptl: Move lowlevellock into libc nptl: Move futex-internal into libc nptl: Move elision implementations into libc elf/libc_early_init.c | 6 + nptl/Makefile | 247 +++++---- nptl/Versions | 474 +++++++++++------- .../elision-conf.c | 9 +- .../elision-lock.c | 9 +- .../elision-timed.c | 9 +- .../elision-trylock.c | 9 +- nptl/elision-unlock.c | 17 + {sysdeps/nptl => nptl}/futex-internal.c | 4 +- nptl/libc-lowlevellock.c | 20 - nptl/lowlevellock.c | 9 +- nptl/pthread_mutex_lock.c | 13 - nptl/pthread_mutex_timedlock.c | 13 - nptl/pthread_mutex_trylock.c | 8 - nptl/pthread_mutex_unlock.c | 4 - sysdeps/nptl/Makefile | 3 +- sysdeps/nptl/futex-internal.h | 4 +- sysdeps/nptl/lowlevellock.h | 108 +++- .../elision-conf.h} | 17 +- sysdeps/riscv/nptl/libc-lowlevellock.c | 8 - sysdeps/unix/sysv/linux/powerpc/Makefile | 2 - .../unix/sysv/linux/powerpc/elision-conf.c | 26 +- .../unix/sysv/linux/powerpc/elision-conf.h | 8 +- .../unix/sysv/linux/powerpc/elision-lock.c | 7 +- .../unix/sysv/linux/powerpc/elision-trylock.c | 1 + .../unix/sysv/linux/powerpc/elision-unlock.c | 1 + .../unix/sysv/linux/powerpc/force-elision.h | 62 --- .../unix/sysv/linux/powerpc/lowlevellock.h | 49 -- .../linux/powerpc/pthread_mutex_cond_lock.c | 22 - .../linux/powerpc/pthread_mutex_timedlock.c | 22 - sysdeps/unix/sysv/linux/s390/Makefile | 3 - sysdeps/unix/sysv/linux/s390/elision-conf.c | 27 +- sysdeps/unix/sysv/linux/s390/elision-conf.h | 8 +- sysdeps/unix/sysv/linux/s390/elision-lock.c | 7 +- .../unix/sysv/linux/s390/elision-trylock.c | 1 + sysdeps/unix/sysv/linux/s390/elision-unlock.c | 1 + sysdeps/unix/sysv/linux/s390/force-elision.h | 62 --- sysdeps/unix/sysv/linux/s390/lowlevellock.h | 49 -- .../sysv/linux/s390/pthread_mutex_cond_lock.c | 22 - .../sysv/linux/s390/pthread_mutex_timedlock.c | 22 - sysdeps/unix/sysv/linux/x86/Makefile | 2 - sysdeps/unix/sysv/linux/x86/elision-conf.c | 25 +- sysdeps/unix/sysv/linux/x86/elision-conf.h | 8 +- sysdeps/unix/sysv/linux/x86/elision-lock.c | 7 +- sysdeps/unix/sysv/linux/x86/elision-trylock.c | 1 + sysdeps/unix/sysv/linux/x86/elision-unlock.c | 1 + sysdeps/unix/sysv/linux/x86/force-elision.h | 62 --- sysdeps/unix/sysv/linux/x86/lowlevellock.h | 24 - .../sysv/linux/x86/pthread_mutex_cond_lock.c | 22 - .../sysv/linux/x86/pthread_mutex_timedlock.c | 22 - .../sysv/linux/x86/pthread_mutex_trylock.c | 22 - 51 files changed, 630 insertions(+), 959 deletions(-) rename sysdeps/unix/sysv/linux/s390/pthread_mutex_lock.c => nptl/elision-conf.c (79%) rename sysdeps/unix/sysv/linux/powerpc/pthread_mutex_lock.c => nptl/elision-lock.c (79%) rename sysdeps/unix/sysv/linux/s390/pthread_mutex_trylock.c => nptl/elision-timed.c (78%) rename sysdeps/unix/sysv/linux/x86/pthread_mutex_lock.c => nptl/elision-trylock.c (79%) create mode 100644 nptl/elision-unlock.c rename {sysdeps/nptl => nptl}/futex-internal.c (97%) delete mode 100644 nptl/libc-lowlevellock.c rename sysdeps/{unix/sysv/linux/powerpc/pthread_mutex_trylock.c => pthread/elision-conf.h} (64%) delete mode 100644 sysdeps/riscv/nptl/libc-lowlevellock.c delete mode 100644 sysdeps/unix/sysv/linux/powerpc/force-elision.h delete mode 100644 sysdeps/unix/sysv/linux/powerpc/lowlevellock.h delete mode 100644 sysdeps/unix/sysv/linux/powerpc/pthread_mutex_cond_lock.c delete mode 100644 sysdeps/unix/sysv/linux/powerpc/pthread_mutex_timedlock.c delete mode 100644 sysdeps/unix/sysv/linux/s390/force-elision.h delete mode 100644 sysdeps/unix/sysv/linux/s390/lowlevellock.h delete mode 100644 sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c delete mode 100644 sysdeps/unix/sysv/linux/s390/pthread_mutex_timedlock.c delete mode 100644 sysdeps/unix/sysv/linux/x86/force-elision.h delete mode 100644 sysdeps/unix/sysv/linux/x86/pthread_mutex_cond_lock.c delete mode 100644 sysdeps/unix/sysv/linux/x86/pthread_mutex_timedlock.c delete mode 100644 sysdeps/unix/sysv/linux/x86/pthread_mutex_trylock.c -- 2.29.2