From eca19329e11c472df9b62da0a643de6f90bb7f46 Mon Sep 17 00:00:00 2001 From: rpj Date: Tue, 28 Jul 1998 09:29:22 +0000 Subject: Tue Jul 28 14:04:29 1998 Ross Johnson * implement.h: Add _PTHREAD_VALID macro. * sync.c (pthread_join): Modify to use the new thread type and _pthread_delete_thread(). Rename "target" to "thread". Remove extra local variable "target". (pthread_detach): Ditto. * signal.c (pthread_sigmask): Move init of "us" out of inner block. Fix instance of "this" should have been "us". Rename "us" to "thread". * sched.c (pthread_setschedparam): Modify to use the new thread type. (pthread_getschedparam): Ditto. * private.c (_pthread_find_thread): Fix return type and arg. * implement.h: Remove _PTHREAD_YES and _PTHREAD_NO. (_pthread_new_thread): Add prototype. (_pthread_find_thread): Ditto. (_pthread_delete_thread): Ditto. (_pthread_new_thread_entry): Remove prototype. (_pthread_find_thread_entry): Ditto. (_pthread_delete_thread_entry): Ditto. ( _PTHREAD_NEW, _PTHREAD_INUSE, _PTHREAD_EXITED, _PTHREAD_REUSE): Add. * create.c (pthread_create): Minor rename "us" to "new" (I need these cues but it doesn't stop me coming out with some major bugs at times). Load start_routine and arg into the thread so the wrapper can call it. * exit.c (pthread_exit): Fix pthread_this should be pthread_self. * cancel.c (pthread_setcancelstate): Change _pthread_threads_thread_t * to pthread_t and init with pthread_this(). (pthread_setcanceltype): Ditto. --- signal.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'signal.c') diff --git a/signal.c b/signal.c index 888319d..77fa0dd 100644 --- a/signal.c +++ b/signal.c @@ -10,6 +10,8 @@ int pthread_sigmask(int how, const sigset_t *set, sigset_t *oset) { + pthread_t thread = pthread_self(); + /* Validate the `how' argument.*/ if (set != NULL) { @@ -30,19 +32,18 @@ pthread_sigmask(int how, const sigset_t *set, sigset_t *oset) /* Copy the old mask before modifying it. */ if (oset != NULL) { - memcpy(oset, this->attr->sigmask, sizeof(sigset_t)); + memcpy(oset, thread->attr.sigmask, sizeof(sigset_t)); } if (set != NULL) { - _pthread_threads_thread_t * us = _PTHREAD_THIS; int i; /* FIXME: this code assumes that sigmask is an even multiple of the size of a long integer. */ unsigned long *src = set; - unsigned long *dest = us->attr.sigmask; + unsigned long *dest = thread->attr.sigmask; switch (how) { @@ -61,7 +62,7 @@ pthread_sigmask(int how, const sigset_t *set, sigset_t *oset) } case SIG_SET: /* Replace the whole sigmask. */ - memcpy(us->attr.sigmask, set, sizeof(sigset_t)); + memcpy(thread->attr.sigmask, set, sizeof(sigset_t)); break; } } -- cgit v1.2.3