More scheduling

1 files changed, 45 insertions, 5 deletions

diff --git a/src/schedule.c b/src/schedule.c
index 3465752..93cd700 100644
--- a/src/schedule.c
+++ b/src/schedule.c
@@ -18,7 +18,13 @@ static struct pqueue *queue;
 static pqueue_pri_t get_pri(void *a)
 {
 	struct term *term = a;
-	return (parse_get_max_depth() - term->depth + 1) * term->refs;
+	return term->priority;
+}
+
+static void set_pri(void *a, pqueue_pri_t pri)
+{
+	struct term *term = a;
+	term->priority = pri;
 }
 
 static int cmp_pri(pqueue_pri_t next, pqueue_pri_t curr)
@@ -26,10 +32,16 @@ static int cmp_pri(pqueue_pri_t next, pqueue_pri_t curr)
 	return next < curr;
 }
 
+static size_t get_pos(void *a)
+{
+	struct term *term = a;
+	return term->position;
+}
+
 static void set_pos(void *a, size_t position)
 {
-	(void)a;
-	(void)position;
+	struct term *term = a;
+	term->position = position;
 }
 
 // skewed random number generator
@@ -40,6 +52,20 @@ static size_t choose_position(void)
 	return size - (size_t)sqrt(((size_t)rand() % (size_t)pow(size, 2)));
 }
 
+static pqueue_pri_t calculate_priority(struct term *term)
+{
+	return (parse_get_max_depth() - term->depth + 1) * term->refs;
+}
+
+void schedule_add(struct term *term)
+{
+	if (!(term->type == APP && term->u.app.lhs->type == ABS))
+		return; // no beta redex
+
+	set_pri(term, calculate_priority(term));
+	pqueue_insert(queue, term);
+}
+
 void schedule(void)
 {
 	while (pqueue_size(queue) > 0) {
@@ -51,10 +77,24 @@ void schedule(void)
 	debug("no more redexes!\n");
 }
 
-void schedule_init(void)
+void schedule_sync_priorities(void)
+{
+	size_t iter = 0;
+	void *iter_val;
+	while (hashmap_iter(map_all_terms(), &iter, &iter_val)) {
+		struct term *term = *(struct term **)iter_val;
+		if (term->type == APP && term->u.app.lhs->type == ABS) {
+			pqueue_change_priority(queue, calculate_priority(term),
+					       term);
+		}
+	}
+}
+
+void schedule_initialize(void)
 {
 	srand(time(0));
-	queue = map_to_pqueue(map_all_terms(), cmp_pri, get_pri, set_pos);
+	size_t size = hashmap_count(map_all_terms()) + 42;
+	queue = pqueue_init(size, cmp_pri, get_pri, set_pri, get_pos, set_pos);
 }
 
 void schedule_destroy(void)