Differences From Artifact [ac9dc3c880]:
- File src/threading.m — part of check-in [39f5e20201] at 2014-08-11 18:44:53 on branch trunk — threading_pthread.m: Set thread name (user: js, size: 2998) [annotate] [blame] [check-ins using]
To Artifact [139fd47bbf]:
- File
src/threading.m
— part of check-in
[be99da0c09]
at
2014-10-04 19:24:47
on branch trunk
— threading: WinAPI's CriticalSection is recursive
No need to manually implement recursiveness for WinAPI. (user: js, size: 3123) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
29 30 31 32 33 34 35 |
#ifdef __HAIKU__
# include <kernel/OS.h>
#endif
bool
of_rmutex_new(of_rmutex_t *rmutex)
{
| | | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 |
#ifdef __HAIKU__
# include <kernel/OS.h>
#endif
bool
of_rmutex_new(of_rmutex_t *rmutex)
{
#if defined(OF_HAVE_RECURSIVE_PTHREAD_MUTEXES) || defined(_WIN32)
pthread_mutexattr_t attr;
if (pthread_mutexattr_init(&attr) != 0)
return false;
if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE) != 0)
return false;
|
| ︙ | ︙ | |||
59 60 61 62 63 64 65 |
return true;
#endif
}
bool
of_rmutex_lock(of_rmutex_t *rmutex)
{
| | | 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 |
return true;
#endif
}
bool
of_rmutex_lock(of_rmutex_t *rmutex)
{
#if defined(OF_HAVE_RECURSIVE_PTHREAD_MUTEXES) || defined(_WIN32)
return of_mutex_lock(rmutex);
#else
uintptr_t count = (uintptr_t)of_tlskey_get(rmutex->count);
if (count > 0) {
if (!of_tlskey_set(rmutex->count, (void*)(count + 1)))
return false;
|
| ︙ | ︙ | |||
86 87 88 89 90 91 92 |
return true;
#endif
}
bool
of_rmutex_trylock(of_rmutex_t *rmutex)
{
| | | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 |
return true;
#endif
}
bool
of_rmutex_trylock(of_rmutex_t *rmutex)
{
#if defined(OF_HAVE_RECURSIVE_PTHREAD_MUTEXES) || defined(_WIN32)
return of_mutex_trylock(rmutex);
#else
uintptr_t count = (uintptr_t)of_tlskey_get(rmutex->count);
if (count > 0) {
if (!of_tlskey_set(rmutex->count, (void*)(count + 1)))
return false;
|
| ︙ | ︙ | |||
113 114 115 116 117 118 119 |
return true;
#endif
}
bool
of_rmutex_unlock(of_rmutex_t *rmutex)
{
| | | 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 |
return true;
#endif
}
bool
of_rmutex_unlock(of_rmutex_t *rmutex)
{
#if defined(OF_HAVE_RECURSIVE_PTHREAD_MUTEXES) || defined(_WIN32)
return of_mutex_unlock(rmutex);
#else
uintptr_t count = (uintptr_t)of_tlskey_get(rmutex->count);
if (count > 1) {
if (!of_tlskey_set(rmutex->count, (void*)(count - 1)))
return false;
|
| ︙ | ︙ | |||
138 139 140 141 142 143 144 |
return true;
#endif
}
bool
of_rmutex_free(of_rmutex_t *rmutex)
{
| | | 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 |
return true;
#endif
}
bool
of_rmutex_free(of_rmutex_t *rmutex)
{
#if defined(OF_HAVE_RECURSIVE_PTHREAD_MUTEXES) || defined(_WIN32)
return of_mutex_free(rmutex);
#else
if (!of_mutex_free(&rmutex->mutex))
return false;
if (!of_tlskey_free(rmutex->count))
return false;
return true;
#endif
}
|