From 9d9cd1d3b93613071d1dffc1c82c4515d2a65af6 Mon Sep 17 00:00:00 2001 From: zhangmeng <775834166@qq.com> Date: 星期二, 21 一月 2020 17:22:39 +0800 Subject: [PATCH] bug fixed change real fetcher ip --- main.go | 165 +++++++++++++++++++++++++++--------------------------- 1 files changed, 83 insertions(+), 82 deletions(-) diff --git a/main.go b/main.go index 15bed52..b495dbe 100644 --- a/main.go +++ b/main.go @@ -2,19 +2,22 @@ import ( "analysis/logo" - "analysis/proc" "analysis/util" + "fmt" + "os/exec" + "os/signal" + "runtime/debug" "strconv" + "syscall" + "time" + + "analysis/app/master" + "analysis/app/slave" "context" "flag" "os" - "os/signal" - - "golang.org/x/sys/unix" - - "basic.com/valib/gogpu.git" // "net/http" // _ "net/http/pprof" ) @@ -27,50 +30,34 @@ gpu int shm bool ruleIPC string - soFile string + + configPath string ) const ( - master = `master` - slave = `slave` - single = `single` + roleMaster = `master` + roleSlave = `slave` ) func init() { - flag.BoolVar(&logit, "logit", false, "use logger,default flase") - flag.StringVar(&role, "role", single, "run process role master/slave/single, default single") - flag.StringVar(&runType, "sdk", util.FeatAll, "run sdk type, face/facedetect/facecompare/yolo,etc.") - flag.StringVar(&id, "id", util.FakeSdkID, "sdk id as ipc label") - flag.IntVar(&gpu, "gpu", -1, "gpu index") - flag.BoolVar(&shm, "shm", false, "use shm for performance") + flag.StringVar(&role, "role", roleMaster, "杩涚▼鍚姩鏂瑰紡,master/slave") + flag.StringVar(&runType, "sdk", util.FeatAll, "杩涚▼杩愯鐨勭畻娉曠被鍨婩aceDetect/Yolo,etc.slave浣跨敤") + flag.StringVar(&id, "id", util.FakeSdkID, "杩涚▼杩愯绠楁硶鐨処D,slave浣跨敤") - flag.StringVar(&soFile, "so-file", "./", "libcffmpeg.so path") + flag.StringVar(&configPath, util.ConfigPath, "", "杩涚▼杩愯绠楁硶鐨勫弬鏁伴厤缃枃浠惰矾寰�,master浠庤矾寰勮鍙栨枃浠�,slave浣跨敤鏂囦欢") - // 浜鸿劯璇嗗埆鍙傛暟 - flag.IntVar(&util.SFI.DetectThrd, util.FaceDetectThread, util.SFI.DetectThrd, "face detect max thread count") - flag.IntVar(&util.SFI.DetectNum, util.FaceDetectNum, util.SFI.DetectNum, "face detect min face count") - flag.IntVar(&util.SFI.DetectAngle, util.FaceDetectAngle, util.SFI.DetectAngle, "face detect face angle") - flag.IntVar(&util.SFI.PropThrd, util.FacePropertyThread, util.SFI.PropThrd, "face property max thread count") - flag.IntVar(&util.SFI.ExtractThrd, util.FaceExtractThread, util.SFI.ExtractThrd, "face extract max thread count") - flag.IntVar(&util.SFI.TrackInterval, util.FaceTrackInterval, util.SFI.TrackInterval, "face track needed interval") - flag.IntVar(&util.SFI.SampleSize, util.FaceTrackSample, util.SFI.SampleSize, "face track sample size") + flag.BoolVar(&logit, util.LogIt, false, "鏄惁淇濆瓨鏃ュ織鏂囦欢,榛樿false") + flag.BoolVar(&shm, util.SHM, false, "鏄惁浣跨敤shared memory, 榛樿false, slave浣跨敤") - // 杞﹁締淇℃伅 - // 鎺堟潈鏈嶅姟璺緞 - flag.StringVar(&util.SCI.LicenseServerPath, util.CarSDKLicense, util.SCI.LicenseServerPath, "car detect lic server bin path") - flag.IntVar(&util.SCI.MaxImageWidth, util.CarMaxImageWidth, util.SCI.MaxImageWidth, "car detect image width") - flag.IntVar(&util.SCI.MaxImageHeight, util.CarMaxImageHeight, util.SCI.MaxImageHeight, "car detect image height") - // cloud plate - flag.StringVar(&util.SCI.Model, util.CarSDKModel, util.SCI.Model, "cloud palte detector model") + flag.IntVar(&gpu, util.GPU, -1, "杩涚▼杩愯绠楁硶闇�瑕佺殑GPU Index") // 鎸囧畾鑾峰彇閰嶇疆淇℃伅浠巗qlite,鏈夋渶楂樹紭鍏堢骇, master浣跨敤 - flag.StringVar(&util.FSI.IP, util.FetchSrvIP, util.FSI.IP, "fetch server ip, like camera info") - flag.IntVar(&util.FSI.HTTPort, util.FetchSrvPort, util.FSI.HTTPort, "fetch server port") - flag.IntVar(&util.FSI.HBPort, util.FetchSrvHeartbeatPort, util.FSI.HBPort, "fetch server heartbeat port") - flag.IntVar(&util.FSI.DataPort, util.FetchSrvDataPort, util.FSI.DataPort, "fetch server data port") + flag.StringVar(&util.FSI.IP, util.FetchSrvIP, util.FSI.IP, "浠嶪P鑾峰彇闇�瑕佽繍琛岀殑SDK,master浣跨敤") + flag.IntVar(&util.FSI.HBPort, util.FetchSrvHeartbeatPort, util.FSI.HBPort, "鑾峰彇闇�瑕佽繍琛岀殑SDK鏈嶅姟鍣ㄧ殑蹇冭烦 Port,master浣跨敤") + flag.IntVar(&util.FSI.DataPort, util.FetchSrvDataPort, util.FSI.DataPort, "鑾峰彇闇�瑕佽繍琛岀殑SDK鏈嶅姟鍣ㄧ殑鏁版嵁 Port,master浣跨敤") // 鎸囧畾鍙戦�佸埌ruleprocess鐨刬pc鍦板潃 - flag.StringVar(&util.ToRuleIPC, util.RuleIPC, util.ToRuleIPC, "send data to ruleprocess ipc") + flag.StringVar(&util.ToRuleIPC, util.RuleIPC, util.ToRuleIPC, "灏嗙畻娉曡繍琛岀粨鏋滃彂閫佸埌瑙勫垯鏈嶅姟鍣ㄧ殑IPC鍦板潃,slave浣跨敤") } func runLogger() { @@ -86,52 +73,22 @@ } func setParamters() { - util.FillParams(util.FaceDetectThread, strconv.Itoa(util.SFI.DetectThrd)) - util.FillParams(util.FaceDetectNum, strconv.Itoa(util.SFI.DetectNum)) - util.FillParams(util.FaceDetectAngle, strconv.Itoa(util.SFI.DetectAngle)) - util.FillParams(util.FacePropertyThread, strconv.Itoa(util.SFI.PropThrd)) - util.FillParams(util.FaceExtractThread, strconv.Itoa(util.SFI.ExtractThrd)) - util.FillParams(util.FaceTrackInterval, strconv.Itoa(util.SFI.TrackInterval)) - util.FillParams(util.FaceTrackSample, strconv.Itoa(util.SFI.SampleSize)) - - util.FillParams(util.CarSDKLicense, util.SCI.LicenseServerPath) - util.FillParams(util.CarSDKModel, util.SCI.Model) - util.FillParams(util.CarMaxImageWidth, strconv.Itoa(util.SCI.MaxImageWidth)) - util.FillParams(util.CarMaxImageHeight, strconv.Itoa(util.SCI.MaxImageHeight)) - - util.FillParams(util.FetchSrvIP, util.FSI.IP) - util.FillParams(util.FetchSrvPort, strconv.Itoa(util.FSI.HTTPort)) - util.FillParams(util.FetchSrvHeartbeatPort, strconv.Itoa(util.FSI.HBPort)) - util.FillParams(util.FetchSrvDataPort, strconv.Itoa(util.FSI.DataPort)) + // util.FillParams(util.FetchSrvIP, util.FSI.IP) + // util.FillParams(util.FetchSrvHeartbeatPort, strconv.Itoa(util.FSI.HBPort)) + // util.FillParams(util.FetchSrvDataPort, strconv.Itoa(util.FSI.DataPort)) util.FillParams(util.RuleIPC, util.ToRuleIPC) - util.SetParams("-so-file=" + soFile) - util.SetParams("-gpu=" + strconv.Itoa(gpu)) + util.FillParams(util.GPU, strconv.Itoa(gpu)) if logit { - util.SetParams("-logit") + util.FillParams(util.LogIt, "true") } if shm { - util.SetParams("-shm") + util.FillParams(util.SHM, "true") } - - // util.FillParams("gpu", strconv.Itoa(gpu)) - // if logit { - // util.FillParams("logit", "true") - // } - // if shm { - // util.FillParams("shm", "true") - // } - } func main() { - - indices := gogpu.RankGPU() - if len(indices) == 0 { - logo.Errorln("there is no gpu for valid") - return - } util.InitConfig() @@ -143,23 +100,67 @@ runLogger() + if configPath == "" || len(configPath) == 0 { + logo.Infoln("!!!!!! SDK CONFIG PATH MUST EXIST !!!!!!") + return + } logo.Infoln(os.Args) ctx, cancel := context.WithCancel(context.Background()) - if role == single { - proc.SingleRole(ctx, runType, id, gpu, shm) - } else if role == master { + ret := false + if role == roleMaster { + defer dump(util.LogFile + "_dump_" + time.Now().Format("20060102150405")) setParamters() - proc.MasterRole(ctx) - } else if role == slave { - proc.SingleRole(ctx, runType, id, gpu, shm) + ret = master.Run(ctx, "./libcomm.so", configPath) + + } else if role == roleSlave { + ret = slave.Run(ctx, configPath, runType, id, gpu, shm) + } else if role == "test" { + ret = slave.TwoPluginConflict("./libcomm.so", "./zconf/Yolo.json") } - c := make(chan os.Signal, 1) - signal.Notify(c, os.Interrupt, os.Kill, unix.SIGTERM) - <-c + if ret { + c := make(chan os.Signal, 1) + signal.Notify(c, os.Interrupt, os.Kill, syscall.SIGTERM) + <-c + } cancel() logo.Close() } + +// const ( +// configFilePath = "/opt/vasystem/config/" +// configFileName = "sdkconfig" +// configFileType = "yaml" +// ) +// viper.SetConfigType(configFileType) +// viper.SetConfigName(configFileName) +// viper.AddConfigPath(configFilePath) +// viper.AddConfigPath("./") + +// envString := "" + +func dump(dumpFile string) { + dumpErr := recover() + if dumpErr == nil { + return + } + f, err := os.Create(dumpFile) + if err != nil { + return + } + f.WriteString(fmt.Sprintf("panic:\r\n%v", dumpErr)) + f.WriteString("\r\n\nstack:\r\n") + f.WriteString(string(debug.Stack())) + f.Close() + + ////////////////////////////////////////////// + // restart master + + cmd := exec.Command(os.Args[0], os.Args[1:]...) + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + cmd.Start() +} -- Gitblit v1.8.0