diff options
| author | Chaz Brown <iamparadox@netscape.net> | 2009-09-13 06:18:26 -0400 |
|---|---|---|
| committer | Chaz Brown <iamparadox@netscape.net> | 2009-09-13 06:18:26 -0400 |
| commit | a02bb96290c09658c0f54e9fa9828eafe778f079 (patch) | |
| tree | ee7443cea56991c9ba56bc576d8ec8539dd079b4 /dep/src/zthread/linux | |
| parent | e08ddd3096660c871d1b5acc03889c9be3e8ada3 (diff) | |
Remove the remaining obsolete Zthread code Part3 Really this time.
--HG--
branch : trunk
Diffstat (limited to 'dep/src/zthread/linux')
| -rw-r--r-- | dep/src/zthread/linux/AtomicCount.cxx | 73 | ||||
| -rw-r--r-- | dep/src/zthread/linux/AtomicFastLock.h | 118 | ||||
| -rw-r--r-- | dep/src/zthread/linux/FastRecursiveLock.h | 84 |
3 files changed, 0 insertions, 275 deletions
diff --git a/dep/src/zthread/linux/AtomicCount.cxx b/dep/src/zthread/linux/AtomicCount.cxx deleted file mode 100644 index 18b31e3a8ce..00000000000 --- a/dep/src/zthread/linux/AtomicCount.cxx +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (c) 2005, Eric Crahen - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is furnished - * to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - */ - -#ifndef __ZTATOMICCOUNTIMPL_H__ -#define __ZTATOMICCOUNTIMPL_H__ - -#include <asm/atomic.h> -#include <assert.h> - -namespace ZThread { - -typedef struct atomic_count_t { - - atomic_t count; - - atomic_count_t() { - atomic_t init = ATOMIC_INIT(0); - count = init; - } - - ~atomic_count_t() { - assert(atomic_read(&count) == 0); - } - -} ATOMIC_COUNT; - - -AtomicCount::AtomicCount() { - - _value = reinterpret_cast<void*>(new ATOMIC_COUNT); - -} - -AtomicCount::~AtomicCount() { - - delete reinterpret_cast<ATOMIC_COUNT*>(_value); - -} - -void AtomicCount::increment() { - - atomic_inc(&reinterpret_cast<ATOMIC_COUNT*>(_value)->count); - -} - -bool AtomicCount::decrement() { - - return atomic_dec_and_test(&reinterpret_cast<ATOMIC_COUNT*>(_value)->count); - -} - -}; - -#endif // __ZTATOMICCOUNTIMPL_H__ diff --git a/dep/src/zthread/linux/AtomicFastLock.h b/dep/src/zthread/linux/AtomicFastLock.h deleted file mode 100644 index e5851c96d17..00000000000 --- a/dep/src/zthread/linux/AtomicFastLock.h +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright (c) 2005, Eric Crahen - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is furnished - * to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - */ - -#ifndef __ZTFASTLOCK_H__ -#define __ZTFASTLOCK_H__ - -#include "zthread/NonCopyable.h" -#include "../ThreadOps.h" -#include <assert.h> -#include <asm/atomic.h> - -#if !defined(NDEBUG) -# include <pthread.h> -#endif - -namespace ZThread { - -/** - * @class FastLock - * - * @author Eric Crahen <http://www.code-foo.com> - * @date <2003-07-16T23:27:03-0400> - * @version 2.2.0 - * - * This implementation of a FastLock uses the atomic operations that - * linux provides with its kernel sources. This demonstrates how to implement - * a spinlock with a decrement and test primative. - */ -class FastLock : private NonCopyable { - - atomic_t _value; - -#if !defined(NDEBUG) - pthread_t _owner; -#endif - -public: - - inline FastLock() { - - atomic_t tmp = ATOMIC_INIT(1); - _value = tmp; - - } - - inline ~FastLock() { - - assert(atomic_read(&_value) == 1); - assert(_owner == 0); - - } - - inline void acquire() { - - while(!atomic_dec_and_test(&_value)) { - - atomic_inc(&_value); - ThreadOps::yield(); - - } - -#if !defined(NDEBUG) - _owner = pthread_self(); -#endif - } - - inline void release() { - -#if !defined(NDEBUG) - assert(pthread_equal(_owner, pthread_self()) != 0); -#endif - - atomic_inc(&_value); - _owner = 0; - - } - - inline bool tryAcquire(unsigned long timeout=0) { - - bool wasLocked = atomic_dec_and_test(&_value); - if(!wasLocked) - atomic_inc(&_value); - -#if !defined(NDEBUG) - if(wasLocked) - _owner = pthread_self(); -#endif - - return wasLocked; - - } - -}; /* FastLock */ - - -} // namespace ZThread - -#endif - diff --git a/dep/src/zthread/linux/FastRecursiveLock.h b/dep/src/zthread/linux/FastRecursiveLock.h deleted file mode 100644 index 6ba392145ec..00000000000 --- a/dep/src/zthread/linux/FastRecursiveLock.h +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (c) 2005, Eric Crahen - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is furnished - * to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - */ - -#ifndef __ZTFASTRECURSIVELOCK_H__ -#define __ZTFASTRECURSIVELOCK_H__ - -#include "zthread/NonCopyable.h" -#include <pthread.h> - -namespace ZThread { - -/** - * @class FastRecursiveLock - * - * @author Eric Crahen <http://www.code-foo.com> - * @date <2003-07-16T23:27:14-0400> - * @version 2.2.0 - * - * This implementation of a FastRecursiveLock uses the recursive mutex - * that linux pthreads provides. - */ -class FastRecursiveLock : private NonCopyable { - - pthread_mutex_t _mtx; - -public: - - inline FastRecursiveLock() { - - static const pthread_mutexattr_t attr = { PTHREAD_MUTEX_RECURSIVE_NP }; - pthread_mutex_init(&_mtx, &attr); - - } - - inline ~FastRecursiveLock() { - - pthread_mutex_destroy(&_mtx); - - } - - inline void acquire() { - - pthread_mutex_lock(&_mtx); - - } - - inline void release() { - - pthread_mutex_unlock(&_mtx); - - } - - inline bool tryAcquire(unsigned long timeout=0) { - - return (pthread_mutex_trylock(&_mtx) == 0); - - } - -}; /* FastRecursiveLock */ - - -} // namespace ZThread - -#endif - |
