all: make sure Context.Close is called

drew-512 · Drew O'Meara · web-flow · commit 232eb8ec2c06 · 2022-02-13T12:03:34.000+01:00
Co-authored-by: Drew O'Meara &lt;drew@plan-systems.org&gt;
diff --git a/examples/embedding/main.go b/examples/embedding/main.go
@@ -27,6 +27,9 @@ func runWithFile(pyFile string) error {
 
 	// See type Context interface and related docs
 	ctx := py.NewContext(py.DefaultContextOpts())
+	
+	// This drives modules being able to perform cleanup and release resources 
+	defer ctx.Close()
 
 	var err error
 	if len(pyFile) == 0 {
diff --git a/examples/embedding/mylib.module.go b/examples/embedding/mylib.module.go
@@ -47,6 +47,9 @@ func init() {
 			"GO_VERSION": py.String(fmt.Sprintf("%s on %s %s", runtime.Version(), runtime.GOOS, runtime.GOARCH)),
 			"MYLIB_VERS": py.String("Vacation 1.0 by Fletch F. Fletcher"),
 		},
+		OnContextClosed: func(instance *py.Module) {
+			fmt.Print("<<< host py.Context of py.Module instance closing >>>\n+++\n")
+		},
 	})
 }
 
diff --git a/examples/embedding/testdata/embedding_out_golden.txt b/examples/embedding/testdata/embedding_out_golden.txt
@@ -15,3 +15,5 @@ Spring Break itinerary:
 
 I bet Monaco will be the best!
 
+<<< host py.Context of py.Module instance closing >>>
++++
diff --git a/examples/multi-context/main.go b/examples/multi-context/main.go
@@ -128,6 +128,9 @@ func RunMultiPi(numWorkers, numTimes int) time.Duration {
 				w.ctx.RunCode(jobCode, w.main.Globals, w.main.Globals, nil)
 			}
 			workersRunning.Done()
+
+			// This drives modules being able to perform cleanup and release resources 
+			w.ctx.Close()
 		}()
 	}
 
diff --git a/main.go b/main.go
@@ -48,6 +48,7 @@ func xmain(args []string) {
 	opts := py.DefaultContextOpts()
 	opts.SysArgs = args
 	ctx := py.NewContext(opts)
+	defer ctx.Close()
 
 	if *cpuprofile != "" {
 		f, err := os.Create(*cpuprofile)

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,9 @@ func init() {`
`47`	`47`	`"GO_VERSION": py.String(fmt.Sprintf("%s on %s %s", runtime.Version(), runtime.GOOS, runtime.GOARCH)),`
`48`	`48`	`"MYLIB_VERS": py.String("Vacation 1.0 by Fletch F. Fletcher"),`
`49`	`49`	`},`
	`50`	`+ OnContextClosed: func(instance *py.Module) {`
	`51`	`+ fmt.Print("<<< host py.Context of py.Module instance closing >>>\n+++\n")`
	`52`	`+ },`
`50`	`53`	`})`
`51`	`54`	`}`
`52`	`55`
Original file line number	Diff line number	Diff line change
`@@ -15,3 +15,5 @@ Spring Break itinerary:`
`15`	`15`
`16`	`16`	`I bet Monaco will be the best!`
`17`	`17`
	`18`	`+<<< host py.Context of py.Module instance closing >>>`
	`19`	`++++`
Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,9 @@ func RunMultiPi(numWorkers, numTimes int) time.Duration {`
`128`	`128`	`w.ctx.RunCode(jobCode, w.main.Globals, w.main.Globals, nil)`
`129`	`129`	`}`
`130`	`130`	`workersRunning.Done()`
	`131`	`+`
	`132`	`+ // This drives modules being able to perform cleanup and release resources`
	`133`	`+ w.ctx.Close()`
`131`	`134`	`}()`
`132`	`135`	`}`
`133`	`136`