From 941b178ab29efd12da4f3df83e5a6b78088a689c Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 18 Apr 2024 11:36:54 +0200 Subject: syz-manager: make nextRequestID non-atomic It's incremented next to runner.mu critical section, there is no point in having it atomic. This only makes the code slower and more complex. --- syz-manager/rpc.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/syz-manager/rpc.go b/syz-manager/rpc.go index 3d4a16d6e..07533e078 100644 --- a/syz-manager/rpc.go +++ b/syz-manager/rpc.go @@ -8,7 +8,6 @@ import ( "fmt" "net" "sync" - "sync/atomic" "time" "github.com/google/syzkaller/pkg/cover" @@ -68,7 +67,7 @@ type Runner struct { mu sync.Mutex newMaxSignal signal.Signal dropMaxSignal signal.Signal - nextRequestID atomic.Int64 + nextRequestID int64 requests map[int64]Request } @@ -435,8 +434,9 @@ func (runner *Runner) newRequest(req *fuzzer.Request) (rpctype.ExecutionRequest, // We don't care about specific priorities here. signalFilter = signal.FromRaw(newRawSignal, 0) } - id := runner.nextRequestID.Add(1) runner.mu.Lock() + runner.nextRequestID++ + id := runner.nextRequestID if runner.requests != nil { runner.requests[id] = Request{ req: req, -- cgit mrf-deployment