cleanup and consolidate the spinlock_lock (what a name!) code.

it's now atomic_lock to better reflect its usage, and librthread now
features a new spinlock that's really a ticket lock.
thrlseep can handle both types of lock via a flag in the clock arg.
(temp back compat hack)
remove some old stuff that's accumulated along the way and no longer used.
some feedback from dlg, who is concerned with all things ticket lock.
(you need to boot a new kernel before installing librthread)

1 files changed, 0 insertions, 78 deletions

diff --git a/lib/libpthread/include/spinlock.h b/lib/libpthread/include/spinlock.h
deleted file mode 100644
index 1e836d41605..00000000000
--- a/lib/libpthread/include/spinlock.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
- * 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. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
- *
- * $Id: spinlock.h,v 1.9 2012/12/05 23:20:05 deraadt Exp $
- * $OpenBSD: spinlock.h,v 1.9 2012/12/05 23:20:05 deraadt Exp $
- *
- * Lock definitions used in both libc and libpthread.
- *
- */
-
-#ifndef _SPINLOCK_H_
-#define _SPINLOCK_H_
-#include <sys/types.h>
-#include <machine/spinlock.h>
-
-/*
- * Lock structure with room for debugging information.
- */
-typedef volatile struct {
-	_spinlock_lock_t	access_lock;
-	void *			lock_owner;
-	const char *		fname;
-	int			lineno;
-} spinlock_t;
-
-#define	_SPINLOCK_INITIALIZER	{ _SPINLOCK_UNLOCKED, 0, 0, 0 }
-
-#define _SPINUNLOCK(_lck)	(_lck)->access_lock = _SPINLOCK_UNLOCKED
-#ifdef	_LOCK_DEBUG
-#define	_SPINLOCK(_lck)		_spinlock_debug(_lck, __FILE__, __LINE__)
-#else
-#define	_SPINLOCK(_lck)		_spinlock(_lck)
-#endif
-
-#define _SPINLOCK_INIT(_lck)	_SPINUNLOCK(_lck)
-
-/*
- * Thread function prototype definitions:
- */
-__BEGIN_DECLS
-void	_spinlock(spinlock_t *);
-void	_spinlock_debug(spinlock_t *, const char *, int);
-
-/* lock() functions return 0 if lock was acquired. */
-/* is_locked functions() return 1 if lock is locked. */
-int	_atomic_lock(volatile _spinlock_lock_t *);
-int	_atomic_is_locked(volatile _spinlock_lock_t *);
-__END_DECLS
-
-#endif /* _SPINLOCK_H_ */