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

Merge pull request #949 from hardening/eventfd

Browse Source 
Add support for eventfd
This commit is contained in:
Marc-André Moreau 2013-02-02 13:30:33 -08:00
commit a00ac1f689
3 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -208,6 +208,7 @@ if(NOT ANDROID)
endif() endif()
if(UNIX OR CYGWIN) if(UNIX OR CYGWIN)
check_include_files(sys/eventfd.h HAVE_EVENTFD_H)
set(X11_FEATURE_TYPE "RECOMMENDED") set(X11_FEATURE_TYPE "RECOMMENDED")
else() else()
set(X11_FEATURE_TYPE "DISABLED") set(X11_FEATURE_TYPE "DISABLED")

2
config.h.in
View File

@ -28,7 +28,7 @@
#cmakedefine HAVE_SYS_MODEM_H #cmakedefine HAVE_SYS_MODEM_H
#cmakedefine HAVE_SYS_FILIO_H #cmakedefine HAVE_SYS_FILIO_H
#cmakedefine HAVE_SYS_STRTIO_H #cmakedefine HAVE_SYS_STRTIO_H
#cmakedefine HAVE_EVENTFD_H
#cmakedefine HAVE_TM_GMTOFF #cmakedefine HAVE_TM_GMTOFF

39
winpr/libwinpr/synch/event.c
View File

@ -35,6 +35,12 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#ifdef HAVE_EVENTFD_H
#include <sys/eventfd.h>
#include <errno.h>
#endif
CRITICAL_SECTION cs = { NULL, 0, 0, NULL, NULL, 0 }; CRITICAL_SECTION cs = { NULL, 0, 0, NULL, NULL, 0 };
HANDLE CreateEventW(LPSECURITY_ATTRIBUTES lpEventAttributes, BOOL bManualReset, BOOL bInitialState, LPCWSTR lpName) HANDLE CreateEventW(LPSECURITY_ATTRIBUTES lpEventAttributes, BOOL bManualReset, BOOL bInitialState, LPCWSTR lpName)
@ -57,11 +63,20 @@ HANDLE CreateEventW(LPSECURITY_ATTRIBUTES lpEventAttributes, BOOL bManualReset,
event->pipe_fd[0] = -1; event->pipe_fd[0] = -1;
event->pipe_fd[1] = -1; event->pipe_fd[1] = -1;
#ifdef HAVE_EVENTFD_H
event->pipe_fd[0] = eventfd(0, EFD_NONBLOCK);
if (event->pipe_fd[0] < 0)
{
printf("CreateEventW: failed to create event\n");
return NULL;
}
#else
if (pipe(event->pipe_fd) < 0) if (pipe(event->pipe_fd) < 0)
{ {
printf("CreateEventW: failed to create event\n"); printf("CreateEventW: failed to create event\n");
return NULL; return NULL;
} }
#endif
handle = winpr_Handle_Insert(HANDLE_TYPE_EVENT, event); handle = winpr_Handle_Insert(HANDLE_TYPE_EVENT, event);
} }
@ -113,7 +128,16 @@ BOOL SetEvent(HANDLE hEvent)
{ {
event = (WINPR_EVENT*) Object; event = (WINPR_EVENT*) Object;
if (!(WaitForSingleObject(hEvent, 0) == WAIT_OBJECT_0)) #ifdef HAVE_EVENTFD_H
eventfd_t val = 1;
do
{
length = eventfd_write(event->pipe_fd[0], val);
}
while(length < 0 && errno == EINTR);
status = (length == 0) ? TRUE : FALSE;
#else
if (WaitForSingleObject(hEvent, 0) != WAIT_OBJECT_0)
{ {
length = write(event->pipe_fd[1], "-", 1); length = write(event->pipe_fd[1], "-", 1);
@ -124,6 +148,7 @@ BOOL SetEvent(HANDLE hEvent)
{ {
status = TRUE; status = TRUE;
} }
#endif
} }
LeaveCriticalSection(&cs); LeaveCriticalSection(&cs);
@ -149,13 +174,23 @@ BOOL ResetEvent(HANDLE hEvent)
while (WaitForSingleObject(hEvent, 0) == WAIT_OBJECT_0) while (WaitForSingleObject(hEvent, 0) == WAIT_OBJECT_0)
{ {
length = read(event->pipe_fd[0], &length, 1); #ifdef HAVE_EVENTFD_H
eventfd_t value;
do
{
length = eventfd_read(event->pipe_fd[0], &value);
}
while(length < 0 && errno == EINTR);
status = (length > 0) ? TRUE : FALSE;
#else
length = read(event->pipe_fd[0], &length, 1);
if (length == 1) if (length == 1)
status = TRUE; status = TRUE;
if (length != 1) if (length != 1)
break; break;
#endif
} }
} }