X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=src%2FIOEngine_select.c;h=aff5fb920f264e47caa8ce9a86772cb7fcf0a6dd;hp=74e8431dfccca8a75041483d3fc5808d0a585911;hb=f83bd22fe2dcb3ca0ddb9321944ee0b9c9b61ea6;hpb=59659c9123e0b56c34f5fa9281566f574365deb5
diff --git a/src/IOEngine_select.c b/src/IOEngine_select.c
index 74e8431..aff5fb9 100644
--- a/src/IOEngine_select.c
+++ b/src/IOEngine_select.c
@@ -15,18 +15,21 @@
* along with this program. If not, see .
*/
#include "IOEngine.h"
+#include
+#include
#ifdef WIN32
#define _WIN32_WINNT 0x501
#include
#include
#else
-#include
#include
#include
#endif
+static int engine_select_timer_delay_fix;
+
static int engine_select_init() {
- /* empty */
+ engine_select_timer_delay_fix = 0;
return 1;
}
@@ -53,6 +56,7 @@ static void engine_select_loop(struct timeval *timeout) {
struct IODescriptor *iofd, *tmp_iofd;
struct timeval now, tdiff;
int select_result;
+ int timer_fix;
gettimeofday(&now, NULL);
@@ -60,6 +64,7 @@ static void engine_select_loop(struct timeval *timeout) {
FD_ZERO(&read_fds);
FD_ZERO(&write_fds);
+ select_result = 0;
for(iofd = first_descriptor; iofd; iofd = tmp_iofd) {
tmp_iofd = iofd->next;
if(iofd->type == IOTYPE_STDIN) {
@@ -96,12 +101,16 @@ static void engine_select_loop(struct timeval *timeout) {
if(iofd->fd > fds_size)
fds_size = iofd->fd;
FD_SET(iofd->fd, &read_fds);
+ select_result++;
#endif
}
else if(iofd->type == IOTYPE_SERVER || iofd->type == IOTYPE_CLIENT) {
+ if(iofd->state == IO_CLOSED)
+ continue;
if(iofd->fd > fds_size)
fds_size = iofd->fd;
FD_SET(iofd->fd, &read_fds);
+ select_result++;
if(iohandler_wants_writes(iofd))
FD_SET(iofd->fd, &write_fds);
}
@@ -111,8 +120,14 @@ static void engine_select_loop(struct timeval *timeout) {
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
+ 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;
} else if(tdiff.tv_usec < 0) {
tdiff.tv_sec--;
@@ -120,13 +135,28 @@ static void engine_select_loop(struct timeval *timeout) {
}
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) {
@@ -152,9 +182,20 @@ static void engine_select_loop(struct timeval *timeout) {
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;