myprioriy queue reorg

MaxNcu · Aug 27, 2016 · 688fd8b · 688fd8b
1 parent 24746f6
commit 688fd8b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/framework/fuzzer/Fuzzer.py b/framework/fuzzer/Fuzzer.py
@@ -153,7 +153,7 @@ def __init__(self, options):
 	# initial seed request
 	self.genReq.stats.mark_start()
         if self.printer: self.printer.header(self.genReq.stats)
-	self.qmanager["seed_queue"].put_priority(1, FuzzResult.to_new_signal(FuzzResult.startseed))
+	self.qmanager["seed_queue"].put_first(FuzzResult.to_new_signal(FuzzResult.startseed))
 
 
     def __iter__(self):

diff --git a/framework/utils/myqueue.py b/framework/utils/myqueue.py
@@ -15,21 +15,19 @@ def __init__(self, limit = 0):
 
 	self.max_prio = 0
 
-    def put_priority(self, prio, item):
+    def _put_priority(self, prio, item):
 	self.max_prio = max(prio, self.max_prio)
 	PriorityQueue.put(self, (prio, item))
 
     def put(self, item):
-	self.max_prio = max(item.rlevel, self.max_prio)
-	PriorityQueue.put(self, (item.rlevel, item))
+        self._put_priority(item.rlevel, item)
 
     def put_first(self, item):
-	PriorityQueue.put(self, (0, item))
+        self._put_priority(0, item)
 
     def put_last(self, item):
-	self.max_prio += 1
-	PriorityQueue.put(self, (self.max_prio, item))
-
+        self._put_priority(self.max_prio + 1, item)
+
 class FuzzQueue(MyPriorityQueue, Thread):
     def __init__(self, queue_out = None, limit = 0):
         MyPriorityQueue.__init__(self, limit)