Nearly tickless tinc.

Use pselect instead of select in main_loop (if available). This lets
tincd sleeps as long as there is nothing to do.

diff --git a/configure.in b/configure.in
index 8836ca2..45db547 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -130,7 +130,7 @@ dnl Checks for library functions.
 AC_FUNC_MEMCMP
 AC_FUNC_ALLOCA
 AC_TYPE_SIGNAL
 AC_FUNC_MEMCMP
 AC_FUNC_ALLOCA
 AC_TYPE_SIGNAL

-AC_CHECK_FUNCS([asprintf daemon fchmod flock ftime fork get_current_dir_name gettimeofday mlockall putenv random select strdup strerror strsignal strtol system unsetenv usleep vsyslog writev],
+AC_CHECK_FUNCS([asprintf daemon fchmod flock ftime fork get_current_dir_name gettimeofday mlockall pselect putenv random select strdup strerror strsignal strtol system unsetenv usleep vsyslog writev],

   [], [], [#include "have.h"]
 )
 AC_FUNC_MALLOC
   [], [], [#include "have.h"]
 )
 AC_FUNC_MALLOC

diff --git a/src/event.c b/src/event.c
index e03b04d..89ee022 100644 (file)
--- a/src/event.c
+++ b/src/event.c
@@ -62,10 +62,10 @@ void expire_events(void) {
                return;
 
        event = event_tree->tail->data;
                return;
 
        event = event_tree->tail->data;

-       if(event->time < now)
+       if(event->time <= now)

                return;
 
                return;
 

-       diff = 1 + event->time - now;
+       diff = event->time - now;

        
        for(node = event_tree->head; node; node = node->next) {
                event = node->data;
        
        for(node = event_tree->head; node; node = node->next) {
                event = node->data;


@@ -96,7 +96,7 @@ event_t *get_expired_event(void) {
        if(event_tree->head) {
                event = event_tree->head->data;
 
        if(event_tree->head) {
                event = event_tree->head->data;
 

-               if(event->time < now) {
+               if(event->time <= now) {

                        avl_node_t *node = event_tree->head;
                        avl_unlink_node(event_tree, node);
                        free(node);
                        avl_node_t *node = event_tree->head;
                        avl_unlink_node(event_tree, node);
                        free(node);


@@ -106,3 +106,9 @@ event_t *get_expired_event(void) {
 
        return NULL;
 }
 
        return NULL;
 }

+
+event_t *peek_next_event(void) {
+       if (event_tree->head)
+               return event_tree->head->data;
+       return NULL;
+}

diff --git a/src/event.h b/src/event.h
index da2e741..38a4eb4 100644 (file)
--- a/src/event.h
+++ b/src/event.h
@@ -42,5 +42,6 @@ extern void free_event(event_t *);
 extern void event_add(event_t *);
 extern void event_del(event_t *);
 extern event_t *get_expired_event(void);
 extern void event_add(event_t *);
 extern void event_del(event_t *);
 extern event_t *get_expired_event(void);

+extern event_t *peek_next_event(void);

 
 #endif                                                 /* __TINC_EVENT_H__ */
 
 #endif                                                 /* __TINC_EVENT_H__ */

diff --git a/src/net.c b/src/net.c
index 3508dd7..6700a29 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -42,6 +42,9 @@
 
 bool do_purge = false;
 volatile bool running = false;
 
 bool do_purge = false;
 volatile bool running = false;

+#ifdef HAVE_PSELECT
+bool graph_dump = false;
+#endif

 
 time_t now = 0;
 int contradicting_add_edge = 0;
 
 time_t now = 0;
 int contradicting_add_edge = 0;


@@ -229,14 +232,14 @@ static void check_dead_connections(void) {
                next = node->next;
                c = node->data;
 
                next = node->next;
                c = node->data;
 

-               if(c->last_ping_time + pingtimeout < now) {
+               if(c->last_ping_time + pingtimeout <= now) {

                        if(c->status.active) {
                                if(c->status.pinged) {
                                        ifdebug(CONNECTIONS) logger(LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds",
                                                           c->name, c->hostname, now - c->last_ping_time);
                                        c->status.timeout = true;
                                        terminate_connection(c, true);
                        if(c->status.active) {
                                if(c->status.pinged) {
                                        ifdebug(CONNECTIONS) logger(LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds",
                                                           c->name, c->hostname, now - c->last_ping_time);
                                        c->status.timeout = true;
                                        terminate_connection(c, true);

-                               } else if(c->last_ping_time + pinginterval < now) {
+                               } else if(c->last_ping_time + pinginterval <= now) {

                                        send_ping(c);
                                }
                        } else {
                                        send_ping(c);
                                }
                        } else {


@@ -258,7 +261,7 @@ static void check_dead_connections(void) {
                        }
                }
 
                        }
                }
 

-               if(c->outbuflen > 0 && c->last_flushed_time + pingtimeout < now) {
+               if(c->outbuflen > 0 && c->last_flushed_time + pingtimeout <= now) {

                        if(c->status.active) {
                                ifdebug(CONNECTIONS) logger(LOG_INFO,
                                                "%s (%s) could not flush for %ld seconds (%d bytes remaining)",
                        if(c->status.active) {
                                ifdebug(CONNECTIONS) logger(LOG_INFO,
                                                "%s (%s) could not flush for %ld seconds (%d bytes remaining)",


@@ -350,7 +353,13 @@ static void check_network_activity(fd_set * readset, fd_set * writeset) {
 */
 int main_loop(void) {
        fd_set readset, writeset;
 */
 int main_loop(void) {
        fd_set readset, writeset;

+#ifdef HAVE_PSELECT
+       struct timespec tv;
+       sigset_t omask, block_mask;
+       time_t next_event;
+#else

        struct timeval tv;
        struct timeval tv;

+#endif

        int r, maxfd;
        time_t last_ping_check, last_config_check, last_graph_dump;
        event_t *event;
        int r, maxfd;
        time_t last_ping_check, last_config_check, last_graph_dump;
        event_t *event;


@@ -361,21 +370,48 @@ int main_loop(void) {
        
        srand(now);
 
        
        srand(now);
 

+#ifdef HAVE_PSELECT
+       if(lookup_config(config_tree, "GraphDumpFile"))
+               graph_dump = true;
+       /* Block SIGHUP & SIGALRM */
+       sigemptyset(&block_mask);
+       sigaddset(&block_mask, SIGHUP);
+       sigaddset(&block_mask, SIGALRM);
+       sigprocmask(SIG_BLOCK, &block_mask, &omask);
+#endif
+

        running = true;
 
        while(running) {
        running = true;
 
        while(running) {

-               now = time(NULL);
-
-       //      tv.tv_sec = 1 + (rand() & 7);   /* Approx. 5 seconds, randomized to prevent global synchronisation effects */
+#ifdef HAVE_PSELECT
+               next_event = last_ping_check + pingtimeout;
+               if(graph_dump && next_event > last_graph_dump + 60)
+                       next_event = last_graph_dump + 60;
+
+               if((event = peek_next_event()) && next_event > event->time)
+                       next_event = event->time;
+
+               if(next_event <= now)
+                       tv.tv_sec = 0;
+               else
+                       tv.tv_sec = next_event - now;
+               tv.tv_nsec = 0;
+#else

                tv.tv_sec = 1;
                tv.tv_usec = 0;
                tv.tv_sec = 1;
                tv.tv_usec = 0;

+#endif

 
                maxfd = build_fdset(&readset, &writeset);
 
 #ifdef HAVE_MINGW
                LeaveCriticalSection(&mutex);
 #endif
 
                maxfd = build_fdset(&readset, &writeset);
 
 #ifdef HAVE_MINGW
                LeaveCriticalSection(&mutex);
 #endif

+#ifdef HAVE_PSELECT
+               r = pselect(maxfd + 1, &readset, &writeset, NULL, &tv, &omask);
+#else

                r = select(maxfd + 1, &readset, &writeset, NULL, &tv);
                r = select(maxfd + 1, &readset, &writeset, NULL, &tv);

+#endif
+               now = time(NULL);

 #ifdef HAVE_MINGW
                EnterCriticalSection(&mutex);
 #endif
 #ifdef HAVE_MINGW
                EnterCriticalSection(&mutex);
 #endif


@@ -398,7 +434,7 @@ int main_loop(void) {
 
                /* Let's check if everybody is still alive */
 
 
                /* Let's check if everybody is still alive */
 

-               if(last_ping_check + pingtimeout < now) {
+               if(last_ping_check + pingtimeout <= now) {

                        check_dead_connections();
                        last_ping_check = now;
 
                        check_dead_connections();
                        last_ping_check = now;
 


@@ -409,7 +445,7 @@ int main_loop(void) {
 
                        /* Should we regenerate our key? */
 
 
                        /* Should we regenerate our key? */
 

-                       if(keyexpires < now) {
+                       if(keyexpires <= now) {

                                avl_node_t *node;
                                node_t *n;
 
                                avl_node_t *node;
                                node_t *n;
 


@@ -550,11 +586,16 @@ int main_loop(void) {
                
                /* Dump graph if wanted every 60 seconds*/
 
                
                /* Dump graph if wanted every 60 seconds*/
 

-               if(last_graph_dump + 60 < now) {
+               if(last_graph_dump + 60 <= now) {

                        dump_graph();
                        last_graph_dump = now;
                }
        }
 
                        dump_graph();
                        last_graph_dump = now;
                }
        }
 

+#ifdef HAVE_PSELECT
+       /* Restore SIGHUP & SIGALARM mask */
+       sigprocmask(SIG_SETMASK, &omask, NULL);
+#endif
+

        return 0;
 }
        return 0;
 }

diff --git a/src/net_packet.c b/src/net_packet.c
index f2bcc3e..fe20a25 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -403,7 +403,7 @@ static void send_udppacket(node_t *n, vpn_packet_t *origpkt) {
                                   "No valid key known yet for %s (%s), forwarding via TCP",
                                   n->name, n->hostname);
 
                                   "No valid key known yet for %s (%s), forwarding via TCP",
                                   n->name, n->hostname);
 

-               if(n->last_req_key + 10 < now) {
+               if(n->last_req_key + 10 <= now) {

                        send_req_key(n);
                        n->last_req_key = now;
                }
                        send_req_key(n);
                        n->last_req_key = now;
                }

diff --git a/src/protocol.c b/src/protocol.c
index 5de30d7..aec00ee 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -214,7 +214,7 @@ void age_past_requests(void) {
                next = node->next;
                p = node->data;
 
                next = node->next;
                p = node->data;
 

-               if(p->firstseen + pinginterval < now)
+               if(p->firstseen + pinginterval <= now)

                        avl_delete_node(past_request_tree, node), deleted++;
                else
                        left++;
                        avl_delete_node(past_request_tree, node), deleted++;
                else
                        left++;

diff --git a/src/route.c b/src/route.c
index 1caf738..e3bcf3b 100644 (file)
--- a/src/route.c
+++ b/src/route.c
@@ -220,7 +220,7 @@ void age_subnets(void) {
        for(node = myself->subnet_tree->head; node; node = next) {
                next = node->next;
                s = node->data;
        for(node = myself->subnet_tree->head; node; node = next) {
                next = node->next;
                s = node->data;

-               if(s->expires && s->expires < now) {
+               if(s->expires && s->expires <= now) {

                        ifdebug(TRAFFIC) {
                                char netstr[MAXNETSTR];
                                if(net2str(netstr, sizeof netstr, s))
                        ifdebug(TRAFFIC) {
                                char netstr[MAXNETSTR];
                                if(net2str(netstr, sizeof netstr, s))