Skip to content

macOS Semaphore Cleanup #895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ejohnstown wants to merge 1 commit into
base: master
Choose a base branch
from
+141 −57
Open

macOS Semaphore Cleanup #895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 70 additions & 28 deletions apps/wolfssh/wolfssh.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,22 +272,80 @@ static int sendCurrentWindowSize(thread_args* args)

#ifndef _MSC_VER

#if (defined(__OSX__) || defined(__APPLE__))
#if (defined(__OSX__) || defined(__APPLE__)) \
&& defined(HAVE_DISPATCH_DISPATCH_H)

/* On a Mac and GCD is available. */
#include <dispatch/dispatch.h>
dispatch_semaphore_t windowSem;

typedef struct {
dispatch_semaphore_t s;
} WOLFSSH_SEMAPHORE;

static inline
void wolfSSH_SEMAPHORE_Init(WOLFSSH_SEMAPHORE* s, unsigned int n)
{
s->s = dispatch_semaphore_create((long)n);
}

static inline
void wolfSSH_SEMAPHORE_Release(WOLFSSH_SEMAPHORE* s)
{
dispatch_release(s->s);
}
Comment on lines +291 to +295

static inline
void wolfSSH_SEMAPHORE_Wait(WOLFSSH_SEMAPHORE* s)
{
dispatch_semaphore_wait(s->s, DISPATCH_TIME_FOREVER);
}

Comment on lines +281 to +302
static inline
void wolfSSH_SEMAPHORE_Post(WOLFSSH_SEMAPHORE* s)
{
dispatch_semaphore_signal(s->s);
}

#else

#include <semaphore.h>
static sem_t windowSem;

typedef struct {
sem_t s;
} WOLFSSH_SEMAPHORE;

static inline
void wolfSSH_SEMAPHORE_Init(WOLFSSH_SEMAPHORE* s, unsigned int n)
{
sem_init(&s->s, 0, n);
}

static inline
void wolfSSH_SEMAPHORE_Release(WOLFSSH_SEMAPHORE* s)
{
sem_destroy(&s->s);
}

static inline
void wolfSSH_SEMAPHORE_Wait(WOLFSSH_SEMAPHORE* s)
{
sem_wait(&s->s);
}

static inline
void wolfSSH_SEMAPHORE_Post(WOLFSSH_SEMAPHORE* s)
{
sem_post(&s->s);
}

#endif

WOLFSSH_SEMAPHORE windowSem;

/* capture window change signals */
static void WindowChangeSignal(int sig)
{
#if (defined(__OSX__) || defined(__APPLE__))
dispatch_semaphore_signal(windowSem);
#else
sem_post(&windowSem);
#endif
wolfSSH_SEMAPHORE_Post(&windowSem);
(void)sig;
}
Comment on lines 345 to 350

Expand All @@ -299,11 +357,7 @@ static THREAD_RET windowMonitor(void* in)

args = (thread_args*)in;
do {
#if (defined(__OSX__) || defined(__APPLE__))
dispatch_semaphore_wait(windowSem, DISPATCH_TIME_FOREVER);
#else
sem_wait(&windowSem);
#endif
wolfSSH_SEMAPHORE_Wait(&windowSem);
if (args->quit) {
break;
}
Expand Down Expand Up @@ -1060,11 +1114,7 @@ static THREAD_RETURN WOLFSSH_THREAD wolfSSH_Client(void* args)
arg.readError = 0;
#ifdef WOLFSSH_TERM
arg.quit = 0;
#if (defined(__OSX__) || defined(__APPLE__))
windowSem = dispatch_semaphore_create(0);
#else
sem_init(&windowSem, 0, 0);
#endif
wolfSSH_SEMAPHORE_Init(&windowSem, 0);

if (config.command) {
int err;
Expand All @@ -1087,21 +1137,13 @@ static THREAD_RETURN WOLFSSH_THREAD wolfSSH_Client(void* args)
#ifdef WOLFSSH_TERM
/* Wake the windowMonitor thread so it can exit. */
arg.quit = 1;
#if (defined(__OSX__) || defined(__APPLE__))
dispatch_semaphore_signal(windowSem);
#else
sem_post(&windowSem);
#endif
wolfSSH_SEMAPHORE_Post(&windowSem);
pthread_join(thread[0], NULL);
#endif /* WOLFSSH_TERM */
pthread_cancel(thread[1]);
pthread_join(thread[1], NULL);
#ifdef WOLFSSH_TERM
#if (defined(__OSX__) || defined(__APPLE__))
dispatch_release(windowSem);
#else
sem_destroy(&windowSem);
#endif
wolfSSH_SEMAPHORE_Release(&windowSem);
#endif /* WOLFSSH_TERM */
ioErr = arg.readError;
#elif defined(_MSC_VER)
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ AC_TYPE_UINT8_T
AC_TYPE_UINTPTR_T

# Check headers/libs
AC_CHECK_HEADERS([limits.h sys/select.h sys/time.h sys/ioctl.h pty.h util.h termios.h])
AC_CHECK_HEADERS([limits.h sys/select.h sys/time.h sys/ioctl.h pty.h util.h termios.h dispatch/dispatch.h])
AC_CHECK_LIB([network],[socket])
AC_CHECK_LIB([util],[forkpty])

Expand Down
98 changes: 70 additions & 28 deletions examples/client/client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,22 +240,80 @@ static int sendCurrentWindowSize(thread_args* args)
#ifdef WOLFSSH_TERM
#ifndef _MSC_VER

#if (defined(__OSX__) || defined(__APPLE__))
#if (defined(__OSX__) || defined(__APPLE__)) \
&& defined(HAVE_DISPATCH_DISPATCH_H)

/* On a Mac and GCD is available. */
#include <dispatch/dispatch.h>
dispatch_semaphore_t windowSem;

typedef struct {
dispatch_semaphore_t s;
} WOLFSSH_SEMAPHORE;

static inline
void wolfSSH_SEMAPHORE_Init(WOLFSSH_SEMAPHORE* s, unsigned int n)
{
s->s = dispatch_semaphore_create((long)n);
}
Comment on lines +249 to +257

static inline
void wolfSSH_SEMAPHORE_Release(WOLFSSH_SEMAPHORE* s)
{
dispatch_release(s->s);
}

static inline
void wolfSSH_SEMAPHORE_Wait(WOLFSSH_SEMAPHORE* s)
{
dispatch_semaphore_wait(s->s, DISPATCH_TIME_FOREVER);
}

static inline
void wolfSSH_SEMAPHORE_Post(WOLFSSH_SEMAPHORE* s)
{
dispatch_semaphore_signal(s->s);
}

#else

#include <semaphore.h>
static sem_t windowSem;

typedef struct {
sem_t s;
} WOLFSSH_SEMAPHORE;

static inline
void wolfSSH_SEMAPHORE_Init(WOLFSSH_SEMAPHORE* s, unsigned int n)
{
sem_init(&s->s, 0, n);
}

static inline
void wolfSSH_SEMAPHORE_Release(WOLFSSH_SEMAPHORE* s)
{
sem_destroy(&s->s);
}

static inline
void wolfSSH_SEMAPHORE_Wait(WOLFSSH_SEMAPHORE* s)
{
sem_wait(&s->s);
}
Comment on lines +297 to +301

static inline
void wolfSSH_SEMAPHORE_Post(WOLFSSH_SEMAPHORE* s)
{
sem_post(&s->s);
}

#endif

WOLFSSH_SEMAPHORE windowSem;

/* capture window change signals */
static void WindowChangeSignal(int sig)
{
#if (defined(__OSX__) || defined(__APPLE__))
dispatch_semaphore_signal(windowSem);
#else
sem_post(&windowSem);
#endif
wolfSSH_SEMAPHORE_Post(&windowSem);
(void)sig;
}

Expand All @@ -267,11 +325,7 @@ static THREAD_RET windowMonitor(void* in)

args = (thread_args*)in;
do {
#if (defined(__OSX__) || defined(__APPLE__))
dispatch_semaphore_wait(windowSem, DISPATCH_TIME_FOREVER);
#else
sem_wait(&windowSem);
#endif
wolfSSH_SEMAPHORE_Wait(&windowSem);
if (args->quit) {
break;
}
Expand Down Expand Up @@ -1032,11 +1086,7 @@ THREAD_RETURN WOLFSSH_THREAD client_test(void* args)
arg.quit = 0;
wc_InitMutex(&arg.lock);
#ifdef WOLFSSH_TERM
#if (defined(__OSX__) || defined(__APPLE__))
windowSem = dispatch_semaphore_create(0);
#else
sem_init(&windowSem, 0, 0);
#endif
wolfSSH_SEMAPHORE_Init(&windowSem, 0);

if (cmd) {
int err;
Expand All @@ -1057,21 +1107,13 @@ THREAD_RETURN WOLFSSH_THREAD client_test(void* args)
#ifdef WOLFSSH_TERM
/* Wake the windowMonitor thread so it can exit. */
arg.quit = 1;
#if (defined(__OSX__) || defined(__APPLE__))
dispatch_semaphore_signal(windowSem);
#else
sem_post(&windowSem);
#endif
wolfSSH_SEMAPHORE_Post(&windowSem);
pthread_join(thread[0], NULL);
#endif /* WOLFSSH_TERM */
pthread_cancel(thread[1]);
pthread_join(thread[1], NULL);
#ifdef WOLFSSH_TERM
#if (defined(__OSX__) || defined(__APPLE__))
dispatch_release(windowSem);
#else
sem_destroy(&windowSem);
#endif
wolfSSH_SEMAPHORE_Release(&windowSem);
#endif /* WOLFSSH_TERM */
#elif defined(_MSC_VER)
thread_args arg;
Expand Down
Loading