diff mbox

Remove the ptw-% patterns

Message ID 20160814141339.61F66402B978B@oldenburg.str.redhat.com
State New
Headers show

Commit Message

Florian Weimer Aug. 14, 2016, 2:13 p.m. UTC
Nothing depends on the PTW macro anymore, so the mechanism to define
PTW for recompliations of libc routines is no longer needed.

(Reducing the number of pattern rules in sysd-rules is critical for
improving make performance.)

2016-08-14  Florian Weimer  <fweimer@redhat.com>

	Remove support for compiling wrappers with PTW.
	* sysdeps/nptl/Makeconfig: Drop ptw- support.
	* nptl/Makefile (pthread-compat-wrappers): Define.
	(libpthread-routines): Use pthread-compat-wrappers.
	* sysdeps/unix/sysv/linux/alpha/Makefile
	(libpthread-routines, libpthread-shared-only-routines): Remove
	ptw- prefix.
	* sysdeps/s390/nptl/Makefile
	(libpthread-routines, libpthread-shared-only-routines): Likewise.
	* sysdeps/ia64/nptl/Makefile
	(libpthread-routines, libpthread-shared-only-routines): Likewise.
	* sysdeps/nacl/Makefile (libpthread-routines): Use
	pthread-compat-wrappers to filter the routines list instead of the
	ptw- prefix.

Comments

Andreas Schwab Aug. 14, 2016, 5:07 p.m. UTC | #1
On Aug 14 2016, fweimer@redhat.com (Florian Weimer) wrote:

> Nothing depends on the PTW macro anymore, so the mechanism to define
> PTW for recompliations of libc routines is no longer needed.

There's more to them than that.  All the ptw-% objects are
IS_IN(libpthread) instead of IS_IN(libc).  Take a look at
sysdep-cancel.h for the difference.

Andreas.
Florian Weimer Aug. 14, 2016, 5:19 p.m. UTC | #2
On 08/14/2016 07:07 PM, Andreas Schwab wrote:
> On Aug 14 2016, fweimer@redhat.com (Florian Weimer) wrote:
>
>> Nothing depends on the PTW macro anymore, so the mechanism to define
>> PTW for recompliations of libc routines is no longer needed.
>
> There's more to them than that.  All the ptw-% objects are
> IS_IN(libpthread) instead of IS_IN(libc).  Take a look at
> sysdep-cancel.h for the difference.

The objects are still recompiled.  I believe this is sufficient to make 
the IS_IN conditionals effective.

Florian
Florian Weimer Sept. 13, 2016, 1:09 p.m. UTC | #3
On 08/14/2016 07:19 PM, Florian Weimer wrote:
> On 08/14/2016 07:07 PM, Andreas Schwab wrote:
>> On Aug 14 2016, fweimer@redhat.com (Florian Weimer) wrote:
>>
>>> Nothing depends on the PTW macro anymore, so the mechanism to define
>>> PTW for recompliations of libc routines is no longer needed.
>>
>> There's more to them than that.  All the ptw-% objects are
>> IS_IN(libpthread) instead of IS_IN(libc).  Take a look at
>> sysdep-cancel.h for the difference.
>
> The objects are still recompiled.  I believe this is sufficient to make
> the IS_IN conditionals effective.

Andreas,

do you still object to the proposed change?

Thanks,
Florian
Andreas Schwab Sept. 13, 2016, 5:19 p.m. UTC | #4
If that doesn't create any problems due to the duplicated module names
then this is ok.

Andreas.
Florian Weimer Sept. 14, 2016, 2:12 p.m. UTC | #5
On 09/13/2016 07:19 PM, Andreas Schwab wrote:
> If that doesn't create any problems due to the duplicated module names
> then this is ok.

We already duplicate sigaction (and likely others) in this way, so I 
don't expect any problems.  I also checked libpthread.a and 
libpthread.so before and after this change using “objdump -d”, and there 
are no changes in the disassembly.  Committed.

Thanks,
Florian
Carlos O'Donell Sept. 14, 2016, 4:52 p.m. UTC | #6
On 09/14/2016 10:12 AM, Florian Weimer wrote:
> On 09/13/2016 07:19 PM, Andreas Schwab wrote:
>> If that doesn't create any problems due to the duplicated module
>> names then this is ok.
> 
> We already duplicate sigaction (and likely others) in this way, so I
> don't expect any problems.  I also checked libpthread.a and
> libpthread.so before and after this change using “objdump -d”, and
> there are no changes in the disassembly.  Committed.

I'm happy to see us cut down on the number of auto-generated rules.

I think that if you can show no difference before an after on the generated
binary, that is should be an easy matter to just commit the changes. Since
these changes are usually generic. A quick grep might show any arch-specific
uses of some rules.
diff mbox

Patch

diff --git a/nptl/Makefile b/nptl/Makefile
index 2ddcd2b..e8de1bc 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -33,6 +33,18 @@  routines = alloca_cutoff forward libc-lowlevellock libc-cancellation \
 	   register-atfork unregister-atfork
 shared-only-routines = forward
 
+# We need to provide certain routines for compatibility with existing
+# binaries.
+pthread-compat-wrappers = \
+		      write read close fcntl accept \
+		      connect recv recvfrom send \
+		      sendto fsync lseek llseek \
+		      msync nanosleep open open64 pause \
+		      pread pread64 pwrite pwrite64 \
+		      tcdrain wait waitpid msgrcv msgsnd \
+		      sigwait sigsuspend \
+		      recvmsg sendmsg
+
 libpthread-routines = nptl-init vars events version pt-interp \
 		      pthread_create pthread_exit pthread_detach \
 		      pthread_join pthread_tryjoin pthread_timedjoin \
@@ -108,14 +120,7 @@  libpthread-routines = nptl-init vars events version pt-interp \
 		      lowlevellock lowlevelrobustlock \
 		      lll_timedlock_wait lll_timedwait_tid \
 		      pt-fork pt-vfork \
-		      ptw-write ptw-read ptw-close ptw-fcntl ptw-accept \
-		      ptw-connect ptw-recv ptw-recvfrom ptw-send \
-		      ptw-sendto ptw-fsync ptw-lseek ptw-llseek \
-		      ptw-msync ptw-nanosleep ptw-open ptw-open64 ptw-pause \
-		      ptw-pread ptw-pread64 ptw-pwrite ptw-pwrite64 \
-		      ptw-tcdrain ptw-wait ptw-waitpid ptw-msgrcv ptw-msgsnd \
-		      ptw-sigwait ptw-sigsuspend \
-		      ptw-recvmsg ptw-sendmsg \
+		      $(pthread-compat-wrappers) \
 		      pt-raise pt-system \
 		      flockfile ftrylockfile funlockfile \
 		      sigaction \
diff --git a/sysdeps/ia64/nptl/Makefile b/sysdeps/ia64/nptl/Makefile
index 1e6be8e..4bc1a18 100644
--- a/sysdeps/ia64/nptl/Makefile
+++ b/sysdeps/ia64/nptl/Makefile
@@ -20,6 +20,6 @@  gen-as-const-headers += tcb-offsets.sym
 endif
 
 ifeq ($(subdir),nptl)
-libpthread-routines += ptw-sysdep ptw-sigblock ptw-sigprocmask
-libpthread-shared-only-routines += ptw-sysdep ptw-sigblock ptw-sigprocmask
+libpthread-routines += sysdep sigblock sigprocmask
+libpthread-shared-only-routines += sysdep sigblock sigprocmask
 endif
diff --git a/sysdeps/nacl/Makefile b/sysdeps/nacl/Makefile
index 71a4f8f..a25bd69 100644
--- a/sysdeps/nacl/Makefile
+++ b/sysdeps/nacl/Makefile
@@ -123,7 +123,8 @@  endif
 
 ifeq ($(subdir),nptl)
 # We do not need any wrappers in libpthread.
-libpthread-routines := $(filter-out ptw-%,$(libpthread-routines))
+libpthread-routines := \
+  $(filter-out $(pthread-compat-wrappers),$(libpthread-routines))
 endif
 
 ifeq ($(subdir),misc)
diff --git a/sysdeps/nptl/Makeconfig b/sysdeps/nptl/Makeconfig
index 2f4918d..babee94 100644
--- a/sysdeps/nptl/Makeconfig
+++ b/sysdeps/nptl/Makeconfig
@@ -26,7 +26,3 @@  shared-thread-library = $(common-objpfx)nptl/libpthread_nonshared.a \
 static-thread-library = $(common-objpfx)nptl/libpthread.a
 
 rpath-dirs += nptl
-
-# This makes for ptw-*.? object rules in sysd-rules.
-ptw-CPPFLAGS := -DPTW
-sysd-rules-patterns += ptw-%:%
diff --git a/sysdeps/s390/nptl/Makefile b/sysdeps/s390/nptl/Makefile
index 3a391c8..352edc0 100644
--- a/sysdeps/s390/nptl/Makefile
+++ b/sysdeps/s390/nptl/Makefile
@@ -20,6 +20,6 @@  gen-as-const-headers += tcb-offsets.sym
 endif
 
 ifeq ($(subdir),nptl)
-libpthread-routines += ptw-sysdep
-libpthread-shared-only-routines += ptw-sysdep
+libpthread-routines += sysdep
+libpthread-shared-only-routines += sysdep
 endif
diff --git a/sysdeps/unix/sysv/linux/alpha/Makefile b/sysdeps/unix/sysv/linux/alpha/Makefile
index 3b523b7..1e858ce 100644
--- a/sysdeps/unix/sysv/linux/alpha/Makefile
+++ b/sysdeps/unix/sysv/linux/alpha/Makefile
@@ -39,6 +39,6 @@  endif   # math
 
 ifeq ($(subdir),nptl)
 # pull in __syscall_error routine, __sigprocmask, __syscall_rt_sigaction
-libpthread-routines += ptw-sysdep ptw-sigprocmask ptw-rt_sigaction
-libpthread-shared-only-routines += ptw-sysdep ptw-sigprocmask ptw-rt_sigaction
+libpthread-routines += sysdep sigprocmask rt_sigaction
+libpthread-shared-only-routines += sysdep sigprocmask rt_sigaction
 endif