From b5560d3cae1164f016ca9339592eda6b9008fb9f Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期六, 27 七月 2019 12:31:29 +0800
Subject: [PATCH] 重构代码
---
sdk/sdk.go | 265 ++++++++++++++++++++++++-----------------------------
1 files changed, 120 insertions(+), 145 deletions(-)
diff --git a/sdk/sdk.go b/sdk/sdk.go
index e3e338c..0998b97 100644
--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -1,161 +1,170 @@
package sdk
import (
- "context"
- "errors"
"fmt"
- // "taskpubsub/httpclient"
+ "github.com/gogo/protobuf/proto"
"taskpubsub/tasktag"
"taskpubsub/util"
- "github.com/gogo/protobuf/proto"
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
- "taskpubsub/logger"
+ "taskpubsub/logger"
)
const (
- postPull = "_1.ipc"
- postPush = "_2.ipc"
+ postPush = "_1.ipc"
+ postPull = "_2.ipc"
)
-var SocketManage = make(map[string]SocketContext)
+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 innerRecvTopic = []string{
+ "facedetect-sdk-no-track", //to sdk-no-track 浠ュ浘鎼滃浘
+}
+
+var innerSendTopic = []string{
+ "facedetect-sdk-no-track", //to sdk-no-track 浠ュ浘鎼滃浘
+ "virtual-faceextract-sdk-pull", //to web 浠ュ浘鎼滃浘
+}
+
+func initInnerTopic() {
+ for _, sendTopic := range innerSendTopic {
+ createSdkSendServerAndListen(sendTopic)
+ }
+
+ for _, recvTopic := range innerRecvTopic {
+ createSdkRecvServerAndListen(recvTopic)
+ }
}
func Init() {
logger.Info("============= init sdk info =====================")
for _, sdkid := range util.Sdklist { // 鍒涘缓sdk server
- CreatesdkTopicandServer(sdkid)
+ createSdkTopicAndServer(sdkid)
logger.Info()
}
- // 鎵嬪姩杈撳叆鐨勪富棰�
-
- // sdk-no-track
- CreatesdkTopicandServer("facedetect-sdk-no-track")
- logger.Info()
+ // 鎵嬪姩杈撳叆鐨勪富棰�
+ initInnerTopic()
- // es
+ // es
SdkMap["es"] = make(chan protomsg.SdkMessage)
logger.Info("create es channel: ")
+ go DealEsTopic()
- // web
- SdkMap["virtual-faceextract-sdk-pull"] = make(chan protomsg.SdkMessage)
- logger.Info("create virtual-faceextract-sdk-pull")
-
- Createwebserver("virtual-faceextract-sdk-pull")
-
- go Dealextern()
- go AutoDelSdk(util.Sdkflag)
+ go autoUpdateSdk(util.Sdkflag)
}
-func CreatesdkTopicandServer(sdkid string) {
-
- SdkMap[sdkid] = make(chan protomsg.SdkMessage)
- logger.Info("create sdk channel: ", sdkid)
-
- url := fmt.Sprintf("ipc:///tmp/%s%s", sdkid, postPull)
- socketser, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
- if err != nil {
- delete(SdkMap, sdkid)
- logger.Error(sdkid, "create server error!")
- return
- }
-
-
- go Send(sdkid, 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)
- logger.Error(sdkid, "create dial error!")
- return
- }
- go Recv(socketdial)
-
+func createSdkTopicAndServer(sdkid string) {
+ createSdkSendServerAndListen(sdkid)
+ createSdkRecvServerAndListen(sdkid)
}
-// web 鎺ュ彈绔鐞�
-func Createwebserver(webid string ){
- url := fmt.Sprintf("ipc:///tmp/%s%s", webid, postPull)
- socketser, err := NewSdkSocketListen(deliver.PushPull, webid, url)
- if err != nil {
- logger.Error(webid, "create server error!")
- return
+func deleteSdkTopicAndServer(id string) {
+ if _, isExist := SdkMap[id]; isExist { //瀛樺湪
+ close(SdkMap[id])
+ delete(SdkMap, id)
+ logger.Info("鍒犻櫎涓婚 sdk: ", id)
}
- go Send(webid, socketser, SdkMap[webid])
+
+ if _, isExist := SocketManage[id]; isExist { //瀛樺湪
+ SocketManage[id].Cancel()
+ delete(SocketManage, id)
+ logger.Info("鍒犻櫎server sdk: ", id)
+ }
}
-func DeletesdkTopicandServer(sdkid string) {
- close(SdkMap[sdkid])
- delete(SdkMap, sdkid)
- logger.Info("鍒犻櫎涓婚 sdk: ", sdkid)
+func createSdkSendServerAndListen(id string) {
+ if _, isExist := SdkMap[id]; !isExist { //涓嶅瓨鍦�
+ SdkMap[id] = make(chan protomsg.SdkMessage)
+ logger.Info("create", id)
+ }
- SocketManage[sdkid].Cancel()
- delete(SocketManage, sdkid)
- logger.Info("鍒犻櫎server sdk: ", sdkid)
+ url := fmt.Sprintf("ipc:///tmp/%s%s", id, postPush)
+ socket, err := util.NewSocketListen(int(deliver.PushPull), url)
+ 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 := fmt.Sprintf("ipc:///tmp/%s%s", id, postPull)
+ socket, err := util.NewSocketListen(int(deliver.PushPull), url)
+ if err != nil {
+ delete(SdkMap, id)
+ logger.Error(id, "create socket error!")
+ return
+ }
+ SocketManage[id] = socket
+
+ go Recv(socket)
}
//鍗曠嫭澶勭悊 es 涓婚鐨勬儏鍐�
-func Dealextern() {
- for {
- select {
- case <-SdkMap["es"]:
- //logger.Info("es finanl 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 {
logger.Info("test autodelsdk")
- var oldSdk []string
- for key, _ := range SdkMap {
- oldSdk = append(oldSdk, key)
+ var oldSdkList []string
+ for key := range SdkMap {
+ oldSdkList = append(oldSdkList, key)
}
- // 鎵嬪姩娣诲姞鐨勫叏閮ㄥ姞涓�
- util.Sdklist = append(util.Sdklist, "es")
- util.Sdklist = append(util.Sdklist, "virtual-faceextract-sdk-pull")
- util.Sdklist = append(util.Sdklist, "facedetect-sdk-no-track")
+ newSdkList := util.Sdklist
- sdkChanDel := util.Difference(oldSdk, util.Sdklist)
- logger.Info(sdkChanDel)
+ // 鎵嬪姩娣诲姞鐨勫叏閮ㄥ姞涓�
+ for _, sendTopic := range innerSendTopic {
+ newSdkList = append(newSdkList, sendTopic)
+ }
+ for _, recvTopic := range innerRecvTopic {
+ newSdkList = append(newSdkList, recvTopic)
+ }
- for key, op := range sdkChanDel {
+ sdkListUpdate := util.Difference(oldSdkList, newSdkList)
+ logger.Info(sdkListUpdate)
+
+ for key, op := range sdkListUpdate {
if op == "add" {
- CreatesdkTopicandServer(key)
+ createSdkTopicAndServer(key)
} else {
- DeletesdkTopicandServer(key)
- logger.Info("鍒犻櫎涓婚 sdk: ", key)
+ deleteSdkTopicAndServer(key)
}
}
}
}
-
//sdk鏁版嵁 鍔犲伐鍣�
-func SdkData(cid string,caddr string, taskid string, data []byte) protomsg.SdkMessage {
+func ToSdkMsg(cid string, caddr string, taskid string, data []byte) protomsg.SdkMessage {
var sdkmsg = protomsg.SdkMessage{}
sdkmsg.Cid = cid
- sdkmsg.Caddr =caddr
- 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
}
@@ -163,51 +172,17 @@
}
//sdk鏁版嵁鍒嗗彂鍣�
-func SdkSendTopic(sdkmsg protomsg.SdkMessage) (sdksend string) {
+func GetSdkSendTopic(sdkmsg protomsg.SdkMessage) (sendTopic string) {
if int(sdkmsg.Tasklab.Index) < len(sdkmsg.Tasklab.Sdkinfos) {
- sdksend = sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Ipcid
+ sendTopic = sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Ipcid
} else {
- sdksend = "es"
+ sendTopic = "es"
}
- logger.Debug("鍒嗗彂鐨勪富棰�: ", sdksend , "浣嶇疆锛�", int(sdkmsg.Tasklab.Index)+1,"/", len(sdkmsg.Tasklab.Sdkinfos))
+ logger.Debug("鍒嗗彂鐨勪富棰�: ", sendTopic, "浣嶇疆锛�", int(sdkmsg.Tasklab.Index)+1, "/", len(sdkmsg.Tasklab.Sdkinfos))
return
}
-// create server
-func NewSdkSocketListen(mode int, sdkid string, url string) (socket SocketContext, err error) {
- logger.Info("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 socket, errors.New("create listen error")
- }
-
- SocketManage[sdkid] = socket
- return socket, nil
-}
-
-func NewSdkSocketDial(mode int, sdkid string, url string) (sid string, socket SocketContext, err error) {
- logger.Info("url is: ", url)
- ctx, cancel := context.WithCancel(context.Background())
-
- socket.Context = ctx
- socket.Cancel = cancel
-
- 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) {
+func Recv(socket util.SocketContext) {
var repsdkmsg = protomsg.SdkMessage{}
for {
select {
@@ -222,36 +197,36 @@
if err != nil {
logger.Error("unmarshal error: ", err)
continue
- }
- repsdkmsg.Tasklab.Index++
- //璋冪敤璁＄畻鍑芥暟锛� 鍒嗗彂缁欎笅涓�涓富棰�
- nexttopic := SdkSendTopic(repsdkmsg)
- SdkMap[nexttopic] <- repsdkmsg
+ }
+ repsdkmsg.Tasklab.Index++
+ //璋冪敤璁＄畻鍑芥暟锛� 鍒嗗彂缁欎笅涓�涓富棰�
+ nexttopic := GetSdkSendTopic(repsdkmsg)
+ SdkMap[nexttopic] <- repsdkmsg
}
}
}
}
-func Send(sdkid string, socket SocketContext, in chan protomsg.SdkMessage) {
+func Send(sdkid string, socket util.SocketContext, in chan protomsg.SdkMessage) {
for {
select {
case <-socket.Context.Done():
logger.Info("socket is close")
return
- case v, ok := <-in:
+ case v, ok := <-in:
if ok {
- data, err :=v.Marshal()
+ data, err := v.Marshal()
if err != nil {
logger.Error("proto marshal error ", err)
continue
- }
-
+ }
+
if err := socket.Sock.Send(data); err != nil {
- logger.Error("failed send")
+ logger.Error("failed send:sdkid=", sdkid)
continue
}
- logger.Debug(sdkid, " send success: ", len(data))
+ logger.Debug(sdkid, " send success: ", len(data))
} else {
logger.Debug(sdkid, " 涓婚鍏抽棴, 鍏抽棴send()")
return
--
Gitblit v1.8.0