From b5560d3cae1164f016ca9339592eda6b9008fb9f Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期六, 27 七月 2019 12:31:29 +0800
Subject: [PATCH] 重构代码
---
camera/camera.go | 194 ++++++++++++++++++++++--------------------------
1 files changed, 90 insertions(+), 104 deletions(-)
diff --git a/camera/camera.go b/camera/camera.go
index 65b24df..5329bae 100644
--- a/camera/camera.go
+++ b/camera/camera.go
@@ -1,29 +1,34 @@
package camera
import (
- "errors"
-
"basic.com/valib/deliver.git"
- "taskpubsub/logger"
+ //"sync"
+ "taskpubsub/logger"
+ "basic.com/pubsub/protomsg.git"
+ "github.com/gogo/protobuf/proto"
"taskpubsub/sdk"
"taskpubsub/util"
- "github.com/gogo/protobuf/proto"
- "basic.com/pubsub/protomsg.git"
- "context"
"fmt"
- "sync"
//"time"
-
)
-var SocketManage sync.Map
+const (
+ faceExtractWebCID = "virtual-face-extract-web-camera-id"
+ faceExtractWebTaskID = "92496BDF-2BFA-98F2-62E8-96DD9866ABD2"
+)
-type SocketContext struct {
- Sock deliver.Deliver
- Context context.Context
- Cancel context.CancelFunc
+var SocketManage = make(map[string]util.SocketContext)
+
+var innerRecvTopic = []string{
+ "virtual-faceextract-sdk-pull_2", //to web 浠ュ浘鎼滃浘
+}
+
+func initInnerTopic() {
+ for _, recvTopic := range innerRecvTopic {
+ createCameraRecvServerAndListen(recvTopic)
+ }
}
func Init() {
@@ -33,96 +38,80 @@
logger.Info()
}
- // 鎽勫儚鏈哄垵濮嬪寲
+ // 鎽勫儚鏈哄垵濮嬪寲
for _, cam := range util.CameraIds {
- CreateCamera(cam.Id, "camera")
+ createCameraRecvServerAndListen(cam.Id)
}
- // web绔垵濮嬪寲
- CreateCamera("virtual-faceextract-sdk-pull_2" , "web")
+ // 鎵嬪姩杈撳叆鐨勪富棰�
+ initInnerTopic()
- go AutoDelCamera(util.Cameraflag)
+ go autoUpdateCamera(util.Cameraflag)
}
// camera 鎺ュ彈鏁版嵁
-func CreateCamera(id string, remote string) {
- if _, ok := SocketManage.Load(id); !ok {
- url := fmt.Sprintf("ipc:///tmp/%s.ipc", id)
+func createCameraRecvServerAndListen(id string) {
+ if _, isExist := SocketManage[id]; !isExist { //涓嶅瓨鍦�
- socketlisten, err := NewCamerSocketListen(deliver.PushPull, id, url)
- if err != nil {
- logger.Error("create socket error")
- return
- }
-
- go Recv(socketlisten, remote)
+ url := fmt.Sprintf("ipc:///tmp/%s.ipc", id)
+ socket, err := util.NewSocketListen(int(deliver.PushPull), url)
+ if err != nil {
+ logger.Error("create socket error")
+ return
}
+ SocketManage[id] = socket
+
+ go Recv(socket)
+ }
+}
+
+func deleteCameraRecvServer(id string) {
+ if _, isExist := SocketManage[id]; isExist { //瀛樺湪
+ SocketManage[id].Cancel()
+ delete(SocketManage, id)
+ logger.Info("鍒犻櫎server sdk: ", id)
+ }
}
//鍔ㄦ�佸鐞�
-func AutoDelCamera(cameraflag chan bool) {
+func autoUpdateCamera(cameraflag chan bool) {
for _ = range cameraflag {
logger.Info("test autodelcameraflag")
- var oldcamera []string
+ var oldcameras []string
- SocketManage.Range(func(k, v interface{}) bool {
- if str, ok := k.(string); ok {
- oldcamera = append(oldcamera, str)
- }
- return true
- })
+ for key := range SocketManage {
+ oldcameras = append(oldcameras, key)
+ }
- var newcamera []string
-
- for _, camnew := range util.CameraIds {
- newcamera = append(newcamera, camnew.Id)
- }
- newcamera = append(newcamera, "virtual-faceextract-sdk-pull_2")
+ var newcameras []string
+ for _, camnew := range util.CameraIds {
+ newcameras = append(newcameras, camnew.Id)
+ }
+ // 鎵嬪姩娣诲姞鐨勫叏閮ㄥ姞涓�
+ for _, recvTopic := range innerRecvTopic {
+ newcameras = append(newcameras, recvTopic)
+ }
- cameraChanDel := util.Difference(oldcamera, newcamera)
- logger.Info(cameraChanDel)
+ cameraListUpdate := util.Difference(oldcameras, newcameras)
+ logger.Info(cameraListUpdate)
- for key, op := range cameraChanDel {
+ for key, op := range cameraListUpdate {
if op == "add" {
- CreateCamera(key, "camera")
- logger.Info("add new camera id=========================", key)
+ createCameraRecvServerAndListen(key)
} else {
- if sock, ok := SocketManage.Load(key); ok {
- if socket, sok := sock.(SocketContext); sok {
- socket.Cancel()
- SocketManage.Delete(key)
- }
- }
- logger.Info("鍒犻櫎camera server : ", key)
+ deleteCameraRecvServer(key)
}
}
}
}
-// create server
-func NewCamerSocketListen(mode int, cameraid string, url string) (socket SocketContext, err error) {
- ctx, cancel := context.WithCancel(context.Background())
+func Recv(socket util.SocketContext) {
- socket.Context = ctx
- socket.Cancel = cancel
-
- socket.Sock = deliver.NewServer(deliver.Mode(mode), url)
- logger.Info("new socket.Sock: ", socket.Sock)
-
- if socket.Sock == nil {
- return socket, errors.New("create listen error")
- }
- SocketManage.Store(cameraid, socket)
- return socket, nil
-}
-
-func Recv(socket SocketContext, remote string ) {
-
- var recvmessage []byte
- var imagemsg protomsg.Image
- var err error
+ var recvmessage []byte
+ var imagemsg protomsg.Image
+ var err error
for {
select {
case <-socket.Context.Done():
@@ -134,34 +123,31 @@
continue
}
- unmsg, err := util.UnCompress(recvmessage)
- if err != nil {
- logger.Error(err)
- continue
- }
+ unmsg, err := util.UnCompress(recvmessage)
+ if err != nil {
+ logger.Error(err)
+ continue
+ }
- if err := proto.Unmarshal(unmsg,&imagemsg); err != nil {
- logger.Error("recv msg is not protomsgImage")
- continue
- }
-
- switch remote {
- case "camera":
- for _, taskid := range GetAlltask(imagemsg.Cid) {
- //time.Sleep(5 * time.Second)
- logger.Debug("id: ", imagemsg.Cid, " taskid: ", taskid)
- Taskdolist(imagemsg.Cid, "", taskid, recvmessage)
- }
- case "web":
- logger.Debug("id: ", imagemsg.Cid , " taskid: ", "92496BDF-2BFA-98F2-62E8-96DD9866ABD2")
- Taskdolist(imagemsg.Cid,"", "92496BDF-2BFA-98F2-62E8-96DD9866ABD2", recvmessage)
- }
+ if err := proto.Unmarshal(unmsg, &imagemsg); err != nil {
+ logger.Error("recv msg is not protomsgImage")
+ continue
+ }
+ if faceExtractWebCID == imagemsg.Cid { //浠ュ浘鎼滃浘
+ doTaskList(imagemsg.Cid, "", faceExtractWebTaskID, recvmessage)
+ } else {
+ taskIDs := GetAllTaskByID(imagemsg.Cid)
+ for _, taskID := range taskIDs {
+ logger.Debug("id: ", imagemsg.Cid, " taskid: ", taskID)
+ doTaskList(imagemsg.Cid, "", taskID, recvmessage)
+ }
+ }
}
}
}
// 鎹甤id 鑾峰彇 鎵�鏈夌殑浠诲姟
-func GetAlltask(cid string) (tasks []string) {
+func GetAllTaskByID(cid string) (tasks []string) {
for _, camsingle := range util.CameraTasks {
if cid == camsingle.Camera.Id {
for _, tasksingle := range camsingle.Tasks {
@@ -173,22 +159,22 @@
return
}
-func Taskdolist(cid string, caddr string, taskid string, data []byte) {
+func doTaskList(cid string, caddr string, taskid string, data []byte) {
// 鏁版嵁鍔犲伐(鎵撴爣绛�)
- logger.Debug("taskid: ",taskid, "has ", len(data), "data[]byte")
- sdkmsg := sdk.SdkData(cid, caddr, taskid, data)
+ logger.Debug("taskid: ", taskid, "has ", len(data), "data[]byte")
+ sdkmsg := sdk.ToSdkMsg(cid, caddr, taskid, data)
if sdkmsg.Tasklab == nil {
- logger.Error(cid, " not have taskid: ", taskid )
+ logger.Error(cid, " not have taskid: ", taskid)
return
}
// 璁＄畻鍒嗗彂鐨勪富棰�
- SendTopic := sdk.SdkSendTopic(sdkmsg)
- logger.Debug(SendTopic)
+ SendTopic := sdk.GetSdkSendTopic(sdkmsg)
+ logger.Debug(SendTopic)
if _, ok := sdk.SdkMap[SendTopic]; ok {
sdk.SdkMap[SendTopic] <- sdkmsg
- logger.Debug("dispute sendtopic success", SendTopic)
+ logger.Debug("dispute sendtopic success", SendTopic)
} else {
logger.Debug("鍒嗗彂鐨勪富棰樹笉瀛樺湪")
}
--
Gitblit v1.8.0