fix IsSystemGoroutine after rebase.

doujiang24 · doujiang24 · commit ff6dbed800f3 · 2022-07-28T13:42:21.000+08:00
diff --git a/src/internal/trace/goroutines.go b/src/internal/trace/goroutines.go
@@ -353,5 +353,6 @@ func RelatedGoroutines(events []*Event, goid uint64) map[uint64]bool {
 func IsSystemGoroutine(entryFn string) bool {
 	// This mimics runtime.isSystemGoroutine as closely as
 	// possible.
-	return entryFn != "runtime.main" && strings.HasPrefix(entryFn, "runtime.")
+	// Also, locked g in extra M (with empty entryFn) is system goroutine.
+	return entryFn == "" || entryFn != "runtime.main" && strings.HasPrefix(entryFn, "runtime.")
 }

Original file line number	Diff line number	Diff line change
`@@ -353,5 +353,6 @@ func RelatedGoroutines(events []*Event, goid uint64) map[uint64]bool {`
`353`	`353`	`func IsSystemGoroutine(entryFn string) bool {`
`354`	`354`	`// This mimics runtime.isSystemGoroutine as closely as`
`355`	`355`	`// possible.`
`356`		`- return entryFn != "runtime.main" && strings.HasPrefix(entryFn, "runtime.")`
	`356`	`+ // Also, locked g in extra M (with empty entryFn) is system goroutine.`
	`357`	`+ return entryFn == "" \|\| entryFn != "runtime.main" && strings.HasPrefix(entryFn, "runtime.")`
`357`	`358`	`}`