From ba96922f40f82d12e9a5f4cfa4d887e78f460125 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期四, 26 十二月 2019 15:23:17 +0800
Subject: [PATCH] update
---
camera/camera.go | 275 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 171 insertions(+), 104 deletions(-)
diff --git a/camera/camera.go b/camera/camera.go
index 65b24df..a542e7e 100644
--- a/camera/camera.go
+++ b/camera/camera.go
@@ -1,170 +1,229 @@
package camera
import (
- "errors"
-
- "basic.com/valib/deliver.git"
- "taskpubsub/logger"
-
+ "strings"
"taskpubsub/sdk"
"taskpubsub/util"
- "github.com/gogo/protobuf/proto"
- "basic.com/pubsub/protomsg.git"
- "context"
- "fmt"
- "sync"
- //"time"
-
+ "basic.com/pubsub/protomsg.git"
+ "basic.com/valib/deliver.git"
+ "basic.com/valib/logger.git"
+ "github.com/gogo/protobuf/proto"
)
-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 shm bool = false
+
+var innerRecvTopic = []string{
+ "virtual-faceextract-sdk-pull_2", //to web 浠ュ浘鎼滃浘
}
-func Init() {
+func initInnerTopic() {
+ // for _, recvTopic := range innerRecvTopic {
+ // createCameraRecvServerAndListen(recvTopic)
+ // }
+}
+
+func Init(useShm bool) {
+ shm = useShm
+
logger.Info("============ camera info ====================")
for _, cd := range util.CameraIds {
logger.Info(cd)
logger.Info()
}
- // 鎽勫儚鏈哄垵濮嬪寲
+ // 鎽勫儚鏈哄垵濮嬪寲
for _, cam := range util.CameraIds {
- CreateCamera(cam.Id, "camera")
+ createCameraRecvServerAndListen(cam.Id)
}
- // web绔垵濮嬪寲
- CreateCamera("virtual-faceextract-sdk-pull_2" , "web")
+ //鏂囦欢鍒濆鍖�
+ for _, f := range util.FileArr {
+ logger.Info(f)
+ }
+ for _, f := range util.FileArr {
+ createCameraRecvServerAndListen(f.Id)
+ }
- go AutoDelCamera(util.Cameraflag)
+ // 鎵嬪姩杈撳叆鐨勪富棰�
+ initInnerTopic()
+
+ go autoUpdateCamera(util.Cameraflag)
+
+ go autoUpdateFiles(util.Fileflag)
}
// 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 := "ipc:///tmp/" + id + ".ipc"
+ m := deliver.PushPull
+ if shm {
+ m = deliver.Shm
+ url = id
+
}
+
+ logger.Info("CAMERA URL : ", url)
+ socket, err := util.NewSocketListen(int(m), url, shm)
+ 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)
+ for key := range SocketManage {
+ if !strings.HasPrefix(key, util.File_Video_Id_Pre) && !strings.HasPrefix(key, util.File_Audio_Id_Pre) && !strings.HasPrefix(key, util.File_Img_Id_Pre) {
+ oldcameras = append(oldcameras, key)
}
- return true
- })
+ }
- 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 autoUpdateFiles(fileflag chan bool) {
- socket.Context = ctx
- socket.Cancel = cancel
+ for _ = range fileflag {
+ logger.Info("do auto del fileflag")
+ var oldIds []string
- socket.Sock = deliver.NewServer(deliver.Mode(mode), url)
- logger.Info("new socket.Sock: ", socket.Sock)
+ for key := range SocketManage {
+ if strings.HasPrefix(key, util.File_Video_Id_Pre) || strings.HasPrefix(key, util.File_Audio_Id_Pre) || strings.HasPrefix(key, util.File_Img_Id_Pre) {
+ oldIds = append(oldIds, key)
+ }
+ }
- if socket.Sock == nil {
- return socket, errors.New("create listen error")
+ var newIds []string
+ for _, f := range util.FileArr {
+ newIds = append(newIds, f.Id)
+ }
+
+ fileListUpdate := util.Difference(oldIds, newIds)
+ logger.Info(fileListUpdate)
+
+ for key, op := range fileListUpdate {
+ if op == "add" {
+ createCameraRecvServerAndListen(key)
+ } else {
+ deleteCameraRecvServer(key)
+ }
+ }
}
- SocketManage.Store(cameraid, socket)
- return socket, nil
}
-func Recv(socket SocketContext, remote string ) {
+func Recv(socket util.SocketContext) {
- var recvmessage []byte
- var imagemsg protomsg.Image
- var err error
+ tryCount := 0
+
+ var recvmessage []byte
+ var imagemsg protomsg.Image
+ var err error
for {
select {
case <-socket.Context.Done():
+ socket.Sock.Close()
logger.Error("listen recv quit")
return
default:
if recvmessage, err = socket.Sock.Recv(); err != nil {
- //logger.Error("[camera] err is: ", 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("=========CAMERA RECV SHM ERROR=========")
+ logger.Info("CAMERA RECV FROM:", socket.URL, " ERROR ", util.ShmMaxTryCount, " TIMES SO RESTART IT")
+ tryCount = 0
+ continue
+ }
+ tryCount++
+ }
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 { //浠ュ浘鎼滃浘
+ logger.Info("id: ", faceExtractWebTaskID)
+ doTaskList(imagemsg.Cid, "", faceExtractWebTaskID, recvmessage)
+ } else {
+ taskIDs := GetAllTaskByID(imagemsg.Cid)
+ for _, taskID := range taskIDs {
+ logger.Info("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 {
+ if !tasksingle.Enable {
+ continue
+ }
tasks = append(tasks, tasksingle.Taskid)
}
return
@@ -173,23 +232,31 @@
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.Info("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.Info(SendTopic)
+ if "facedetect-sdk-no-track" == SendTopic || "virtual-faceextract-sdk-pull" == SendTopic {
+ logger.Info(SendTopic)
+ }
if _, ok := sdk.SdkMap[SendTopic]; ok {
+ if "facedetect-sdk-no-track" == SendTopic || "virtual-faceextract-sdk-pull" == SendTopic {
+ logger.Info(SendTopic)
+ }
sdk.SdkMap[SendTopic] <- sdkmsg
- logger.Debug("dispute sendtopic success", SendTopic)
+ if "facedetect-sdk-no-track" == SendTopic || "virtual-faceextract-sdk-pull" == SendTopic {
+ logger.Info("dispute sendtopic success", SendTopic)
+ }
} else {
- logger.Debug("鍒嗗彂鐨勪富棰樹笉瀛樺湪")
+ logger.Info("鍒嗗彂鐨勪富棰樹笉瀛樺湪")
}
}
--
Gitblit v1.8.0