Merge pull request #273 from tbs60/dev_tming

feat:support auto search toolchain, issue: #272

src/backend/booster/bk_dist/booster/command/command.go

@@ -63,6 +63,7 @@ const (
 	FlagOutputEnvSourceFile  = "output_env_source_file"
 	FlagCommitSuicide        = "commit_suicide"
 	FlagToolChainJSONFile    = "tool_chain_json_file"
+	FlagSearchToolchain      = "search_toolchain"
 	FlagBatchMode            = "batch_mode"
 	FlagDirectives           = "directives"
 	FlagGlobalSlots          = "global_slots"
@@ -279,6 +280,10 @@ var (
 			Name:  "tool_chain_json_file",
 			Usage: "json file to describe tool chain",
 		},
+		commandCli.BoolFlag{
+			Name:  "search_toolchain",
+			Usage: "automatically search for toolchain based on command",
+		},
 		commandCli.BoolFlag{
 			Name:  "batch_mode, bm",
 			Usage: "batch mode for booster, multi booster in the same projectID will use one same workID",

src/backend/booster/bk_dist/booster/command/process.go

@@ -315,6 +315,7 @@ func newBooster(c *commandCli.Context) (*pkg.Booster, error) {
 			WriteMemroy:          c.Bool(FlagWriteMemroMemroy),
 			IdleKeepSecs:         c.Int(FlagIdleKeepSecs),
 			CleanTmpFilesDayAgo:  cleanTmpFilesDayAgo,
+			SearchToolchain:      c.Bool(FlagSearchToolchain),
 		},
 
 		Transport: dcType.BoosterTransport{

src/backend/booster/bk_dist/booster/pkg/booster.go

@@ -360,6 +360,10 @@ func (b *Booster) getWorkersEnv() map[string]string {
 		requiredEnv[env.KeyExecutorIdleKeepSecs] = strconv.Itoa(b.config.Works.IdleKeepSecs)
 	}
 
+	if b.config.Works.SearchToolchain {
+		requiredEnv[env.KeyExecutorSearchToolchain] = envValueTrue
+	}
+
 	resultEnv := make(map[string]string, 10)
 	for k, v := range requiredEnv {
 		resultEnv[env.GetEnvKey(k)] = v

src/backend/booster/bk_dist/common/env/env.go

@@ -64,6 +64,7 @@ const (
 	KeyExecutorTotalActionNum          = "TOTAL_ACTION_NUM"
 	KeyExecutorUseWebSocket            = "USE_WEBSOCKET"
 	KeyExecutorNewShader               = "NEW_SHADER"
+	KeyExecutorSearchToolchain         = "SEARCH_TOOLCHAIN"
 
 	KeyUserDefinedLogLevel         = "USER_DEFINED_LOG_LEVEL"
 	KeyUserDefinedExecutorLogLevel = "USER_DEFINED_EXECUTOR_LOG_LEVEL"

src/backend/booster/bk_dist/common/syscall/syscall_darwin.go

@@ -331,3 +331,7 @@ func RedirectStderror(f string) error {
 
 	return nil
 }
+
+func NeedSearchToolchain(input *env.Sandbox) bool {
+	return false
+}

src/backend/booster/bk_dist/common/syscall/syscall_unix.go

@@ -332,3 +332,11 @@ func RedirectStderror(f string) error {
 
 	return nil
 }
+
+func NeedSearchToolchain(input *env.Sandbox) bool {
+	if input != nil {
+		return input.GetEnv(env.KeyExecutorSearchToolchain) != ""
+	}
+
+	return env.GetEnv(env.KeyExecutorSearchToolchain) != ""
+}

src/backend/booster/bk_dist/common/syscall/syscall_windows.go

@@ -516,3 +516,7 @@ func RedirectStderror(f string) error {
 
 	return nil
 }
+
+func NeedSearchToolchain(input *env.Sandbox) bool {
+	return false
+}

src/backend/booster/bk_dist/common/types/booster.go

@@ -132,6 +132,8 @@ type BoosterWorks struct {
 
 	EnableLink bool
 	EnableLib  bool
+
+	SearchToolchain bool
 }
 
 // BoosterTransport describe the transport data to controller

src/backend/booster/bk_dist/controller/pkg/manager/basic/mgr.go

@@ -42,13 +42,14 @@ func NewMgr(pCtx context.Context, work *types.Work) types.BasicMgr {
 	ctx, _ := context.WithCancel(pCtx)
 
 	return &Mgr{
-		ctx:               ctx,
-		work:              work,
-		settings:          &types.WorkSettings{},
-		info:              types.NewInitWorkInfo(work.ID()),
-		waitWorkReadyTick: 100 * time.Millisecond,
-		analysisStatus:    types.NewWorkAnalysisStatus(),
-		toolchainMap:      make(map[string]toolchainCache, 1),
+		ctx:                  ctx,
+		work:                 work,
+		settings:             &types.WorkSettings{},
+		info:                 types.NewInitWorkInfo(work.ID()),
+		waitWorkReadyTick:    100 * time.Millisecond,
+		analysisStatus:       types.NewWorkAnalysisStatus(),
+		toolchainMap:         make(map[string]toolchainCache, 1),
+		searchToolChainCache: make(map[string]bool, 10),
 	}
 }
 
@@ -70,9 +71,13 @@ type Mgr struct {
 	toolchainLock sync.RWMutex
 	toolchainMap  map[string]toolchainCache
 
+	searchToolchainLock sync.RWMutex
+
 	aliveTask int64
 
 	registeredCounter int32
+
+	searchToolChainCache map[string]bool
 }
 
 // Alive return the current alive task number
@@ -516,3 +521,24 @@ func (m *Mgr) GetToolChainTimestamp(key string) (int64, error) {
 
 	return v.toolchain.Timestamp, nil
 }
+
+// SearchToolChain search toolchain files by cmd, ensure only execute once
+func (m *Mgr) SearchToolChain(cmd string) error {
+	m.searchToolchainLock.Lock()
+	defer m.searchToolchainLock.Unlock()
+
+	if _, ok := m.searchToolChainCache[cmd]; ok {
+		blog.Infof("basic: toolchain with key:%s search before, do nothing", cmd)
+		return nil
+	}
+
+	m.searchToolChainCache[cmd] = true
+
+	// TODO : search toolchain with cmd now
+	toolchain, err := searchToolChain(cmd)
+	if err == nil && toolchain != nil {
+		m.SetToolChain(toolchain)
+	}
+
+	return nil
+}