From c2e0726105cc811a456d900c62443159acc29c32 Mon Sep 17 00:00:00 2001
From: Aleksandr Nogikh <nogikh@google.com>
Date: Thu, 16 May 2024 17:54:30 +0200
Subject: pkg/fuzzer/queue: simplify the priority queue

We don't need the full priority queue functionality anymore. For our
purposes it's enough to only enforce the order between the elements of
different sub-queues.
---
 pkg/fuzzer/queue/prio_queue.go | 40 ++++------------------------------------
 1 file changed, 4 insertions(+), 36 deletions(-)

(limited to 'pkg/fuzzer/queue/prio_queue.go')

diff --git a/pkg/fuzzer/queue/prio_queue.go b/pkg/fuzzer/queue/prio_queue.go
index a71afe61d..5e7c65fba 100644
--- a/pkg/fuzzer/queue/prio_queue.go
+++ b/pkg/fuzzer/queue/prio_queue.go
@@ -7,37 +7,6 @@ import (
 	"container/heap"
 )
 
-type priority []int64
-
-func (p priority) greaterThan(other priority) bool {
-	for i := range p {
-		if i >= len(other) || p[i] > other[i] {
-			return true
-		}
-		if p[i] < other[i] {
-			return false
-		}
-	}
-	for i := len(p); i < len(other); i++ {
-		if other[i] < 0 {
-			return true
-		}
-		if other[i] > 0 {
-			return false
-		}
-	}
-	return false
-}
-
-func (p priority) next() priority {
-	if len(p) == 0 {
-		return p
-	}
-	newPrio := append([]int64{}, p...)
-	newPrio[len(newPrio)-1]--
-	return newPrio
-}
-
 type priorityQueueOps[T any] struct {
 	impl priorityQueueImpl[T]
 }
@@ -46,7 +15,7 @@ func (pq *priorityQueueOps[T]) Len() int {
 	return pq.impl.Len()
 }
 
-func (pq *priorityQueueOps[T]) Push(item T, prio priority) {
+func (pq *priorityQueueOps[T]) Push(item T, prio int) {
 	heap.Push(&pq.impl, &priorityQueueItem[T]{item, prio})
 }
 
@@ -63,7 +32,7 @@ func (pq *priorityQueueOps[T]) Pop() T {
 
 type priorityQueueItem[T any] struct {
 	value T
-	prio  priority
+	prio  int
 }
 
 type priorityQueueImpl[T any] []*priorityQueueItem[T]
@@ -71,9 +40,8 @@ type priorityQueueImpl[T any] []*priorityQueueItem[T]
 func (pq priorityQueueImpl[T]) Len() int { return len(pq) }
 
 func (pq priorityQueueImpl[T]) Less(i, j int) bool {
-	// We want Pop to give us the highest, not lowest,
-	// priority so we use greater than here.
-	return pq[i].prio.greaterThan(pq[j].prio)
+	// We want Pop to give us the lowest priority.
+	return pq[i].prio < pq[j].prio
 }
 
 func (pq priorityQueueImpl[T]) Swap(i, j int) {
-- 
cgit mrf-deployment