diff options
| author | Haru <haru@dotalux.com> | 2016-03-13 15:48:14 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2016-07-12 20:58:42 +0200 |
| commit | b9578c1d8ce54b48363e297b1c56cdea0ed72821 (patch) | |
| tree | 4539010ef6af70a55b2b1515a464ebe3cfe60fcd /src/common/spinlock.h | |
| parent | 8c66f639fdd495f3d28aac905acda823fc6a0ae6 (diff) | |
| download | hercules-b9578c1d8ce54b48363e297b1c56cdea0ed72821.tar.gz hercules-b9578c1d8ce54b48363e297b1c56cdea0ed72821.tar.bz2 hercules-b9578c1d8ce54b48363e297b1c56cdea0ed72821.tar.xz hercules-b9578c1d8ce54b48363e297b1c56cdea0ed72821.zip | |
Removed unnecessary typedefs from thread and spinlock
- SPIN_LOCK -> struct spin_lock
- rAthread -> struct thread_handle
- rAthreadProc -> threadFunc
- RATHREAD_PRIO -> enum thread_priority
- RAT_PRIO_LOW -> THREADPRIO_LOW
- RAT_PRIO_NORMAL -> THREADPRIO_NORMAL
- RAT_PRIO_HIGH -> THREADPRIO_HIGH
- RA_THREADS_MAX -> THREADS_MAX
Signed-off-by: Haru <haru@dotalux.com>
fixupthread
Diffstat (limited to 'src/common/spinlock.h')
| -rw-r--r-- | src/common/spinlock.h | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/src/common/spinlock.h b/src/common/spinlock.h index f1df6ef34..c04416285 100644 --- a/src/common/spinlock.h +++ b/src/common/spinlock.h @@ -37,31 +37,28 @@ #endif #ifdef WIN32 - -typedef struct __declspec( align(64) ) SPIN_LOCK{ +struct __declspec(align(64)) spin_lock { volatile LONG lock; volatile LONG nest; volatile LONG sync_lock; -} SPIN_LOCK; +}; #else -typedef struct SPIN_LOCK{ - volatile int32 lock; - volatile int32 nest; // nesting level. - - volatile int32 sync_lock; -} __attribute__((aligned(64))) SPIN_LOCK; +struct spin_lock { + volatile int32 lock; + volatile int32 nest; // nesting level. + volatile int32 sync_lock; +} __attribute__((aligned(64))); #endif - #ifdef HERCULES_CORE -static forceinline void InitializeSpinLock(SPIN_LOCK *lck) +static forceinline void InitializeSpinLock(struct spin_lock *lck) { lck->lock = 0; lck->nest = 0; lck->sync_lock = 0; } -static forceinline void FinalizeSpinLock(SPIN_LOCK *lck) +static forceinline void FinalizeSpinLock(struct spin_lock *lck) { return; } @@ -70,7 +67,7 @@ static forceinline void FinalizeSpinLock(SPIN_LOCK *lck) #define getsynclock(l) do { if(InterlockedCompareExchange((l), 1, 0) == 0) break; thread->yield(); } while(/*always*/1) #define dropsynclock(l) do { InterlockedExchange((l), 0); } while(0) -static forceinline void EnterSpinLock(SPIN_LOCK *lck) +static forceinline void EnterSpinLock(struct spin_lock *lck) { int tid = thread->get_tid(); @@ -97,7 +94,7 @@ static forceinline void EnterSpinLock(SPIN_LOCK *lck) } -static forceinline void LeaveSpinLock(SPIN_LOCK *lck) +static forceinline void LeaveSpinLock(struct spin_lock *lck) { int tid = thread->get_tid(); |