From 679548fc2073108b0206231ec74896610d88f880 Mon Sep 17 00:00:00 2001 From: Evan Wallace Date: Thu, 3 Nov 2022 01:11:34 -0400 Subject: [PATCH] small code simplification --- cmd/esbuild/service.go | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/cmd/esbuild/service.go b/cmd/esbuild/service.go index 8f8366545d2..36b1fef9b82 100644 --- a/cmd/esbuild/service.go +++ b/cmd/esbuild/service.go @@ -56,18 +56,18 @@ func (service *serviceType) getActiveBuild(key int) *activeBuild { return activeBuild } -func (service *serviceType) trackActiveBuild(key int, activeBuild *activeBuild) { - if activeBuild.refCount > 0 { - service.mutex.Lock() - defer service.mutex.Unlock() - if service.activeBuilds[key] != nil { - panic("Internal error") - } - service.activeBuilds[key] = activeBuild - - // This pairs with "Done()" in "decRefCount" - service.keepAliveWaitGroup.Add(1) +func (service *serviceType) trackActiveBuild(key int) *activeBuild { + service.mutex.Lock() + defer service.mutex.Unlock() + if service.activeBuilds[key] != nil { + panic("Internal error") } + activeBuild := &activeBuild{refCount: 1} + service.activeBuilds[key] = activeBuild + + // This pairs with "Done()" in "decRefCount" + service.keepAliveWaitGroup.Add(1) + return activeBuild } func (service *serviceType) decRefCount(key int, activeBuild *activeBuild) { @@ -494,8 +494,7 @@ func (service *serviceType) handleBuildRequest(id uint32, request map[string]int } } - activeBuild := &activeBuild{refCount: 1} - service.trackActiveBuild(key, activeBuild) + activeBuild := service.trackActiveBuild(key) defer service.decRefCount(key, activeBuild) if plugins, ok := request["plugins"]; ok {