1 files changed, 30 insertions, 83 deletions

diff --git a/rtemsbsd/rtems/rtems-kernel-rwlock.c b/rtemsbsd/rtems/rtems-kernel-rwlock.c
index c2002e0e..80918f70 100644
--- a/rtemsbsd/rtems/rtems-kernel-rwlock.c
+++ b/rtemsbsd/rtems/rtems-kernel-rwlock.c
@@ -15,7 +15,7 @@
  *  USA
  *  <kevin.kirspel@optimedical.com>
  *
- * Copyright (c) 2013, 2017 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2013-2015 embedded brains GmbH.  All rights reserved.
  *
  *  embedded brains GmbH
  *  Dornierstr. 4
@@ -23,9 +23,6 @@
  *  Germany
  *  <rtems@embedded-brains.de>
  *
- * Copyright (c) 2006 John Baldwin <jhb@FreeBSD.org>
- * All rights reserved.
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -49,7 +46,7 @@
  */
 
 #include <machine/rtems-bsd-kernel-space.h>
-#include <machine/rtems-bsd-rwlockimpl.h>
+#include <machine/rtems-bsd-muteximpl.h>
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -73,9 +70,9 @@ struct lock_class lock_class_rw = {
 	.lc_unlock = unlock_rw,
 };
 
-#define	rw_wowner(rw) rtems_bsd_rwlock_wowner(&(rw)->rwlock)
+#define	rw_wowner(rw) rtems_bsd_mutex_owner(&(rw)->mutex)
 
-#define	rw_recursed(rw) rtems_bsd_rwlock_recursed(&(rw)->rwlock)
+#define	rw_recursed(rw) rtems_bsd_mutex_recursed(&(rw)->mutex)
 
 void
 assert_rw(const struct lock_object *lock, int what)
@@ -87,29 +84,16 @@ assert_rw(const struct lock_object *lock, int what)
 void
 lock_rw(struct lock_object *lock, uintptr_t how)
 {
-	struct rwlock *rw;
 
-	rw = (struct rwlock *)lock;
-	if (how)
-		rw_rlock(rw);
-	else
-		rw_wlock(rw);
+	rw_wlock((struct rwlock *)lock);
 }
 
 uintptr_t
 unlock_rw(struct lock_object *lock)
 {
-	struct rwlock *rw;
-
-	rw = (struct rwlock *)lock;
-	rw_assert(rw, RA_LOCKED | LA_NOTRECURSED);
-	if (rw->rwlock.readers > 0) {
-		rw_runlock(rw);
-		return (1);
-	} else {
-		rw_wunlock(rw);
-		return (0);
-	}
+
+	rw_unlock((struct rwlock *)lock);
+	return (0);
 }
 
 void
@@ -121,7 +105,7 @@ rw_init_flags(struct rwlock *rw, const char *name, int opts)
 	if (opts & RW_RECURSE)
 		flags |= LO_RECURSABLE;
 
-	rtems_bsd_rwlock_init(&rw->lock_object, &rw->rwlock, &lock_class_rw,
+	rtems_bsd_mutex_init(&rw->lock_object, &rw->mutex, &lock_class_rw,
 	    name, NULL, flags);
 }
 
@@ -129,87 +113,77 @@ void
 rw_destroy(struct rwlock *rw)
 {
 
-	rtems_bsd_rwlock_destroy(&rw->lock_object, &rw->rwlock);
+	rtems_bsd_mutex_destroy(&rw->lock_object, &rw->mutex);
 }
 
 void
 rw_sysinit(void *arg)
 {
-	struct rw_args *args = arg;
+  struct rw_args *args = arg;
 
-	rw_init((struct rwlock *)args->ra_rw, args->ra_desc);
+  rw_init(args->ra_rw, args->ra_desc);
 }
 
 void
 rw_sysinit_flags(void *arg)
 {
-	struct rw_args_flags *args = arg;
+  struct rw_args_flags *args = arg;
 
-	rw_init_flags((struct rwlock *)args->ra_rw, args->ra_desc,
-	    args->ra_flags);
+  rw_init_flags(args->ra_rw, args->ra_desc, args->ra_flags);
 }
 
 int
 rw_wowned(struct rwlock *rw)
 {
-
-	return (rtems_bsd_rwlock_wowned(&rw->rwlock));
+	return (rtems_bsd_mutex_owned(&rw->mutex));
 }
 
 void
 _rw_wlock(struct rwlock *rw, const char *file, int line)
 {
-
-	rtems_bsd_rwlock_wlock(&rw->lock_object, &rw->rwlock);
+	rtems_bsd_mutex_lock(&rw->lock_object, &rw->mutex);
 }
 
 int
 _rw_try_wlock(struct rwlock *rw, const char *file, int line)
 {
-
-	return (rtems_bsd_rwlock_try_wlock(&rw->lock_object, &rw->rwlock));
+	return (rtems_bsd_mutex_trylock(&rw->lock_object, &rw->mutex));
 }
 
 void
 _rw_wunlock(struct rwlock *rw, const char *file, int line)
 {
-
-	rtems_bsd_rwlock_wunlock(&rw->rwlock);
+	rtems_bsd_mutex_unlock(&rw->mutex);
 }
 
 void
 _rw_rlock(struct rwlock *rw, const char *file, int line)
 {
-
-	rtems_bsd_rwlock_rlock(&rw->lock_object, &rw->rwlock);
+	rtems_bsd_mutex_lock(&rw->lock_object, &rw->mutex);
 }
 
 int
 _rw_try_rlock(struct rwlock *rw, const char *file, int line)
 {
-
-	return (rtems_bsd_rwlock_try_rlock(&rw->lock_object, &rw->rwlock));
+	return (rtems_bsd_mutex_trylock(&rw->lock_object, &rw->mutex));
 }
 
 void
 _rw_runlock(struct rwlock *rw, const char *file, int line)
 {
-
-	rtems_bsd_rwlock_runlock(&rw->rwlock);
+	rtems_bsd_mutex_unlock(&rw->mutex);
 }
 
 int
 _rw_try_upgrade(struct rwlock *rw, const char *file, int line)
 {
-
-	return (rtems_bsd_rwlock_try_upgrade(&rw->rwlock));
+	return (1);
 }
 
 void
 _rw_downgrade(struct rwlock *rw, const char *file, int line)
 {
-
-	rtems_bsd_rwlock_downgrade(&rw->rwlock);
+	/* Nothing to do */
 }
 
 #ifdef INVARIANT_SUPPORT
@@ -221,7 +195,7 @@ _rw_downgrade(struct rwlock *rw, const char *file, int line)
 void
 _rw_assert(const struct rwlock *rw, int what, const char *file, int line)
 {
-	const char *name = rtems_bsd_rwlock_name(&rw->rwlock);
+	const char *name = rtems_bsd_mutex_name(&rw->mutex);
 
 	switch (what) {
 	case RA_LOCKED:
@@ -230,33 +204,6 @@ _rw_assert(const struct rwlock *rw, int what, const char *file, int line)
 	case RA_RLOCKED:
 	case RA_RLOCKED | RA_RECURSED:
 	case RA_RLOCKED | RA_NOTRECURSED:
-#ifdef WITNESS
-		witness_assert(&rw->lock_object, what, file, line);
-#else
-		/*
-		 * If some other thread has a write lock or we have one
-		 * and are asserting a read lock, fail.  Also, if no one
-		 * has a lock at all, fail.
-		 */
-		if ((rw->rwlock.readers == 0 && rw_wowner(rw) == NULL) ||
-		    (rw->rwlock.readers == 0 && (what & RA_RLOCKED ||
-		    rw_wowner(rw) != _Thread_Get_executing())))
-			panic("Lock %s not %slocked @ %s:%d\n",
-			    name, (what & RA_RLOCKED) ?
-			    "read " : "", file, line);
-
-		if (rw->rwlock.readers == 0 && !(what & RA_RLOCKED)) {
-			if (rw_recursed(rw)) {
-				if (what & RA_NOTRECURSED)
-					panic("Lock %s recursed @ %s:%d\n",
-					    name, file,
-					    line);
-			} else if (what & RA_RECURSED)
-				panic("Lock %s not recursed @ %s:%d\n",
-				    name, file, line);
-		}
-#endif
-		break;
 	case RA_WLOCKED:
 	case RA_WLOCKED | RA_RECURSED:
 	case RA_WLOCKED | RA_NOTRECURSED:
@@ -265,11 +212,11 @@ _rw_assert(const struct rwlock *rw, int what, const char *file, int line)
 			    name, file, line);
 		if (rw_recursed(rw)) {
 			if (what & RA_NOTRECURSED)
-				panic("Lock %s recursed @ %s:%d\n",
-				    name, file, line);
+				panic("Lock %s recursed @ %s:%d\n", name, file,
+				    line);
 		} else if (what & RA_RECURSED)
-			panic("Lock %s not recursed @ %s:%d\n",
-			    name, file, line);
+			panic("Lock %s not recursed @ %s:%d\n", name, file,
+			    line);
 		break;
 	case RA_UNLOCKED:
 #ifdef WITNESS
@@ -280,8 +227,8 @@ _rw_assert(const struct rwlock *rw, int what, const char *file, int line)
 		 * to see if we hold a read lock or not.
 		 */
 		if (rw_wowner(rw) == _Thread_Get_executing())
-			panic("Lock %s exclusively locked @ %s:%d\n",
-			    name, file, line);
+			panic("Lock %s exclusively locked @ %s:%d\n", name,
+			    file, line);
 #endif
 		break;
 	default: