From 39c4451cecac1bc3c3bccf53521333cef18d37c6 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 5 Sep 2011 10:01:52 -0700 Subject: Fix nptl semaphore cleanup invocation. --- nptl/sysdeps/unix/sysv/linux/sparc/sem_wait.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'nptl/sysdeps/unix/sysv/linux/sparc/sem_wait.c') diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sem_wait.c b/nptl/sysdeps/unix/sysv/linux/sparc/sem_wait.c index a846f20601..4a2c9357a0 100644 --- a/nptl/sysdeps/unix/sysv/linux/sparc/sem_wait.c +++ b/nptl/sysdeps/unix/sysv/linux/sparc/sem_wait.c @@ -37,6 +37,20 @@ __sem_wait_cleanup (void *arg) atomic_decrement (&isem->nwaiters); } +/* This is in a seperate function in order to make sure gcc + puts the call site into an exception region, and thus the + cleanups get properly run. */ +static int +__attribute__ ((noinline)) +do_futex_wait (struct sparc_new_sem *isem) +{ + int err, oldtype = __pthread_enable_asynccancel (); + + err = lll_futex_wait (&isem->value, 0, isem->private ^ FUTEX_PRIVATE_FLAG); + + __pthread_disable_asynccancel (oldtype); + return err; +} int __new_sem_wait (sem_t *sem) @@ -53,15 +67,7 @@ __new_sem_wait (sem_t *sem) while (1) { - /* Enable asynchronous cancellation. Required by the standard. */ - int oldtype = __pthread_enable_asynccancel (); - - err = lll_futex_wait (&isem->value, 0, - isem->private ^ FUTEX_PRIVATE_FLAG); - - /* Disable asynchronous cancellation. */ - __pthread_disable_asynccancel (oldtype); - + err = do_futex_wait(isem); if (err != 0 && err != -EWOULDBLOCK) { __set_errno (-err); -- cgit v1.2.3