 @@ -1,14 +1,14 @@
-/*	$NetBSD: pthread_cond.c,v 1.66 2020/01/13 18:22:56 ad Exp $	*/
+/*	$NetBSD: pthread_cond.c,v 1.67 2020/01/29 15:07:46 kamil Exp $	*/
 /*-
  * Copyright (c) 2001, 2006, 2007, 2008 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
  *    notice, this list of conditions and the following disclaimer.
 @@ -36,27 +36,27 @@
  * spinlock is present only to prevent libpthread causing the application
  * to crash or malfunction as a result of corrupted data structures, in
  * the event that the application is buggy.
+ *
  * If there is contention on spinlock when real-time threads are in use,
  * it could cause a deadlock due to priority inversion: the thread holding
  * the spinlock may not get CPU time to make forward progress and release
  * the spinlock to a higher priority thread that is waiting for it.
  * Contention on the spinlock will only occur with buggy applications,
  * so at the time of writing it's not considered a major bug in libpthread.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread_cond.c,v 1.66 2020/01/13 18:22:56 ad Exp $");
+__RCSID("$NetBSD: pthread_cond.c,v 1.67 2020/01/29 15:07:46 kamil Exp $");
 #include <stdlib.h>
 #include <errno.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include "pthread.h"
 #include "pthread_int.h"
 #include "reentrant.h"
 int	_sys___nanosleep50(const struct timespec *, struct timespec *);
 extern int pthread__started;
 @@ -68,26 +68,30 @@ int	_pthread_cond_has_waiters_np(pthread
 __weak_alias(pthread_cond_has_waiters_np,_pthread_cond_has_waiters_np)
 __strong_alias(__libc_cond_init,pthread_cond_init)
 __strong_alias(__libc_cond_signal,pthread_cond_signal)
 __strong_alias(__libc_cond_broadcast,pthread_cond_broadcast)
 __strong_alias(__libc_cond_wait,pthread_cond_wait)
 __strong_alias(__libc_cond_timedwait,pthread_cond_timedwait)
 __strong_alias(__libc_cond_destroy,pthread_cond_destroy)
 static clockid_t
 pthread_cond_getclock(const pthread_cond_t *cond)
+{
 	pthread__error(EINVAL, "Invalid condition variable",
 	    cond->ptc_magic == _PT_COND_MAGIC);
 	return cond->ptc_private ?
 	    *(clockid_t *)cond->ptc_private : CLOCK_REALTIME;
+}
 int
 pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr)
+{
 	if (__predict_false(__uselibcstub))
 		return __libc_cond_init_stub(cond, attr);
 	pthread__error(EINVAL, "Invalid condition variable attribute",
 	    (attr == NULL) || (attr->ptca_magic == _PT_CONDATTR_MAGIC));
 @@ -212,29 +216,26 @@ pthread_cond_wait(pthread_cond_t *cond,
 	if (__predict_false(__uselibcstub))
 		return __libc_cond_wait_stub(cond, mutex);
 	return pthread_cond_timedwait(cond, mutex, NULL);
+}
 static int __noinline
 pthread__cond_wake_one(pthread_cond_t *cond)
+{
 	pthread_t self, signaled;
 	pthread_mutex_t *mutex;
 	lwpid_t lid;
 	pthread__error(EINVAL, "Invalid condition variable",
 	    cond->ptc_magic == _PT_COND_MAGIC);
 	/*
 	 * Pull the first thread off the queue.  If the current thread
 	 * is associated with the condition variable, remove it without
 	 * awakening (error case in pthread_cond_timedwait()).
 	 */
 	self = pthread__self();
 	pthread__spinlock(self, &cond->ptc_lock);
 	if (self->pt_sleepobj == cond) {
 		PTQ_REMOVE(&cond->ptc_waiters, self, pt_sleep);
 		self->pt_sleepobj = NULL;
+	}
 	signaled = PTQ_FIRST(&cond->ptc_waiters);
 	if (__predict_false(signaled == NULL)) {
 @@ -268,42 +269,42 @@ pthread__cond_wake_one(pthread_cond_t *c
+	}
 	self->pt_waiters[self->pt_nwaiters++] = lid;
 	pthread__mutex_deferwake(self, mutex);
 	return 0;
+}
 int
 pthread_cond_signal(pthread_cond_t *cond)
+{
 	if (__predict_false(__uselibcstub))
 		return __libc_cond_signal_stub(cond);
 	pthread__error(EINVAL, "Invalid condition variable",
 	    cond->ptc_magic == _PT_COND_MAGIC);
 	if (__predict_true(PTQ_EMPTY(&cond->ptc_waiters)))
 		return 0;
 	return pthread__cond_wake_one(cond);
+}
 static int __noinline
 pthread__cond_wake_all(pthread_cond_t *cond)
+{
 	pthread_t self, signaled;
 	pthread_mutex_t *mutex;
 	u_int max;
 	size_t nwaiters;
 	pthread__error(EINVAL, "Invalid condition variable",
 	    cond->ptc_magic == _PT_COND_MAGIC);
 	/*
 	 * Try to defer waking threads (see pthread_cond_signal()).
 	 * Only transfer waiters for which there is no pending wakeup.
 	 */
 	self = pthread__self();
 	pthread__spinlock(self, &cond->ptc_lock);
 	max = pthread__unpark_max;
 	mutex = cond->ptc_mutex;
 	nwaiters = self->pt_nwaiters;
 	PTQ_FOREACH(signaled, &cond->ptc_waiters, pt_sleep) {
 		if (__predict_false(nwaiters == max)) {
 			/* Overflow. */
 			(void)_lwp_unpark_all(self->pt_waiters,
 @@ -318,102 +319,119 @@ pthread__cond_wake_all(pthread_cond_t *c
 	cond->ptc_mutex = NULL;
 	pthread__spinunlock(self, &cond->ptc_lock);
 	pthread__mutex_deferwake(self, mutex);
 	return 0;
+}
 int
 pthread_cond_broadcast(pthread_cond_t *cond)
+{
 	if (__predict_false(__uselibcstub))
 		return __libc_cond_broadcast_stub(cond);
 	pthread__error(EINVAL, "Invalid condition variable",
 	    cond->ptc_magic == _PT_COND_MAGIC);
 	if (__predict_true(PTQ_EMPTY(&cond->ptc_waiters)))
 		return 0;
 	return pthread__cond_wake_all(cond);
+}
 int
 _pthread_cond_has_waiters_np(pthread_cond_t *cond)
+{
 	return !PTQ_EMPTY(&cond->ptc_waiters);
+}
 int
 pthread_condattr_init(pthread_condattr_t *attr)
+{
 	attr->ptca_magic = _PT_CONDATTR_MAGIC;
 	attr->ptca_private = NULL;
 	return 0;
+}
 int
 pthread_condattr_setclock(pthread_condattr_t *attr, clockid_t clck)
+{
 	pthread__error(EINVAL, "Invalid condition variable attribute",
 	    attr->ptca_magic == _PT_CONDATTR_MAGIC);
 	switch (clck) {
 	case CLOCK_MONOTONIC:
 	case CLOCK_REALTIME:
 		if (attr->ptca_private == NULL)
 			attr->ptca_private = malloc(sizeof(clockid_t));
 		if (attr->ptca_private == NULL)
 			return errno;
 		*(clockid_t *)attr->ptca_private = clck;
 		return 0;
 	default:
 		return EINVAL;
+	}
+}
 int
 pthread_condattr_getclock(const pthread_condattr_t *__restrict attr,
     clockid_t *__restrict clock_id)
+{
 	pthread__error(EINVAL, "Invalid condition variable attribute",
 	    attr->ptca_magic == _PT_CONDATTR_MAGIC);
 	if (attr == NULL || attr->ptca_private == NULL)
 		return EINVAL;
 	*clock_id = *(clockid_t *)attr->ptca_private;
 	return 0;
+}
 int
 pthread_condattr_destroy(pthread_condattr_t *attr)
+{
 	pthread__error(EINVAL, "Invalid condition variable attribute",
 	    attr->ptca_magic == _PT_CONDATTR_MAGIC);
 	attr->ptca_magic = _PT_CONDATTR_DEAD;
 	free(attr->ptca_private);
 	return 0;
+}
 #ifdef _PTHREAD_PSHARED
 int
 pthread_condattr_getpshared(const pthread_condattr_t * __restrict attr,
     int * __restrict pshared)
+{
 	pthread__error(EINVAL, "Invalid condition variable attribute",
 	    attr->ptca_magic == _PT_CONDATTR_MAGIC);
 	*pshared = PTHREAD_PROCESS_PRIVATE;
 	return 0;
+}
 int
 pthread_condattr_setpshared(pthread_condattr_t *attr, int pshared)
+{
 	pthread__error(EINVAL, "Invalid condition variable attribute",
 	    attr->ptca_magic == _PT_CONDATTR_MAGIC);
 	switch(pshared) {
 	case PTHREAD_PROCESS_PRIVATE:
 		return 0;
 	case PTHREAD_PROCESS_SHARED:
 		return ENOSYS;
+	}
 	return EINVAL;
+}
 #endif
 /* Utility routine to hang out for a while if threads haven't started yet. */
 static int
 pthread_cond_wait_nothread(pthread_t self, pthread_mutex_t *mutex,