Skip to content

remove unnecessary wg and WaitExit from kernel, make Startup() block … #310

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

Merged
Lawliet-Chan merged 3 commits into from
Apr 17, 2026
Merged

remove unnecessary wg and WaitExit from kernel, make Startup() block … #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e41b5a
remove unnecessary wg and WaitExit from kernel, make Startup() block …
Apr 17, 2026
7a581c9
stopchan
Apr 17, 2026
53c02d4
http admin stop
Apr 17, 2026
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: 1 addition & 1 deletion core/kernel/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func (k *Kernel) HandleHttp() {
if k.cfg.IsAdmin {
admin := api.Group(AdminType)
admin.GET("stop", func(c *gin.Context) {
close(k.stopChan)
k.Stop()
})
}

Expand Down
14 changes: 2 additions & 12 deletions core/kernel/kernel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package kernel

import (
"sync"

"github.com/sirupsen/logrus"

"github.com/yu-org/yu/common"
Expand All @@ -29,7 +27,6 @@ type Kernel struct {
*env.ChainEnv

Land *tripod.Land
wg *sync.WaitGroup
}

func NewKernel(
Expand All @@ -46,7 +43,6 @@ func NewKernel(
wsPort: ip.MakePort(cfg.WsPort),
ChainEnv: env,
Land: land,
wg: &sync.WaitGroup{},
}

env.Execute = k.SeqExecuteWritings
Expand Down Expand Up @@ -76,24 +72,18 @@ func (k *Kernel) WithExecuteFn(fn env.ExecuteFn) {
k.Execute = fn
}

func (k *Kernel) WaitExit() {
k.wg.Wait()
}

func (k *Kernel) Startup() {
k.InitBlockChain()

go k.HandleHttp()
go k.HandleWS()

k.wg.Add(1)
go k.AcceptUnpkgTxnsJob()
go k.Run()
k.Run()
}

func (k *Kernel) Stop() {
close(k.stopChan)
k.wg.Wait()
k.stopChan <- struct{}{}
}

func (k *Kernel) InitBlockChain() {
Expand Down
5 changes: 1 addition & 4 deletions core/kernel/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@ func (k *Kernel) AcceptUnpkgTxnsJob() {
}

func (k *Kernel) Run() {
defer func() {
logrus.Info("Run exit")
k.wg.Done()
}()
defer logrus.Info("Run exit")
switch k.RunMode {
case common.LocalNode:
for {
Expand Down
Loading