1 files changed, 339 insertions, 236 deletions

diff --git a/lib/libthr/thread/thr_attr.c b/lib/libthr/thread/thr_attr.c
index 1db7bf3..9e65548 100644
--- a/lib/libthr/thread/thr_attr.c
+++ b/lib/libthr/thread/thr_attr.c
@@ -1,38 +1,4 @@
 /*
- * Copyright (c) 1995-1997 John Birrell <jb@cimlogic.com.au>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-/*
  * Copyright (c) 2003 Craig Rodrigues <rodrigc@attbi.com>.
  * All rights reserved.
  *
@@ -69,7 +35,6 @@
  * Copyright (c) 1998 Daniel Eischen <eischen@vigrid.com>.
  * Copyright (C) 2001 Jason Evans <jasone@freebsd.org>.
  * Copyright (c) 2002,2003 Alexey Zelkin <phantom@FreeBSD.org>
- * Copyright (c) 2003 Jeff Roberson <jeff@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -97,333 +62,471 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* XXXTHR I rewrote the entire file, can we lose some of the copyrights? */
-
-#include <sys/param.h>
+/*
+ * Copyright (c) 1996 John Birrell <jb@cimlogic.com.au>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by John Birrell.
+ * 4. Neither the name of the author nor the names of any co-contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
 
 #include <errno.h>
 #include <pthread.h>
-#include <pthread_np.h>
 #include <stdlib.h>
 #include <string.h>
+#include <pthread_np.h>
 
 #include "thr_private.h"
 
 __weak_reference(_pthread_attr_destroy, pthread_attr_destroy);
-__weak_reference(_pthread_attr_init, pthread_attr_init);
-__weak_reference(_pthread_attr_setcreatesuspend_np,
-    pthread_attr_setcreatesuspend_np);
-__weak_reference(_pthread_attr_setdetachstate, pthread_attr_setdetachstate);
-__weak_reference(_pthread_attr_setguardsize, pthread_attr_setguardsize);
-__weak_reference(_pthread_attr_setinheritsched, pthread_attr_setinheritsched);
-__weak_reference(_pthread_attr_setschedparam, pthread_attr_setschedparam);
-__weak_reference(_pthread_attr_setschedpolicy, pthread_attr_setschedpolicy);
-__weak_reference(_pthread_attr_setscope, pthread_attr_setscope);
-__weak_reference(_pthread_attr_setstack, pthread_attr_setstack);
-__weak_reference(_pthread_attr_setstackaddr, pthread_attr_setstackaddr);
-__weak_reference(_pthread_attr_setstacksize, pthread_attr_setstacksize);
-__weak_reference(_pthread_attr_get_np, pthread_attr_get_np);
-__weak_reference(_pthread_attr_getdetachstate, pthread_attr_getdetachstate);
-__weak_reference(_pthread_attr_getguardsize, pthread_attr_getguardsize);
-__weak_reference(_pthread_attr_getinheritsched, pthread_attr_getinheritsched);
-__weak_reference(_pthread_attr_getschedparam, pthread_attr_getschedparam);
-__weak_reference(_pthread_attr_getschedpolicy, pthread_attr_getschedpolicy);
-__weak_reference(_pthread_attr_getscope, pthread_attr_getscope);
-__weak_reference(_pthread_attr_getstack, pthread_attr_getstack);
-__weak_reference(_pthread_attr_getstackaddr, pthread_attr_getstackaddr);
-__weak_reference(_pthread_attr_getstacksize, pthread_attr_getstacksize);
 
 int
-_pthread_attr_init(pthread_attr_t *attr)
+_pthread_attr_destroy(pthread_attr_t *attr)
 {
-	pthread_attr_t	pattr;
-
-	if ((pattr = (pthread_attr_t)
-	    malloc(sizeof(struct pthread_attr))) == NULL)
-		return (ENOMEM);
-
-	memcpy(pattr, &pthread_attr_default, sizeof(struct pthread_attr));
-	*attr = pattr;
+	int	ret;
 
-	return (0);
+	/* Check for invalid arguments: */
+	if (attr == NULL || *attr == NULL)
+		/* Invalid argument: */
+		ret = EINVAL;
+	else {
+		/* Free the memory allocated to the attribute object: */
+		free(*attr);
+
+		/*
+		 * Leave the attribute pointer NULL now that the memory
+		 * has been freed:
+		 */
+		*attr = NULL;
+		ret = 0;
+	}
+	return(ret);
 }
 
+__weak_reference(_pthread_attr_get_np, pthread_attr_get_np);
+
 int
-_pthread_attr_destroy(pthread_attr_t *attr)
+_pthread_attr_get_np(pthread_t pid, pthread_attr_t *dst)
 {
-	if (attr == NULL || *attr == NULL)
+	struct pthread *curthread;
+	struct pthread_attr attr;
+	int	ret;
+
+	if (pid == NULL || dst == NULL || *dst == NULL)
 		return (EINVAL);
 
-	free(*attr);
-	*attr = NULL;
+	curthread = _get_curthread();
+	if ((ret = _thr_ref_add(curthread, pid, /*include dead*/0)) != 0)
+		return (ret);
+	attr = pid->attr;
+	_thr_ref_delete(curthread, pid);
+	memcpy(*dst, &attr, sizeof(struct pthread_attr));
 
 	return (0);
 }
 
+__weak_reference(_pthread_attr_getdetachstate, pthread_attr_getdetachstate);
+
 int
-_pthread_attr_setcreatesuspend_np(pthread_attr_t *attr)
+_pthread_attr_getdetachstate(const pthread_attr_t *attr, int *detachstate)
 {
-	if (attr == NULL || *attr == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	(*attr)->suspend = PTHREAD_CREATE_SUSPENDED;
+	int	ret;
 
-	return (0);
+	/* Check for invalid arguments: */
+	if (attr == NULL || *attr == NULL || detachstate == NULL)
+		ret = EINVAL;
+	else {
+		/* Check if the detached flag is set: */
+		if ((*attr)->flags & PTHREAD_DETACHED)
+			/* Return detached: */
+			*detachstate = PTHREAD_CREATE_DETACHED;
+		else
+			/* Return joinable: */
+			*detachstate = PTHREAD_CREATE_JOINABLE;
+		ret = 0;
+	}
+	return(ret);
 }
 
+__weak_reference(_pthread_attr_getguardsize, pthread_attr_getguardsize);
+
 int
-_pthread_attr_setdetachstate(pthread_attr_t *attr, int detachstate)
+_pthread_attr_getguardsize(const pthread_attr_t *attr, size_t *guardsize)
 {
-	if (attr == NULL || *attr == NULL ||
-	    (detachstate != PTHREAD_CREATE_DETACHED &&
-	    detachstate != PTHREAD_CREATE_JOINABLE))
-		return (EINVAL);
-
-	if (detachstate == PTHREAD_CREATE_DETACHED)
-		(*attr)->flags |= PTHREAD_DETACHED;
-	else
-		(*attr)->flags &= ~PTHREAD_DETACHED;
+	int	ret;
 
-	return (0);
+	/* Check for invalid arguments: */
+	if (attr == NULL || *attr == NULL || guardsize == NULL)
+		ret = EINVAL;
+	else {
+		/* Return the guard size: */
+		*guardsize = (*attr)->guardsize_attr;
+		ret = 0;
+	}
+	return(ret);
 }
 
+__weak_reference(_pthread_attr_getinheritsched, pthread_attr_getinheritsched);
+
 int
-_pthread_attr_setguardsize(pthread_attr_t *attr, size_t guardsize)
+_pthread_attr_getinheritsched(const pthread_attr_t *attr, int *sched_inherit)
 {
+	int ret = 0;
 
-	if (attr == NULL || *attr == NULL)
-		return (EINVAL);
-
-	(*attr)->guardsize_attr = roundup(guardsize, _pthread_page_size);
+	if ((attr == NULL) || (*attr == NULL))
+		ret = EINVAL;
+	else
+		*sched_inherit = (*attr)->sched_inherit;
 
-	return (0);
+	return(ret);
 }
 
+__weak_reference(_pthread_attr_getschedparam, pthread_attr_getschedparam);
+
 int
-_pthread_attr_setinheritsched(pthread_attr_t *attr, int sched_inherit)
+_pthread_attr_getschedparam(const pthread_attr_t *attr, struct sched_param *param)
 {
-	if (attr == NULL || *attr == NULL)
-		return (EINVAL);
+	int ret = 0;
 
-	(*attr)->sched_inherit = sched_inherit;
+	if ((attr == NULL) || (*attr == NULL) || (param == NULL))
+		ret = EINVAL;
+	else
+		param->sched_priority = (*attr)->prio;
 
-	return (0);
+	return(ret);
 }
 
+__weak_reference(_pthread_attr_getschedpolicy, pthread_attr_getschedpolicy);
+
 int
-_pthread_attr_setschedparam(pthread_attr_t *attr,
-    const struct sched_param *param)
+_pthread_attr_getschedpolicy(const pthread_attr_t *attr, int *policy)
 {
-	if (attr == NULL || *attr == NULL)
-		return (EINVAL);
-
-	if (param == NULL)
-		return (ENOTSUP);
+	int ret = 0;
 
-	if (param->sched_priority < PTHREAD_MIN_PRIORITY ||
-	    param->sched_priority > PTHREAD_MAX_PRIORITY)
-		return (ENOTSUP);
-
-	(*attr)->prio = param->sched_priority;
+	if ((attr == NULL) || (*attr == NULL) || (policy == NULL))
+		ret = EINVAL;
+	else
+		*policy = (*attr)->sched_policy;
 
-	return (0);
+	return(ret);
 }
 
+__weak_reference(_pthread_attr_getscope, pthread_attr_getscope);
+
 int
-_pthread_attr_setschedpolicy(pthread_attr_t *attr, int policy)
+_pthread_attr_getscope(const pthread_attr_t *attr, int *contentionscope)
 {
-	if (attr == NULL || *attr == NULL)
-		return (EINVAL);
+	int ret = 0;
 
-	if (policy < SCHED_FIFO || policy > SCHED_RR)
-		return (ENOTSUP);
+	if ((attr == NULL) || (*attr == NULL) || (contentionscope == NULL))
+		/* Return an invalid argument: */
+		ret = EINVAL;
 
-	(*attr)->sched_policy = policy;
+	else
+		*contentionscope = (*attr)->flags & PTHREAD_SCOPE_SYSTEM ?
+		    PTHREAD_SCOPE_SYSTEM : PTHREAD_SCOPE_PROCESS;
 
-	return (0);
+	return(ret);
 }
 
+__weak_reference(_pthread_attr_getstack, pthread_attr_getstack);
+
 int
-_pthread_attr_setscope(pthread_attr_t *attr, int contentionscope)
+_pthread_attr_getstack(const pthread_attr_t * __restrict attr,
+                        void ** __restrict stackaddr,
+                        size_t * __restrict stacksize)
 {
-	if (attr == NULL || *attr == NULL)
-		return (EINVAL);
-
-	if (contentionscope != PTHREAD_SCOPE_PROCESS ||
-	    contentionscope == PTHREAD_SCOPE_SYSTEM) 
-		/* We don't support PTHREAD_SCOPE_SYSTEM. */
-		return (ENOTSUP);
-
-	(*attr)->flags |= contentionscope;
+	int     ret;
 
-	return (0);
+	/* Check for invalid arguments: */
+	if (attr == NULL || *attr == NULL || stackaddr == NULL
+	    || stacksize == NULL )
+		ret = EINVAL;
+	else {
+		/* Return the stack address and size */
+		*stackaddr = (*attr)->stackaddr_attr;
+		*stacksize = (*attr)->stacksize_attr;
+		ret = 0;
+	}
+	return(ret);
 }
 
+__weak_reference(_pthread_attr_getstackaddr, pthread_attr_getstackaddr);
+
 int
-_pthread_attr_setstack(pthread_attr_t *attr, void *stackaddr,
-                        size_t stacksize)
+_pthread_attr_getstackaddr(const pthread_attr_t *attr, void **stackaddr)
 {
-	if (attr == NULL || *attr == NULL || stackaddr == NULL
-	    || stacksize < PTHREAD_STACK_MIN)
-		return (EINVAL);
-
-	(*attr)->stackaddr_attr = stackaddr;
-	(*attr)->stacksize_attr = stacksize;
+	int	ret;
 
-	return (0);
+	/* Check for invalid arguments: */
+	if (attr == NULL || *attr == NULL || stackaddr == NULL)
+		ret = EINVAL;
+	else {
+		/* Return the stack address: */
+		*stackaddr = (*attr)->stackaddr_attr;
+		ret = 0;
+	}
+	return(ret);
 }
 
+__weak_reference(_pthread_attr_getstacksize, pthread_attr_getstacksize);
+
 int
-_pthread_attr_setstackaddr(pthread_attr_t *attr, void *stackaddr)
+_pthread_attr_getstacksize(const pthread_attr_t *attr, size_t *stacksize)
 {
-	if (attr == NULL || *attr == NULL || stackaddr == NULL)
-		return (EINVAL);
-
-	(*attr)->stackaddr_attr = stackaddr;
+	int	ret;
 
-	return (0);
+	/* Check for invalid arguments: */
+	if (attr == NULL || *attr == NULL || stacksize  == NULL)
+		ret = EINVAL;
+	else {
+		/* Return the stack size: */
+		*stacksize = (*attr)->stacksize_attr;
+		ret = 0;
+	}
+	return(ret);
 }
 
+__weak_reference(_pthread_attr_init, pthread_attr_init);
+
 int
-_pthread_attr_setstacksize(pthread_attr_t *attr, size_t stacksize)
+_pthread_attr_init(pthread_attr_t *attr)
 {
-	if (attr == NULL || *attr == NULL || stacksize < PTHREAD_STACK_MIN)
-		return (EINVAL);
+	int	ret;
+	pthread_attr_t	pattr;
 
-	(*attr)->stacksize_attr = stacksize;
+	_thr_check_init();
 
-	return (0);
+	/* Allocate memory for the attribute object: */
+	if ((pattr = (pthread_attr_t) malloc(sizeof(struct pthread_attr))) == NULL)
+		/* Insufficient memory: */
+		ret = ENOMEM;
+	else {
+		/* Initialise the attribute object with the defaults: */
+		memcpy(pattr, &_pthread_attr_default, sizeof(struct pthread_attr));
+
+		/* Return a pointer to the attribute object: */
+		*attr = pattr;
+		ret = 0;
+	}
+	return(ret);
 }
 
+__weak_reference(_pthread_attr_setcreatesuspend_np, pthread_attr_setcreatesuspend_np);
+
 int
-_pthread_attr_get_np(pthread_t pid, pthread_attr_t *dst)
+_pthread_attr_setcreatesuspend_np(pthread_attr_t *attr)
 {
 	int	ret;
 
-	if (pid == NULL || dst == NULL || *dst == NULL)
-		return (EINVAL);
-
-	if ((ret = _find_thread(pid)) != 0)
-		return (ret);
-
-	memcpy(*dst, &pid->attr, sizeof(struct pthread_attr));
-
-	/*
-	 * Special case, if stack address was not provided by caller
-	 * of pthread_create(), then return address allocated internally
-	 */
-	if ((*dst)->stackaddr_attr == NULL)
-		(*dst)->stackaddr_attr = pid->stack;
-
-	return (0);
+	if (attr == NULL || *attr == NULL) {
+		ret = EINVAL;
+	} else {
+		(*attr)->suspend = THR_CREATE_SUSPENDED;
+		ret = 0;
+	}
+	return(ret);
 }
 
+__weak_reference(_pthread_attr_setdetachstate, pthread_attr_setdetachstate);
+
 int
-_pthread_attr_getdetachstate(const pthread_attr_t *attr, int *detachstate)
+_pthread_attr_setdetachstate(pthread_attr_t *attr, int detachstate)
 {
+	int	ret;
 
-	if (attr == NULL || *attr == NULL || detachstate == NULL)
-		return (EINVAL);
-
-	/* Check if the detached flag is set: */
-	if ((*attr)->flags & PTHREAD_DETACHED)
-		*detachstate = PTHREAD_CREATE_DETACHED;
-	else
-		*detachstate = PTHREAD_CREATE_JOINABLE;
-
-	return (0);
+	/* Check for invalid arguments: */
+	if (attr == NULL || *attr == NULL ||
+	    (detachstate != PTHREAD_CREATE_DETACHED &&
+	    detachstate != PTHREAD_CREATE_JOINABLE))
+		ret = EINVAL;
+	else {
+		/* Check if detached state: */
+		if (detachstate == PTHREAD_CREATE_DETACHED)
+			/* Set the detached flag: */
+			(*attr)->flags |= PTHREAD_DETACHED;
+		else
+			/* Reset the detached flag: */
+			(*attr)->flags &= ~PTHREAD_DETACHED;
+		ret = 0;
+	}
+	return(ret);
 }
 
+__weak_reference(_pthread_attr_setguardsize, pthread_attr_setguardsize);
+
 int
-_pthread_attr_getguardsize(const pthread_attr_t *attr, size_t *guardsize)
+_pthread_attr_setguardsize(pthread_attr_t *attr, size_t guardsize)
 {
-	if (attr == NULL || *attr == NULL || guardsize == NULL)
-		return (EINVAL);
-
-	*guardsize = (*attr)->guardsize_attr;
+	int	ret;
 
-	return (0);
+	/* Check for invalid arguments. */
+	if (attr == NULL || *attr == NULL)
+		ret = EINVAL;
+	else {
+		/* Save the stack size. */
+		(*attr)->guardsize_attr = guardsize;
+		ret = 0;
+	}
+	return(ret);
 }
 
+__weak_reference(_pthread_attr_setinheritsched, pthread_attr_setinheritsched);
+
 int
-_pthread_attr_getinheritsched(const pthread_attr_t *attr, int *sched_inherit)
+_pthread_attr_setinheritsched(pthread_attr_t *attr, int sched_inherit)
 {
-	if (attr == NULL || *attr == NULL)
-		return (EINVAL);
+	int ret = 0;
 
-	*sched_inherit = (*attr)->sched_inherit;
+	if ((attr == NULL) || (*attr == NULL))
+		ret = EINVAL;
+	else if (sched_inherit != PTHREAD_INHERIT_SCHED &&
+		 sched_inherit != PTHREAD_EXPLICIT_SCHED)
+		ret = ENOTSUP;
+	else
+		(*attr)->sched_inherit = sched_inherit;
 
-	return (0);
+	return(ret);
 }
 
+__weak_reference(_pthread_attr_setschedparam, pthread_attr_setschedparam);
+
 int
-_pthread_attr_getschedparam(const pthread_attr_t *attr, struct sched_param *param)
+_pthread_attr_setschedparam(pthread_attr_t *attr, const struct sched_param *param)
 {
-	if (attr == NULL || *attr == NULL || param == NULL)
-		return (EINVAL);
-
-	param->sched_priority = (*attr)->prio;
-
-	return (0);
+	int ret = 0;
+
+	if ((attr == NULL) || (*attr == NULL))
+		ret = EINVAL;
+	else if (param == NULL) {
+		ret = ENOTSUP;
+	} else if ((param->sched_priority < THR_MIN_PRIORITY) ||
+	    (param->sched_priority > THR_MAX_PRIORITY)) {
+		/* Return an unsupported value error. */
+		ret = ENOTSUP;
+	} else
+		(*attr)->prio = param->sched_priority;
+
+	return(ret);
 }
 
+__weak_reference(_pthread_attr_setschedpolicy, pthread_attr_setschedpolicy);
+
 int
-_pthread_attr_getschedpolicy(const pthread_attr_t *attr, int *policy)
+_pthread_attr_setschedpolicy(pthread_attr_t *attr, int policy)
 {
-	if (attr == NULL || *attr == NULL || policy == NULL)
-		return (EINVAL);
+	int ret = 0;
 
-	*policy = (*attr)->sched_policy;
+	if ((attr == NULL) || (*attr == NULL))
+		ret = EINVAL;
+	else if ((policy < SCHED_FIFO) || (policy > SCHED_RR)) {
+		ret = ENOTSUP;
+	} else
+		(*attr)->sched_policy = policy;
 
-	return (0);
+	return(ret);
 }
 
+__weak_reference(_pthread_attr_setscope, pthread_attr_setscope);
+
 int
-_pthread_attr_getscope(const pthread_attr_t *attr, int *contentionscope)
+_pthread_attr_setscope(pthread_attr_t *attr, int contentionscope)
 {
-	if (attr == NULL || *attr == NULL || contentionscope == NULL)
-		return (EINVAL);
-
-	*contentionscope = (*attr)->flags & PTHREAD_SCOPE_SYSTEM ?
-	    PTHREAD_SCOPE_SYSTEM : PTHREAD_SCOPE_PROCESS;
-
-	return (0);
+	int ret = 0;
+
+	if ((attr == NULL) || (*attr == NULL)) {
+		/* Return an invalid argument: */
+		ret = EINVAL;
+	} else if ((contentionscope != PTHREAD_SCOPE_PROCESS) &&
+	    (contentionscope != PTHREAD_SCOPE_SYSTEM)) {
+		ret = EINVAL;
+	} else if (contentionscope == PTHREAD_SCOPE_SYSTEM) {
+		(*attr)->flags |= contentionscope;
+	} else {
+		(*attr)->flags &= ~PTHREAD_SCOPE_SYSTEM;
+	}
+	return (ret);
 }
 
+__weak_reference(_pthread_attr_setstack, pthread_attr_setstack);
+
 int
-_pthread_attr_getstack(const pthread_attr_t * __restrict attr,
-                        void ** __restrict stackaddr,
-                        size_t * __restrict stacksize)
+_pthread_attr_setstack(pthread_attr_t *attr, void *stackaddr,
+                        size_t stacksize)
 {
-	if (attr == NULL || *attr == NULL || stackaddr == NULL
-	    || stacksize == NULL)
-		return (EINVAL);
-
-	*stackaddr = (*attr)->stackaddr_attr;
-	*stacksize = (*attr)->stacksize_attr;
+	int     ret;
 
-	return (0);
+	/* Check for invalid arguments: */
+	if (attr == NULL || *attr == NULL || stackaddr == NULL
+	    || stacksize < PTHREAD_STACK_MIN)
+		ret = EINVAL;
+	else {
+		/* Save the stack address and stack size */
+		(*attr)->stackaddr_attr = stackaddr;
+		(*attr)->stacksize_attr = stacksize;
+		ret = 0;
+	}
+	return(ret);
 }
 
+__weak_reference(_pthread_attr_setstackaddr, pthread_attr_setstackaddr);
+
 int
-_pthread_attr_getstackaddr(const pthread_attr_t *attr, void **stackaddr)
+_pthread_attr_setstackaddr(pthread_attr_t *attr, void *stackaddr)
 {
-	if (attr == NULL || *attr == NULL || stackaddr == NULL)
-		return (EINVAL);
-
-	*stackaddr = (*attr)->stackaddr_attr;
+	int	ret;
 
-	return (0);
+	/* Check for invalid arguments: */
+	if (attr == NULL || *attr == NULL || stackaddr == NULL)
+		ret = EINVAL;
+	else {
+		/* Save the stack address: */
+		(*attr)->stackaddr_attr = stackaddr;
+		ret = 0;
+	}
+	return(ret);
 }
 
+__weak_reference(_pthread_attr_setstacksize, pthread_attr_setstacksize);
+
 int
-_pthread_attr_getstacksize(const pthread_attr_t *attr, size_t *stacksize)
+_pthread_attr_setstacksize(pthread_attr_t *attr, size_t stacksize)
 {
-	if (attr == NULL || *attr == NULL || stacksize  == NULL)
-		return (EINVAL);
-
-	*stacksize = (*attr)->stacksize_attr;
+	int	ret;
 
-	return (0);
+	/* Check for invalid arguments: */
+	if (attr == NULL || *attr == NULL || stacksize < PTHREAD_STACK_MIN)
+		ret = EINVAL;
+	else {
+		/* Save the stack size: */
+		(*attr)->stacksize_attr = stacksize;
+		ret = 0;
+	}
+	return(ret);
 }