 @@ -1,14 +1,14 @@
-/*	$NetBSD: pthread.c,v 1.160 2020/01/29 15:31:14 kamil Exp $	*/
+/*	$NetBSD: pthread.c,v 1.161 2020/01/29 16:03:44 kamil Exp $	*/
 /*-
  * Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008, 2020
  *     The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Nathan J. Williams and Andrew Doran.
+ *
  * 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
 @@ -21,27 +21,27 @@
  * ``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 FOUNDATION 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.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread.c,v 1.160 2020/01/29 15:31:14 kamil Exp $");
+__RCSID("$NetBSD: pthread.c,v 1.161 2020/01/29 16:03:44 kamil Exp $");
 #define	__EXPOSE_STACK	1
 #include <sys/param.h>
 #include <sys/exec_elf.h>
 #include <sys/mman.h>
 #include <sys/lwp.h>
 #include <sys/lwpctl.h>
 #include <sys/resource.h>
 #include <sys/sysctl.h>
 #include <sys/tls.h>
 #include <uvm/uvm_param.h>
 @@ -587,40 +587,46 @@ pthread__create_tramp(void *cookie)
 	retval = (*self->pt_func)(self->pt_arg);
 	pthread_exit(retval);
 	/*NOTREACHED*/
 	pthread__abort();
+}
 int
 pthread_suspend_np(pthread_t thread)
+{
 	pthread_t self;
 	pthread__error(EINVAL, "Invalid thread",
 	    thread->pt_magic == PT_MAGIC);
 	self = pthread__self();
 	if (self == thread) {
 		return EDEADLK;
+	}
 	if (pthread__find(thread) != 0)
 		return ESRCH;
 	if (_lwp_suspend(thread->pt_lid) == 0)
 		return 0;
 	return errno;
+}
 int
 pthread_resume_np(pthread_t thread)
+{
 	pthread__error(EINVAL, "Invalid thread",
 	    thread->pt_magic == PT_MAGIC);
 	if (pthread__find(thread) != 0)
 		return ESRCH;
 	if (_lwp_continue(thread->pt_lid) == 0)
 		return 0;
 	return errno;
+}
 /*
  * In case the thread is exiting at an inopportune time leaving waiters not
  * awoken (because cancelled, for instance) make sure we have no waiters
  * left.
  */
 @@ -692,34 +698,34 @@ pthread_exit(void *retval)
 out:
 	/*NOTREACHED*/
 	pthread__abort();
 	exit(1);
+}
 int
 pthread_join(pthread_t thread, void **valptr)
+{
 	pthread_t self;
 	pthread__error(EINVAL, "Invalid thread",
 	    thread->pt_magic == PT_MAGIC);
 	self = pthread__self();
 	if (pthread__find(thread) != 0)
 		return ESRCH;
 	if (thread->pt_magic != PT_MAGIC)
 		return EINVAL;
 	if (thread == self)
 		return EDEADLK;
 	/* XXX temporary - kernel should handle. */
 	if ((thread->pt_flags & PT_FLAG_DETACHED) != 0)
 		return EINVAL;
 	/* IEEE Std 1003.1 says pthread_join() never returns EINTR. */
 	for (;;) {
 		pthread__testcancel(self);
 		if (_lwp_wait(thread->pt_lid, NULL) == 0)
 			break;
 		if (errno != EINTR)
 @@ -754,97 +760,104 @@ pthread__reap(pthread_t thread)
 	pthread_mutex_unlock(&thread->pt_lock);
 	pthread_mutex_lock(&pthread__deadqueue_lock);
 	PTQ_INSERT_HEAD(&pthread__deadqueue, thread, pt_deadq);
 	pthread_mutex_unlock(&pthread__deadqueue_lock);
 	if (name != NULL)
 		free(name);
+}
 int
 pthread_equal(pthread_t t1, pthread_t t2)
+{
 	if (__predict_false(__uselibcstub))
 		return __libc_thr_equal_stub(t1, t2);
 	pthread__error(EINVAL, "Invalid thread",
 	    t1->pt_magic == PT_MAGIC);
 	pthread__error(EINVAL, "Invalid thread",
 	    t2->pt_magic == PT_MAGIC);
 	/* Nothing special here. */
 	return (t1 == t2);
+}
 int
 pthread_detach(pthread_t thread)
+{
 	int error;
 	pthread__error(EINVAL, "Invalid thread",
 	    thread->pt_magic == PT_MAGIC);
 	if (pthread__find(thread) != 0)
 		return ESRCH;
 	if (thread->pt_magic != PT_MAGIC)
 		return EINVAL;
 	pthread_mutex_lock(&thread->pt_lock);
 	if ((thread->pt_flags & PT_FLAG_DETACHED) != 0) {
 		error = EINVAL;
 	} else {
 		error = _lwp_detach(thread->pt_lid);
 		if (error == 0)
 			thread->pt_flags |= PT_FLAG_DETACHED;
 		else
 			error = errno;
+	}
 	if (thread->pt_state == PT_STATE_ZOMBIE) {
 		/* pthread__reap() will drop the lock. */
 		pthread__reap(thread);
 	} else
 		pthread_mutex_unlock(&thread->pt_lock);
 	return error;
+}
 int
 pthread_getname_np(pthread_t thread, char *name, size_t len)
+{
 	pthread__error(EINVAL, "Invalid thread",
 	    thread->pt_magic == PT_MAGIC);
 	if (pthread__find(thread) != 0)
 		return ESRCH;
 	if (thread->pt_magic != PT_MAGIC)
 		return EINVAL;
 	pthread_mutex_lock(&thread->pt_lock);
 	if (thread->pt_name == NULL)
 		name[0] = '\0';
 	else
 		strlcpy(name, thread->pt_name, len);
 	pthread_mutex_unlock(&thread->pt_lock);
 	return 0;
+}
 int
 pthread_setname_np(pthread_t thread, const char *name, void *arg)
+{
 	char *oldname, *cp, newname[PTHREAD_MAX_NAMELEN_NP];
 	int namelen;
 	pthread__error(EINVAL, "Invalid thread",
 	    thread->pt_magic == PT_MAGIC);
 	if (pthread__find(thread) != 0)
 		return ESRCH;
 	if (thread->pt_magic != PT_MAGIC)
 		return EINVAL;
 	namelen = snprintf(newname, sizeof(newname), name, arg);
 	if (namelen >= PTHREAD_MAX_NAMELEN_NP)
 		return EINVAL;
 	cp = strdup(newname);
 	if (cp == NULL)
 		return ENOMEM;
 	pthread_mutex_lock(&thread->pt_lock);
 	oldname = thread->pt_name;
 	thread->pt_name = cp;
 	(void)_lwp_setname(thread->pt_lid, cp);
 	pthread_mutex_unlock(&thread->pt_lock);
 @@ -860,26 +873,29 @@ pthread_t
 pthread_self(void)
+{
 	if (__predict_false(__uselibcstub))
 		return (pthread_t)__libc_thr_self_stub();
 	return pthread__self();
+}
 int
 pthread_cancel(pthread_t thread)
+{
 	pthread__error(EINVAL, "Invalid thread",
 	    thread->pt_magic == PT_MAGIC);
 	if (pthread__find(thread) != 0)
 		return ESRCH;
 	pthread_mutex_lock(&thread->pt_lock);
 	thread->pt_flags |= PT_FLAG_CS_PENDING;
 	if ((thread->pt_flags & PT_FLAG_CS_DISABLED) == 0) {
 		thread->pt_cancel = 1;
 		pthread_mutex_unlock(&thread->pt_lock);
 		_lwp_wakeup(thread->pt_lid);
 	} else
 		pthread_mutex_unlock(&thread->pt_lock);
 	return 0;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pthread_getcpuclockid.c,v 1.2 2017/03/04 11:16:33 njoly Exp $	*/
+/*	$NetBSD: pthread_getcpuclockid.c,v 1.3 2020/01/29 16:03:44 kamil Exp $	*/
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * 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.
 @@ -20,35 +20,38 @@
  * ``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 FOUNDATION 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.
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: pthread_getcpuclockid.c,v 1.2 2017/03/04 11:16:33 njoly Exp $");
+__RCSID("$NetBSD: pthread_getcpuclockid.c,v 1.3 2020/01/29 16:03:44 kamil Exp $");
 #endif /* LIBC_SCCS and not lint */
 #include <sys/types.h>
 #include <errno.h>
 #include <pthread.h>
 #include <time.h>
 #include "pthread_int.h"
 int
 pthread_getcpuclockid(pthread_t thread, clockid_t *clock_id)
+{
 	int error = 0, saved_errno;
 	pthread__error(EINVAL, "Invalid thread",
 	    thread->pt_magic == PT_MAGIC);
 	saved_errno = errno;
 	if (clock_getcpuclockid2(P_LWPID, (id_t)thread->pt_lid, clock_id) == -1)
 		error = errno;
 	errno = saved_errno;
 	return error;
+}