stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

tvhpoll: added support (epoll) for auto-modifying poll entries

Browse source
This commit is contained in:
Adam Sutton 2013-11-23 21:36:20 +00:00
parent ec4d5f7675
commit fe5f076ddd
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/tvhpoll.c
View file

@ -101,8 +101,8 @@ void tvhpoll_destroy ( tvhpoll_t *tp )
int tvhpoll_add
( tvhpoll_t *tp, tvhpoll_event_t *evs, size_t num )
{
int i, rc;
#if ENABLE_EPOLL
int i;
struct epoll_event ev;
for (i = 0; i < num; i++) {
memset(&ev, 0, sizeof(ev));
@ -112,13 +112,14 @@ int tvhpoll_add
if (evs[i].events & TVHPOLL_PRI) ev.events |= EPOLLPRI;
if (evs[i].events & TVHPOLL_ERR) ev.events |= EPOLLERR;
if (evs[i].events & TVHPOLL_HUP) ev.events |= EPOLLHUP;
if (epoll_ctl(tp->fd, EPOLL_CTL_ADD, evs[i].fd, &ev) != 0)
return -1;
rc = epoll_ctl(tp->fd, EPOLL_CTL_ADD, evs[i].fd, &ev);
if (rc && errno == EEXIST) {
if (epoll_ctl(tp->fd, EPOLL_CTL_MOD, evs[i].fd, &ev))
return -1;
}
}
return 0;
#elif ENABLE_KQUEUE
int i;
int rc;
tvhpoll_alloc(tp, num);
for (i = 0; i < num; i++) {
if (evs[i].events & TVHPOLL_OUT){
@ -149,7 +150,6 @@ int tvhpoll_add
int tvhpoll_rem
( tvhpoll_t *tp, tvhpoll_event_t *evs, size_t num )
{
tvhpoll_alloc(tp, num);
#if ENABLE_EPOLL
int i;
for (i = 0; i < num; i++)

1
src/tvhpoll.h
View file

@ -21,6 +21,7 @@
#ifndef __TVHPOLL_H__
#define __TVHPOLL_H__
#include <stdint.h>
#include <sys/types.h>
typedef struct tvhpoll tvhpoll_t;