From e5249a1d2c507ac51689214680c00fcd1b3ab2ef Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 08 八月 2019 20:46:11 +0800
Subject: [PATCH] 测试多线程
---
main.go | 76 ++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/main.go b/main.go
index b1dc371..8ec5686 100644
--- a/main.go
+++ b/main.go
@@ -6,6 +6,7 @@
"basic.com/valib/deliver.git"
"ruleprocess/insertdata"
"ruleprocess/util"
+ "time"
//"bufio"
//"bytes"
@@ -56,28 +57,41 @@
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{}
- //paramFormat(msg, &arg)
- m := paramFormat(msg, &arg)
- logger.Info("瑙ｆ瀽鍑烘潵鐨勬暟鎹細", arg)
- ruleserver.Judge(&arg,&m) // 鎶妔dkMessage浼犺繘鍘伙紝鏂逛究缂撳瓨鏁版嵁鏃舵嫾鍑轰竴涓猺esultMag
- // 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
- resultMag := ruleserver.ResultMsg{SdkMessage: &m, RuleResult: arg.RuleResult}
- //logger.Info("鎵撳畬鏍囩鍚庣殑缁撴灉锛�",resultMag)
- // 灏嗘墦瀹屾爣绛剧殑鏁版嵁鎻掑叆鍒癊S
- insertdata.InsertToEs(resultMag)
+ wg := sync.WaitGroup{}
+ for msg := range msgChan {
+ wg.Add(1)
+ go func() {
+ logger.Debug("褰撳墠鏃堕棿鎴筹細",time.Now().Unix())
+ arg := ruleserver.SdkDatas{}
+ //paramFormat(msg, &arg)
+ start := time.Now()
+ m := paramFormat(msg, &arg)
+ // 杩涜瑙勫垯澶勭悊鍒ゆ柇(鎵撲笂瑙勫垯鐨勬爣绛�)
+ ruleserver.Judge(&arg,&m) // 鎶妔dkMessage浼犺繘鍘伙紝鏂逛究缂撳瓨鏁版嵁鏃舵嫾鍑轰竴涓猺esultMag
+ // 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
+ resultMsg := ruleserver.ResultMsg{SdkMessage: &m, RuleResult: arg.RuleResult}
+ logger.Debug("瑙勫垯鍒ゆ柇瀹屾墍鐢ㄦ椂闂达細",time.Since(start))
+ // 灏嗘墦瀹屾爣绛剧殑鏁版嵁鎻掑叆鍒癊S
+ insertdata.InsertToEs(resultMsg)
+ logger.Debug("鎻掑叆瀹孍s鎵�鐢ㄦ椂闂达細",time.Since(start))
+ //浜嬩欢鎺ㄩ��
+ //go labelFilter.Judge(resultMsg)
+ wg.Done()
+ }()
+ }
}
}
}
@@ -109,17 +123,6 @@
panic("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�")
}
- // 鎵�201鐨勪汉鑴告暟鎹�
- //for _, sdkinfo := range m.Tasklab.Sdkinfos {
- // if sdkinfo.Sdktype == "FaceDetect" && m.Cid == "e7e3f5b0-d0ef-40af-a9c9-eefd736937bf"{ // 浜鸿劯妫�娴�
- // if len(sdkinfo.Sdkdata) > 1 {
- // logger.Debug("鏈�201鐨勪汉鑴告暟鎹簡")
- // } else {
- // logger.Debug("娌℃湁201鐨勪汉鑴告暟鎹�")
- // }
- // }
- //}
-
// 鍏堣繘琛屼竴涓嬭拷韪�
//ruleserver.FaceIsSame(&m)
args.CameraId = m.Cid
@@ -131,6 +134,7 @@
}
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" {
@@ -138,12 +142,12 @@
arg.TaskId = m.Tasklab.Taskid
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杩樻病鏈夎繖淇╃畻娉�
@@ -179,12 +183,12 @@
arg.TaskId = m.Tasklab.Taskid
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杩樻病鏈夎繖淇╃畻娉�
@@ -197,10 +201,10 @@
logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
- logger.Info("--------------杩借釜涔嬪悗yolo鐨勪釜鏁帮細",len(faceParam.Faces))
+ logger.Info("--------------杩借釜涔嬪悗浜鸿劯鐨勪釜鏁帮細",len(faceParam.Faces))
for _, info := range faceParam.Faces {
//logger.Info("_______________________________________________绗竴娆＄湅鐩镐技鍊硷細",info.Pos.FAngle.Confidence*100)
- photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.FAngle.Confidence*100), IsYolo:false,ThftRes:*(info.Result),Feature:info.Feats}
+ photoMap := ruleserver.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)
--
Gitblit v1.8.0