2003-03-15 Roland McGrath <roland@redhat.com>
* thread_db.h (td_err_e): Add TD_NOTLS and TD_TLSDEFER. (td_thr_tlsbase): Declare it. * td_thr_tlsbase.c: New file. * Makefile (libthread_db-routines): Add it. * Versions (libthread_db: GLIBC_2.3.3): New set, add td_thr_tlsbase. * td_thr_tls_get_addr.c (td_thr_tls_get_addr): Use td_thr_tlsbase.
This commit is contained in:
Roland McGrath
parent
c04dad400a
commit
2f84cc6a48
|
|
@ -39,7 +39,8 @@ libthread_db-routines = td_init td_log td_ta_delete td_ta_get_nthreads \
|
|||
td_thr_event_enable td_thr_set_event \
|
||||
td_thr_clear_event td_thr_event_getmsg \
|
||||
td_ta_set_event td_ta_event_getmsg \
|
||||
td_ta_clear_event td_symbol_list td_thr_tls_get_addr
|
||||
td_ta_clear_event td_symbol_list \
|
||||
td_thr_tlsbase td_thr_tls_get_addr
|
||||
|
||||
libthread_db-inhibit-o = $(filter-out .os,$(object-suffixes))
|
||||
|
||||
|
|
|
|||
|
|
@ -18,4 +18,7 @@ libthread_db {
|
|||
GLIBC_2.3 {
|
||||
td_thr_tls_get_addr;
|
||||
}
|
||||
GLIBC_2.3.3 {
|
||||
td_thr_tlsbase;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,14 +18,9 @@
|
|||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA. */
|
||||
|
||||
#include <stddef.h>
|
||||
#include <link.h>
|
||||
#include "thread_dbP.h"
|
||||
|
||||
/* Value used for dtv entries for which the allocation is delayed. */
|
||||
# define TLS_DTV_UNALLOCATED ((void *) -1l)
|
||||
|
||||
|
||||
td_err_e
|
||||
td_thr_tls_get_addr (const td_thrhandle_t *th __attribute__ ((unused)),
|
||||
void *map_address __attribute__ ((unused)),
|
||||
|
|
@ -33,44 +28,17 @@ td_thr_tls_get_addr (const td_thrhandle_t *th __attribute__ ((unused)),
|
|||
void **address __attribute__ ((unused)))
|
||||
{
|
||||
#if USE_TLS
|
||||
size_t modid;
|
||||
union dtv pdtv, *dtvp;
|
||||
|
||||
LOG ("td_thr_tls_get_addr");
|
||||
|
||||
psaddr_t dtvpp = th->th_unique;
|
||||
#if TLS_TCB_AT_TP
|
||||
dtvpp += offsetof (struct _pthread_descr_struct, p_header.data.dtvp);
|
||||
#elif TLS_DTV_AT_TP
|
||||
dtvpp += TLS_PRE_TCB_SIZE + offsetof (tcbhead_t, dtv);
|
||||
#else
|
||||
# error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined."
|
||||
#endif
|
||||
|
||||
/* Get the DTV pointer from the thread descriptor. */
|
||||
if (ps_pdread (th->th_ta_p->ph, dtvpp, &dtvp, sizeof dtvp) != PS_OK)
|
||||
return TD_ERR; /* XXX Other error value? */
|
||||
|
||||
/* Read the module ID from the link_map. */
|
||||
size_t modid;
|
||||
if (ps_pdread (th->th_ta_p->ph,
|
||||
&((struct link_map *) map_address)->l_tls_modid,
|
||||
&modid, sizeof modid) != PS_OK)
|
||||
return TD_ERR; /* XXX Other error value? */
|
||||
|
||||
/* Get the corresponding entry in the DTV. */
|
||||
if (ps_pdread (th->th_ta_p->ph, dtvp + modid,
|
||||
&pdtv, sizeof (union dtv)) != PS_OK)
|
||||
return TD_ERR; /* XXX Other error value? */
|
||||
|
||||
/* It could be that the memory for this module is not allocated for
|
||||
the given thread. */
|
||||
if (pdtv.pointer == TLS_DTV_UNALLOCATED)
|
||||
/* There is not much we can do. */
|
||||
return TD_NOTALLOC;
|
||||
|
||||
*address = (char *) pdtv.pointer + offset;
|
||||
|
||||
return TD_OK;
|
||||
td_err_e result = td_thr_tlsbase (th, modid, address);
|
||||
if (result == TD_OK)
|
||||
*address += offset;
|
||||
return result;
|
||||
#else
|
||||
return TD_ERR;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -0,0 +1,67 @@
|
|||
/* Locate TLS data for a thread.
|
||||
Copyright (C) 2003 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 "thread_dbP.h"
|
||||
|
||||
/* Value used for dtv entries for which the allocation is delayed. */
|
||||
# define TLS_DTV_UNALLOCATED ((void *) -1l)
|
||||
|
||||
td_err_e
|
||||
td_thr_tlsbase (const td_thrhandle_t *th,
|
||||
unsigned long int modid,
|
||||
psaddr_t *base)
|
||||
{
|
||||
if (modid < 1)
|
||||
return TD_NOTLS;
|
||||
|
||||
#if USE_TLS
|
||||
union dtv pdtv, *dtvp;
|
||||
|
||||
LOG ("td_thr_tlsbase");
|
||||
|
||||
psaddr_t dtvpp = th->th_unique;
|
||||
#if TLS_TCB_AT_TP
|
||||
dtvpp += offsetof (struct _pthread_descr_struct, p_header.data.dtvp);
|
||||
#elif TLS_DTV_AT_TP
|
||||
dtvpp += TLS_PRE_TCB_SIZE + offsetof (tcbhead_t, dtv);
|
||||
#else
|
||||
# error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined."
|
||||
#endif
|
||||
|
||||
/* Get the DTV pointer from the thread descriptor. */
|
||||
if (ps_pdread (th->th_ta_p->ph, dtvpp, &dtvp, sizeof dtvp) != PS_OK)
|
||||
return TD_ERR; /* XXX Other error value? */
|
||||
|
||||
/* Get the corresponding entry in the DTV. */
|
||||
if (ps_pdread (th->th_ta_p->ph, dtvp + modid,
|
||||
&pdtv, sizeof (union dtv)) != PS_OK)
|
||||
return TD_ERR; /* XXX Other error value? */
|
||||
|
||||
/* It could be that the memory for this module is not allocated for
|
||||
the given thread. */
|
||||
if (pdtv.pointer == TLS_DTV_UNALLOCATED)
|
||||
return TD_TLSDEFER;
|
||||
|
||||
*base = (char *) pdtv.pointer;
|
||||
|
||||
return TD_OK;
|
||||
#else
|
||||
return TD_ERR;
|
||||
#endif
|
||||
}
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
/* Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
|
||||
/* thread_db.h -- interface to libthread_db.so library for debugging -lpthread
|
||||
Copyright (C) 1999,2001,2002,2003 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
|
||||
|
|
@ -52,8 +53,10 @@ typedef enum
|
|||
TD_MALLOC, /* Out of memory. */
|
||||
TD_PARTIALREG, /* Not entire register set was read or written. */
|
||||
TD_NOXREGS, /* X register set not available for given thread. */
|
||||
TD_NOTALLOC, /* TLS memory not yet allocated. */
|
||||
TD_VERSION /* Version if libpthread and libthread_db do not match. */
|
||||
TD_TLSDEFER, /* Thread has not yet allocated TLS for given module. */
|
||||
TD_NOTALLOC = TD_TLSDEFER,
|
||||
TD_VERSION, /* Version if libpthread and libthread_db do not match. */
|
||||
TD_NOTLS /* There is TLS segment in the given module. */
|
||||
} td_err_e;
|
||||
|
||||
|
||||
|
|
@ -402,6 +405,11 @@ extern td_err_e td_thr_setxregs (const td_thrhandle_t *__th,
|
|||
const void *__addr);
|
||||
|
||||
|
||||
/* Get address of the given module's TLS storage area for the given thread. */
|
||||
extern td_err_e td_thr_tlsbase (const td_thrhandle_t *__th,
|
||||
unsigned long int __modid,
|
||||
psaddr_t *__base);
|
||||
|
||||
/* Get address of thread local variable. */
|
||||
extern td_err_e td_thr_tls_get_addr (const td_thrhandle_t *__th,
|
||||
void *__map_address, size_t __offset,
|
||||
|
|
|
|||
|
|
@ -41,9 +41,8 @@ libthread_db-routines = td_init td_log td_ta_new td_ta_delete \
|
|||
td_thr_event_enable td_thr_set_event \
|
||||
td_thr_clear_event td_thr_event_getmsg \
|
||||
td_ta_set_event td_ta_event_getmsg \
|
||||
td_ta_clear_event td_symbol_list td_thr_tls_get_addr
|
||||
|
||||
|
||||
td_ta_clear_event td_symbol_list \
|
||||
td_thr_tlsbase td_thr_tls_get_addr
|
||||
|
||||
libthread_db-inhibit-o = $(filter-out .os,$(object-suffixes))
|
||||
|
||||
|
|
|
|||
|
|
@ -18,4 +18,7 @@ libthread_db {
|
|||
GLIBC_2.3 {
|
||||
td_thr_tls_get_addr;
|
||||
}
|
||||
GLIBC_2.3.3 {
|
||||
td_thr_tlsbase;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* Get address of thread local variable.
|
||||
Copyright (C) 2002, 2003 Free Software Foundation, Inc.
|
||||
Copyright (C) 2002,2003 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
|
||||
Contributed by Ulrich Drepper <drepper@cygnus.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
|
||||
|
|
@ -18,15 +18,9 @@
|
|||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA. */
|
||||
|
||||
#include <stddef.h>
|
||||
#include <link.h>
|
||||
#include "thread_dbP.h"
|
||||
|
||||
|
||||
/* Value used for dtv entries for which the allocation is delayed. */
|
||||
# define TLS_DTV_UNALLOCATED ((void *) -1l)
|
||||
|
||||
|
||||
td_err_e
|
||||
td_thr_tls_get_addr (const td_thrhandle_t *th __attribute__ ((unused)),
|
||||
void *map_address __attribute__ ((unused)),
|
||||
|
|
@ -34,44 +28,17 @@ td_thr_tls_get_addr (const td_thrhandle_t *th __attribute__ ((unused)),
|
|||
void **address __attribute__ ((unused)))
|
||||
{
|
||||
#if USE_TLS
|
||||
size_t modid;
|
||||
union dtv pdtv, *dtvp;
|
||||
|
||||
LOG ("td_thr_tls_get_addr");
|
||||
|
||||
psaddr_t dtvpp = th->th_unique;
|
||||
#if TLS_TCB_AT_TP
|
||||
dtvpp += offsetof (struct pthread, header.dtv);
|
||||
#elif TLS_DTV_AT_TP
|
||||
dtvpp += TLS_PRE_TCB_SIZE + offsetof (tcbhead_t, dtv);
|
||||
#else
|
||||
# error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined."
|
||||
#endif
|
||||
|
||||
/* Get the DTV pointer from the thread descriptor. */
|
||||
if (ps_pdread (th->th_ta_p->ph, dtvpp, &dtvp, sizeof dtvp) != PS_OK)
|
||||
return TD_ERR; /* XXX Other error value? */
|
||||
|
||||
/* Read the module ID from the link_map. */
|
||||
size_t modid;
|
||||
if (ps_pdread (th->th_ta_p->ph,
|
||||
&((struct link_map *) map_address)->l_tls_modid,
|
||||
&modid, sizeof modid) != PS_OK)
|
||||
return TD_ERR; /* XXX Other error value? */
|
||||
|
||||
/* Get the corresponding entry in the DTV. */
|
||||
if (ps_pdread (th->th_ta_p->ph, dtvp + modid,
|
||||
&pdtv, sizeof (union dtv)) != PS_OK)
|
||||
return TD_ERR; /* XXX Other error value? */
|
||||
|
||||
/* It could be that the memory for this module is not allocated for
|
||||
the given thread. */
|
||||
if (pdtv.pointer == TLS_DTV_UNALLOCATED)
|
||||
/* There is not much we can do. */
|
||||
return TD_NOTALLOC;
|
||||
|
||||
*address = (char *) pdtv.pointer + offset;
|
||||
|
||||
return TD_OK;
|
||||
td_err_e result = td_thr_tlsbase (th, modid, address);
|
||||
if (result == TD_OK)
|
||||
*address += offset;
|
||||
return result;
|
||||
#else
|
||||
return TD_ERR;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -0,0 +1,67 @@
|
|||
/* Locate TLS data for a thread.
|
||||
Copyright (C) 2003 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 "thread_dbP.h"
|
||||
|
||||
/* Value used for dtv entries for which the allocation is delayed. */
|
||||
# define TLS_DTV_UNALLOCATED ((void *) -1l)
|
||||
|
||||
td_err_e
|
||||
td_thr_tlsbase (const td_thrhandle_t *th,
|
||||
unsigned long int modid,
|
||||
psaddr_t *base)
|
||||
{
|
||||
if (modid < 1)
|
||||
return TD_NOTLS;
|
||||
|
||||
#if USE_TLS
|
||||
union dtv pdtv, *dtvp;
|
||||
|
||||
LOG ("td_thr_tlsbase");
|
||||
|
||||
psaddr_t dtvpp = th->th_unique;
|
||||
#if TLS_TCB_AT_TP
|
||||
dtvpp += offsetof (struct pthread, header.dtv);
|
||||
#elif TLS_DTV_AT_TP
|
||||
dtvpp += TLS_PRE_TCB_SIZE + offsetof (tcbhead_t, dtv);
|
||||
#else
|
||||
# error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined."
|
||||
#endif
|
||||
|
||||
/* Get the DTV pointer from the thread descriptor. */
|
||||
if (ps_pdread (th->th_ta_p->ph, dtvpp, &dtvp, sizeof dtvp) != PS_OK)
|
||||
return TD_ERR; /* XXX Other error value? */
|
||||
|
||||
/* Get the corresponding entry in the DTV. */
|
||||
if (ps_pdread (th->th_ta_p->ph, dtvp + modid,
|
||||
&pdtv, sizeof (union dtv)) != PS_OK)
|
||||
return TD_ERR; /* XXX Other error value? */
|
||||
|
||||
/* It could be that the memory for this module is not allocated for
|
||||
the given thread. */
|
||||
if (pdtv.pointer == TLS_DTV_UNALLOCATED)
|
||||
return TD_TLSDEFER;
|
||||
|
||||
*base = (char *) pdtv.pointer;
|
||||
|
||||
return TD_OK;
|
||||
#else
|
||||
return TD_ERR;
|
||||
#endif
|
||||
}
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
/* Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
|
||||
/* thread_db.h -- interface to libthread_db.so library for debugging -lpthread
|
||||
Copyright (C) 1999,2001,2002,2003 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
|
||||
|
|
@ -52,8 +53,10 @@ typedef enum
|
|||
TD_MALLOC, /* Out of memory. */
|
||||
TD_PARTIALREG, /* Not entire register set was read or written. */
|
||||
TD_NOXREGS, /* X register set not available for given thread. */
|
||||
TD_NOTALLOC, /* TLS memory not yet allocated. */
|
||||
TD_VERSION /* Version if libpthread and libthread_db do not match. */
|
||||
TD_TLSDEFER, /* Thread has not yet allocated TLS for given module. */
|
||||
TD_NOTALLOC = TD_TLSDEFER,
|
||||
TD_VERSION, /* Version if libpthread and libthread_db do not match. */
|
||||
TD_NOTLS /* There is TLS segment in the given module. */
|
||||
} td_err_e;
|
||||
|
||||
|
||||
|
|
@ -402,6 +405,11 @@ extern td_err_e td_thr_setxregs (const td_thrhandle_t *__th,
|
|||
const void *__addr);
|
||||
|
||||
|
||||
/* Get address of the given module's TLS storage area for the given thread. */
|
||||
extern td_err_e td_thr_tlsbase (const td_thrhandle_t *__th,
|
||||
unsigned long int __modid,
|
||||
psaddr_t *__base);
|
||||
|
||||
/* Get address of thread local variable. */
|
||||
extern td_err_e td_thr_tls_get_addr (const td_thrhandle_t *__th,
|
||||
void *__map_address, size_t __offset,
|
||||
|
|
|
|||
Loading…
Reference in New Issue