mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 07:10:06 +00:00
d051b143f7
The sem_* functions bring in references to tdelete, tfind, tsearch and twalk. But the t* functions are XSI-shaded, while sem_* aren't. This patch fixes this by using __t* instead, exporting those functions from libc at version GLIBC_PRIVATE (since sem_* are in libpthread) and using libc_hidden_* for the benefit of calls within libc. Tested for x86_64 and x86 (testsuite, and comparison of disassembly of installed stripped shared libraries). libpthread gets changes from PLT reordering; addresses in libc change because of PLT / dynamic symbol table changes. [BZ #18536] * misc/tsearch.c (__tsearch): Use libc_hidden_def. (__tfind): Likewise. (__tdelete): Likewise. (__twalk): Likewise. * misc/Versions (libc): Add __tdelete, __tfind, __tsearch and __twalk to GLIBC_PRIVATE. * include/search.h (__tsearch): Use libc_hidden_proto. (__tfind): Likewise. (__tdelete): Likewise. (__twalk): Likewise. * nptl/sem_close.c (sem_close): Call __twalk instead of twalk. Call __tdelete instead of tdelete. * nptl/sem_open.c (check_add_mapping): Call __tfind instead of tfind. Call __tsearch instead of tsearch. * sysdeps/sparc/sparc32/sem_open.c (check_add_mapping): Likewise. * conform/Makefile (test-xfail-POSIX/semaphore.h/linknamespace): Remove variable. (test-xfail-POSIX2008/semaphore.h/linknamespace): Likewise.
81 lines
2.1 KiB
C
81 lines
2.1 KiB
C
/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@redhat.com>, 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
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <errno.h>
|
|
#include <search.h>
|
|
#include <sys/mman.h>
|
|
#include "semaphoreP.h"
|
|
|
|
|
|
/* Global variables to parametrize the walk function. This works
|
|
since we always have to use locks. And we have to use the twalk
|
|
function since the entries are not sorted wrt the mapping
|
|
address. */
|
|
static sem_t *the_sem;
|
|
static struct inuse_sem *rec;
|
|
|
|
static void
|
|
walker (const void *inodep, const VISIT which, const int depth)
|
|
{
|
|
struct inuse_sem *nodep = *(struct inuse_sem **) inodep;
|
|
|
|
if (nodep->sem == the_sem)
|
|
rec = nodep;
|
|
}
|
|
|
|
|
|
int
|
|
sem_close (sem)
|
|
sem_t *sem;
|
|
{
|
|
int result = 0;
|
|
|
|
/* Get the lock. */
|
|
lll_lock (__sem_mappings_lock, LLL_PRIVATE);
|
|
|
|
/* Locate the entry for the mapping the caller provided. */
|
|
rec = NULL;
|
|
the_sem = sem;
|
|
__twalk (__sem_mappings, walker);
|
|
if (rec != NULL)
|
|
{
|
|
/* Check the reference counter. If it is going to be zero, free
|
|
all the resources. */
|
|
if (--rec->refcnt == 0)
|
|
{
|
|
/* Remove the record from the tree. */
|
|
(void) __tdelete (rec, &__sem_mappings, __sem_search);
|
|
|
|
result = munmap (rec->sem, sizeof (sem_t));
|
|
|
|
free (rec);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* This is no valid semaphore. */
|
|
result = -1;
|
|
__set_errno (EINVAL);
|
|
}
|
|
|
|
/* Release the lock. */
|
|
lll_unlock (__sem_mappings_lock, LLL_PRIVATE);
|
|
|
|
return result;
|
|
}
|