Mirrors/bx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bx.git synced 2026-02-17 20:52:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

OSX/iOS: Fixed semaphore timed wait.

Browse Source
This commit is contained in:
Branimir Karadžić
2017-11-14 16:53:22 -08:00
parent 8ee7f1cccb
commit e84ced5ab1
3 changed files with 49 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bx_p.h
View File

@@ -7,7 +7,7 @@
#define BX_P_H_HEADER_GUARD
#ifndef BX_CONFIG_DEBUG
# define BX_CONFIG_DEBUG 0
# define BX_CONFIG_DEBUG 1
#endif // BX_CONFIG_DEBUG
#if BX_CONFIG_DEBUG

53
src/semaphore.cpp
View File

@@ -8,7 +8,10 @@
#if BX_CONFIG_SUPPORTS_THREADING
#if BX_PLATFORM_POSIX
#if BX_PLATFORM_OSX \
|| BX_PLATFORM_IOS
# include <dispatch/dispatch.h>
#elif BX_PLATFORM_POSIX
# include <errno.h>
# include <pthread.h>
# include <semaphore.h>
@@ -26,8 +29,6 @@
#ifndef BX_CONFIG_SEMAPHORE_PTHREAD
# define BX_CONFIG_SEMAPHORE_PTHREAD (0 \
|| BX_PLATFORM_LINUX \
|| BX_PLATFORM_OSX \
|| BX_PLATFORM_IOS \
)
#endif // BX_CONFIG_SEMAPHORE_PTHREAD
@@ -35,7 +36,10 @@ namespace bx
{
struct SemaphoreInternal
{
#if BX_PLATFORM_POSIX
#if BX_PLATFORM_OSX \
|| BX_PLATFORM_IOS
dispatch_semaphore_t m_handle;
#elif BX_PLATFORM_POSIX
# if BX_CONFIG_SEMAPHORE_PTHREAD
pthread_mutex_t m_mutex;
pthread_cond_t m_cond;
@@ -137,7 +141,7 @@ namespace bx
# if BX_PLATFORM_OSX
BX_UNUSED(_msecs);
BX_CHECK(-1 == _msecs, "OSX doesn't support pthread_cond_timedwait at this moment.");
// BX_CHECK(-1 == _msecs, "OSX doesn't support pthread_cond_timedwait at this moment.");
while (0 == result
&& 0 >= si->m_count)
{
@@ -190,6 +194,45 @@ namespace bx
return ok;
}
# elif BX_PLATFORM_OSX \
|| BX_PLATFORM_IOS
Semaphore::Semaphore()
{
BX_STATIC_ASSERT(sizeof(SemaphoreInternal) <= sizeof(m_internal) );
SemaphoreInternal* si = (SemaphoreInternal*)m_internal;
si->m_handle = dispatch_semaphore_create(0);
BX_CHECK(NULL != si->m_handle, "dispatch_semaphore_create failed.");
}
Semaphore::~Semaphore()
{
SemaphoreInternal* si = (SemaphoreInternal*)m_internal;
dispatch_release(si->m_handle);
}
void Semaphore::post(uint32_t _count)
{
SemaphoreInternal* si = (SemaphoreInternal*)m_internal;
for (uint32_t ii = 0; ii < _count; ++ii)
{
dispatch_semaphore_signal(si->m_handle);
}
}
bool Semaphore::wait(int32_t _msecs)
{
SemaphoreInternal* si = (SemaphoreInternal*)m_internal;
dispatch_time_t dt = 0 > _msecs
? DISPATCH_TIME_FOREVER
: dispatch_time(DISPATCH_TIME_NOW, _msecs*1000000)
;
return !dispatch_semaphore_wait(si->m_handle, dt);
}
# else
Semaphore::Semaphore()

2
tests/os_test.cpp
View File

@@ -14,7 +14,6 @@ TEST_CASE("getProcessMemoryUsed", "")
// DBG("bx::getProcessMemoryUsed %d", bx::getProcessMemoryUsed() );
}
#if !BX_PLATFORM_OSX
TEST_CASE("semaphore_timeout", "")
{
bx::Semaphore sem;
@@ -27,4 +26,3 @@ TEST_CASE("semaphore_timeout", "")
printf("%f\n", ms);
REQUIRE(!ok);
}
#endif // !BX_PLATFORM_OSX