mutex for globalctx

Author: sawka

tsunami/comp/globalctx.go

@@ -0,0 +1,38 @@
+// Copyright 2025, Command Line Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+package comp
+
+import (
+	"sync"
+
+	"github.com/outrigdev/goid"
+)
+
+// is set ONLY when we're in the render function of a component
+// used for hooks, and automatic dependency tracking
+var globalVC *VDomContextImpl
+var globalRenderGoId uint64
+var globalCtxMutex sync.Mutex
+
+func withGlobalCtx[T any](vc *VDomContextImpl, fn func() T) T {
+	globalCtxMutex.Lock()
+	defer globalCtxMutex.Unlock()
+	globalVC = vc
+	globalRenderGoId = goid.Get()
+	defer func() {
+		globalVC = nil
+		globalRenderGoId = 0
+	}()
+	return fn()
+}
+
+func GetGlobalContext() *VDomContextImpl {
+	globalCtxMutex.Lock()
+	defer globalCtxMutex.Unlock()
+	gid := goid.Get()
+	if gid != globalRenderGoId {
+		return nil
+	}
+	return globalVC
+}

tsunami/comp/rootelem.go

@@ -14,7 +14,6 @@ import (
 	"unicode"
 
 	"github.com/google/uuid"
-	"github.com/outrigdev/goid"
 	"github.com/wavetermdev/waveterm/tsunami/rpctypes"
 	"github.com/wavetermdev/waveterm/tsunami/util"
 	"github.com/wavetermdev/waveterm/tsunami/vdom"
@@ -23,11 +22,6 @@ import (
 
 const ChildrenPropKey = "children"
 
-// is set ONLY when we're in the render function of a component
-// used for hooks, and automatic dependency tracking
-var globalVC *VDomContextImpl
-var globalRenderGoId uint64
-
 type RenderOpts struct {
 	Resync bool
 }
@@ -443,24 +437,6 @@ func callCFunc(cfunc any, ctx context.Context, props map[string]any) any {
 	return rtnVal[0].Interface()
 }
 
-func withGlobalCtx[T any](vc *VDomContextImpl, fn func() T) T {
-	globalVC = vc
-	globalRenderGoId = goid.Get()
-	defer func() {
-		globalVC = nil
-		globalRenderGoId = 0
-	}()
-	return fn()
-}
-
-func GetGlobalContext() *VDomContextImpl {
-	gid := goid.Get()
-	if gid != globalRenderGoId {
-		return nil
-	}
-	return globalVC
-}
-
 func (r *RootElem) renderComponent(cfunc any, elem *vdom.VDomElem, comp **ComponentImpl, opts *RenderOpts) {
 	if (*comp).Children != nil {
 		for _, child := range (*comp).Children {