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

lang: core: os: Simplify waitgroup

Browse Source 
Doesn't need to be part of the struct. Maybe there are others like this
that need porting.
This commit is contained in:
James Shubin
2025-09-26 21:18:05 -04:00
parent 17544e881c
commit 15b2ff68cc
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lang/core/os/readfile.go
View File

@@ -63,7 +63,6 @@ type ReadFileFunc struct {
recWatcher *recwatch.RecWatcher recWatcher *recwatch.RecWatcher
events chan error // internal events events chan error // internal events
wg *sync.WaitGroup
input chan string // stream of inputs input chan string // stream of inputs
filename *string // the active filename filename *string // the active filename
@@ -106,7 +105,6 @@ func (obj *ReadFileFunc) Init(init *interfaces.Init) error {
obj.init = init obj.init = init
obj.input = make(chan string) obj.input = make(chan string)
obj.events = make(chan error) obj.events = make(chan error)
obj.wg = &sync.WaitGroup{}
return nil return nil
} }
@@ -114,11 +112,12 @@ func (obj *ReadFileFunc) Init(init *interfaces.Init) error {
func (obj *ReadFileFunc) Stream(ctx context.Context) error { func (obj *ReadFileFunc) Stream(ctx context.Context) error {
//defer close(obj.input) // if we close, this is a race with the sender //defer close(obj.input) // if we close, this is a race with the sender
defer close(obj.events) // clean up for fun defer close(obj.events) // clean up for fun
defer obj.wg.Wait() wg := &sync.WaitGroup{}
defer wg.Wait()
defer func() { defer func() {
if obj.recWatcher != nil { if obj.recWatcher != nil {
obj.recWatcher.Close() // close previous watcher obj.recWatcher.Close() // close previous watcher
obj.wg.Wait() wg.Wait()
} }
}() }()
for { for {
@@ -144,7 +143,7 @@ func (obj *ReadFileFunc) Stream(ctx context.Context) error {
if obj.recWatcher != nil { if obj.recWatcher != nil {
obj.recWatcher.Close() // close previous watcher obj.recWatcher.Close() // close previous watcher
obj.wg.Wait() wg.Wait()
} }
// create new watcher // create new watcher
obj.recWatcher = &recwatch.RecWatcher{ obj.recWatcher = &recwatch.RecWatcher{
@@ -169,9 +168,9 @@ func (obj *ReadFileFunc) Stream(ctx context.Context) error {
// watch recwatch events in a proxy goroutine, since // watch recwatch events in a proxy goroutine, since
// changing the recwatch object would panic the main // changing the recwatch object would panic the main
// select when it's nil... // select when it's nil...
obj.wg.Add(1) wg.Add(1)
go func() { go func() {
defer obj.wg.Done() defer wg.Done()
for { for {
var err error var err error
select { select {

13
lang/core/os/readfilewait.go
View File

@@ -65,7 +65,6 @@ type ReadFileWaitFunc struct {
recWatcher *recwatch.RecWatcher recWatcher *recwatch.RecWatcher
events chan error // internal events events chan error // internal events
wg *sync.WaitGroup
input chan string // stream of inputs input chan string // stream of inputs
filename *string // the active filename filename *string // the active filename
@@ -108,7 +107,6 @@ func (obj *ReadFileWaitFunc) Init(init *interfaces.Init) error {
obj.init = init obj.init = init
obj.input = make(chan string) obj.input = make(chan string)
obj.events = make(chan error) obj.events = make(chan error)
obj.wg = &sync.WaitGroup{}
return nil return nil
} }
@@ -116,11 +114,12 @@ func (obj *ReadFileWaitFunc) Init(init *interfaces.Init) error {
func (obj *ReadFileWaitFunc) Stream(ctx context.Context) error { func (obj *ReadFileWaitFunc) Stream(ctx context.Context) error {
//defer close(obj.input) // if we close, this is a race with the sender //defer close(obj.input) // if we close, this is a race with the sender
defer close(obj.events) // clean up for fun defer close(obj.events) // clean up for fun
defer obj.wg.Wait() wg := &sync.WaitGroup{}
defer wg.Wait()
defer func() { defer func() {
if obj.recWatcher != nil { if obj.recWatcher != nil {
obj.recWatcher.Close() // close previous watcher obj.recWatcher.Close() // close previous watcher
obj.wg.Wait() wg.Wait()
} }
}() }()
for { for {
@@ -146,7 +145,7 @@ func (obj *ReadFileWaitFunc) Stream(ctx context.Context) error {
if obj.recWatcher != nil { if obj.recWatcher != nil {
obj.recWatcher.Close() // close previous watcher obj.recWatcher.Close() // close previous watcher
obj.wg.Wait() wg.Wait()
} }
// create new watcher // create new watcher
obj.recWatcher = &recwatch.RecWatcher{ obj.recWatcher = &recwatch.RecWatcher{
@@ -171,9 +170,9 @@ func (obj *ReadFileWaitFunc) Stream(ctx context.Context) error {
// watch recwatch events in a proxy goroutine, since // watch recwatch events in a proxy goroutine, since
// changing the recwatch object would panic the main // changing the recwatch object would panic the main
// select when it's nil... // select when it's nil...
obj.wg.Add(1) wg.Add(1)
go func() { go func() {
defer obj.wg.Done() defer wg.Done()
for { for {
var err error var err error
select { select {