Fix starting/stopping SPN + more #1668
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| package service | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "errors" | ||
| "fmt" | ||
| "io" | ||
| "runtime" | ||
|
|
||
| "github.com/maruel/panicparse/v2/stack" | ||
|
|
||
| "github.com/safing/portmaster/base/utils/debug" | ||
| "github.com/safing/portmaster/service/mgr" | ||
| ) | ||
|
|
||
| // GetWorkerInfo returns the worker info of all running workers. | ||
| func (i *Instance) GetWorkerInfo() (*mgr.WorkerInfo, error) { | ||
| snapshot, _, err := stack.ScanSnapshot(bytes.NewReader(fullStack()), io.Discard, stack.DefaultOpts()) | ||
| if err != nil && !errors.Is(err, io.EOF) { | ||
| return nil, fmt.Errorf("get stack: %w", err) | ||
| } | ||
|
|
||
| infos := make([]*mgr.WorkerInfo, 0, 32) | ||
| for _, m := range i.serviceGroup.Modules() { | ||
| wi, _ := m.Manager().WorkerInfo(snapshot) // Does not fail when we provide a snapshot. | ||
| infos = append(infos, wi) | ||
| } | ||
| for _, m := range i.SpnGroup.Modules() { | ||
| wi, _ := m.Manager().WorkerInfo(snapshot) // Does not fail when we provide a snapshot. | ||
| infos = append(infos, wi) | ||
| } | ||
|
|
||
| return mgr.MergeWorkerInfo(infos...), nil | ||
| } | ||
|
Comment on lines
+16
to
+34
There was a problem hiding this comment. Review: Implementation of This method is similar to the one in Apply the same enhancements regarding error handling and logging as suggested for the |
||
|
|
||
| // AddWorkerInfoToDebugInfo adds the worker info of all running workers to the debug info. | ||
| func (i *Instance) AddWorkerInfoToDebugInfo(di *debug.Info) { | ||
| info, err := i.GetWorkerInfo() | ||
| if err != nil { | ||
| di.AddSection( | ||
| "Worker Status Failed", | ||
| debug.UseCodeSection, | ||
| err.Error(), | ||
| ) | ||
| return | ||
| } | ||
|
|
||
| di.AddSection( | ||
| fmt.Sprintf("Worker Status: %d/%d (%d?)", info.Running, len(info.Workers), info.Missing+info.Other), | ||
| debug.UseCodeSection, | ||
| info.Format(), | ||
| ) | ||
| } | ||
|
|
||
| func fullStack() []byte { | ||
| buf := make([]byte, 8096) | ||
| for { | ||
| n := runtime.Stack(buf, true) | ||
| if n < len(buf) { | ||
| return buf[:n] | ||
| } | ||
| buf = make([]byte, 2*len(buf)) | ||
| } | ||
| } | ||
|
Comment on lines
+55
to
+64
There was a problem hiding this comment. Review: The implementation is identical to that in the Add a comment explaining the buffer resizing strategy as suggested for the |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,33 @@ | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| package service | ||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||
| import ( | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| "testing" | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| "time" | ||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||
| "github.com/safing/portmaster/base/notifications" | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| "github.com/safing/portmaster/service/mgr" | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| ) | ||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||
| func TestDebug(t *testing.T) { | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| t.Parallel() | ||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||
| // Create test instance with at least one worker. | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| i := &Instance{} | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| n, err := notifications.New(i) | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| if err != nil { | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| t.Fatal(err) | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| i.serviceGroup = mgr.NewGroup(n) | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| i.SpnGroup = mgr.NewExtendedGroup() | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| err = i.Start() | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| if err != nil { | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| t.Fatal(err) | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||
|
Comment on lines
+14
to
+25
There was a problem hiding this comment. Ensure proper cleanup in tests. The test creates an instance and starts it but does not ensure it is properly stopped or cleaned up after the test, which could lead to resource leaks during test runs. Consider adding a + defer i.Stop()
err = i.Start()
if err != nil {
t.Fatal(err)
}Committable suggestion
Suggested change
|
||||||||||||||||||||||||||||||||||||||||||||||||||||
| time.Sleep(100 * time.Millisecond) | ||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||
| info, err := i.GetWorkerInfo() | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| if err != nil { | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| t.Fatal(err) | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| t.Log(info) | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||
|
Comment on lines
+11
to
+33
There was a problem hiding this comment. Consider using synchronization primitives instead of The use of |
||||||||||||||||||||||||||||||||||||||||||||||||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Issue: Contradictory linter configuration.
The linters
perfsprint,testifylint, andgomoddirectivesare both added and removed. This could be an oversight. Please verify the linter configuration.Also applies to: 27-27, 39-39