mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Using new handle cleanup structure

Browse Source
This commit is contained in:
Armin Novak 2015-03-11 17:57:01 +01:00
parent e701e802bb
commit 372927fedb
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
winpr/libwinpr/synch/semaphore.c
View File

@ -31,12 +31,10 @@
#ifndef _WIN32
#include <errno.h>
#include "../handle/handle.h"
#include "../log.h"
#define TAG WINPR_TAG("synch.semaphore")
static pthread_once_t semaphore_initialized = PTHREAD_ONCE_INIT;
static HANDLE_CLOSE_CB _SemaphoreHandleCloseCb;
static BOOL SemaphoreCloseHandle(HANDLE handle);
@ -53,11 +51,33 @@ static BOOL SemaphoreIsHandled(HANDLE handle)
return TRUE;
}
static void SemaphoreInitialize(void)
static int SemaphoreGetFd(HANDLE handle)
{
_SemaphoreHandleCloseCb.IsHandled = SemaphoreIsHandled;
_SemaphoreHandleCloseCb.CloseHandle = SemaphoreCloseHandle;
RegisterHandleCloseCb(&_SemaphoreHandleCloseCb);
WINPR_SEMAPHORE *sem = (WINPR_SEMAPHORE *)handle;
if (!SemaphoreIsHandled(handle))
return -1;
return sem->pipe_fd[0];
}
static DWORD SemaphoreCleanupHandle(HANDLE handle)
{
int length;
WINPR_SEMAPHORE *sem = (WINPR_SEMAPHORE *)handle;
if (!SemaphoreIsHandled(handle))
return WAIT_FAILED;
length = read(sem->pipe_fd[0], &length, 1);
if (length != 1)
{
WLog_ERR(TAG, "semaphore read() failure [%d] %s", errno, strerror(errno));
return WAIT_FAILED;
}
return WAIT_OBJECT_0;
}
BOOL SemaphoreCloseHandle(HANDLE handle) {
@ -96,9 +116,6 @@ HANDLE CreateSemaphoreW(LPSECURITY_ATTRIBUTES lpSemaphoreAttributes, LONG lIniti
HANDLE handle;
WINPR_SEMAPHORE* semaphore;
if (pthread_once(&semaphore_initialized, SemaphoreInitialize))
return NULL;
semaphore = (WINPR_SEMAPHORE*) malloc(sizeof(WINPR_SEMAPHORE));
if (!semaphore)
@ -107,6 +124,10 @@ HANDLE CreateSemaphoreW(LPSECURITY_ATTRIBUTES lpSemaphoreAttributes, LONG lIniti
semaphore->pipe_fd[0] = -1;
semaphore->pipe_fd[0] = -1;
semaphore->sem = (winpr_sem_t*) NULL;
semaphore->cb.IsHandled = SemaphoreIsHandled;
semaphore->cb.CloseHandle = SemaphoreCloseHandle;
semaphore->cb.GetFd = SemaphoreGetFd;
semaphore->cb.CleanupHandle = SemaphoreCleanupHandle;
if (semaphore)
{