Date: Sat, 20 Nov 2004 12:23:31 GMT From: David Xu <davidxu@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 65551 for review Message-ID: <200411201223.iAKCNVbK034734@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=65551 Change 65551 by davidxu@davidxu_alona on 2004/11/20 12:22:56 Compilable on alpha, sparc64. Affected files ... .. //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/Makefile.inc#2 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/alpha/pthread_md.c#2 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/include/pthread_md.h#2 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/ia64/Makefile.inc#2 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/Makefile.inc#2 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/include/pthread_md.h#2 edit .. //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/sparc64/pthread_md.c#2 edit .. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#3 edit Differences ... ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/Makefile.inc#2 (text+ko) ==== @@ -2,4 +2,4 @@ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} -SRCS+= enter_uts.S context.S pthread_md.c +SRCS+= pthread_md.c ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/alpha/pthread_md.c#2 (text+ko) ==== @@ -40,37 +40,14 @@ struct tcb *tcb; if ((tcb = malloc(sizeof(struct tcb))) != NULL) { - bzero(tcb, sizeof(struct tcb)); tcb->tcb_thread = thread; - /* Allocate TDV */ } + printf("tcb=%p\n", tcb); return (tcb); } void _tcb_dtor(struct tcb *tcb) { - /* Free TDV */ free(tcb); } - -struct kcb * -_kcb_ctor(struct kse *kse) -{ - struct kcb *kcb; - - if ((kcb = malloc(sizeof(struct kcb))) != NULL) { - bzero(kcb, sizeof(struct kcb)); - kcb->kcb_faketcb.tcb_isfake = 1; - kcb->kcb_faketcb.tcb_tmbx.tm_flags = TMF_NOUPCALL; - kcb->kcb_curtcb = &kcb->kcb_faketcb; - kcb->kcb_kse = kse; - } - return (kcb); -} - -void -_kcb_dtor(struct kcb *kcb) -{ - free(kcb); -} ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/alpha/include/pthread_md.h#2 (text+ko) ==== @@ -29,219 +29,53 @@ #ifndef _PTHREAD_MD_H_ #define _PTHREAD_MD_H_ -#include <sys/kse.h> #include <stddef.h> -#include <ucontext.h> -#define KSE_STACKSIZE 16384 -#define DTV_OFFSET offsetof(struct tcb, tcb_tp.tp_tdv) - -#define THR_GETCONTEXT(ucp) _alpha_save_context(&(ucp)->uc_mcontext) -#define THR_SETCONTEXT(ucp) PANIC("THR_SETCONTEXT() now in use!\n") - -#define PER_THREAD +#define DTV_OFFSET offsetof(struct tcb, tcb_tdv) -struct kcb; -struct kse; struct pthread; struct tcb; struct tdv; /* We don't know what this is yet? */ -/* - * tp points to one of these. We define the static TLS as an array - * of long double to enforce 16-byte alignment of the TLS memory, - * struct alpha_tp, struct tcb and also struct kcb. Both static and - * dynamic allocation of any of these structures will result in a - * valid, well-aligned thread pointer. - */ -struct alpha_tp { +struct tcb { struct tdv *tp_tdv; /* dynamic TLS */ - uint64_t _reserved_; - long double tp_tls[0]; /* static TLS */ -}; - -struct tcb { - struct kse_thr_mailbox tcb_tmbx; struct pthread *tcb_thread; - struct kcb *tcb_curkcb; - long tcb_isfake; - struct alpha_tp tcb_tp; -}; - -struct kcb { - struct kse_mailbox kcb_kmbx; - struct tcb kcb_faketcb; - struct tcb *kcb_curtcb; - struct kse *kcb_kse; }; #define _tp __builtin_thread_pointer() -#define _tcb ((struct tcb*)((char*)(_tp) - offsetof(struct tcb, tcb_tp))) +#define _tcb ((struct tcb*)((char*)(_tp))) /* - * The kcb and tcb constructors. + * The constructors. */ struct tcb *_tcb_ctor(struct pthread *, int); void _tcb_dtor(struct tcb *); -struct kcb *_kcb_ctor(struct kse *kse); -void _kcb_dtor(struct kcb *); -/* Called from the KSE to set its private data. */ +/* Called from the thread to set its private data. */ static __inline void -_kcb_set(struct kcb *kcb) +_tcb_set(struct tcb *tcb) { /* There is no thread yet; use the fake tcb. */ - __builtin_set_thread_pointer(&kcb->kcb_faketcb.tcb_tp); + __builtin_set_thread_pointer(tcb); } /* - * Get the current kcb. - * - * This can only be called while in a critical region; don't - * worry about having the kcb changed out from under us. - */ -static __inline struct kcb * -_kcb_get(void) -{ - return (_tcb->tcb_curkcb); -} - -/* - * Enter a critical region. - * - * Read and clear km_curthread in the kse mailbox. + * Get the current tcb. */ -static __inline struct kse_thr_mailbox * -_kcb_critical_enter(void) -{ - struct kse_thr_mailbox *crit; - uint32_t flags; - - if (_tcb->tcb_isfake != 0) { - /* - * We already are in a critical region since - * there is no current thread. - */ - crit = NULL; - } else { - flags = _tcb->tcb_tmbx.tm_flags; - _tcb->tcb_tmbx.tm_flags |= TMF_NOUPCALL; - crit = _tcb->tcb_curkcb->kcb_kmbx.km_curthread; - _tcb->tcb_curkcb->kcb_kmbx.km_curthread = NULL; - _tcb->tcb_tmbx.tm_flags = flags; - } - return (crit); -} - -static __inline void -_kcb_critical_leave(struct kse_thr_mailbox *crit) -{ - /* No need to do anything if this is a fake tcb. */ - if (_tcb->tcb_isfake == 0) - _tcb->tcb_curkcb->kcb_kmbx.km_curthread = crit; -} - -static __inline int -_kcb_in_critical(void) -{ - uint32_t flags; - int ret; - - if (_tcb->tcb_isfake != 0) { - /* - * We are in a critical region since there is no - * current thread. - */ - ret = 1; - } else { - flags = _tcb->tcb_tmbx.tm_flags; - _tcb->tcb_tmbx.tm_flags |= TMF_NOUPCALL; - ret = (_tcb->tcb_curkcb->kcb_kmbx.km_curthread == NULL); - _tcb->tcb_tmbx.tm_flags = flags; - } - return (ret); -} - -static __inline void -_tcb_set(struct kcb *kcb, struct tcb *tcb) -{ - if (tcb == NULL) - tcb = &kcb->kcb_faketcb; - kcb->kcb_curtcb = tcb; - tcb->tcb_curkcb = kcb; - __builtin_set_thread_pointer(&tcb->tcb_tp); -} - static __inline struct tcb * _tcb_get(void) { return (_tcb); } +extern int _thread_inited; + static __inline struct pthread * _get_curthread(void) { - return (_tcb->tcb_thread); -} - -/* - * Get the current kse. - * - * Like _kcb_get(), this can only be called while in a critical region. - */ -static __inline struct kse * -_get_curkse(void) -{ - return (_tcb->tcb_curkcb->kcb_kse); -} - -void _alpha_enter_uts(struct kse_mailbox *km, kse_func_t uts, void *stack, - size_t stacksz); -int _alpha_restore_context(mcontext_t *mc, intptr_t val, intptr_t *loc); -int _alpha_save_context(mcontext_t *mc); - -static __inline int -_thread_enter_uts(struct tcb *tcb, struct kcb *kcb) -{ - if (_alpha_save_context(&tcb->tcb_tmbx.tm_context.uc_mcontext) == 0) { - /* Make the fake tcb the current thread. */ - kcb->kcb_curtcb = &kcb->kcb_faketcb; - __builtin_set_thread_pointer(&kcb->kcb_faketcb.tcb_tp); - _alpha_enter_uts(&kcb->kcb_kmbx, kcb->kcb_kmbx.km_func, - kcb->kcb_kmbx.km_stack.ss_sp, - kcb->kcb_kmbx.km_stack.ss_size); - /* We should not reach here. */ - return (-1); - } - return (0); -} - -static __inline int -_thread_switch(struct kcb *kcb, struct tcb *tcb, int setmbox) -{ - extern int _libkse_debug; - - _tcb_set(kcb, tcb); - if (_libkse_debug == 0) { - tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp; - if (setmbox != 0) - _alpha_restore_context( - &tcb->tcb_tmbx.tm_context.uc_mcontext, - (intptr_t)&tcb->tcb_tmbx, - (intptr_t *)&kcb->kcb_kmbx.km_curthread); - else - _alpha_restore_context( - &tcb->tcb_tmbx.tm_context.uc_mcontext, - 0, NULL); - } else { - if (setmbox) - kse_switchin(&tcb->tcb_tmbx, KSE_SWITCHIN_SETTMBX); - else - kse_switchin(&tcb->tcb_tmbx, 0); - } - - /* We should not reach here. */ - return (-1); + if (_thread_inited) + return (_tcb->tcb_thread); + return (NULL); } #endif /* _PTHREAD_MD_H_ */ ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/ia64/Makefile.inc#2 (text+ko) ==== @@ -2,4 +2,4 @@ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} -SRCS+= context.S enter_uts.S pthread_md.c +SRCS+= pthread_md.c ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/Makefile.inc#2 (text+ko) ==== @@ -2,4 +2,4 @@ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} -SRCS+= pthread_md.c thr_getcontext.S +SRCS+= pthread_md.c ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/include/pthread_md.h#2 (text+ko) ==== @@ -33,222 +33,53 @@ #ifndef _PTHREAD_MD_H_ #define _PTHREAD_MD_H_ -#include <sys/kse.h> #include <stddef.h> -#include <ucontext.h> -#define KSE_STACKSIZE 16384 #define DTV_OFFSET offsetof(struct tcb, tcb_tp.tp_tdv) -int _thr_setcontext(mcontext_t *, intptr_t, intptr_t *); -int _thr_getcontext(mcontext_t *); - -#define THR_GETCONTEXT(ucp) _thr_getcontext(&(ucp)->uc_mcontext) -#define THR_SETCONTEXT(ucp) _thr_setcontext(&(ucp)->uc_mcontext, 0, NULL) - -#define PER_THREAD - -struct kcb; -struct kse; struct pthread; struct tcb; struct tdv; /* We don't know what this is yet? */ - -/* - * %g6 points to one of these. We define the static TLS as an array - * of long double to enforce 16-byte alignment of the TLS memory. - * - * XXX - Both static and dynamic allocation of any of these structures - * will result in a valid, well-aligned thread pointer??? - */ -struct sparc64_tp { +struct tcb { struct tdv *tp_tdv; /* dynamic TLS */ - uint64_t _reserved_; - long double tp_tls[0]; /* static TLS */ -}; - -struct tcb { struct pthread *tcb_thread; - void *tcb_addr; /* allocated tcb address */ - struct kcb *tcb_curkcb; - uint64_t tcb_isfake; - uint64_t tcb_spare[4]; - struct kse_thr_mailbox tcb_tmbx; /* needs 64-byte alignment */ - struct sparc64_tp tcb_tp; -} __aligned(64); - -struct kcb { - struct kse_mailbox kcb_kmbx; - struct tcb kcb_faketcb; - struct tcb *kcb_curtcb; - struct kse *kcb_kse; }; -register struct sparc64_tp *_tp __asm("%g6"); +register struct tcb *_tp __asm("%g6"); -#define _tcb ((struct tcb*)((char*)(_tp) - offsetof(struct tcb, tcb_tp))) +#define _tcb _tp /* - * The kcb and tcb constructors. + * The tcb constructors. */ struct tcb *_tcb_ctor(struct pthread *, int); void _tcb_dtor(struct tcb *); -struct kcb *_kcb_ctor(struct kse *kse); -void _kcb_dtor(struct kcb *); -/* Called from the KSE to set its private data. */ +/* Called from the thread to set its private data. */ static __inline void -_kcb_set(struct kcb *kcb) +_tcb_set(struct tcb *tcb) { - /* There is no thread yet; use the fake tcb. */ - _tp = &kcb->kcb_faketcb.tcb_tp; + _tcb = tcb; } /* - * Get the current kcb. - * - * This can only be called while in a critical region; don't - * worry about having the kcb changed out from under us. + * Get the current tcb. */ -static __inline struct kcb * -_kcb_get(void) -{ - return (_tcb->tcb_curkcb); -} - -/* - * Enter a critical region. - * - * Read and clear km_curthread in the kse mailbox. - */ -static __inline struct kse_thr_mailbox * -_kcb_critical_enter(void) -{ - struct kse_thr_mailbox *crit; - uint32_t flags; - - if (_tcb->tcb_isfake != 0) { - /* - * We already are in a critical region since - * there is no current thread. - */ - crit = NULL; - } else { - flags = _tcb->tcb_tmbx.tm_flags; - _tcb->tcb_tmbx.tm_flags |= TMF_NOUPCALL; - crit = _tcb->tcb_curkcb->kcb_kmbx.km_curthread; - _tcb->tcb_curkcb->kcb_kmbx.km_curthread = NULL; - _tcb->tcb_tmbx.tm_flags = flags; - } - return (crit); -} - -static __inline void -_kcb_critical_leave(struct kse_thr_mailbox *crit) -{ - /* No need to do anything if this is a fake tcb. */ - if (_tcb->tcb_isfake == 0) - _tcb->tcb_curkcb->kcb_kmbx.km_curthread = crit; -} - -static __inline int -_kcb_in_critical(void) -{ - uint32_t flags; - int ret; - - if (_tcb->tcb_isfake != 0) { - /* - * We are in a critical region since there is no - * current thread. - */ - ret = 1; - } else { - flags = _tcb->tcb_tmbx.tm_flags; - _tcb->tcb_tmbx.tm_flags |= TMF_NOUPCALL; - ret = (_tcb->tcb_curkcb->kcb_kmbx.km_curthread == NULL); - _tcb->tcb_tmbx.tm_flags = flags; - } - return (ret); -} - -static __inline void -_tcb_set(struct kcb *kcb, struct tcb *tcb) -{ - if (tcb == NULL) - tcb = &kcb->kcb_faketcb; - kcb->kcb_curtcb = tcb; - tcb->tcb_curkcb = kcb; - _tp = &tcb->tcb_tp; -} - static __inline struct tcb * _tcb_get(void) { return (_tcb); } +extern int _thread_inited; + static __inline struct pthread * _get_curthread(void) { - return (_tcb->tcb_thread); -} - -/* - * Get the current kse. - * - * Like _kcb_get(), this can only be called while in a critical region. - */ -static __inline struct kse * -_get_curkse(void) -{ - return (_tcb->tcb_curkcb->kcb_kse); -} - -void _sparc64_enter_uts(kse_func_t uts, struct kse_mailbox *km, void *stack, - size_t stacksz); - -static __inline int -_thread_enter_uts(struct tcb *tcb, struct kcb *kcb) -{ - if (_thr_getcontext(&tcb->tcb_tmbx.tm_context.uc_mcontext) == 0) { - /* Make the fake tcb the current thread. */ - kcb->kcb_curtcb = &kcb->kcb_faketcb; - _tp = &kcb->kcb_faketcb.tcb_tp; - _sparc64_enter_uts(kcb->kcb_kmbx.km_func, &kcb->kcb_kmbx, - kcb->kcb_kmbx.km_stack.ss_sp, - kcb->kcb_kmbx.km_stack.ss_size); - /* We should not reach here. */ - return (-1); - } - return (0); -} - -static __inline int -_thread_switch(struct kcb *kcb, struct tcb *tcb, int setmbox) -{ - extern int _libkse_debug; - mcontext_t *mc; - - _tcb_set(kcb, tcb); - mc = &tcb->tcb_tmbx.tm_context.uc_mcontext; - if (_libkse_debug == 0) { - tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp; - if (setmbox) - _thr_setcontext(mc, (intptr_t)&tcb->tcb_tmbx, - (intptr_t *)&kcb->kcb_kmbx.km_curthread); - else - _thr_setcontext(mc, 0, NULL); - } else { - if (setmbox) - kse_switchin(&tcb->tcb_tmbx, KSE_SWITCHIN_SETTMBX); - else - kse_switchin(&tcb->tcb_tmbx, 0); - } - - /* We should not reach here. */ - return (-1); + if (_thread_inited) + return (_tcb->tcb_thread); + return (NULL); } #endif /* _PTHREAD_MD_H_ */ ==== //depot/projects/davidxu_thread/src/lib/libthread/arch/sparc64/sparc64/pthread_md.c#2 (text+ko) ==== @@ -31,11 +31,8 @@ #include <sys/types.h> -#include <unistd.h> -#include <signal.h> #include <stdlib.h> #include <string.h> -#include <ucontext.h> #include "pthread_md.h" @@ -43,17 +40,9 @@ _tcb_ctor(struct pthread *thread, int initial) { struct tcb *tcb; - void *addr; - addr = malloc(sizeof(struct tcb) + 63); - if (addr == NULL) - tcb = NULL; - else { - tcb = (struct tcb *)(((uintptr_t)(addr) + 63) & ~63); - bzero(tcb, sizeof(struct tcb)); - tcb->tcb_addr = addr; + if ((tcb = malloc(sizeof(struct tcb))) != NULL) { tcb->tcb_thread = thread; - /* XXX - Allocate tdv/tls */ } return (tcb); } @@ -61,31 +50,5 @@ void _tcb_dtor(struct tcb *tcb) { - void *addr; - - addr = tcb->tcb_addr; - tcb->tcb_addr = NULL; - free(addr); -} - -struct kcb * -_kcb_ctor(struct kse *kse) -{ - struct kcb *kcb; - - kcb = malloc(sizeof(struct kcb)); - if (kcb != NULL) { - bzero(kcb, sizeof(struct kcb)); - kcb->kcb_faketcb.tcb_isfake = 1; - kcb->kcb_faketcb.tcb_tmbx.tm_flags = TMF_NOUPCALL; - kcb->kcb_curtcb = &kcb->kcb_faketcb; - kcb->kcb_kse = kse; - } - return (kcb); -} - -void -_kcb_dtor(struct kcb *kcb) -{ - free(kcb); + free(tcb); } ==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#3 (text+ko) ==== @@ -44,13 +44,13 @@ #include <signal.h> #include <stdio.h> #include <sched.h> -#include <ucontext.h> #include <unistd.h> #include <sys/types.h> #include <sys/time.h> #include <sys/cdefs.h> #include <sys/queue.h> #include <sys/thr.h> +#include <ucontext.h> #include <pthread.h> #include <pthread_np.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200411201223.iAKCNVbK034734>