*/
#include "IOEngine.h"
#include <errno.h>
+#include <time.h>
#ifdef WIN32
#define _WIN32_WINNT 0x501
#include <windows.h>
#include <stdio.h>
#endif
+static int engine_select_timer_delay_fix;
+
static int engine_select_init() {
- /* empty */
+ engine_select_timer_delay_fix = 0;
return 1;
}
-static void engine_select_add(struct IODescriptor *iofd) {
+static void engine_select_add(struct IOLowlevelDescriptor *iold) {
#ifdef WIN32
- if(iofd->type == IOTYPE_STDIN)
- SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE),ENABLE_LINE_INPUT|ENABLE_ECHO_INPUT);
+ struct IODescriptor *iofd;
+ if((iofd = IOLOWLEVEL_GET_IOFD(iold))) {
+ if(iofd->type == IOTYPE_STDIN)
+ SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE),ENABLE_LINE_INPUT|ENABLE_ECHO_INPUT);
+ }
#endif
/* empty */
}
fd_set read_fds;
fd_set write_fds;
unsigned int fds_size = 0;
- struct IODescriptor *iofd, *tmp_iofd;
+ struct IOLowlevelDescriptor *iold, *tmp_iold;
+ struct IODescriptor *iofd;
struct timeval now, tdiff;
int select_result;
+ int timer_fix;
gettimeofday(&now, NULL);
FD_ZERO(&read_fds);
FD_ZERO(&write_fds);
- for(iofd = first_descriptor; iofd; iofd = tmp_iofd) {
- tmp_iofd = iofd->next;
- if(iofd->type == IOTYPE_STDIN) {
+ select_result = 0;
+ for(iold = first_descriptor; iold; iold = tmp_iold) {
+ tmp_iold = iold->next;
+ iofd = IOLOWLEVEL_GET_IOFD(iold);
+ if(iofd && iofd->type == IOTYPE_STDIN) {
#ifdef WIN32
//WIN32 doesn't support stdin within select
//just try to read the single events from the console
timeout->tv_usec = 100000;
}
#else
- if(iofd->fd > fds_size)
- fds_size = iofd->fd;
- FD_SET(iofd->fd, &read_fds);
+ if(iold->fd > fds_size)
+ fds_size = iold->fd;
+ FD_SET(iold->fd, &read_fds);
+ select_result++;
#endif
}
- else if(iofd->type == IOTYPE_SERVER || iofd->type == IOTYPE_CLIENT) {
- if(iofd->state == IO_CLOSED)
+ else if(iold->fd >= 0) {
+ if(iofd && iofd->state == IO_CLOSED)
continue;
- if(iofd->fd > fds_size)
- fds_size = iofd->fd;
- FD_SET(iofd->fd, &read_fds);
- if(iohandler_wants_writes(iofd))
+ if(iold->fd > fds_size)
+ fds_size = iold->fd;
+ select_result++;
+ if(iold->flags & IOFLAGS_WANT_READ)
+ FD_SET(iold->fd, &read_fds);
+ if(iold->flags & IOFLAGS_WANT_WRITE)
FD_SET(iofd->fd, &write_fds);
}
}
tdiff.tv_sec = timer_priority->timeout.tv_sec - now.tv_sec;
tdiff.tv_usec = timer_priority->timeout.tv_usec - now.tv_usec;
if(tdiff.tv_sec < 0 || (tdiff.tv_sec == 0 && tdiff.tv_usec <= 0)) {
- iohandler_events(timer_priority, 0, 0);
- iohandler_close(timer_priority); //also sets timer_priority to the next timed element
+ iofd = IOLOWLEVEL_GET_IOFD(iold);
+ if(iofd && iofd->constant_timeout) {
+ tdiff.tv_sec = 0;
+ iohandler_set_timeout(iofd, &tdiff);
+ if(iofd)
+ iohandler_events(timer_priority, 0, 0);
+ else
+ timer_priority->data.callback(timer_priority, 0, 0);
+ } else {
+ iohandler_events(timer_priority, 0, 0);
+ iohandler_close(timer_priority); //also sets timer_priority to the next timed element
+ }
continue;
} else if(tdiff.tv_usec < 0) {
tdiff.tv_sec--;
}
if(timeval_is_smaler((&tdiff), timeout)) {
timeout->tv_sec = tdiff.tv_sec;
- timeout->tv_usec = tdiff.tv_usec;
+ timeout->tv_usec = tdiff.tv_usec + engine_select_timer_delay_fix;
+ if(timeout->tv_usec < 0) {
+ timeout->tv_sec--;
+ timeout->tv_usec += 1000000;
+ }
}
break;
}
- //select system call
- select_result = select(fds_size + 1, &read_fds, &write_fds, NULL, timeout);
+ if(select_result) {
+ //select system call
+ select_result = select(fds_size + 1, &read_fds, &write_fds, NULL, timeout);
+ } else {
+ #ifdef WIN32
+ Sleep((timeout->tv_sec * 1000) + (timeout->tv_usec / 1000) + 1);
+ #else
+ struct timespec usleep_time;
+ usleep_time.tv_sec = timeout->tv_sec;
+ usleep_time.tv_nsec = timeout->tv_usec * 1000;
+ nanosleep(&usleep_time, NULL);
+ #endif
+ }
if (select_result < 0) {
if (errno != EINTR) {
gettimeofday(&now, NULL);
//check all descriptors
- for(iofd = first_descriptor; iofd; iofd = tmp_iofd) {
- tmp_iofd = iofd->next;
- if(iofd->type == IOTYPE_SERVER || iofd->type == IOTYPE_CLIENT || iofd->type == IOTYPE_STDIN) {
- if(FD_ISSET(iofd->fd, &read_fds) || FD_ISSET(iofd->fd, &write_fds)) {
- iohandler_events(iofd, FD_ISSET(iofd->fd, &read_fds), FD_ISSET(iofd->fd, &write_fds));
+ for(iold = first_descriptor; iold; iold = tmp_iold) {
+ tmp_iold = iold->next;
+ iofd = IOLOWLEVEL_GET_IOFD(iold);
+ if((iofd && iofd->type == IOTYPE_STDIN) || iold->fd >= 0) {
+ if(FD_ISSET(iold->fd, &read_fds) || FD_ISSET(iold->fd, &write_fds)) {
+ if(iofd)
+ iohandler_events(iofd, FD_ISSET(iofd->fd, &read_fds), FD_ISSET(iofd->fd, &write_fds));
+ else
+ iold->data.callback(iold, FD_ISSET(iofd->fd, &read_fds), FD_ISSET(iofd->fd, &write_fds));
continue;
}
}
while(timer_priority) {
tdiff.tv_sec = timer_priority->timeout.tv_sec - now.tv_sec;
tdiff.tv_usec = timer_priority->timeout.tv_usec - now.tv_usec;
- if(tdiff.tv_sec < 0 || (tdiff.tv_sec == 0 && tdiff.tv_usec <= 0)) {
- iohandler_events(timer_priority, 0, 0);
- iohandler_close(timer_priority); //also sets timer_priority to the next timed element
+ timer_fix = (tdiff.tv_sec * 1000000) + tdiff.tv_usec;
+ if(timer_fix <= 100) {
+ if(timer_fix + 100 < engine_select_timer_delay_fix || timer_fix - 100 > engine_select_timer_delay_fix) {
+ engine_select_timer_delay_fix = ((engine_select_timer_delay_fix * 19) + timer_fix) / 20;
+ iohandler_log(IOLOG_DEBUG, "timer delay fix set to: %d us", engine_select_timer_delay_fix);
+ }
+ if(timer_priority->constant_timeout) {
+ tdiff.tv_sec = 0;
+ iohandler_set_timeout(timer_priority, &tdiff);
+ iohandler_events(timer_priority, 0, 0);
+ } else {
+ iohandler_events(timer_priority, 0, 0);
+ iohandler_close(timer_priority); //also sets timer_priority to the next timed element
+ }
continue;
}
break;
projects / IOMultiplexer.git / blobdiff