mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-07 06:43:00 +03:00
Break out _dl_scope_free into its own file.
This reduces the coarse static callgraph that can be discovered by looking at the object files.
This commit is contained in:
@@ -29,7 +29,7 @@ routines = $(dl-routines) dl-support dl-iteratephdr \
|
|||||||
# profiled libraries.
|
# profiled libraries.
|
||||||
dl-routines = $(addprefix dl-,load cache lookup object reloc deps \
|
dl-routines = $(addprefix dl-,load cache lookup object reloc deps \
|
||||||
runtime error init fini debug misc \
|
runtime error init fini debug misc \
|
||||||
version profile conflict tls origin \
|
version profile conflict tls origin scope \
|
||||||
execstack caller open close trampoline)
|
execstack caller open close trampoline)
|
||||||
all-dl-routines = $(dl-routines) $(sysdep-dl-routines)
|
all-dl-routines = $(dl-routines) $(sysdep-dl-routines)
|
||||||
# But they are absent from the shared libc, because that code is in ld.so.
|
# But they are absent from the shared libc, because that code is in ld.so.
|
||||||
|
@@ -165,41 +165,6 @@ add_to_global (struct link_map *new)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
|
||||||
_dl_scope_free (void *old)
|
|
||||||
{
|
|
||||||
struct dl_scope_free_list *fsl;
|
|
||||||
#define DL_SCOPE_FREE_LIST_SIZE (sizeof (fsl->list) / sizeof (fsl->list[0]))
|
|
||||||
|
|
||||||
if (RTLD_SINGLE_THREAD_P)
|
|
||||||
free (old);
|
|
||||||
else if ((fsl = GL(dl_scope_free_list)) == NULL)
|
|
||||||
{
|
|
||||||
GL(dl_scope_free_list) = fsl = malloc (sizeof (*fsl));
|
|
||||||
if (fsl == NULL)
|
|
||||||
{
|
|
||||||
THREAD_GSCOPE_WAIT ();
|
|
||||||
free (old);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
fsl->list[0] = old;
|
|
||||||
fsl->count = 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (fsl->count < DL_SCOPE_FREE_LIST_SIZE)
|
|
||||||
fsl->list[fsl->count++] = old;
|
|
||||||
else
|
|
||||||
{
|
|
||||||
THREAD_GSCOPE_WAIT ();
|
|
||||||
while (fsl->count > 0)
|
|
||||||
free (fsl->list[--fsl->count]);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
dl_open_worker (void *a)
|
dl_open_worker (void *a)
|
||||||
{
|
{
|
||||||
|
58
elf/dl-scope.c
Normal file
58
elf/dl-scope.c
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
/* Memory handling for the scope data structures.
|
||||||
|
Copyright (C) 2009 Free Software Foundation, Inc.
|
||||||
|
This file is part of the GNU C Library.
|
||||||
|
|
||||||
|
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, write to the Free
|
||||||
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||||
|
02111-1307 USA. */
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <ldsodefs.h>
|
||||||
|
#include <sysdep-cancel.h>
|
||||||
|
|
||||||
|
|
||||||
|
int
|
||||||
|
_dl_scope_free (void *old)
|
||||||
|
{
|
||||||
|
struct dl_scope_free_list *fsl;
|
||||||
|
#define DL_SCOPE_FREE_LIST_SIZE (sizeof (fsl->list) / sizeof (fsl->list[0]))
|
||||||
|
|
||||||
|
if (RTLD_SINGLE_THREAD_P)
|
||||||
|
free (old);
|
||||||
|
else if ((fsl = GL(dl_scope_free_list)) == NULL)
|
||||||
|
{
|
||||||
|
GL(dl_scope_free_list) = fsl = malloc (sizeof (*fsl));
|
||||||
|
if (fsl == NULL)
|
||||||
|
{
|
||||||
|
THREAD_GSCOPE_WAIT ();
|
||||||
|
free (old);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
fsl->list[0] = old;
|
||||||
|
fsl->count = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (fsl->count < DL_SCOPE_FREE_LIST_SIZE)
|
||||||
|
fsl->list[fsl->count++] = old;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
THREAD_GSCOPE_WAIT ();
|
||||||
|
while (fsl->count > 0)
|
||||||
|
free (fsl->list[--fsl->count]);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
Reference in New Issue
Block a user