Module Name: src
Committed By: ad
Date: Sat Feb 22 21:44:51 UTC 2020
Modified Files:
src/sys/rump/librump/rumpkern: locks.c locks_up.c
Log Message:
rump rw_lock_op
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/rump/librump/rumpkern/locks.c
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/librump/rumpkern/locks_up.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/locks.c
diff -u src/sys/rump/librump/rumpkern/locks.c:1.80 src/sys/rump/librump/rumpkern/locks.c:1.81
--- src/sys/rump/librump/rumpkern/locks.c:1.80 Mon Feb 5 05:00:48 2018
+++ src/sys/rump/librump/rumpkern/locks.c Sat Feb 22 21:44:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: locks.c,v 1.80 2018/02/05 05:00:48 ozaki-r Exp $ */
+/* $NetBSD: locks.c,v 1.81 2020/02/22 21:44:51 ad Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.80 2018/02/05 05:00:48 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.81 2020/02/22 21:44:51 ad Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -358,6 +358,13 @@ rw_lock_held(krwlock_t *rw)
return rw_read_held(rw) || rw_write_held(rw);
}
+krw_t
+rw_lock_op(krwlock_t *rw)
+{
+
+ return rw_write_held(rw) ? RW_WRITER : RW_READER;
+}
+
/* curriculum vitaes */
#define RUMPCV(cv) (*(struct rumpuser_cv **)(cv))
Index: src/sys/rump/librump/rumpkern/locks_up.c
diff -u src/sys/rump/librump/rumpkern/locks_up.c:1.10 src/sys/rump/librump/rumpkern/locks_up.c:1.11
--- src/sys/rump/librump/rumpkern/locks_up.c:1.10 Tue Jan 26 23:12:17 2016
+++ src/sys/rump/librump/rumpkern/locks_up.c Sat Feb 22 21:44:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: locks_up.c,v 1.10 2016/01/26 23:12:17 pooka Exp $ */
+/* $NetBSD: locks_up.c,v 1.11 2020/02/22 21:44:51 ad Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: locks_up.c,v 1.10 2016/01/26 23:12:17 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locks_up.c,v 1.11 2020/02/22 21:44:51 ad Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -317,6 +317,12 @@ rw_lock_held(krwlock_t *rw)
return uprw->uprw_owner || uprw->uprw_readers;
}
+krw_t
+rw_lock_op(krwlock_t *rw)
+{
+
+ return rw_write_held(rw) ? RW_WRITER : RW_READER;
+}
/*
* Condvars are almost the same as in the MP case except that we
