From 5d17d528ded3c828f7f79ae57ec72429de6dd1c9 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 13 十一月 2019 16:56:37 +0800
Subject: [PATCH] 去掉link
---
main.go | 223 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 123 insertions(+), 100 deletions(-)
diff --git a/main.go b/main.go
index c74cd05..f7c05c9 100644
--- a/main.go
+++ b/main.go
@@ -1,28 +1,68 @@
package main
import (
- "fmt"
- "log"
- "ruleprocess/insertdata"
- "ruleprocess/ruleserver"
- "ruleprocess/util"
-
+ "basic.com/dbapi.git"
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
+ "net/http"
+ _ "net/http/pprof"
+ "ruleprocess/insertdata"
+ "ruleprocess/labelFilter"
+ "ruleprocess/structure"
+ "ruleprocess/util"
+ "time"
+
+ "basic.com/valib/logger.git"
+ "flag"
+ "fmt"
"github.com/golang/protobuf/proto"
+
+ "ruleprocess/cache"
+ "ruleprocess/ruleserver"
+ "sync"
+ "github.com/spf13/viper"
)
-func main() {
- //wg := sync.WaitGroup{}
- //wg.Add(1)
- //go ruleserver.TimeTicker()
- //nReciever("ipc:///tmp/sdk-2-rules-process.ipc", deliver.PushPull, 1)
- //wg.Wait()
- resp,err := util.DrawPolygon()
- if err != nil {
- log.Println("鐢绘鎴栬�呬笂浼犳湁闂")
+var dbIp = flag.String("dbIp", "127.0.0.1", "dbserver ip")
+var dbPort = flag.Int("dbPort", 8001, "default dbPort=8001")
+var surveyPort = flag.Int("surveyPort", 40007, "survey port") //蹇冭烦
+var pubPort = flag.Int("pubPort", 50007, "pubsub port") //鏁版嵁鏇存柊
+var initchan = make(chan bool)
+var env = flag.String("env","pro","env set")
+
+func init() {
+ flag.Parse()
+ // 鏃ュ織鍒濆鍖�
+
+ insertdata.Init(*env)
+ var logFile = "./logger/"
+ if viper.GetString("LogBasePath") != "" {
+ logFile = viper.GetString("LogBasePath")
}
- log.Println(resp["fileUrl"].(string))
+ logFile = logFile + "ruleprocess.log"
+ fmt.Println("鏃ュ織鍦板潃锛�",logFile)
+ logger.Config(logFile, logger.DebugLevel)
+ logger.SetSaveDays(7)
+ logger.Info("鏃ュ織鍒濆鍖栨垚鍔燂紒")
+}
+func main() {
+ //fmt.Println("缂撳瓨鍒濆鍖栧畬鎴�",<- initchan)//dbserver鍒濆鍖栧畬姣�
+ go func() {
+ http.ListenAndServe("0.0.0.0:8899",nil)
+ }()
+ flag.Parse()
+ wg := sync.WaitGroup{}
+ wg.Add(3)
+
+ dbapi.Init(*dbIp, *dbPort)
+ go cache.Init(initchan, *dbIp, *surveyPort, *pubPort)
+ logger.Info("cache init completed!!!", <-initchan) //dbserver鍒濆鍖栧畬姣�
+ ruleserver.Init()
+ labelFilter.Init()
+ go ruleserver.TimeTicker()
+ go ruleserver.StartServer()
+ nReciever("ipc:///tmp/sdk-2-rules-process.ipc", deliver.PushPull, 1)
+ wg.Wait()
}
func nReciever(url string, m deliver.Mode, count int) {
c := deliver.NewServer(m, url)
@@ -33,35 +73,51 @@
var msg []byte
var err error
-
+ //msgChan := make(chan []byte,100)
for {
select {
// case <-ctx.Done():
// return
default:
msg, err = c.Recv()
+ //msgChan <- msg
if err != nil {
+ logger.Info("recv error : ", err)
fmt.Println("recv error : ", err)
continue
} else {
- arg := ruleserver.SdkDatas{}
- m := paramFormat(msg, &arg)
- fmt.Println("瑙ｆ瀽鍑烘潵鐨勬暟鎹細", arg)
- ruleserver.Judge(&arg)
- // 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
- resultMag := ruleserver.ResultMsg{SdkMessage: m, RuleResult: arg.RuleResult}
- //fmt.Println("鎵撳畬鏍囩鍚庣殑缁撴灉锛�",resultMag)
-
- // 灏嗘墦瀹屾爣绛剧殑鏁版嵁鎻掑叆鍒癊S
- insertdata.InsertToEs(resultMag)
+ //runtime.GOMAXPROCS(runtime.NumCPU())
+ //logger.Debug("浣跨敤鐨刢pu涓暟锛�",runtime.NumCPU())
+ //go func(msg []byte) {
+ logger.Debug("褰撳墠鏃堕棿鎴筹細", time.Now().Unix())
+ arg := structure.SdkDatas{}
+ //paramFormat(msg, &arg)
+ start := time.Now()
+ m := paramFormat(msg, &arg)
+ // 杩涜瑙勫垯澶勭悊鍒ゆ柇(鎵撲笂瑙勫垯鐨勬爣绛�)
+ ruleserver.Judge(&arg, &m) // 鎶妔dkMessage浼犺繘鍘伙紝鏂逛究缂撳瓨鏁版嵁鏃舵嫾鍑轰竴涓猺esultMag
+ // 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
+ resultMsg := structure.ResultMsg{SdkMessage: &m, RuleResult: arg.RuleResult}
+ ruleserver.GetAttachInfo(resultMsg.SdkMessage)
+ ruleEnd := time.Since(start)
+ logger.Debug("瑙勫垯鍒ゆ柇瀹屾墍鐢ㄦ椂闂达細", ruleEnd)
+ // 灏嗘墦瀹屾爣绛剧殑鏁版嵁鎻掑叆鍒癊S
+ insertdata.InsertToEs(resultMsg)
+ esEnd := time.Since(start)
+ logger.Debug("鎻掑叆瀹孍s鎵�鐢ㄦ椂闂达細", esEnd)
+ //浜嬩欢鎺ㄩ��
+ labelFilter.PushSomthing(resultMsg)
+ //}(msg)
}
}
}
}
+
// 灏嗗閮ㄤ紶杩涙潵鐨剅ect锛坱op,bottom,left,right锛夎浆鍖栦负鑷繁鍐呴儴鐨剅ect(left top width height)
-func rectFormat(rcobj *protomsg.Rect) ruleserver.Rect {
- rect := ruleserver.Rect{}
+func rectFormat(rcobj *protomsg.Rect) structure.Rect {
+ //logger.Info("++++++++++++++++++++++++++++++鏀跺埌鐨剏olo鐨勫尯鍩熷潗鏍囷細",rcobj)
+ rect := structure.Rect{}
rect.X = float64(rcobj.Left)
rect.Y = float64(rcobj.Top)
rect.Width = float64(rcobj.Right - rcobj.Left)
@@ -70,10 +126,10 @@
}
// 灏嗗閮ㄤ紶杩涙潵鐨剆dk鏁版嵁鍖呰В鎴� SdkDatas
-func paramFormat(msg []byte, args *ruleserver.SdkDatas) protomsg.SdkMessage {
+func paramFormat(msg []byte, args *structure.SdkDatas) protomsg.SdkMessage {
defer func() {
if err := recover(); err != nil {
- fmt.Println("瑙ｅ寘杩囩▼鐨勯敊璇�", err.(string))
+ logger.Info("瑙ｅ寘杩囩▼鐨勫紓甯告崟鑾�", err.(string))
}
}()
@@ -83,7 +139,11 @@
if err != nil {
panic("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�")
}
+
+ // 鍏堣繘琛屼竴涓嬭拷韪�
+ ruleserver.FaceIsSame(&m)
args.CameraId = m.Cid
+ args.TaskId = m.Tasklab.Taskid
// 鎶婂浘鐗囩殑浜岃繘鍒惰В鍘嬬缉杩涜鐢绘鍦ㄥ帇缂╁洖鍘�
bdata, err := util.UnCompress(m.Data)
if err != nil {
@@ -91,121 +151,84 @@
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
-
+ logger.Info("鎺ュ埌鏁版嵁锛屾憚鍍忔満涓猴細", m.Cid, "鍥剧墖鐨刬d涓猴細", i.Id)
+ //logger.Info("----------------鐪嬬湅鏈夊嚑涓畻娉曪細",len(m.Tasklab.Sdkinfos))
for _, sdkinfo := range m.Tasklab.Sdkinfos { // yolo绠楁硶
if sdkinfo.Sdktype == "Yolo" {
- arg := ruleserver.SdkData{}
+ arg := structure.SdkData{}
arg.TaskId = m.Tasklab.Taskid
- arg.SdkId = sdkinfo.Sdkid
- arg.SdkName = sdkinfo.SdkName
+ arg.IpcId = sdkinfo.Ipcid
arg.IsYolo = true
- bdata, err := util.UnCompress(m.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- }
- i := protomsg.Image{}
- err = proto.Unmarshal(bdata, &i)
+ //bdata, err := util.UnCompress(m.Data)
+ //if err != nil {
+ // panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ //}
+ //i := protomsg.Image{}
+ //err = proto.Unmarshal(bdata, &i)
arg.ImageWidth = int(i.Width)
arg.ImageHeight = int(i.Height)
// 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
arg.KeepRight = false
arg.IsStatic = false
+ logger.Info("-----杩借釜涔嬪悗sdkinfo.Sdkdata鐨勯暱搴︿负锛�----", len(sdkinfo.Sdkdata))
if len(sdkinfo.Sdkdata) > 1 {
// 澶т簬1鎵嶆湁鏁版嵁
- fmt.Println("----------------------------------------------------",m.Cid)
yoloParam := protomsg.ParamYoloObj{}
err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
if err != nil {
- fmt.Println("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ logger.Info("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
+ var yoloNum int = 0
for _, info := range yoloParam.Infos {
if info.Typ == 0 {
- photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)*100,IsYolo:true}
+ //logger.Debug("-------------yolo鐨勫潗鏍囨湁鍑犱釜",info.RcObj)
+ photoMap := structure.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob) * 100, IsYolo: true,Id:info.ObjID}
arg.Photo = append(arg.Photo, photoMap)
+ yoloNum++
}
}
- args.Sdkdata = append(args.Sdkdata,&arg)
+ logger.Info("--------------杩借釜涔嬪悗yolo鐨勪釜鏁帮細", yoloNum)
+ args.Sdkdata = append(args.Sdkdata, &arg)
} else {
continue
}
}
if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
- arg := ruleserver.SdkData{}
+ arg := structure.SdkData{}
arg.TaskId = m.Tasklab.Taskid
- arg.SdkId = sdkinfo.Sdkid
- arg.SdkName = sdkinfo.SdkName
+ arg.IpcId = sdkinfo.Ipcid
arg.IsYolo = false
- bdata, err := util.UnCompress(m.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- }
- i := protomsg.Image{}
- err = proto.Unmarshal(bdata, &i)
+ //bdata, err := util.UnCompress(m.Data)
+ //if err != nil {
+ // panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ //}
+ //i := protomsg.Image{}
+ //err = proto.Unmarshal(bdata, &i)
arg.ImageWidth = int(i.Width)
arg.ImageHeight = int(i.Height)
// 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
arg.KeepRight = false
arg.IsStatic = false
if len(sdkinfo.Sdkdata) > 1 {
- fmt.Println("----------------------------------------------------",m.Caddr)
faceParam := protomsg.ParamFacePos{}
err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
if err != nil {
- fmt.Println("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
+ logger.Info("--------------杩借釜涔嬪悗浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces))
for _, info := range faceParam.Faces {
- photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.Quality)*100, IsYolo:false,ThftRes:*(info.Result)}
+ //logger.Info("_______________________________________________绗竴娆＄湅鐩镐技鍊硷細",info.Pos.FAngle.Confidence*100)
+ photoMap := structure.PhotoMap{Id: info.Pos.FaceID, Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.FAngle.Confidence * 100), IsYolo: false, ThftRes: *(info.Result), Feature: info.Feats}
arg.Photo = append(arg.Photo, photoMap)
}
- args.Sdkdata = append(args.Sdkdata,&arg)
+ args.Sdkdata = append(args.Sdkdata, &arg)
} else {
continue
}
}
- if sdkinfo.Sdktype == "FaceExtract" { // 浜鸿劯鎻愬彇
- arg := ruleserver.SdkData{}
- arg.TaskId = m.Tasklab.Taskid
- arg.SdkId = sdkinfo.Sdkid
- arg.SdkName = sdkinfo.SdkName
- arg.IsYolo = false
- bdata, err := util.UnCompress(m.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- }
- i := protomsg.Image{}
- err = proto.Unmarshal(bdata, &i)
- arg.ImageWidth = int(i.Width)
- arg.ImageHeight = int(i.Height)
- // 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
- arg.KeepRight = false
- arg.IsStatic = false
- if len(sdkinfo.Sdkdata) > 1 {
- fmt.Println("----------------------------------------------------",m.Caddr)
- faceParam := protomsg.ParamFaceFeature{}
- err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
- if err != nil {
- fmt.Println("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- continue
- }
- for _, extComp := range faceParam.ExtComp {
- baseinfos := protomsg.Binfos{}
- err1 := proto.Unmarshal(extComp.Comp, &baseinfos)
- if err1 != nil {
- fmt.Println("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- continue
- }
- photoMap := ruleserver.PhotoMap{Rects: rectFormat(extComp.Pos.Pos.RcFace), Score: float64(extComp.Pos.Pos.Quality)*100, IsYolo:false,ThftRes:*(extComp.Pos.Result),Liker:baseinfos.Infos}
- arg.Photo = append(arg.Photo, photoMap)
- }
- args.Sdkdata = append(args.Sdkdata,&arg)
- } else {
- continue
- }
- }
-
}
return m
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0