lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lang: Plumb the ctx deeper into the lang API

Browse Source
This commit is contained in:
James Shubin
2024-03-16 00:35:33 -04:00
parent 10319dd641
commit d6a6734b65
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lang/gapi/gapi.go
View File

@@ -427,7 +427,7 @@ func (obj *GAPI) Init(data *gapi.Data) error {
} }
// LangInit is a wrapper around the lang Init method. // LangInit is a wrapper around the lang Init method.
func (obj *GAPI) LangInit() error { func (obj *GAPI) LangInit(ctx context.Context) error {
if obj.lang != nil { if obj.lang != nil {
return nil // already ran init, close first! return nil // already ran init, close first!
} }
@@ -456,7 +456,7 @@ func (obj *GAPI) LangInit() error {
obj.data.Logf(Name+": "+format, v...) obj.data.Logf(Name+": "+format, v...)
}, },
} }
if err := lang.Init(); err != nil { if err := lang.Init(ctx); err != nil {
return errwrap.Wrapf(err, "can't init the lang") return errwrap.Wrapf(err, "can't init the lang")
} }
obj.lang = lang // once we can't fail, store the struct... obj.lang = lang // once we can't fail, store the struct...
@@ -553,7 +553,7 @@ func (obj *GAPI) Next() chan gapi.Next {
// run up to these three but fail on err // run up to these three but fail on err
if e := obj.LangClose(); e != nil { // close any old lang if e := obj.LangClose(); e != nil { // close any old lang
err = e // pass through the err err = e // pass through the err
} else if e := obj.LangInit(); e != nil { // init the new one! } else if e := obj.LangInit(context.TODO()); e != nil { // init the new one!
err = e // pass through the err err = e // pass through the err
// Always run LangClose after LangInit // Always run LangClose after LangInit

4
lang/lang.go
View File

@@ -99,7 +99,7 @@ type Lang struct {
// NOTE: The trick is that we need to get the list of funcs to watch AND start // NOTE: The trick is that we need to get the list of funcs to watch AND start
// watching them, *before* we pull their values, that way we'll know if they // watching them, *before* we pull their values, that way we'll know if they
// changed from the values we wanted. // changed from the values we wanted.
func (obj *Lang) Init() error { func (obj *Lang) Init(ctx context.Context) error {
if obj.Debug { if obj.Debug {
obj.Logf("input: %s", obj.Input) obj.Logf("input: %s", obj.Input)
tree, err := util.FsTree(obj.Fs, "/") // should look like gapi tree, err := util.FsTree(obj.Fs, "/") // should look like gapi
@@ -232,7 +232,7 @@ func (obj *Lang) Init() error {
Debug: obj.Debug, Debug: obj.Debug,
Logf: logf, Logf: logf,
} }
unifyErr := unifier.Unify(context.TODO()) unifyErr := unifier.Unify(ctx)
obj.Logf("type unification took: %s", time.Since(timing)) obj.Logf("type unification took: %s", time.Since(timing))
if unifyErr != nil { if unifyErr != nil {
return errwrap.Wrapf(unifyErr, "could not unify types") return errwrap.Wrapf(unifyErr, "could not unify types")

14
lang/lang_test.go
View File

@@ -128,23 +128,23 @@ func runInterpret(t *testing.T, code string) (_ *pgraph.Graph, reterr error) {
} }
logf("tree:\n%s", tree) logf("tree:\n%s", tree)
wg := &sync.WaitGroup{}
defer wg.Wait()
ctx, cancel := context.WithCancel(context.Background()) // TODO: get it from parent
defer cancel()
lang := &Lang{ lang := &Lang{
Fs: fs, Fs: fs,
Input: "/" + interfaces.MetadataFilename, // start path in fs Input: "/" + interfaces.MetadataFilename, // start path in fs
Debug: testing.Verbose(), // set via the -test.v flag to `go test` Debug: testing.Verbose(), // set via the -test.v flag to `go test`
Logf: logf, Logf: logf,
} }
if err := lang.Init(); err != nil { if err := lang.Init(ctx); err != nil {
return nil, errwrap.Wrapf(err, "init failed") return nil, errwrap.Wrapf(err, "init failed")
} }
defer lang.Cleanup() defer lang.Cleanup()
wg := &sync.WaitGroup{}
defer wg.Wait()
ctx, cancel := context.WithCancel(context.Background()) // TODO: get it from parent
defer cancel()
wg.Add(1) wg.Add(1)
go func() { go func() {
defer wg.Done() defer wg.Done()