From 9d49f3a7c56a414597a16f28dd8b6b2be6352ad8 Mon Sep 17 00:00:00 2001 From: Taras Madan Date: Wed, 30 Mar 2022 15:47:47 +0200 Subject: Revert "syz-verifier/exectask.go: add tests" (#3050) This reverts commit 42718dd659525414aa0bf2794688ac94a32f7764. Original PR had a race. --- syz-verifier/exectask.go | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'syz-verifier/exectask.go') diff --git a/syz-verifier/exectask.go b/syz-verifier/exectask.go index db947cbcd..052469ed7 100644 --- a/syz-verifier/exectask.go +++ b/syz-verifier/exectask.go @@ -66,12 +66,6 @@ func MakeExecTask(prog *prog.Prog) *ExecTask { return task } -func ExecTasksQueued() int { - ChanMapMutex.Lock() - defer ChanMapMutex.Unlock() - return len(TaskIDToExecResultChan) -} - func DeleteExecTask(task *ExecTask) { ChanMapMutex.Lock() defer ChanMapMutex.Unlock() @@ -94,28 +88,22 @@ func MakeExecTaskQueue() *ExecTaskQueue { // ExecTaskQueue respects the pq.priority. Internally it is a thread-safe PQ. type ExecTaskQueue struct { pq ExecTaskPriorityQueue - mu sync.Mutex } // PopTask return false if no tasks are available. func (q *ExecTaskQueue) PopTask() (*ExecTask, bool) { - q.mu.Lock() - defer q.mu.Unlock() if q.pq.Len() == 0 { return nil, false } + return heap.Pop(&q.pq).(*ExecTask), true } func (q *ExecTaskQueue) PushTask(task *ExecTask) { - q.mu.Lock() - defer q.mu.Unlock() heap.Push(&q.pq, task) } func (q *ExecTaskQueue) Len() int { - q.mu.Lock() - defer q.mu.Unlock() return q.pq.Len() } -- cgit mrf-deployment