From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 22 Nov 2016 17:30:40 +0000 (-0500)
Subject: create heaps
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74708d463ddf5d53eb441114e3c47d71ea4073cd;p=thirdparty%2Ffreeradius-server.git

create heaps
---

diff --git a/src/util/transport.h b/src/util/transport.h
index 94e85a70029..3c0ba7b53e5 100644
--- a/src/util/transport.h
+++ b/src/util/transport.h
@@ -96,6 +96,7 @@ typedef struct fr_transport_t {
  *	Minimal data structure to use the new code.
  */
 struct rad_request {
+	int			heap_id;
 	uint32_t		priority;
 	fr_time_t		recv_time;
 	fr_time_t		*original_recv_time;
diff --git a/src/util/worker.c b/src/util/worker.c
index db7eced2253..46bfc17428a 100644
--- a/src/util/worker.c
+++ b/src/util/worker.c
@@ -406,6 +406,35 @@ static int fr_worker_idle(void *ctx, struct timeval *wake)
 	return 1;
 }
 
+static int worker_message_cmp(void const *one, void const *two)
+{
+	fr_channel_data_t const *a = one;
+	fr_channel_data_t const *b = two;
+
+	if (a->request.priority < b->request.priority) return -1;
+	if (a->request.priority > b->request.priority) return +1;
+
+	if (a->m.when < b->m.when) return -1;
+	if (a->m.when > b->m.when) return +1;
+
+	return 0;
+}
+
+
+static int worker_request_cmp(void const *one, void const *two)
+{
+	REQUEST const *a = one;
+	REQUEST const *b = two;
+
+	if (a->priority < b->priority) return -1;
+	if (a->priority > b->priority) return +1;
+
+	if (a->recv_time < b->recv_time) return -1;
+	if (a->recv_time > b->recv_time) return +1;
+
+	return 0;
+}
+
 
 /** Create a worker
  *
@@ -431,7 +460,29 @@ static fr_worker_t *fr_worker_create(TALLOC_CTX *ctx)
 		return NULL;
 	}
 
-	// @todo create all of the heaps
+	worker->to_decode = fr_heap_create(worker_message_cmp, offsetof(fr_channel_data_t, channel.heap_id));
+	if (!worker->to_decode) {
+		talloc_free(worker);
+		return NULL;
+	}
+
+	worker->localized = fr_heap_create(worker_message_cmp, offsetof(fr_channel_data_t, channel.heap_id));
+	if (!worker->localized) {
+		talloc_free(worker);
+		return NULL;
+	}
+
+	worker->decoded = fr_heap_create(worker_request_cmp, offsetof(REQUEST, heap_id));
+	if (!worker->decoded) {
+		talloc_free(worker);
+		return NULL;
+	}
+
+	worker->runnable = fr_heap_create(worker_request_cmp, offsetof(REQUEST, heap_id));
+	if (!worker->decoded) {
+		talloc_free(worker);
+		return NULL;
+	}
 
 	// @todo register our event loop / KQ with the global KQ system