mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-23 13:30:06 +00:00
23b5cae1af
This patch adds pretty printers for the following NPTL types: - pthread_mutex_t - pthread_mutexattr_t - pthread_cond_t - pthread_condattr_t - pthread_rwlock_t - pthread_rwlockattr_t To load the pretty printers into your gdb session, do the following: python import sys sys.path.insert(0, '/path/to/glibc/build/nptl/pretty-printers') end source /path/to/glibc/source/pretty-printers/nptl-printers.py You can check which printers are registered and enabled by issuing the 'info pretty-printer' gdb command. Printers should trigger automatically when trying to print a variable of one of the types mentioned above. The printers are architecture-independent, and were tested on an AMD64 running Ubuntu 14.04 and an x86 VM running Fedora 24. In order to work, the printers need to know the values of various flags that are scattered throughout pthread.h and pthreadP.h as enums and #defines. Since replicating these constants in the printers file itself would create a maintenance burden, I wrote a script called gen-py-const.awk that Makerules uses to extract the constants. This script is pretty much the same as gen-as-const.awk, except it doesn't cast the constant values to 'long' and is thorougly documented. The constants need only to be enumerated in a .pysym file, which is then referenced by a Make variable called gen-py-const-headers. As for the install directory, I discussed this with Mike Frysinger and Siddhesh Poyarekar, and we agreed that it can be handled in a separate patch, and shouldn't block merging of this one. In addition, I've written a series of test cases for the pretty printers. Each lock type (mutex, condvar and rwlock) has two test programs, one for itself and other for its related 'attributes' object. Each test program in turn has a PExpect-based Python script that drives gdb and compares its output to the expected printer's. The tests run on the glibc host, which is assumed to have both gdb and PExpect; if either is absent the tests will fail with code 77 (UNSUPPORTED). For cross-testing you should use cross-test-ssh.sh as test-wrapper. I've tested the printers on both native builds and a cross build using a Beaglebone Black running Debian, with the build system's filesystem shared with the board through NFS. Finally, I've written a README that explains all this and more. * INSTALL: Regenerated. * Makeconfig: Add comments and whitespace to make the control flow clearer. (+link-printers-tests, +link-pie-printers-tests, CFLAGS-printers-tests, installed-rtld-LDFLAGS, built-rtld-LDFLAGS, link-libc-rpath, link-libc-tests-after-rpath-link, link-libc-printers-tests): New. (rtld-LDFLAGS, rtld-tests-LDFLAGS, link-libc-tests-rpath-link, link-libc-tests): Use the new variables as required. * Makerules ($(py-const)): New rule. generated: Add $(py-const). * README.pretty-printers: New file. * Rules (tests-printers-programs, tests-printers-out, py-env): New. (others): Depend on $(py-const). (tests): Depend on $(tests-printers-programs) or $(tests-printers-out), as required. Pass $(tests-printers) to merge-test-results.sh. * manual/install.texi: Add requirements for testing the pretty printers. * nptl/Makefile (gen-py-const-headers, pretty-printers, tests-printers, CFLAGS-test-mutexattr-printers.c CFLAGS-test-mutex-printers.c, CFLAGS-test-condattr-printers.c, CFLAGS-test-cond-printers.c, CFLAGS-test-rwlockattr-printers.c CFLAGS-test-rwlock-printers.c, tests-printers-libs): Define. * nptl/nptl-printers.py: New file. * nptl/nptl_lock_constants.pysym: Likewise. * nptl/test-cond-printers.c: Likewise. * nptl/test-cond-printers.py: Likewise. * nptl/test-condattr-printers.c: Likewise. * nptl/test-condattr-printers.py: Likewise. * nptl/test-mutex-printers.c: Likewise. * nptl/test-mutex-printers.py: Likewise. * nptl/test-mutexattr-printers.c: Likewise. * nptl/test-mutexattr-printers.py: Likewise. * nptl/test-rwlock-printers.c: Likewise. * nptl/test-rwlock-printers.py: Likewise. * nptl/test-rwlockattr-printers.c: Likewise. * nptl/test-rwlockattr-printers.py: Likewise. * scripts/gen-py-const.awk: Likewise. * scripts/test_printers_common.py: Likewise. * scripts/test_printers_exceptions.py: Likewise.
76 lines
1.9 KiB
Plaintext
76 lines
1.9 KiB
Plaintext
#include <pthreadP.h>
|
|
|
|
-- Mutex types
|
|
PTHREAD_MUTEX_KIND_MASK PTHREAD_MUTEX_KIND_MASK_NP
|
|
PTHREAD_MUTEX_NORMAL
|
|
PTHREAD_MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE_NP
|
|
PTHREAD_MUTEX_ERRORCHECK PTHREAD_MUTEX_ERRORCHECK_NP
|
|
PTHREAD_MUTEX_ADAPTIVE_NP
|
|
|
|
-- Mutex status
|
|
-- These are hardcoded all over the code; there are no enums/macros for them.
|
|
PTHREAD_MUTEX_DESTROYED -1
|
|
PTHREAD_MUTEX_UNLOCKED 0
|
|
PTHREAD_MUTEX_LOCKED_NO_WAITERS 1
|
|
|
|
-- For robust mutexes
|
|
PTHREAD_MUTEX_INCONSISTENT
|
|
PTHREAD_MUTEX_NOTRECOVERABLE
|
|
FUTEX_OWNER_DIED
|
|
|
|
-- For robust and PI mutexes
|
|
FUTEX_WAITERS
|
|
FUTEX_TID_MASK
|
|
|
|
-- Mutex attributes
|
|
PTHREAD_MUTEX_ROBUST_NORMAL_NP
|
|
PTHREAD_MUTEX_PRIO_INHERIT_NP
|
|
PTHREAD_MUTEX_PRIO_PROTECT_NP
|
|
PTHREAD_MUTEX_PSHARED_BIT
|
|
PTHREAD_MUTEX_PRIO_CEILING_SHIFT
|
|
PTHREAD_MUTEX_PRIO_CEILING_MASK
|
|
|
|
-- Mutex attribute flags
|
|
PTHREAD_MUTEXATTR_PROTOCOL_SHIFT
|
|
PTHREAD_MUTEXATTR_PROTOCOL_MASK
|
|
PTHREAD_MUTEXATTR_PRIO_CEILING_MASK
|
|
PTHREAD_MUTEXATTR_FLAG_ROBUST
|
|
PTHREAD_MUTEXATTR_FLAG_PSHARED
|
|
PTHREAD_MUTEXATTR_FLAG_BITS
|
|
PTHREAD_MUTEX_NO_ELISION_NP
|
|
|
|
-- Priority protocols
|
|
PTHREAD_PRIO_NONE
|
|
PTHREAD_PRIO_INHERIT
|
|
PTHREAD_PRIO_PROTECT
|
|
|
|
-- These values are hardcoded as well:
|
|
-- Value of __mutex for shared condvars.
|
|
PTHREAD_COND_SHARED (void *)~0l
|
|
|
|
-- Value of __total_seq for destroyed condvars.
|
|
PTHREAD_COND_DESTROYED -1ull
|
|
|
|
-- __nwaiters encodes the number of threads waiting on a condvar
|
|
-- and the clock ID.
|
|
-- __nwaiters >> COND_NWAITERS_SHIFT gives us the number of waiters.
|
|
COND_NWAITERS_SHIFT
|
|
|
|
-- Condvar clock IDs
|
|
CLOCK_REALTIME
|
|
CLOCK_MONOTONIC
|
|
CLOCK_PROCESS_CPUTIME_ID
|
|
CLOCK_THREAD_CPUTIME_ID
|
|
CLOCK_MONOTONIC_RAW
|
|
CLOCK_REALTIME_COARSE
|
|
CLOCK_MONOTONIC_COARSE
|
|
|
|
-- Rwlock attributes
|
|
PTHREAD_RWLOCK_PREFER_READER_NP
|
|
PTHREAD_RWLOCK_PREFER_WRITER_NP
|
|
PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP
|
|
|
|
-- 'Shared' attribute values
|
|
PTHREAD_PROCESS_PRIVATE
|
|
PTHREAD_PROCESS_SHARED
|