diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2004-07-20 20:16:45 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2004-07-20 20:16:45 +0000 |
| commit | f4495499d3272f5778d149843b42f4ad4b70347e (patch) | |
| tree | 71c92381c2bad8bdea22fb7b74d06d9039717508 /sys/arch/i386/include | |
| parent | 2ffda532d68e2f976e0579af1ee163b2eac6e2a7 (diff) | |
MD mutex implementation for i386.
Diffstat (limited to 'sys/arch/i386/include')
| -rw-r--r-- | sys/arch/i386/include/mutex.h | 55 | ||||
| -rw-r--r-- | sys/arch/i386/include/types.h | 3 |
2 files changed, 57 insertions, 1 deletions
diff --git a/sys/arch/i386/include/mutex.h b/sys/arch/i386/include/mutex.h new file mode 100644 index 00000000000..0982b8fe36a --- /dev/null +++ b/sys/arch/i386/include/mutex.h @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2004 Artur Grabowski <art@openbsd.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: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED ``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 AUTHOR 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. + */ +#ifndef _I386_MUTEX_H_ +#define _I386_MUTEX_H_ + +/* + * XXX - we don't really need the mtx_lock field, we can use mtx_oldipl + * as the lock to save some space. + */ +struct mutex { + __volatile int mtx_lock; + int mtx_wantipl; + int mtx_oldipl; + void *mtx_owner; +}; + +#define MUTEX_INITIALIZER(IPL) { 0, (IPL), 0, NULL } + +#define MUTEX_ASSERT_LOCKED(mtx) do { \ + if ((mtx)->mtx_lock != 1 || \ + (mtx)->mtx_owner != curcpu()) \ + panic("mutex %p not held in %s\n", (mtx), __func__); \ +} while (0) + +#define MUTEX_ASSERT_UNLOCKED(mtx) do { \ + if ((mtx)->mtx_lock == 1 && \ + (mtx)->mtx_owner == curcpu()) \ + panic("mutex %p held in %s\n", (mtx), __func__); \ +} while (0) + +#define MUTEX_OLDIPL(mtx) (mtx)->mtx_oldipl + +#endif diff --git a/sys/arch/i386/include/types.h b/sys/arch/i386/include/types.h index 7262847c9cc..c01b2537ed3 100644 --- a/sys/arch/i386/include/types.h +++ b/sys/arch/i386/include/types.h @@ -1,5 +1,5 @@ /* $NetBSD: types.h,v 1.12 1995/12/24 01:08:03 mycroft Exp $ */ -/* $OpenBSD: types.h,v 1.15 2004/06/28 01:41:53 aaron Exp $ */ +/* $OpenBSD: types.h,v 1.16 2004/07/20 20:16:44 art Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -74,5 +74,6 @@ typedef int32_t register_t; #define __HAVE_NWSCONS #define __HAVE_EVCOUNT #define __HAVE_CPUINFO +#define __HAVE_MUTEX #endif /* _MACHTYPES_H_ */ |