Date: Mon, 28 Jun 2004 04:13:28 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 55970 for review Message-ID: <200406280413.i5S4DS0D033867@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=55970 Change 55970 by marcel@marcel_nfs on 2004/06/28 04:12:48 Submit the result of me fucking around a bit: o Add td_ta_delete() o Make this WARNS 4 clean. This basicly means adding __unused to most of the argument of the functions I haven't implemented yet. o Detect libc_r and libthr. I don't worry about libkse, because davidxu@ is playing with that. We probably need to combine our efforts... o Implement some of the functions that GDB already needs. In particular I see td_ta_thr_iter() play a pivoting role... Affected files ... .. //depot/projects/gdb/lib/libthread_db/Makefile#2 edit .. //depot/projects/gdb/lib/libthread_db/td_ta_delete.c#1 add .. //depot/projects/gdb/lib/libthread_db/td_ta_event_addr.c#2 edit .. //depot/projects/gdb/lib/libthread_db/td_ta_event_getmsg.c#2 edit .. //depot/projects/gdb/lib/libthread_db/td_ta_map_id2thr.c#2 edit .. //depot/projects/gdb/lib/libthread_db/td_ta_map_lwp2thr.c#2 edit .. //depot/projects/gdb/lib/libthread_db/td_ta_new.c#2 edit .. //depot/projects/gdb/lib/libthread_db/td_ta_set_event.c#2 edit .. //depot/projects/gdb/lib/libthread_db/td_ta_thr_iter.c#2 edit .. //depot/projects/gdb/lib/libthread_db/td_thr_event_enable.c#2 edit .. //depot/projects/gdb/lib/libthread_db/td_thr_get_info.c#2 edit .. //depot/projects/gdb/lib/libthread_db/td_thr_getfpregs.c#2 edit .. //depot/projects/gdb/lib/libthread_db/td_thr_getgregs.c#2 edit .. //depot/projects/gdb/lib/libthread_db/td_thr_setfpregs.c#3 edit .. //depot/projects/gdb/lib/libthread_db/td_thr_setgregs.c#3 edit .. //depot/projects/gdb/lib/libthread_db/td_thr_validate.c#2 edit .. //depot/projects/gdb/lib/libthread_db/thread_db.h#4 edit Differences ... ==== //depot/projects/gdb/lib/libthread_db/Makefile#2 (text+ko) ==== @@ -2,11 +2,13 @@ LIB= thread_db SHLIB_MAJOR= 1 -SRCS= td_init.c td_ta_event_addr.c td_ta_event_getmsg.c td_ta_map_id2thr.c \ - td_ta_map_lwp2thr.c td_ta_new.c td_ta_set_event.c td_ta_thr_iter.c \ - td_thr_event_enable.c td_thr_get_info.c td_thr_getfpregs.c \ - td_thr_getgregs.c td_thr_setfpregs.c td_thr_setgregs.c \ - td_thr_validate.c +SRCS= td_init.c td_ta_delete.c td_ta_event_addr.c td_ta_event_getmsg.c \ + td_ta_map_id2thr.c td_ta_map_lwp2thr.c td_ta_new.c td_ta_set_event.c \ + td_ta_thr_iter.c td_thr_event_enable.c td_thr_get_info.c \ + td_thr_getfpregs.c td_thr_getgregs.c td_thr_setfpregs.c \ + td_thr_setgregs.c td_thr_validate.c INCS= thread_db.h +WARNS?= 4 + .include <bsd.lib.mk> ==== //depot/projects/gdb/lib/libthread_db/td_ta_event_addr.c#2 (text+ko) ==== @@ -31,8 +31,8 @@ #include <thread_db.h> td_err_e -td_ta_event_addr(const td_thragent_t *ta, td_thr_events_e event, - td_notify_t *n) +td_ta_event_addr(const td_thragent_t *ta __unused, + td_thr_events_e event __unused, td_notify_t *n __unused) { return (TD_OK); } ==== //depot/projects/gdb/lib/libthread_db/td_ta_event_getmsg.c#2 (text+ko) ==== @@ -31,7 +31,8 @@ #include <thread_db.h> td_err_e -td_ta_event_getmsg(const td_thragent_t *ta, td_event_msg_t *msg) +td_ta_event_getmsg(const td_thragent_t *ta __unused, + td_event_msg_t *msg __unused) { return (TD_OK); } ==== //depot/projects/gdb/lib/libthread_db/td_ta_map_id2thr.c#2 (text+ko) ==== @@ -31,7 +31,8 @@ #include <thread_db.h> td_err_e -td_ta_map_id2thr(const td_thragent_t *ta, thread_t tid, td_thrhandle_t *th) +td_ta_map_id2thr(const td_thragent_t *ta __unused, thread_t tid __unused, + td_thrhandle_t *th __unused) { return (TD_OK); } ==== //depot/projects/gdb/lib/libthread_db/td_ta_map_lwp2thr.c#2 (text+ko) ==== @@ -30,8 +30,25 @@ #include <proc_service.h> #include <thread_db.h> +#include "thread_db_int.h" + td_err_e -td_ta_map_lwp2thr(const td_thragent_t *ta, lwpid_t pid, td_thrhandle_t *th) +td_ta_map_lwp2thr(const td_thragent_t *ta, lwpid_t lwp, td_thrhandle_t *th) { - return (TD_OK); + ps_err_e err; + + th->th_ta = ta; + + switch (ta->ta_lib) { + case PTHREAD_LIBC_R: + err = ps_pread(ta->ta_ph, ta->ta.libc_r.thread_run, + &th->th_thread, sizeof(psaddr_t)); + return (err == PS_OK) ? TD_OK : TD_ERR; + case PTHREAD_LIBKSE: + lwp = 0; + return (TD_NOTHR); + case PTHREAD_LIBTHR: + return (TD_NOTHR); + } + return (TD_ERR); } ==== //depot/projects/gdb/lib/libthread_db/td_ta_new.c#2 (text+ko) ==== @@ -28,10 +28,98 @@ __FBSDID("$FreeBSD$"); #include <proc_service.h> +#include <stdlib.h> #include <thread_db.h> +#include "thread_db_int.h" + +static td_err_e +td_ta_new_libc_r(td_thragent_t *ta) +{ + psaddr_t addr; + ps_err_e err; + + err = ps_pglobal_lookup(ta->ta_ph, NULL, "_thread_list", + &ta->ta.libc_r.thread_list); + if (err != PS_OK) + return (TD_ERR); + err = ps_pglobal_lookup(ta->ta_ph, NULL, "_thread_run", + &ta->ta.libc_r.thread_run); + if (err != PS_OK) + return (TD_ERR); + + err = ps_pglobal_lookup(ta->ta_ph, NULL, "_thread_next_offset", + &addr); + if (err != PS_OK) + return (TD_ERR); + err = ps_pread(ta->ta_ph, addr, &ta->ta.libc_r.offset_next, + sizeof(int)); + if (err != PS_OK) + return (TD_ERR); + + err = ps_pglobal_lookup(ta->ta_ph, NULL, "_thread_uniqueid_offset", + &addr); + if (err != PS_OK) + return (TD_ERR); + err = ps_pread(ta->ta_ph, addr, &ta->ta.libc_r.offset_uniqueid, + sizeof(int)); + if (err != PS_OK) + return (TD_ERR); + + return (TD_OK); +} + +static td_err_e +td_ta_new_libkse(td_thragent_t *ta __unused) +{ + return (TD_OK); +} + +static td_err_e +td_ta_new_libthr(td_thragent_t *ta __unused) +{ + return (TD_OK); +} + td_err_e td_ta_new(struct ps_prochandle *ph, td_thragent_t **ta_p) { - return (TD_OK); + ps_err_e ps_err; + td_err_e td_err; + + *ta_p = malloc(sizeof(td_thragent_t)); + if (*ta_p == NULL) + return (TD_MALLOC); + + (*ta_p)->ta_ph = ph; + + ps_err = ps_pglobal_lookup(ph, NULL, "_libkse_debug", + &(*ta_p)->ta_debug); + if (ps_err == PS_OK) { + (*ta_p)->ta_lib = PTHREAD_LIBKSE; + td_err = td_ta_new_libkse(*ta_p); + goto out; + } + + ps_err = ps_pglobal_lookup(ph, NULL, "_libthr_debug", + &(*ta_p)->ta_debug); + if (ps_err == PS_OK) { + (*ta_p)->ta_lib = PTHREAD_LIBTHR; + td_err = td_ta_new_libthr(*ta_p); + goto out; + } + + ps_err = ps_pglobal_lookup(ph, NULL, "_libc_r_debug", + &(*ta_p)->ta_debug); + if (ps_err == PS_OK) { + (*ta_p)->ta_lib = PTHREAD_LIBC_R; + td_err = td_ta_new_libc_r(*ta_p); + goto out; + } + td_err = TD_NOLIBTHREAD; + + out: + if (td_err != TD_OK) + free(*ta_p); + return (td_err); } ==== //depot/projects/gdb/lib/libthread_db/td_ta_set_event.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ #include <thread_db.h> td_err_e -td_ta_set_event(const td_thragent_t *ta, td_thr_events_t *ev) +td_ta_set_event(const td_thragent_t *ta __unused, td_thr_events_t *ev __unused) { return (TD_OK); } ==== //depot/projects/gdb/lib/libthread_db/td_ta_thr_iter.c#2 (text+ko) ==== @@ -30,9 +30,38 @@ #include <proc_service.h> #include <thread_db.h> +#include "thread_db_int.h" + td_err_e td_ta_thr_iter(const td_thragent_t *ta, td_thr_iter_f *cb, void *data, td_thr_state_e state, int pri, sigset_t *mask, unsigned int flags) { - return (TD_OK); + td_thrhandle_t th; + psaddr_t addr; + ps_err_e err; + + th.th_ta = ta; + switch (ta->ta_lib) { + case PTHREAD_LIBC_R: + err = ps_pread(ta->ta_ph, ta->ta.libc_r.thread_list, + &th.th_thread, sizeof(th.th_thread)); + if (err != PS_OK) + return (TD_ERR); + while (th.th_thread != NULL) { + if (cb(&th, data) != 0) + return (TD_OK); + addr = th.th_thread + ta->ta.libc_r.offset_next; + err = ps_pread(ta->ta_ph, addr, &th.th_thread, + sizeof(th.th_thread)); + if (err != PS_OK) + return (TD_ERR); + } + return (TD_OK); + case PTHREAD_LIBKSE: + err = (state || pri || mask || flags) ? TD_OK : TD_ERR; + return (TD_NOTHR); + case PTHREAD_LIBTHR: + return (TD_NOTHR); + } + return (TD_ERR); } ==== //depot/projects/gdb/lib/libthread_db/td_thr_event_enable.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ #include <thread_db.h> td_err_e -td_thr_event_enable(const td_thrhandle_t *th, int oo) +td_thr_event_enable(const td_thrhandle_t *th __unused, int oo __unused) { return (TD_OK); } ==== //depot/projects/gdb/lib/libthread_db/td_thr_get_info.c#2 (text+ko) ==== @@ -30,8 +30,26 @@ #include <proc_service.h> #include <thread_db.h> +#include "thread_db_int.h" + td_err_e td_thr_get_info(const td_thrhandle_t *th, td_thrinfo_t *ti) { + const td_thragent_t *ta; + psaddr_t addr; + ps_err_e err; + + ta = th->th_ta; + ti->ti_ta = ta; + switch (ta->ta_lib) { + case PTHREAD_LIBC_R: + addr = th->th_thread + ta->ta.libc_r.offset_uniqueid; + err = ps_pread(ta->ta_ph, addr, &ti->ti_tid, + sizeof(thread_t)); + ti->ti_tid++; + return (err == PS_OK) ? TD_OK : TD_ERR; + default: + break; + } return (TD_OK); } ==== //depot/projects/gdb/lib/libthread_db/td_thr_getfpregs.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ #include <thread_db.h> td_err_e -td_thr_getfpregs(const td_thrhandle_t *th, prfpregset_t *r) +td_thr_getfpregs(const td_thrhandle_t *th __unused, prfpregset_t *r __unused) { return (TD_OK); } ==== //depot/projects/gdb/lib/libthread_db/td_thr_getgregs.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ #include <thread_db.h> td_err_e -td_thr_getgregs(const td_thrhandle_t *th, prgregset_t *r) +td_thr_getgregs(const td_thrhandle_t *th __unused, prgregset_t *r __unused) { return (TD_OK); } ==== //depot/projects/gdb/lib/libthread_db/td_thr_setfpregs.c#3 (text+ko) ==== @@ -31,7 +31,8 @@ #include <thread_db.h> td_err_e -td_thr_setfpregs(const td_thrhandle_t *th, const prfpregset_t *r) +td_thr_setfpregs(const td_thrhandle_t *th __unused, + const prfpregset_t *r __unused) { return (TD_OK); } ==== //depot/projects/gdb/lib/libthread_db/td_thr_setgregs.c#3 (text+ko) ==== @@ -31,7 +31,8 @@ #include <thread_db.h> td_err_e -td_thr_setgregs(const td_thrhandle_t *th, const prgregset_t *r) +td_thr_setgregs(const td_thrhandle_t *th __unused, + const prgregset_t *r __unused) { return (TD_OK); } ==== //depot/projects/gdb/lib/libthread_db/td_thr_validate.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ #include <thread_db.h> td_err_e -td_thr_validate(const td_thrhandle_t *th) +td_thr_validate(const td_thrhandle_t *th __unused) { return (TD_OK); } ==== //depot/projects/gdb/lib/libthread_db/thread_db.h#4 (text+ko) ==== @@ -74,10 +74,14 @@ } td_thr_state_e; typedef intptr_t thread_t; /* Must be an integral type. */ -typedef intptr_t td_thrhandle_t; /* Used non-opaguely. */ + +typedef struct { + const td_thragent_t *th_ta; + psaddr_t th_thread; +} td_thrhandle_t; /* Used non-opaguely. */ typedef struct { - td_thragent_t *ti_ta_p; + const td_thragent_t *ti_ta; thread_t ti_tid; td_thr_state_e ti_state; lwpid_t ti_lid; @@ -161,6 +165,7 @@ __BEGIN_DECLS td_err_e td_init(void); +td_err_e td_ta_delete(td_thragent_t *); td_err_e td_ta_event_addr(const td_thragent_t *, td_thr_events_e, td_notify_t *); td_err_e td_ta_event_getmsg(const td_thragent_t *, td_event_msg_t *);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200406280413.i5S4DS0D033867>