Skip to content

Refactor evaluator closure logic to use atomic boolean for thread-saf… #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kasugamirai wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Refactor evaluator closure logic to use atomic boolean for thread-saf… #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkl/evaluator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ type evaluator struct {
logger Logger
manager *evaluatorManager
pendingRequests *sync.Map
closed bool
closed atomicBool
resourceReaders []ResourceReader
moduleReaders []ModuleReader
}
Expand Down Expand Up @@ -154,15 +154,15 @@ func (e *evaluator) EvaluateExpressionRaw(ctx context.Context, source *ModuleSou
}

func (e *evaluator) Close() error {
if e.closed {
if e.closed.get() {
return nil
}
e.manager.closeEvaluator(e)
return nil
}

func (e *evaluator) Closed() bool {
return e.closed
return e.closed.get()
}

func (e *evaluator) handleEvaluateResponse(resp *msgapi.EvaluateResponse) {
Expand Down
2 changes: 1 addition & 1 deletion pkl/evaluator_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ func (m *evaluatorManager) closeEvaluator(ev *evaluator) {
}
m.impl.outChan() <- &msgapi.CloseEvaluator{EvaluatorId: ev.evaluatorId}
m.evaluators.Delete(ev.evaluatorId)
ev.closed = true
ev.closed.set(true)
m.interrupts.Range(func(key, value any) bool {
if value.(int64) == ev.evaluatorId {
key.(chan error) <- nil
Expand Down
Loading