diff --git a/ChangeLog b/ChangeLog index b7f3c61..c50e380 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2015-05-19 Martin Sebor + + [BZ #18435] + * nptl/Makefile: Add tst-once5.cc. + * nptl/pthreadP.h (pthread_cleanup_push, pthread_cleanup_pop): + Remove macro redefinitions. + * nptl/tst-once5.cc: New test. + 2015-05-18 Siddhesh Poyarekar * .gitignore: Ignore generated *.pyc. diff --git a/nptl/Makefile b/nptl/Makefile index d784c8d..1bf35cb 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -203,6 +203,7 @@ CFLAGS-send.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-pt-system.c = -fexceptions +LDFLAGS-tst-once5 = -lstdc++ tests = tst-typesizes \ tst-attr1 tst-attr2 tst-attr3 tst-default-attr \ @@ -224,7 +225,7 @@ tests = tst-typesizes \ tst-rwlock1 tst-rwlock2 tst-rwlock2a tst-rwlock3 tst-rwlock4 \ tst-rwlock5 tst-rwlock6 tst-rwlock7 tst-rwlock8 tst-rwlock9 \ tst-rwlock10 tst-rwlock11 tst-rwlock12 tst-rwlock13 tst-rwlock14 \ - tst-once1 tst-once2 tst-once3 tst-once4 \ + tst-once1 tst-once2 tst-once3 tst-once4 tst-once5 \ tst-key1 tst-key2 tst-key3 tst-key4 \ tst-sem1 tst-sem2 tst-sem3 tst-sem4 tst-sem5 tst-sem6 tst-sem7 \ tst-sem8 tst-sem9 tst-sem10 tst-sem11 tst-sem12 tst-sem13 tst-sem14 \ diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index 84a7105..72d3e23 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -536,16 +536,9 @@ extern void __librt_disable_asynccancel (int oldtype) extern void __pthread_cleanup_push (struct _pthread_cleanup_buffer *buffer, void (*routine) (void *), void *arg) attribute_hidden; -# undef pthread_cleanup_push -# define pthread_cleanup_push(routine,arg) \ - { struct _pthread_cleanup_buffer _buffer; \ - __pthread_cleanup_push (&_buffer, (routine), (arg)); extern void __pthread_cleanup_pop (struct _pthread_cleanup_buffer *buffer, int execute) attribute_hidden; -# undef pthread_cleanup_pop -# define pthread_cleanup_pop(execute) \ - __pthread_cleanup_pop (&_buffer, (execute)); } #endif extern void __pthread_cleanup_push_defer (struct _pthread_cleanup_buffer *buffer, diff --git a/nptl/tst-once5.cc b/nptl/tst-once5.cc new file mode 100644 index 0000000..60bc78a --- /dev/null +++ b/nptl/tst-once5.cc @@ -0,0 +1,80 @@ +/* Copyright (C) 2015 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 2002. + + 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 + . */ + +#include +#include +#include +#include + + +static pthread_once_t once = PTHREAD_ONCE_INIT; + +// Exception type thrown from the pthread_once init routine. +struct OnceException { }; + +// Test iteration counter. +static int niter; + +static void +init_routine (void) +{ + if (niter < 2) + throw OnceException (); +} + +// Verify that an exception thrown from the pthread_once init routine +// is propagated to the pthread_once caller and that the function can +// be subsequently invoked to attempt the initialization again. +static int +do_test (void) +{ + int result = 1; + + // Repeat three times, having the init routine throw the first two + // times and succeed on the final attempt. + for (niter = 0; niter != 3; ++niter) { + + try { + int rc = pthread_once (&once, init_routine); + if (rc) + fprintf (stderr, "pthread_once failed: %i (%s)\n", + rc, strerror (rc)); + + if (niter < 2) + fputs ("pthread_once unexpectedly returned without" + " throwing an exception", stderr); + } + catch (OnceException) { + if (1 < niter) + fputs ("pthread_once unexpectedly threw", stderr); + result = 0; + } + catch (...) { + fputs ("pthread_once threw an unknown exception", stderr); + } + + // Abort the test on the first failure. + if (result) + break; + } + + return result; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c"