WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #8928 from dgarske/macos 

Implement proper MacOS dispatch for conditional signal/wait
pull/8934/head
Sean Parkinson 2025-06-27 09:35:30 +10:00 committed by GitHub
parent 981ba4b14c 6b7fe091bf
commit f713882c54
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
wolfcrypt/src/wc_port.c
View File

@ -3962,7 +3962,21 @@ char* mystrnstr(const char* s1, const char* s2, unsigned int n)
{ {
if (cond == NULL) if (cond == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
#if defined(__OS2__) #if defined(__MACH__)
cond->cond = dispatch_semaphore_create(0);
if (cond->cond == NULL)
return MEMORY_E;
/* dispatch_release() fails hard, with Trace/BPT trap signal, if the
* sem's internal count is less than the value passed in with
* dispatch_semaphore_create(). work around this by initializing
* with 0, then incrementing it afterwards.
*/
if (dispatch_semaphore_signal(s->sem) < 0) {
dispatch_release(s->sem);
return return MEMORY_E;
}
#elif defined(__OS2__)
DosCreateMutexSem( NULL, &cond->mutex, 0, FALSE ); DosCreateMutexSem( NULL, &cond->mutex, 0, FALSE );
DosCreateEventSem( NULL, &cond->cond, DCE_POSTONE, FALSE ); DosCreateEventSem( NULL, &cond->cond, DCE_POSTONE, FALSE );
#elif defined(__NT__) #elif defined(__NT__)
@ -3993,7 +4007,9 @@ char* mystrnstr(const char* s1, const char* s2, unsigned int n)
{ {
if (cond == NULL) if (cond == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
#if defined(__OS2__) #if defined(__MACH__)
dispatch_release(cond->cond);
#elif defined(__OS2__)
DosCloseMutexSem(cond->mutex); DosCloseMutexSem(cond->mutex);
DosCloseEventSem(cond->cond); DosCloseEventSem(cond->cond);
#elif defined(__NT__) #elif defined(__NT__)
@ -4013,7 +4029,8 @@ char* mystrnstr(const char* s1, const char* s2, unsigned int n)
{ {
if (cond == NULL) if (cond == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
#if defined(__OS2__) #if defined(__MACH__)
#elif defined(__OS2__)
#elif defined(__NT__) #elif defined(__NT__)
if (wc_LockMutex(&cond->mutex) != 0) if (wc_LockMutex(&cond->mutex) != 0)
return BAD_MUTEX_E; return BAD_MUTEX_E;
@ -4028,7 +4045,9 @@ char* mystrnstr(const char* s1, const char* s2, unsigned int n)
{ {
if (cond == NULL) if (cond == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
#if defined(__OS2__) #if defined(__MACH__)
dispatch_semaphore_signal(cond->cond);
#elif defined(__OS2__)
#elif defined(__NT__) #elif defined(__NT__)
if (wc_UnLockMutex(&cond->mutex) != 0) if (wc_UnLockMutex(&cond->mutex) != 0)
return BAD_MUTEX_E; return BAD_MUTEX_E;
@ -4049,7 +4068,9 @@ char* mystrnstr(const char* s1, const char* s2, unsigned int n)
{ {
if (cond == NULL) if (cond == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
#if defined(__OS2__) #if defined(__MACH__)
dispatch_semaphore_wait(cond->cond, DISPATCH_TIME_FOREVER);
#elif defined(__OS2__)
#elif defined(__NT__) #elif defined(__NT__)
if (wc_UnLockMutex(&cond->mutex) != 0) if (wc_UnLockMutex(&cond->mutex) != 0)
return BAD_MUTEX_E; return BAD_MUTEX_E;

15
wolfssl/wolfcrypt/types.h
View File

@ -1572,7 +1572,20 @@ WOLFSSL_API word32 CheckRunTimeSettings(void);
#if __WATCOMC__ < 1300 #if __WATCOMC__ < 1300
#define _WCCALLBACK #define _WCCALLBACK
#endif #endif
#if defined(__NT__) #if defined(__MACH__)
#include <dispatch/dispatch.h>
#include <pthread.h>
typedef struct COND_TYPE {
dispatch_semaphore_t cond;
} COND_TYPE;
typedef void* THREAD_RETURN;
typedef pthread_t THREAD_TYPE;
#define WOLFSSL_COND
#define WOLFSSL_THREAD
#ifndef HAVE_SELFTEST
#define WOLFSSL_THREAD_NO_JOIN
#endif
#elif defined(__NT__)
typedef unsigned THREAD_RETURN; typedef unsigned THREAD_RETURN;
typedef uintptr_t THREAD_TYPE; typedef uintptr_t THREAD_TYPE;
typedef struct COND_TYPE { typedef struct COND_TYPE {