X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2FIOEngine_epoll.c;h=e115c003b155da6206d8aa4dbdbc287d654a8754;hb=refs%2Fheads%2FAsyncDNS;hp=d1c139f6970f734a4fdb65ef2b9d5dde12e50e30;hpb=5ad65e65d2234b02151ea7ca17e3fa9893a9b165;p=IOMultiplexer.git

diff --git a/src/IOEngine_epoll.c b/src/IOEngine_epoll.c
index d1c139f..e115c00 100644
--- a/src/IOEngine_epoll.c
+++ b/src/IOEngine_epoll.c
@@ -33,40 +33,44 @@ static int engine_epoll_init() {
     return 1;
 }
 
-static void engine_epoll_add(struct IODescriptor *iofd) {
-    if(iofd->type == IOTYPE_TIMER) return;
+static void engine_epoll_add(struct IOLowlevelDescriptor *iold) {
+    if(iold->fd != -1) return;
     //add descriptor to the epoll queue
     struct epoll_event evt;
     int res;
 
-    evt.events = EPOLLHUP | EPOLLIN | (iohandler_wants_writes(iofd) ? EPOLLOUT : 0);
-    evt.data.ptr = iofd;
-    res = epoll_ctl(epoll_fd, EPOLL_CTL_ADD, iofd->fd, &evt);
+    evt.events = EPOLLHUP | ((iold->flags & IOFLAGS_WANT_READ) ? EPOLLIN : 0) | ((iold->flags & IOFLAGS_WANT_WRITE) ? EPOLLOUT : 0);
+    evt.data.ptr = iold;
+    res = epoll_ctl(epoll_fd, EPOLL_CTL_ADD, iold->fd, &evt);
     if(res < 0) {
-        iohandler_log(IOLOG_ERROR, "could not add IODescriptor %d to epoll queue. (returned: %d)", iofd->fd, res);
+        iohandler_log(IOLOG_ERROR, "could not add IOLowlevelDescriptor %d to epoll queue. (returned: %d)", iold->fd, res);
     }
 }
 
-static void engine_epoll_remove(struct IODescriptor *iofd) {
-    if(iofd->type == IOTYPE_TIMER) return;
+static void engine_epoll_remove(struct IOLowlevelDescriptor *iold) {
+    if(iold->fd != -1) return;
     struct epoll_event evt;
-    epoll_ctl(epoll_fd, EPOLL_CTL_DEL, iofd->fd, &evt);
+    epoll_ctl(epoll_fd, EPOLL_CTL_DEL, iold->fd, &evt);
 }
 
-static void engine_epoll_update(struct IODescriptor *iofd) {
-    if(iofd->type == IOTYPE_TIMER) return;
-    if(iofd->state == IO_CLOSED) {
-        engine_epoll_remove(iofd);
-        return;
+static void engine_epoll_update(struct IOLowlevelDescriptor *iold) {
+    if(iold->fd != -1) return;
+    struct IODescriptor *iofd;
+    if((iofd = IOLOWLEVEL_GET_IOFD(iold))) {
+        if(iofd->state == IO_CLOSED) {
+            engine_epoll_remove(iold);
+            return;
+        }
     }
+    
     struct epoll_event evt;
     int res;
 
-    evt.events = EPOLLHUP | EPOLLIN | (iohandler_wants_writes(iofd) ? EPOLLOUT : 0);
-    evt.data.ptr = iofd;
-    res = epoll_ctl(epoll_fd, EPOLL_CTL_MOD, iofd->fd, &evt);
+    evt.events = EPOLLHUP | ((iold->flags & IOFLAGS_WANT_READ) ? EPOLLIN : 0) | ((iold->flags & IOFLAGS_WANT_WRITE) ? EPOLLOUT : 0);
+    evt.data.ptr = iold;
+    res = epoll_ctl(epoll_fd, EPOLL_CTL_MOD, iold->fd, &evt);
     if(res < 0) {
-        iohandler_log(IOLOG_ERROR, "could not update IODescriptor %d in epoll queue. (returned: %d)", iofd->fd, res);
+        iohandler_log(IOLOG_ERROR, "could not update IOLowlevelDescriptor %d in epoll queue. (returned: %d)", iold->fd, res);
     }
 }
 
@@ -76,6 +80,7 @@ static void engine_epoll_loop(struct timeval *timeout) {
     int msec;
     int events;
     int epoll_result;
+    struct IOLowlevelDescriptor *iold;
     
     gettimeofday(&now, NULL);
     
@@ -117,7 +122,11 @@ static void engine_epoll_loop(struct timeval *timeout) {
         int i;
         for(i = 0; i < epoll_result; i++) {
             events = evts[i].events;
-            iohandler_events(evts[i].data.ptr, (events & (EPOLLIN | EPOLLHUP)), (events & EPOLLOUT));
+            iold = evts[i].data.ptr;
+            if(iold->flags & IOFLAGS_HAVE_IOFD)
+                iohandler_events(iold->data.iofd, (events & (EPOLLIN | EPOLLHUP)), (events & EPOLLOUT));
+            else
+                iold->data.callback(iold, (events & (EPOLLIN | EPOLLHUP)), (events & EPOLLOUT));
         }
     }