61 files changed, 44 insertions, 48 deletions

diff --git a/src/common/LICENSE.txt b/src/common/LICENSE.txt
index 15e3bef..15e3bef 100644..100755
--- a/src/common/LICENSE.txt
+++ b/src/common/LICENSE.txt
diff --git a/src/common/acl.c b/src/common/acl.c
index c8e0488..c8e0488 100644..100755
--- a/src/common/acl.c
+++ b/src/common/acl.c
diff --git a/src/common/acl.h b/src/common/acl.h
index 7ce8f26..7ce8f26 100644..100755
--- a/src/common/acl.h
+++ b/src/common/acl.h
diff --git a/src/common/base32.c b/src/common/base32.c
index 43b86c1..43b86c1 100644..100755
--- a/src/common/base32.c
+++ b/src/common/base32.c
diff --git a/src/common/base32.h b/src/common/base32.h
index 45df9fa..45df9fa 100644..100755
--- a/src/common/base32.h
+++ b/src/common/base32.h
diff --git a/src/common/base32hex.c b/src/common/base32hex.c
index cd2d2ce..cd2d2ce 100644..100755
--- a/src/common/base32hex.c
+++ b/src/common/base32hex.c
diff --git a/src/common/base32hex.h b/src/common/base32hex.h
index 9ac4fa8..9ac4fa8 100644..100755
--- a/src/common/base32hex.h
+++ b/src/common/base32hex.h
diff --git a/src/common/base64.c b/src/common/base64.c
index f1f601c..f1f601c 100644..100755
--- a/src/common/base64.c
+++ b/src/common/base64.c
diff --git a/src/common/base64.h b/src/common/base64.h
index aa0b696..aa0b696 100644..100755
--- a/src/common/base64.h
+++ b/src/common/base64.h
diff --git a/src/common/crc.h b/src/common/crc.h
index 7d748be..7d748be 100644..100755
--- a/src/common/crc.h
+++ b/src/common/crc.h
diff --git a/src/common/dSFMT-params.h b/src/common/dSFMT-params.h
index c779d8a..c779d8a 100644..100755
--- a/src/common/dSFMT-params.h
+++ b/src/common/dSFMT-params.h
diff --git a/src/common/dSFMT-params521.h b/src/common/dSFMT-params521.h
index f771dc1..f771dc1 100644..100755
--- a/src/common/dSFMT-params521.h
+++ b/src/common/dSFMT-params521.h
diff --git a/src/common/dSFMT.c b/src/common/dSFMT.c
index 090bb80..090bb80 100644..100755
--- a/src/common/dSFMT.c
+++ b/src/common/dSFMT.c
diff --git a/src/common/dSFMT.h b/src/common/dSFMT.h
index f1aa9bd..f1aa9bd 100644..100755
--- a/src/common/dSFMT.h
+++ b/src/common/dSFMT.h
diff --git a/src/common/errcode.c b/src/common/errcode.c
index 9f5aff3..9f5aff3 100644..100755
--- a/src/common/errcode.c
+++ b/src/common/errcode.c
diff --git a/src/common/errcode.h b/src/common/errcode.h
index 50535ad..50535ad 100644..100755
--- a/src/common/errcode.h
+++ b/src/common/errcode.h
diff --git a/src/common/errors.c b/src/common/errors.c
index 11aff95..11aff95 100644..100755
--- a/src/common/errors.c
+++ b/src/common/errors.c
diff --git a/src/common/errors.h b/src/common/errors.h
index a2773ac..a2773ac 100644..100755
--- a/src/common/errors.h
+++ b/src/common/errors.h
diff --git a/src/common/evqueue.c b/src/common/evqueue.c
index 240ced6..240ced6 100644..100755
--- a/src/common/evqueue.c
+++ b/src/common/evqueue.c
diff --git a/src/common/evqueue.h b/src/common/evqueue.h
index ffb3860..ffb3860 100644..100755
--- a/src/common/evqueue.h
+++ b/src/common/evqueue.h
diff --git a/src/common/evsched.c b/src/common/evsched.c
index 8b6f721..9bfdef0 100644..100755
--- a/src/common/evsched.c
+++ b/src/common/evsched.c
@@ -26,15 +26,18 @@
 #define OPENBSD_SLAB_BROKEN
 #endif
 
-/* Heap only cares about x<y. */
-static int compare_event_heap_nodes(event_t **e1, event_t **e2)
+/*! \brief Some implementations of timercmp >= are broken, this is for compat.*/
+static inline int timercmp_ge(struct timeval *a, struct timeval *b) {
+	return timercmp(a, b, >) || timercmp(a, b, ==);
+}
+
+static int compare_event_heap_nodes(event_t *e1, event_t *e2)
 {
-	if (timercmp(&(*e1)->tv, &(*e2)->tv, <)) return -1;
-	if (timercmp(&(*e1)->tv, &(*e2)->tv, >)) return 1;
+	if (timercmp(&e1->tv, &e2->tv, <)) return -1;
+	if (timercmp(&e1->tv, &e2->tv, >)) return 1;
 	return 0;
 }
 
-
 /*!
  * \brief Set event timer to T (now) + dt miliseconds.
  */
@@ -78,7 +81,7 @@ evsched_t *evsched_new()
 #ifndef OPENBSD_SLAB_BROKEN
 	slab_cache_init(&s->cache.alloc, sizeof(event_t));
 #endif
-	heap_init(&s->heap, sizeof(event_t *), compare_event_heap_nodes, 0, NULL);
+	heap_init(&s->heap, compare_event_heap_nodes, 0);
 	return s;
 }
 
@@ -179,7 +182,7 @@ event_t* evsched_next(evsched_t *s)
 			event_t *next_ev = *((event_t**)HHEAD(&s->heap));
 
 			/* Immediately return. */
-			if (timercmp(&dt, &next_ev->tv, >=)) {
+			if (timercmp_ge(&dt, &next_ev->tv)) {
 				s->current = next_ev;
 				heap_delmin(&s->heap);
 				pthread_mutex_unlock(&s->mx);
@@ -235,10 +238,10 @@ int evsched_schedule(evsched_t *s, event_t *ev, uint32_t dt)
 	/* Lock calendar. */
 	pthread_mutex_lock(&s->mx);
 	
-	heap_insert(&s->heap, &ev);
+	heap_insert(&s->heap, ev);
 
 	/* Unlock calendar. */
-	pthread_cond_signal(&s->notify);
+	pthread_cond_broadcast(&s->notify);
 	pthread_mutex_unlock(&s->mx);
 
 	return 0;
@@ -302,12 +305,12 @@ int evsched_cancel(evsched_t *s, event_t *ev)
 	/* Lock calendar. */
 	pthread_mutex_lock(&s->mx);
 
-	if ((found = heap_find(&s->heap, &ev))) {
+	if ((found = heap_find(&s->heap, ev))) {
 		heap_delete(&s->heap, found);
 	}
 
 	/* Unlock calendar. */
-	pthread_cond_signal(&s->notify);
+	pthread_cond_broadcast(&s->notify);
 	pthread_mutex_unlock(&s->mx);
 
 	/* Enable running events. */
diff --git a/src/common/evsched.h b/src/common/evsched.h
index 47bf672..47bf672 100644..100755
--- a/src/common/evsched.h
+++ b/src/common/evsched.h
diff --git a/src/common/fdset.c b/src/common/fdset.c
index c915e01..c915e01 100644..100755
--- a/src/common/fdset.c
+++ b/src/common/fdset.c
diff --git a/src/common/fdset.h b/src/common/fdset.h
index 4038083..4038083 100644..100755
--- a/src/common/fdset.h
+++ b/src/common/fdset.h
diff --git a/src/common/fdset_epoll.c b/src/common/fdset_epoll.c
index d4481b5..d4481b5 100644..100755
--- a/src/common/fdset_epoll.c
+++ b/src/common/fdset_epoll.c
diff --git a/src/common/fdset_epoll.h b/src/common/fdset_epoll.h
index 58f25f8..58f25f8 100644..100755
--- a/src/common/fdset_epoll.h
+++ b/src/common/fdset_epoll.h
diff --git a/src/common/fdset_kqueue.c b/src/common/fdset_kqueue.c
index 108c572..108c572 100644..100755
--- a/src/common/fdset_kqueue.c
+++ b/src/common/fdset_kqueue.c
diff --git a/src/common/fdset_kqueue.h b/src/common/fdset_kqueue.h
index 4b650a7..4b650a7 100644..100755
--- a/src/common/fdset_kqueue.h
+++ b/src/common/fdset_kqueue.h
diff --git a/src/common/fdset_poll.c b/src/common/fdset_poll.c
index 9b1c135..9b1c135 100644..100755
--- a/src/common/fdset_poll.c
+++ b/src/common/fdset_poll.c
diff --git a/src/common/fdset_poll.h b/src/common/fdset_poll.h
index 68e9e69..68e9e69 100644..100755
--- a/src/common/fdset_poll.h
+++ b/src/common/fdset_poll.h
diff --git a/src/common/general-tree.c b/src/common/general-tree.c
index e1048e7..e1048e7 100644..100755
--- a/src/common/general-tree.c
+++ b/src/common/general-tree.c
diff --git a/src/common/general-tree.h b/src/common/general-tree.h
index 552638a..552638a 100644..100755
--- a/src/common/general-tree.h
+++ b/src/common/general-tree.h
diff --git a/src/common/heap.c b/src/common/heap.c
index 6fefb11..27b82da 100644..100755
--- a/src/common/heap.c
+++ b/src/common/heap.c
@@ -22,11 +22,8 @@
  *
  * Most macros use these parameters:
  *
- * - @type - the type of elements
  * - @num - a variable (signed or unsigned integer) with the number of elements
  * - @heap - a C array of type @type; the heap is stored in `heap[1] .. heap[num]`; `heap[0]` is unused
- * - @less - a callback to compare two element values; `less(x, y)` shall return a non-zero value iff @x is lower than @y
- * - @swap - a callback to swap two array elements; `swap(heap, i, j, t)` must swap `heap[i]` with `heap[j]` with possible help of temporary variable @t (type @type).
  *
  * A valid heap must follow these rules:
  *
@@ -44,26 +41,23 @@
 #include <string.h>
 #include <stdlib.h>
 
-void _def_swap(struct heap *h, void *e1, void *e2)
+static inline void heap_swap(heap_val_t *e1, heap_val_t *e2)
 {
-	if (e1 == e2) return;
-	void *tmp = HTEMPELEMENT(h);
-	memcpy(tmp, e1, h->elm_size);
-	memcpy(e1, e2, h->elm_size);
-	memcpy(e2, tmp, h->elm_size);
+	if (e1 == e2) return; /* Stack tmp should be faster than tmpelem. */
+	heap_val_t tmp = *e1; /* Even faster than 2-XOR nowadays. */
+	*e1 = *e2;
+	*e2 = tmp;
 }
 
 
-int heap_init(struct heap *h, int elm_size, int (*cmp)(void *, void *), int init_size, void (*swap)(struct heap *, void *, void *))
+int heap_init(struct heap *h, int (*cmp)(void *, void *), int init_size)
 {
 	int isize = init_size ? init_size : INITIAL_HEAP_SIZE;
 
 	h->num = 0;
 	h->max_size = isize;
 	h->cmp = cmp;
-	h->swap = swap ? swap : _def_swap;
-	h->data = malloc((isize + 1) * elm_size);
-	h->elm_size = elm_size;
+	h->data = malloc((isize + 1) * sizeof(heap_val_t)); /* Temp element unused. */
 
 	return h->data ? 1 : 0;
 };
@@ -75,9 +69,9 @@ static inline void _heap_bubble_down(struct heap *h, int e)
 	{
 		e1 = 2*e;
 		if(e1 > h->num) break;
-		if((h->cmp(HELEMENT(h, e),HELEMENT(h,e1)) < 0) && (e1 == h->num || (h->cmp(HELEMENT(h, e),HELEMENT(h,e1+1)) < 0))) break;
-		if((e1 != h->num) && (h->cmp(HELEMENT(h, e1+1), HELEMENT(h,e1)) < 0)) e1++;
-		h->swap(h,HELEMENT(h,e),HELEMENT(h,e1));
+		if((h->cmp(*HELEMENT(h, e),*HELEMENT(h,e1)) < 0) && (e1 == h->num || (h->cmp(*HELEMENT(h, e),*HELEMENT(h,e1+1)) < 0))) break;
+		if((e1 != h->num) && (h->cmp(*HELEMENT(h, e1+1), *HELEMENT(h,e1)) < 0)) e1++;
+		heap_swap(HELEMENT(h,e),HELEMENT(h,e1));
 		e = e1;
 	}
 }
@@ -88,8 +82,8 @@ static inline void _heap_bubble_up(struct heap *h, int e)
 	while (e > 1)
 	{
 		e1 = e/2;
-		if(h->cmp(HELEMENT(h, e1),HELEMENT(h,e)) < 0) break;
-		h->swap(h,HELEMENT(h,e),HELEMENT(h,e1));
+		if(h->cmp(*HELEMENT(h, e1),*HELEMENT(h,e)) < 0) break;
+		heap_swap(HELEMENT(h,e),HELEMENT(h,e1));
 		e = e1;
 	}
 		
@@ -100,7 +94,7 @@ void heap_delmin(struct heap *h)
 	if(h->num == 0) return;
 	if(h->num > 1)
 	{
-		h->swap(h,HHEAD(h),HELEMENT(h,h->num));
+		heap_swap(HHEAD(h),HELEMENT(h,h->num));
 	}
 	--h->num;
 	_heap_bubble_down(h, 1);
@@ -111,39 +105,39 @@ int heap_insert(struct heap *h, void *e)
 	if(h->num == h->max_size)
 	{
 		h->max_size = h->max_size * HEAP_INCREASE_STEP;
-		h->data = realloc(h->data, (h->max_size + 1) * h->elm_size);
+		h->data = realloc(h->data, (h->max_size + 1) * sizeof(heap_val_t));
 	}
 
 	h->num++;
-	memcpy(HELEMENT(h,h->num),e,h->elm_size);
+	*HELEMENT(h,h->num) = e;
 	_heap_bubble_up(h,h->num);
 
-	return h->data ? 1 :0 ;
+	return h->data ? 1 : 0;
 }
 
 int heap_find(struct heap *h, void *elm)	/* FIXME - very slow */
 {
-	int i = h->num;
-
-	while(i > 0)
+	int i = 1; /* Skip tmp element. */
+	int np = h->num + 1; /* Start from min-heap top. */
+	while(i != np)
 	{
-		if(h->cmp(HELEMENT(h, i),elm) == 0) break;
-		--i;
+		if(*HELEMENT(h, i) == elm) return i;
+		++i;
 	}
-	return i;
+	return 0;
 }
 
 void heap_delete(struct heap *h, int e)
 {
-	h->swap(h, HELEMENT(h, e), HELEMENT(h, h->num));
+	heap_swap(HELEMENT(h, e), HELEMENT(h, h->num));
 	h->num--;
-	if(h->cmp(HELEMENT(h, e), HELEMENT(h, h->num + 1)) < 0) _heap_bubble_up(h, e);
+	if(h->cmp(*HELEMENT(h, e), *HELEMENT(h, h->num + 1)) < 0) _heap_bubble_up(h, e);
 	else _heap_bubble_down(h, e);
 
 	if ((h->num > INITIAL_HEAP_SIZE) && (h->num < h->max_size / HEAP_DECREASE_THRESHOLD))
 	{
 		h->max_size = h->max_size / HEAP_INCREASE_STEP;
-		h->data = realloc(h->data, (h->max_size + 1) * h->elm_size);
+		h->data = realloc(h->data, (h->max_size + 1) * sizeof(heap_val_t));
 	}
 }
 
diff --git a/src/common/heap.h b/src/common/heap.h
index d6f8a0b..6fe355c 100644..100755
--- a/src/common/heap.h
+++ b/src/common/heap.h
@@ -28,24 +28,23 @@
 #ifndef _HEAP_H_
 #define _HEAP_H_
 
+typedef void* heap_val_t;
+
 struct heap {
    int num;		/* Number of elements */
-   int elm_size;	/* Size of a single element */
    int max_size;	/* Size of allocated memory */
    int (*cmp)(void *, void *);
-   void (*swap)(struct heap *, void *, void *);
-   void *data;
+   heap_val_t *data;
 };		/* Array follows */
 
 #define INITIAL_HEAP_SIZE 512 /* initial heap size */
 #define HEAP_INCREASE_STEP 2  /* multiplier for each inflation, keep conservative */
 #define HEAP_DECREASE_THRESHOLD 2 /* threshold for deflation, keep conservative */
-#define HTEMPELEMENT(h) ((h)->data)			/* Pointer to tmp element (for swap) */
-#define HELEMENT(h,num) ((char*)(h)->data + (num) * (h)->elm_size)
+#define HELEMENT(h,num) ((h)->data + (num)) 
 #define HHEAD(h) HELEMENT((h),1)
 #define EMPTY_HEAP(h) ((h)->num == 0)			/* h->num == 0 */
 
-int heap_init(struct heap *, int, int (*cmp)(), int, void (*swap)());
+int heap_init(struct heap *, int (*cmp)(), int);
 void heap_delmin(struct heap *);
 int heap_insert(struct heap *, void *);
 int heap_find(struct heap *, void *);
diff --git a/src/common/latency.c b/src/common/latency.c
index a563f58..a563f58 100644..100755
--- a/src/common/latency.c
+++ b/src/common/latency.c
diff --git a/src/common/latency.h b/src/common/latency.h
index d965c56..d965c56 100644..100755
--- a/src/common/latency.h
+++ b/src/common/latency.h
diff --git a/src/common/libtap/README b/src/common/libtap/README
index d57b81d..d57b81d 100644..100755
--- a/src/common/libtap/README
+++ b/src/common/libtap/README
diff --git a/src/common/libtap/tap.c b/src/common/libtap/tap.c
index d6bb995..d6bb995 100644..100755
--- a/src/common/libtap/tap.c
+++ b/src/common/libtap/tap.c
diff --git a/src/common/libtap/tap.h b/src/common/libtap/tap.h
index 89484f4..89484f4 100644..100755
--- a/src/common/libtap/tap.h
+++ b/src/common/libtap/tap.h
diff --git a/src/common/libtap/tap_unit.h b/src/common/libtap/tap_unit.h
index c248fde..c248fde 100644..100755
--- a/src/common/libtap/tap_unit.h
+++ b/src/common/libtap/tap_unit.h
diff --git a/src/common/lists.c b/src/common/lists.c
index 9a93733..9a93733 100644..100755
--- a/src/common/lists.c
+++ b/src/common/lists.c
diff --git a/src/common/lists.h b/src/common/lists.h
index 897b1a9..897b1a9 100644..100755
--- a/src/common/lists.h
+++ b/src/common/lists.h
diff --git a/src/common/log.c b/src/common/log.c
index 5267d2d..5267d2d 100644..100755
--- a/src/common/log.c
+++ b/src/common/log.c
diff --git a/src/common/log.h b/src/common/log.h
index 8b9e311..8b9e311 100644..100755
--- a/src/common/log.h
+++ b/src/common/log.h
diff --git a/src/common/mempattern.c b/src/common/mempattern.c
index 5982e18..5982e18 100644..100755
--- a/src/common/mempattern.c
+++ b/src/common/mempattern.c
diff --git a/src/common/mempattern.h b/src/common/mempattern.h
index ae1fa78..ae1fa78 100644..100755
--- a/src/common/mempattern.h
+++ b/src/common/mempattern.h
diff --git a/src/common/modified_tree.h b/src/common/modified_tree.h
index 9ceddd1..9ceddd1 100644..100755
--- a/src/common/modified_tree.h
+++ b/src/common/modified_tree.h
diff --git a/src/common/print.c b/src/common/print.c
index 9764568..9764568 100644..100755
--- a/src/common/print.c
+++ b/src/common/print.c
diff --git a/src/common/print.h b/src/common/print.h
index 482f55e..482f55e 100644..100755
--- a/src/common/print.h
+++ b/src/common/print.h
diff --git a/src/common/prng.c b/src/common/prng.c
index 250a506..250a506 100644..100755
--- a/src/common/prng.c
+++ b/src/common/prng.c
diff --git a/src/common/prng.h b/src/common/prng.h
index a64eabb..a64eabb 100644..100755
--- a/src/common/prng.h
+++ b/src/common/prng.h
diff --git a/src/common/ref.c b/src/common/ref.c
index 3b9c033..3b9c033 100644..100755
--- a/src/common/ref.c
+++ b/src/common/ref.c
diff --git a/src/common/ref.h b/src/common/ref.h
index 13a7037..13a7037 100644..100755
--- a/src/common/ref.h
+++ b/src/common/ref.h
diff --git a/src/common/skip-list.c b/src/common/skip-list.c
index cde08d7..cde08d7 100644..100755
--- a/src/common/skip-list.c
+++ b/src/common/skip-list.c
diff --git a/src/common/skip-list.h b/src/common/skip-list.h
index 784f366..784f366 100644..100755
--- a/src/common/skip-list.h
+++ b/src/common/skip-list.h
diff --git a/src/common/slab/alloc-common.h b/src/common/slab/alloc-common.h
index e15008a..e15008a 100644..100755
--- a/src/common/slab/alloc-common.h
+++ b/src/common/slab/alloc-common.h
diff --git a/src/common/slab/slab.c b/src/common/slab/slab.c
index b581c42..b581c42 100644..100755
--- a/src/common/slab/slab.c
+++ b/src/common/slab/slab.c
diff --git a/src/common/slab/slab.h b/src/common/slab/slab.h
index 4ea7e31..4ea7e31 100644..100755
--- a/src/common/slab/slab.h
+++ b/src/common/slab/slab.h
diff --git a/src/common/sockaddr.c b/src/common/sockaddr.c
index b4e75ee..b4e75ee 100644..100755
--- a/src/common/sockaddr.c
+++ b/src/common/sockaddr.c
diff --git a/src/common/sockaddr.h b/src/common/sockaddr.h
index 52e621c..52e621c 100644..100755
--- a/src/common/sockaddr.h
+++ b/src/common/sockaddr.h
diff --git a/src/common/tree.h b/src/common/tree.h
index efea65b..efea65b 100644..100755
--- a/src/common/tree.h
+++ b/src/common/tree.h