Restructure modules (#1572)
* Move portbase into monorepo * Add new simple module mgr * [WIP] Switch to new simple module mgr * Add StateMgr and more worker variants * [WIP] Switch more modules * [WIP] Switch more modules * [WIP] swtich more modules * [WIP] switch all SPN modules * [WIP] switch all service modules * [WIP] Convert all workers to the new module system * [WIP] add new task system to module manager * [WIP] Add second take for scheduling workers * [WIP] Add FIXME for bugs in new scheduler * [WIP] Add minor improvements to scheduler * [WIP] Add new worker scheduler * [WIP] Fix more bug related to new module system * [WIP] Fix start handing of the new module system * [WIP] Improve startup process * [WIP] Fix minor issues * [WIP] Fix missing subsystem in settings * [WIP] Initialize managers in constructor * [WIP] Move module event initialization to constrictors * [WIP] Fix setting for enabling and disabling the SPN module * [WIP] Move API registeration into module construction * [WIP] Update states mgr for all modules * [WIP] Add CmdLine operation support * Add state helper methods to module group and instance * Add notification and module status handling to status package * Fix starting issues * Remove pilot widget and update security lock to new status data * Remove debug logs * Improve http server shutdown * Add workaround for cleanly shutting down firewall+netquery * Improve logging * Add syncing states with notifications for new module system * Improve starting, stopping, shutdown; resolve FIXMEs/TODOs * [WIP] Fix most unit tests * Review new module system and fix minor issues * Push shutdown and restart events again via API * Set sleep mode via interface * Update example/template module * [WIP] Fix spn/cabin unit test * Remove deprecated UI elements * Make log output more similar for the logging transition phase * Switch spn hub and observer cmds to new module system * Fix log sources * Make worker mgr less error prone * Fix tests and minor issues * Fix observation hub * Improve shutdown and restart handling * Split up big connection.go source file * Move varint and dsd packages to structures repo * Improve expansion test * Fix linter warnings * Fix interception module on windows * Fix linter errors --------- Co-authored-by: Vladimir Stoilov <vladimir@safing.io>
This commit is contained in:
@@ -7,8 +7,8 @@ import (
|
||||
"sync/atomic"
|
||||
"time"
|
||||
|
||||
"github.com/safing/portbase/formats/varint"
|
||||
"github.com/safing/portbase/modules"
|
||||
"github.com/safing/portmaster/service/mgr"
|
||||
"github.com/safing/structures/varint"
|
||||
)
|
||||
|
||||
// FlowControl defines the flow control interface.
|
||||
@@ -18,7 +18,7 @@ type FlowControl interface {
|
||||
Send(msg *Msg, timeout time.Duration) *Error
|
||||
ReadyToSend() <-chan struct{}
|
||||
Flush(timeout time.Duration)
|
||||
StartWorkers(m *modules.Module, terminalName string)
|
||||
StartWorkers(m *mgr.Manager, terminalName string)
|
||||
RecvQueueLen() int
|
||||
SendQueueLen() int
|
||||
}
|
||||
@@ -121,8 +121,8 @@ func NewDuplexFlowQueue(
|
||||
}
|
||||
|
||||
// StartWorkers starts the necessary workers to operate the flow queue.
|
||||
func (dfq *DuplexFlowQueue) StartWorkers(m *modules.Module, terminalName string) {
|
||||
m.StartWorker(terminalName+" flow queue", dfq.FlowHandler)
|
||||
func (dfq *DuplexFlowQueue) StartWorkers(m *mgr.Manager, terminalName string) {
|
||||
m.Go(terminalName+" flow queue", dfq.FlowHandler)
|
||||
}
|
||||
|
||||
// shouldReportRecvSpace returns whether the receive space should be reported.
|
||||
@@ -187,7 +187,7 @@ func (dfq *DuplexFlowQueue) reportableRecvSpace() int32 {
|
||||
|
||||
// FlowHandler handles all flow queue internals and must be started as a worker
|
||||
// in the module where it is used.
|
||||
func (dfq *DuplexFlowQueue) FlowHandler(_ context.Context) error {
|
||||
func (dfq *DuplexFlowQueue) FlowHandler(_ *mgr.WorkerCtx) error {
|
||||
// The upstreamSender is started by the terminal module, but is tied to the
|
||||
// flow owner instead. Make sure that the flow owner's module depends on the
|
||||
// terminal module so that it is shut down earlier.
|
||||
|
||||
Reference in New Issue
Block a user