Module Name: src
Committed By: pooka
Date: Wed Dec 1 17:22:52 UTC 2010
Modified Files:
src/lib/librumpuser: rumpuser_pth.c
src/sys/rump/include/rump: rumpuser.h
src/sys/rump/librump/rumpkern: locks.c locks_up.c
Log Message:
implement mutex_owner()
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/librumpuser/rumpuser_pth.c
cvs rdiff -u -r1.56 -r1.57 src/sys/rump/include/rump/rumpuser.h
cvs rdiff -u -r1.43 -r1.44 src/sys/rump/librump/rumpkern/locks.c
cvs rdiff -u -r1.4 -r1.5 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/lib/librumpuser/rumpuser_pth.c
diff -u src/lib/librumpuser/rumpuser_pth.c:1.5 src/lib/librumpuser/rumpuser_pth.c:1.6
--- src/lib/librumpuser/rumpuser_pth.c:1.5 Wed Dec 1 15:01:52 2010
+++ src/lib/librumpuser/rumpuser_pth.c Wed Dec 1 17:22:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser_pth.c,v 1.5 2010/12/01 15:01:52 pooka Exp $ */
+/* $NetBSD: rumpuser_pth.c,v 1.6 2010/12/01 17:22:51 pooka Exp $ */
/*
* Copyright (c) 2007-2010 Antti Kantee. All Rights Reserved.
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: rumpuser_pth.c,v 1.5 2010/12/01 15:01:52 pooka Exp $");
+__RCSID("$NetBSD: rumpuser_pth.c,v 1.6 2010/12/01 17:22:51 pooka Exp $");
#endif /* !lint */
#ifdef __linux__
@@ -354,8 +354,8 @@
free(mtx);
}
-int
-rumpuser_mutex_held(struct rumpuser_mtx *mtx)
+struct lwp *
+rumpuser_mutex_owner(struct rumpuser_mtx *mtx)
{
if (__predict_false(!mtx->iskmutex)) {
@@ -363,7 +363,7 @@
abort();
}
- return mtx->owner == rumpuser_get_curlwp();
+ return mtx->owner;
}
void
Index: src/sys/rump/include/rump/rumpuser.h
diff -u src/sys/rump/include/rump/rumpuser.h:1.56 src/sys/rump/include/rump/rumpuser.h:1.57
--- src/sys/rump/include/rump/rumpuser.h:1.56 Wed Dec 1 15:02:04 2010
+++ src/sys/rump/include/rump/rumpuser.h Wed Dec 1 17:22:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.h,v 1.56 2010/12/01 15:02:04 pooka Exp $ */
+/* $NetBSD: rumpuser.h,v 1.57 2010/12/01 17:22:51 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -132,7 +132,7 @@
int rumpuser_mutex_tryenter(struct rumpuser_mtx *);
void rumpuser_mutex_exit(struct rumpuser_mtx *);
void rumpuser_mutex_destroy(struct rumpuser_mtx *);
-int rumpuser_mutex_held(struct rumpuser_mtx *);
+struct lwp *rumpuser_mutex_owner(struct rumpuser_mtx *);
struct rumpuser_rw;
Index: src/sys/rump/librump/rumpkern/locks.c
diff -u src/sys/rump/librump/rumpkern/locks.c:1.43 src/sys/rump/librump/rumpkern/locks.c:1.44
--- src/sys/rump/librump/rumpkern/locks.c:1.43 Wed Dec 1 14:59:38 2010
+++ src/sys/rump/librump/rumpkern/locks.c Wed Dec 1 17:22:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locks.c,v 1.43 2010/12/01 14:59:38 pooka Exp $ */
+/* $NetBSD: locks.c,v 1.44 2010/12/01 17:22:51 pooka Exp $ */
/*
* Copyright (c) 2007, 2008 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.43 2010/12/01 14:59:38 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.44 2010/12/01 17:22:51 pooka Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -109,7 +109,14 @@
mutex_owned(kmutex_t *mtx)
{
- return rumpuser_mutex_held(RUMPMTX(mtx));
+ return mutex_owner(mtx) == curlwp;
+}
+
+struct lwp *
+mutex_owner(kmutex_t *mtx)
+{
+
+ return rumpuser_mutex_owner(RUMPMTX(mtx));
}
#define RUMPRW(rw) (*(struct rumpuser_rw **)(rw))
Index: src/sys/rump/librump/rumpkern/locks_up.c
diff -u src/sys/rump/librump/rumpkern/locks_up.c:1.4 src/sys/rump/librump/rumpkern/locks_up.c:1.5
--- src/sys/rump/librump/rumpkern/locks_up.c:1.4 Mon Jun 14 21:04:56 2010
+++ src/sys/rump/librump/rumpkern/locks_up.c Wed Dec 1 17:22:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locks_up.c,v 1.4 2010/06/14 21:04:56 pooka Exp $ */
+/* $NetBSD: locks_up.c,v 1.5 2010/12/01 17:22:51 pooka 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.4 2010/06/14 21:04:56 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locks_up.c,v 1.5 2010/12/01 17:22:51 pooka Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -157,6 +157,13 @@
return upm->upm_owner == curlwp;
}
+struct lwp *
+mutex_owner(kmutex_t *mtx)
+{
+
+ return upm->upm_owner;
+}
+
struct uprw {
struct lwp *uprw_owner;
int uprw_readers;
