From 330a9e5cb636286cdb399cd305856e5f419c540f Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 13 十二月 2019 17:22:33 +0800
Subject: [PATCH] remove no use code
---
sdk/sdk.go | 140 ++++++++++++++++++++++++++--------------------
1 files changed, 78 insertions(+), 62 deletions(-)
diff --git a/sdk/sdk.go b/sdk/sdk.go
index 6353513..0941757 100644
--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -1,11 +1,10 @@
package sdk
import (
- "fmt"
-
- "github.com/gogo/protobuf/proto"
"taskpubsub/tasktag"
"taskpubsub/util"
+
+ "github.com/gogo/protobuf/proto"
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
@@ -13,49 +12,23 @@
)
const (
- postPush = "_1.ipc"
- postPull = "_2.ipc"
+ postPush = "_1"
+ postPull = "_2"
)
var SocketManage = make(map[string]util.SocketContext)
var SdkMap = make(map[string]chan protomsg.SdkMessage)
-var innerRecvTopic = []string{
- "facedetect-sdk-no-track", //to sdk-no-track 浠ュ浘鎼滃浘
-}
+var shm bool = false
-var innerSendTopic = []string{
- "facedetect-sdk-no-track", //to sdk-no-track 浠ュ浘鎼滃浘
- "virtual-faceextract-sdk-pull", //to web 浠ュ浘鎼滃浘
-}
+func Init(useShm bool) {
-func initInnerTopic() {
- for _, sendTopic := range innerSendTopic {
- createSdkSendServerAndListen(sendTopic)
- }
-
- for _, recvTopic := range innerRecvTopic {
- createSdkRecvServerAndListen(recvTopic)
- }
-}
-
-func Init() {
+ shm = useShm
logger.Info("============= init sdk info =====================")
for _, sdkid := range util.Sdklist { // 鍒涘缓sdk server
createSdkTopicAndServer(sdkid)
- logger.Info()
}
-
- // 鎵嬪姩杈撳叆鐨勪富棰�
- initInnerTopic()
-
- // es
- SdkMap["es"] = make(chan protomsg.SdkMessage)
- logger.Info("create es channel: ")
- logger.Info("SdkMap:", SdkMap)
-
- go DealEsTopic()
go autoUpdateSdk(util.Sdkflag)
}
@@ -82,17 +55,24 @@
func createSdkSendServerAndListen(id string) {
if _, isExist := SdkMap[id]; !isExist { //涓嶅瓨鍦�
SdkMap[id] = make(chan protomsg.SdkMessage)
- logger.Info("create", id)
}
- url := fmt.Sprintf("ipc:///tmp/%s%s", id, postPush)
- socket, err := util.NewSocketListen(int(deliver.PushPull), url)
+ url := "ipc:///tmp/" + id + postPush + ".ipc"
+ m := deliver.PushPull
+ if shm {
+ m = deliver.Shm
+ url = id + postPush
+ }
+
+ socket, err := util.NewSocketListen(int(m), url, shm)
if err != nil {
delete(SdkMap, id)
logger.Error(id, "create socket error!")
return
}
+
SocketManage[id] = socket
+ logger.Info("SDK URL Send: ", url)
go Send(id, socket, SdkMap[id])
}
@@ -103,14 +83,24 @@
logger.Info("create", id)
}
- url := fmt.Sprintf("ipc:///tmp/%s%s", id, postPull)
- socket, err := util.NewSocketListen(int(deliver.PushPull), url)
+ url := "ipc:///tmp/" + id + postPull + ".ipc"
+ m := deliver.PushPull
+ if shm {
+ m = deliver.Shm
+ url = id + postPull
+
+ }
+
+ socket, err := util.NewSocketListen(int(m), url, shm)
+
if err != nil {
delete(SdkMap, id)
logger.Error(id, "create socket error!")
return
}
+
SocketManage[id] = socket
+ logger.Info("SDK URL Recv: ", url)
go Recv(socket)
}
@@ -136,14 +126,6 @@
}
newSdkList := util.Sdklist
-
- // 鎵嬪姩娣诲姞鐨勫叏閮ㄥ姞涓�
- for _, sendTopic := range innerSendTopic {
- newSdkList = append(newSdkList, sendTopic)
- }
- for _, recvTopic := range innerRecvTopic {
- newSdkList = append(newSdkList, recvTopic)
- }
sdkListUpdate := util.Difference(oldSdkList, newSdkList)
logger.Info(sdkListUpdate)
@@ -177,13 +159,13 @@
func GetSdkSendTopic(sdkmsg protomsg.SdkMessage) (sendTopic string) {
if int(sdkmsg.Tasklab.Index) < len(sdkmsg.Tasklab.Sdkinfos) {
sendTopic = sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Ipcid
- if "Yolo" != sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype &&
- "FaceDetect" != sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype &&
- "FaceCompare" != sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype{
- //if sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype == "" {
- logger.Info("----------Sdktype:yitusoutu")
- logger.Info("鍒嗗彂鐨勪富棰�:", sendTopic, "!Sdktype锛�", sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype)
- }
+ // if "Yolo" != sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype &&
+ // "FaceDetect" != sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype &&
+ // "FaceCompare" != sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype {
+ // //if sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype == "" {
+ // logger.Info("----------Sdktype:yitusoutu")
+ // logger.Info("鍒嗗彂鐨勪富棰�:", sendTopic, "!Sdktype锛�", sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype)
+ // }
} else {
sendTopic = "es"
}
@@ -192,16 +174,36 @@
}
func Recv(socket util.SocketContext) {
+
+ tryCount := 0
+
var repsdkmsg = protomsg.SdkMessage{}
for {
select {
case <-socket.Context.Done():
+ socket.Sock.Close()
+
logger.Info("socket close")
return
default:
if msg, err := socket.Sock.Recv(); err != nil {
+
+ // tryCount++
+ // socket = util.MaybeRestartSocket(socket, &tryCount)
+
+ if socket.UseSHM {
+ if tryCount > util.ShmMaxTryCount {
+ socket.Sock.Close()
+ socket, err = util.NewSocketListen(socket.Mode, socket.URL, socket.UseSHM)
+ // logger.Info("SDK SEND SHM TRY :", util.ShmMaxTryCount, " RESTART IT")
+ tryCount = 0
+ continue
+ }
+ tryCount++
+ }
continue
} else {
+
err = proto.Unmarshal(msg, &repsdkmsg)
if err != nil {
logger.Error("unmarshal error: ", err)
@@ -210,10 +212,8 @@
repsdkmsg.Tasklab.Index++
//璋冪敤璁＄畻鍑芥暟锛� 鍒嗗彂缁欎笅涓�涓富棰�
nexttopic := GetSdkSendTopic(repsdkmsg)
- if "facedetect-sdk-no-track" == nexttopic || "virtual-faceextract-sdk-pull" == nexttopic {
- logger.Info("nexttopic:", nexttopic)
- }
SdkMap[nexttopic] <- repsdkmsg
+ logger.Info("recv from URL: ", socket.URL, " success: ", len(msg), " send to: ", repsdkmsg)
}
}
}
@@ -221,9 +221,13 @@
func Send(sdkid string, socket util.SocketContext, in chan protomsg.SdkMessage) {
+ tryCount := 0
+
for {
select {
case <-socket.Context.Done():
+ socket.Sock.Close()
+
logger.Info("socket is close")
return
case v, ok := <-in:
@@ -235,14 +239,26 @@
}
if err := socket.Sock.Send(data); err != nil {
- if "facedetect-sdk-no-track" == sdkid || "virtual-faceextract-sdk-pull" == sdkid {
- logger.Error("failed send:sdkid=", sdkid)
+
+ // tryCount++
+ // socket = util.MaybeRestartSocket(socket, &tryCount)
+
+ if socket.UseSHM {
+ if tryCount > util.ShmMaxTryCount {
+ socket.Sock.Close()
+ socket, err = util.NewSocketListen(socket.Mode, socket.URL, socket.UseSHM)
+ // logger.Info("SDK SEND SHM TRY :", util.ShmMaxTryCount, " RESTART IT")
+ tryCount = 0
+ continue
+ }
+ tryCount++
}
+
continue
}
- if "facedetect-sdk-no-track" == sdkid || "virtual-faceextract-sdk-pull" == sdkid {
- logger.Info(sdkid, " send success: ", len(data))
- }
+
+ logger.Info("send to sdk id: ", sdkid, " success: ", len(data))
+
} else {
logger.Debug(sdkid, " 涓婚鍏抽棴, 鍏抽棴send()")
return
--
Gitblit v1.8.0