Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

router: make room for multiple underlay impls phase 1 #4658

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
+855 −368
Open

router: make room for multiple underlay impls phase 1 #4658

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1443c95
Just a checkpoint. All of this still WIP.
jiceatscion Nov 29, 2024
c37767a
Merge branch 'scionproto:master' into router_multi_io_3
jiceatscion Jan 16, 2025
d16ad11
Move a large part of underlay-specific code out of the main router.
jiceatscion Jan 24, 2025
9861586
Lintify.
jiceatscion Jan 24, 2025
f8242d3
Merge branch 'master' into router_multi_io_3
jiceatscion Jan 24, 2025
a2fb58c
Remove a couple of interface method calls out of the critical path.
jiceatscion Jan 24, 2025
b1eb189
Address reviewers concerns (TODO comments and variable names).
jiceatscion Jan 27, 2025
2df9f4d
Adjust a couple more comment.
jiceatscion Jan 27, 2025
275a5d2
Implement reviewer's suggestions.
jiceatscion Jan 30, 2025
48fcef7
Merge branch 'master' into router_multi_io_3
jiceatscion Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions router/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ go_library(
"metrics.go",
"serialize_proxy.go",
"svc.go",
"underlay.go",
],
importpath = "github.com/scionproto/scion/router",
visibility = ["//visibility:public"],
Expand Down Expand Up @@ -69,6 +70,7 @@ go_test(
"//private/underlay/conn:go_default_library",
"//router/control:go_default_library",
"//router/mock_router:go_default_library",
"//router/underlayproviders:go_default_library",
"@com_github_golang_mock//gomock:go_default_library",
"@com_github_google_gopacket//:go_default_library",
"@com_github_google_gopacket//layers:go_default_library",
Expand Down
1 change: 1 addition & 0 deletions router/cmd/router/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ go_library(
"//router/config:go_default_library",
"//router/control:go_default_library",
"//router/mgmtapi:go_default_library",
"//router/underlayproviders:go_default_library",
"@com_github_go_chi_chi_v5//:go_default_library",
"@com_github_go_chi_cors//:go_default_library",
"@org_golang_x_sync//errgroup:go_default_library",
Expand Down
13 changes: 7 additions & 6 deletions router/cmd/router/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import (
"github.com/scionproto/scion/router/config"
"github.com/scionproto/scion/router/control"
api "github.com/scionproto/scion/router/mgmtapi"
_ "github.com/scionproto/scion/router/underlayproviders"
)

var globalCfg config.Config
Expand Down Expand Up @@ -64,6 +65,11 @@ func realMain(ctx context.Context) error {
DataPlane: router.DataPlane{
Metrics: metrics,
ExperimentalSCMPAuthentication: globalCfg.Features.ExperimentalSCMPAuthentication,
RunConfig: router.RunConfig{
NumProcessors: globalCfg.Router.NumProcessors,
NumSlowPathProcessors: globalCfg.Router.NumSlowPathProcessors,
BatchSize: globalCfg.Router.BatchSize,
},
},
ReceiveBufferSize: globalCfg.Router.ReceiveBufferSize,
SendBufferSize: globalCfg.Router.SendBufferSize,
Expand Down Expand Up @@ -131,12 +137,7 @@ func realMain(ctx context.Context) error {
})
g.Go(func() error {
defer log.HandlePanic()
runConfig := &router.RunConfig{
NumProcessors: globalCfg.Router.NumProcessors,
NumSlowPathProcessors: globalCfg.Router.NumSlowPathProcessors,
BatchSize: globalCfg.Router.BatchSize,
}
if err := dp.DataPlane.Run(errCtx, runConfig); err != nil {
if err := dp.DataPlane.Run(errCtx); err != nil {
return serrors.Wrap("running dataplane", err)
}
return nil
Expand Down
Loading
Loading