chore(build): make platform and arch defines more specific

This commit is contained in:
fallenoak 2020-11-24 17:29:31 -06:00
parent 5e2001a164
commit be391c6592
No known key found for this signature in database
GPG key ID: 7628F8E61AEA070D
12 changed files with 41 additions and 41 deletions

View file

@ -1,11 +1,11 @@
#include "storm/thread/CSRWLock.hpp"
void CSRWLock::Enter(int32_t forwriting) {
#ifdef PLATFORM_WIN
#ifdef WHOA_PLATFORM_WIN
// TODO
#endif
#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
#if defined(WHOA_PLATFORM_MAC) || defined(WHOA_PLATFORM_LINUX)
if (forwriting) {
pthread_rwlock_wrlock(&this->m_lock);
} else {
@ -15,11 +15,11 @@ void CSRWLock::Enter(int32_t forwriting) {
}
void CSRWLock::Leave(int32_t fromwriting) {
#ifdef PLATFORM_WIN
#ifdef WHOA_PLATFORM_WIN
// TODO
#endif
#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
#if defined(WHOA_PLATFORM_MAC) || defined(WHOA_PLATFORM_LINUX)
pthread_rwlock_unlock(&this->m_lock);
#endif
}

View file

@ -3,18 +3,18 @@
#include <cstdint>
#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
#if defined(WHOA_PLATFORM_MAC) || defined(WHOA_PLATFORM_LINUX)
#include <pthread.h>
#endif
class CSRWLock {
public:
// Member variables
#ifdef PLATFORM_WIN
#ifdef WHOA_PLATFORM_WIN
char m_opaqueData[12];
#endif
#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
#if defined(WHOA_PLATFORM_MAC) || defined(WHOA_PLATFORM_LINUX)
pthread_rwlock_t m_lock;
#endif

View file

@ -1,21 +1,21 @@
#include "storm/thread/SCritSect.hpp"
void SCritSect::Enter() {
#if defined(PLATFORM_WIN)
#if defined(WHOA_PLATFORM_WIN)
EnterCriticalSection(&this->m_opaqueData);
#endif
#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
#if defined(WHOA_PLATFORM_MAC) || defined(WHOA_PLATFORM_LINUX)
pthread_mutex_lock(&this->m_mutex);
#endif
}
void SCritSect::Leave() {
#if defined(PLATFORM_WIN)
#if defined(WHOA_PLATFORM_WIN)
LeaveCriticalSection(&this->m_opaqueData);
#endif
#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
#if defined(WHOA_PLATFORM_MAC) || defined(WHOA_PLATFORM_LINUX)
pthread_mutex_unlock(&this->m_mutex);
#endif
}

View file

@ -1,18 +1,18 @@
#ifndef STORM_THREAD_S_CRIT_SECT_HPP
#define STORM_THREAD_S_CRIT_SECT_HPP
#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
#if defined(WHOA_PLATFORM_MAC) || defined(WHOA_PLATFORM_LINUX)
#include <pthread.h>
#endif
class SCritSect {
public:
// Member variables
#if defined(PLATFORM_WIN)
#if defined(WHOA_PLATFORM_WIN)
CRITICAL_SECTION m_opaqueData;
#endif
#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
#if defined(WHOA_PLATFORM_MAC) || defined(WHOA_PLATFORM_LINUX)
pthread_mutex_t m_mutex;
#endif

View file

@ -2,11 +2,11 @@
SEvent::SEvent(int32_t manualReset, int32_t initialValue)
: SSyncObject() {
#if defined(PLATFORM_WIN)
#if defined(WHOA_PLATFORM_WIN)
this->m_opaqueData = CreateEventA(nullptr, manualReset, initialValue, nullptr);
#endif
#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
#if defined(WHOA_PLATFORM_MAC) || defined(WHOA_PLATFORM_LINUX)
this->m_int0 = 2 - (manualReset >= 1);
this->m_value = initialValue;
@ -15,11 +15,11 @@ SEvent::SEvent(int32_t manualReset, int32_t initialValue)
}
int32_t SEvent::Reset() {
#if defined(PLATFORM_WIN)
#if defined(WHOA_PLATFORM_WIN)
return ResetEvent(this->m_opaqueData);
#endif
#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
#if defined(WHOA_PLATFORM_MAC) || defined(WHOA_PLATFORM_LINUX)
pthread_mutex_lock(&this->m_mutex);
this->m_value = 0;
pthread_mutex_unlock(&this->m_mutex);
@ -29,11 +29,11 @@ int32_t SEvent::Reset() {
}
int32_t SEvent::Set() {
#if defined(PLATFORM_WIN)
#if defined(WHOA_PLATFORM_WIN)
return SetEvent(this->m_opaqueData);
#endif
#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
#if defined(WHOA_PLATFORM_MAC) || defined(WHOA_PLATFORM_LINUX)
pthread_mutex_lock(&this->m_mutex);
this->m_value = 1;

View file

@ -1,23 +1,23 @@
#include "storm/thread/SSyncObject.hpp"
#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
#if defined(WHOA_PLATFORM_MAC) || defined(WHOA_PLATFORM_LINUX)
#include <cerrno>
#include <sys/time.h>
#include <unistd.h>
#endif
SSyncObject::SSyncObject() {
#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
#if defined(WHOA_PLATFORM_MAC) || defined(WHOA_PLATFORM_LINUX)
pthread_mutex_init(&this->m_mutex, 0);
#endif
}
uint32_t SSyncObject::Wait(uint32_t timeoutMs) {
#if defined(PLATFORM_WIN)
#if defined(WHOA_PLATFORM_WIN)
return WaitForSingleObject(this->m_opaqueData, timeoutMs);
#endif
#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
#if defined(WHOA_PLATFORM_MAC) || defined(WHOA_PLATFORM_LINUX)
if (this->m_int0 == 6) {
// WAIT_FAILED
return 0xFFFFFFFF;

View file

@ -3,18 +3,18 @@
#include <cstdint>
#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
#if defined(WHOA_PLATFORM_MAC) || defined(WHOA_PLATFORM_LINUX)
#include <pthread.h>
#endif
class SSyncObject {
public:
// Member variables
#if defined(PLATFORM_WIN)
#if defined(WHOA_PLATFORM_WIN)
HANDLE m_opaqueData = nullptr;
#endif
#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
#if defined(WHOA_PLATFORM_MAC) || defined(WHOA_PLATFORM_LINUX)
int32_t m_int0 = 6;
int32_t m_value;
pthread_cond_t m_cond;

View file

@ -2,11 +2,11 @@
#include "storm/Thread.hpp"
int32_t SThread::Create(uint32_t (*threadProc)(void*), void* param, SThread& thread, char* threadName, uint32_t a5) {
#if defined(PLATFORM_WIN)
#if defined(WHOA_PLATFORM_WIN)
// TODO implement
#endif
#if defined(PLATFORM_MAC) || defined(PLATFORM_LINUX)
#if defined(WHOA_PLATFORM_MAC) || defined(WHOA_PLATFORM_LINUX)
thread.m_int0 = 5;
thread.m_value = 0;
pthread_cond_init(&thread.m_cond, nullptr);