From e87bc90683436ee856c1d14ecab1f16940a20471 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期四, 05 十二月 2019 13:20:20 +0800
Subject: [PATCH] update
---
sdk/sdk.go | 365 ++++++++++++++++++++++++++++++---------------------
1 files changed, 216 insertions(+), 149 deletions(-)
diff --git a/sdk/sdk.go b/sdk/sdk.go
index bd933e7..88c0445 100644
--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -1,240 +1,307 @@
package sdk
import (
- "context"
- "errors"
- "fmt"
+ "taskpubsub/tasktag"
+ "taskpubsub/util"
- // "github.com/long/test/httpclient"
- "github.com/long/test/tasktag"
- "github.com/long/test/util"
-
- "github.com/golang/protobuf/proto"
+ "github.com/gogo/protobuf/proto"
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
+ "basic.com/valib/logger.git"
)
const (
- postPull = "_1.ipc"
- postPush = "_2.ipc"
+ postPush = "_1"
+ postPull = "_2"
)
-var SocketManage = make(map[string]SocketContext)
-var SdkMap = make(map[string]chan *protomsg.SdkMessage)
+var SocketManage = make(map[string]util.SocketContext)
+var SdkMap = make(map[string]chan protomsg.SdkMessage)
-type SocketContext struct {
- Sock deliver.Deliver
- Context context.Context
- Cancel context.CancelFunc
+var shm bool = false
+
+var innerRecvTopic = []string{
+ "facedetect-sdk-no-track", //to sdk-no-track 浠ュ浘鎼滃浘
}
-func Init() {
+var innerSendTopic = []string{
+ "facedetect-sdk-no-track", //to sdk-no-track 浠ュ浘鎼滃浘
+ "virtual-faceextract-sdk-pull", //to web 浠ュ浘鎼滃浘
+}
- fmt.Println("============= init sdk info =====================")
+func initInnerTopic() {
+ // for _, sendTopic := range innerSendTopic {
+ // createSdkSendServerAndListen(sendTopic)
+ // }
+
+ // for _, recvTopic := range innerRecvTopic {
+ // createSdkRecvServerAndListen(recvTopic)
+ // }
+}
+
+func Init(useShm bool) {
+
+ shm = useShm
+
+ logger.Info("============= init sdk info =====================")
for _, sdkid := range util.Sdklist { // 鍒涘缓sdk server
- CreatesdkTopicandServer(sdkid)
- fmt.Println()
+ createSdkTopicAndServer(sdkid)
+ logger.Info()
}
- SdkMap["es"] = make(chan *protomsg.SdkMessage)
- fmt.Println("create es channel: ")
- go es(SdkMap["es"])
- go AutoDelSdk(util.Sdkflag)
+ // 鎵嬪姩杈撳叆鐨勪富棰�
+ initInnerTopic()
+
+ // es
+ SdkMap["es"] = make(chan protomsg.SdkMessage)
+ logger.Info("create es channel: ")
+ go DealEsTopic()
+
+ go autoUpdateSdk(util.Sdkflag)
}
-func CreatesdkTopicandServer(sdkid string) {
- SdkMap[sdkid] = make(chan *protomsg.SdkMessage)
- fmt.Println("create sdk channel: ", sdkid)
-
- url := fmt.Sprintf("ipc:///tmp/%s%s", sdkid, postPull)
- sdkidser, socketser, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
- if err != nil {
- delete(SdkMap, sdkid)
- fmt.Println(sdkid, "create server error!")
- return
- }
- go Send(sdkidser, socketser, SdkMap[sdkid])
-
- url = fmt.Sprintf("ipc:///tmp/%s%s", sdkid, postPush)
- _, socketdial, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
- if err != nil {
- delete(SdkMap, sdkid)
- fmt.Println(sdkid, "create dial error!")
- return
- }
- go Recv(socketdial)
-
+func createSdkTopicAndServer(sdkid string) {
+ createSdkSendServerAndListen(sdkid)
+ createSdkRecvServerAndListen(sdkid)
}
-func DeletesdkTopicandServer(sdkid string) {
- close(SdkMap[sdkid])
- delete(SdkMap, sdkid)
- fmt.Println("鍒犻櫎涓婚 sdk: ", sdkid)
- SocketManage[sdkid].Cancel()
- delete(SocketManage, sdkid)
- fmt.Println("鍒犻櫎server sdk: ", sdkid)
+func deleteSdkTopicAndServer(id string) {
+ if _, isExist := SdkMap[id]; isExist { //瀛樺湪
+ close(SdkMap[id])
+ delete(SdkMap, id)
+ logger.Info("鍒犻櫎涓婚 sdk: ", id)
+ }
+
+ if _, isExist := SocketManage[id]; isExist { //瀛樺湪
+ SocketManage[id].Cancel()
+ delete(SocketManage, id)
+ logger.Info("鍒犻櫎server sdk: ", id)
+ }
+}
+
+func createSdkSendServerAndListen(id string) {
+ if _, isExist := SdkMap[id]; !isExist { //涓嶅瓨鍦�
+ SdkMap[id] = make(chan protomsg.SdkMessage)
+ logger.Info("create", id)
+ }
+
+ url := "ipc:///tmp/" + id + postPush + ".ipc"
+ m := deliver.PushPull
+ if shm {
+ m = deliver.Shm
+ url = id + postPush
+ }
+
+ logger.Info("SDK URL: ", url)
+
+ socket, err := util.NewSocketListen(int(m), url, shm)
+ if err != nil {
+ delete(SdkMap, id)
+ logger.Error(id, "create socket error!")
+ return
+ }
+ SocketManage[id] = socket
+
+ go Send(id, socket, SdkMap[id])
+}
+
+func createSdkRecvServerAndListen(id string) {
+ if _, isExist := SdkMap[id]; !isExist { //涓嶅瓨鍦�
+ SdkMap[id] = make(chan protomsg.SdkMessage)
+ logger.Info("create", id)
+ }
+
+ 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
+
+ go Recv(socket)
}
//鍗曠嫭澶勭悊 es 涓婚鐨勬儏鍐�
-func es(sdkmsgchan chan *protomsg.SdkMessage) {
- for _ = range sdkmsgchan {
- fmt.Println("this data is finish all sdk! ")
+func DealEsTopic() {
+ for {
+ select {
+ case <-SdkMap["es"]:
+ //logger.Info("es finanl sdk!")
+ }
}
}
//鍔ㄦ�佸鐞�
-func AutoDelSdk(sdkflag chan bool) {
+func autoUpdateSdk(sdkflag chan bool) {
for _ = range sdkflag {
- fmt.Println("test autodelsdk")
- var oldSdk []string
- for key, _ := range SdkMap {
- oldSdk = append(oldSdk, key)
+ logger.Info("test autodelsdk")
+ var oldSdkList []string
+ for key := range SdkMap {
+ oldSdkList = append(oldSdkList, key)
}
- util.Sdklist = append(util.Sdklist, "es")
- sdkChanDel := util.Difference(oldSdk, util.Sdklist)
- fmt.Println(sdkChanDel)
- for key, op := range sdkChanDel {
+ 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)
+
+ for key, op := range sdkListUpdate {
if op == "add" {
- CreatesdkTopicandServer(key)
+ createSdkTopicAndServer(key)
} else {
- DeletesdkTopicandServer(key)
- fmt.Println("鍒犻櫎涓婚 sdk: ", key)
+ deleteSdkTopicAndServer(key)
}
}
}
}
-//涓婚
-
//sdk鏁版嵁 鍔犲伐鍣�
-func SdkData(cid string, taskid string, data []byte) *protomsg.SdkMessage {
- var sdkmsg = &protomsg.SdkMessage{}
+func ToSdkMsg(cid string, caddr string, taskid string, data []byte) protomsg.SdkMessage {
+ var sdkmsg = protomsg.SdkMessage{}
sdkmsg.Cid = cid
- //if _, ok := tasktag.TaskMapLab[taskid]; !ok {
- // sdkmsg.Tasklab = nil
- // return sdkmsg
- //}
-
- if val, ok := tasktag.TaskMapLab.Load(taskid); !ok {
+ sdkmsg.Caddr = caddr
+ if val, ok := tasktag.TaskLabelMap.Load(taskid); !ok {
sdkmsg.Tasklab = nil
return sdkmsg
-
} else {
-
sdkmsg.Tasklab = val.(*protomsg.TaskLabel)
sdkmsg.Data = data
}
- //sdkmsg.Tasklab = tasktag.TaskMapLab[taskid]
return sdkmsg
}
//sdk鏁版嵁鍒嗗彂鍣�
-func SdkSendTopic(sdkmsg *protomsg.SdkMessage) (sdksend string) {
- if int(sdkmsg.Tasklab.Index) < len(sdkmsg.Tasklab.Sdkids) {
- sdksend = sdkmsg.Tasklab.Sdkids[sdkmsg.Tasklab.Index]
+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)
+ }
} else {
- sdksend = "es"
- }
- fmt.Println("鍒嗗彂鐨勪富棰樻槸锛� ", sdksend)
- return
-}
-
-// create server
-func NewSdkSocketListen(mode int, sdkid string, url string) (sid string, socket SocketContext, err error) {
- fmt.Println("url is: ", url)
- ctx, cancel := context.WithCancel(context.Background())
-
- socket.Context = ctx
- socket.Cancel = cancel
-
- socket.Sock = deliver.NewServer(deliver.Mode(mode), url)
-
- if socket.Sock == nil {
- return sdkid, socket, errors.New("create listen error")
+ sendTopic = "es"
}
- SocketManage[sdkid] = socket
- return sdkid, socket, nil
+ return sendTopic
}
-func NewSdkSocketDial(mode int, sdkid string, url string) (sid string, socket SocketContext, err error) {
- fmt.Println("url is: ", url)
- ctx, cancel := context.WithCancel(context.Background())
+func Recv(socket util.SocketContext) {
- socket.Context = ctx
- socket.Cancel = cancel
+ tryCount := 0
- socket.Sock = deliver.NewClient(deliver.Mode(mode), url)
-
- if socket.Sock == nil {
- return sdkid, socket, errors.New("create listen error")
- }
-
- SocketManage[sdkid] = socket
- return sdkid, socket, nil
-}
-
-func Recv(socket SocketContext) {
-
- var repsdkmsg = &protomsg.SdkMessage{}
+ var repsdkmsg = protomsg.SdkMessage{}
for {
select {
case <-socket.Context.Done():
- fmt.Println("socket close")
+ socket.Sock.Close()
+
+ logger.Info("socket close")
return
default:
if msg, err := socket.Sock.Recv(); err != nil {
- //fmt.Printf("%s ", err)
+
+ // 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)
- fmt.Println("receive len: ", len(msg))
+ err = proto.Unmarshal(msg, &repsdkmsg)
if err != nil {
- fmt.Println("unmarshal error: ", err)
+ logger.Error("unmarshal error: ", err)
continue
}
+ repsdkmsg.Tasklab.Index++
//璋冪敤璁＄畻鍑芥暟锛� 鍒嗗彂缁欎笅涓�涓富棰�
- nexttopic := SdkSendTopic(repsdkmsg)
+ nexttopic := GetSdkSendTopic(repsdkmsg)
+ if "facedetect-sdk-no-track" == nexttopic || "virtual-faceextract-sdk-pull" == nexttopic {
+ logger.Info("nexttopic:", nexttopic)
+ }
SdkMap[nexttopic] <- repsdkmsg
}
}
}
}
-func Send(sdkid string, socket SocketContext, in chan *protomsg.SdkMessage) {
- var v *protomsg.SdkMessage
- var ok bool
+func Send(sdkid string, socket util.SocketContext, in chan protomsg.SdkMessage) {
+
+ tryCount := 0
for {
select {
case <-socket.Context.Done():
- fmt.Println("socket is close")
- return
- case v, ok = <-in:
- if ok {
- data, err := proto.Marshal(v)
- if err != nil {
- fmt.Println("proto marshal error ", err)
- continue
- }
- fmt.Printf("浠庣閬搒dkid=%s 鎺ュ彈鏁版嵁 %d\n", sdkid, len(data))
- fmt.Println()
+ socket.Sock.Close()
- fmt.Println("send len of data: ", len(data))
- if err := socket.Sock.Send(data); err != nil {
- fmt.Println(socket.Sock)
- fmt.Println("failed send")
+ logger.Info("socket is close")
+ return
+ case v, ok := <-in:
+ if ok {
+ data, err := v.Marshal()
+ if err != nil {
+ logger.Error("proto marshal error ", err)
continue
}
- fmt.Printf("sdkid = %s ,send success:%d \n", sdkid, len(data))
+
+ 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))
+ }
} else {
- fmt.Println(sdkid, " 涓婚鍏抽棴, 鍏抽棴send()")
+ logger.Debug(sdkid, " 涓婚鍏抽棴, 鍏抽棴send()")
return
}
-
}
}
}
--
Gitblit v1.8.0