Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-09-22 00:20:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Improve kernel stability by eliminating some data races https://github.com/siyuan-note/siyuan/issues/9842

Browse source
This commit is contained in:
Daniel 2023-12-08 13:05:50 +08:00
parent 8c5c62670e
commit bea32e96d5
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
17 changed files with 158 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

28
kernel/task/queue.go
View file

@ -45,7 +45,7 @@ func AppendTask(action string, handler interface{}, args ...interface{}) {
}
func AppendTaskWithTimeout(action string, timeout time.Duration, handler interface{}, args ...interface{}) {
if util.IsExiting {
if util.IsExiting.Load() {
//logging.LogWarnf("task queue is paused, action [%s] will be ignored", action)
return
}
@ -69,15 +69,18 @@ func AppendTaskWithTimeout(action string, timeout time.Duration, handler interfa
func getCurrentActions() (ret []string) {
queueLock.Lock()
defer queueLock.Unlock()
currentTaskActionLock.Lock()
if "" != currentTaskAction {
ret = append(ret, currentTaskAction)
}
currentTaskActionLock.Unlock()
for _, task := range taskQueue {
ret = append(ret, task.Action)
}
queueLock.Unlock()
return
}
@ -117,20 +120,23 @@ func Contain(action string, moreActions ...string) bool {
actions := append(moreActions, action)
actions = gulu.Str.RemoveDuplicatedElem(actions)
queueLock.Lock()
for _, task := range taskQueue {
if gulu.Str.Contains(task.Action, actions) {
return true
}
}
queueLock.Unlock()
return false
}
func StatusJob() {
tasks := taskQueue
var items []map[string]interface{}
count := map[string]int{}
actionLangs := util.TaskActionLangs[util.Lang]
for _, task := range tasks {
queueLock.Lock()
for _, task := range taskQueue {
action := task.Action
if c := count[action]; 2 < c {
logging.LogWarnf("too many tasks [%s], ignore show its status", action)
@ -147,7 +153,9 @@ func StatusJob() {
item := map[string]interface{}{"action": action}
items = append(items, item)
}
defer queueLock.Unlock()
currentTaskActionLock.Lock()
if "" != currentTaskAction {
if nil != actionLangs {
if label := actionLangs[currentTaskAction]; nil != label {
@ -155,6 +163,7 @@ func StatusJob() {
}
}
}
currentTaskActionLock.Unlock()
if 1 > len(items) {
items = []map[string]interface{}{}
@ -170,7 +179,7 @@ func ExecTaskJob() {
return
}
if util.IsExiting {
if util.IsExiting.Load() {
return
}
@ -190,7 +199,10 @@ func popTask() (ret *Task) {
return
}
var currentTaskAction string
var (
currentTaskAction string
currentTaskActionLock = sync.Mutex{}
)
func execTask(task *Task) {
defer logging.Recover()
@ -204,7 +216,9 @@ func execTask(task *Task) {
}
}
currentTaskActionLock.Lock()
currentTaskAction = task.Action
currentTaskActionLock.Unlock()
ctx, cancel := context.WithTimeout(context.Background(), task.Timeout)
defer cancel()
@ -221,5 +235,7 @@ func execTask(task *Task) {
//logging.LogInfof("task [%s] done", task.Action)
}
currentTaskActionLock.Lock()
currentTaskAction = ""
currentTaskActionLock.Unlock()
}