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 | 108 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 87 insertions(+), 21 deletions(-)
diff --git a/camera/camera.go b/camera/camera.go
index d039361..a542e7e 100644
--- a/camera/camera.go
+++ b/camera/camera.go
@@ -1,20 +1,14 @@
package camera
import (
- "basic.com/valib/deliver.git"
- //"sync"
- "taskpubsub/logger"
-
+ "strings"
"taskpubsub/sdk"
"taskpubsub/util"
"basic.com/pubsub/protomsg.git"
+ "basic.com/valib/deliver.git"
+ "basic.com/valib/logger.git"
"github.com/gogo/protobuf/proto"
-
- // "golang.org/x/sys/unix"
-
- "fmt"
- //"time"
)
const (
@@ -31,9 +25,9 @@
}
func initInnerTopic() {
- for _, recvTopic := range innerRecvTopic {
- createCameraRecvServerAndListen(recvTopic)
- }
+ // for _, recvTopic := range innerRecvTopic {
+ // createCameraRecvServerAndListen(recvTopic)
+ // }
}
func Init(useShm bool) {
@@ -50,17 +44,27 @@
createCameraRecvServerAndListen(cam.Id)
}
+ //鏂囦欢鍒濆鍖�
+ for _, f := range util.FileArr {
+ logger.Info(f)
+ }
+ for _, f := range util.FileArr {
+ createCameraRecvServerAndListen(f.Id)
+ }
+
// 鎵嬪姩杈撳叆鐨勪富棰�
initInnerTopic()
go autoUpdateCamera(util.Cameraflag)
+
+ go autoUpdateFiles(util.Fileflag)
}
// camera 鎺ュ彈鏁版嵁
func createCameraRecvServerAndListen(id string) {
if _, isExist := SocketManage[id]; !isExist { //涓嶅瓨鍦�
- url := fmt.Sprintf("ipc:///tmp/%s.ipc", id)
+ url := "ipc:///tmp/" + id + ".ipc"
m := deliver.PushPull
if shm {
m = deliver.Shm
@@ -68,7 +72,7 @@
}
- fmt.Println("CAMERA URL : ", url)
+ logger.Info("CAMERA URL : ", url)
socket, err := util.NewSocketListen(int(m), url, shm)
if err != nil {
logger.Error("create socket error")
@@ -96,7 +100,9 @@
var oldcameras []string
for key := range SocketManage {
- oldcameras = append(oldcameras, key)
+ 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)
+ }
}
var newcameras []string
@@ -122,7 +128,40 @@
}
}
+//鍔ㄦ�佸鐞嗘枃浠�
+func autoUpdateFiles(fileflag chan bool) {
+
+ for _ = range fileflag {
+ logger.Info("do auto del fileflag")
+ var oldIds []string
+
+ 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)
+ }
+ }
+
+ 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)
+ }
+ }
+ }
+}
+
func Recv(socket util.SocketContext) {
+
+ tryCount := 0
var recvmessage []byte
var imagemsg protomsg.Image
@@ -130,11 +169,26 @@
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
}
@@ -149,11 +203,12 @@
continue
}
if faceExtractWebCID == imagemsg.Cid { //浠ュ浘鎼滃浘
+ logger.Info("id: ", faceExtractWebTaskID)
doTaskList(imagemsg.Cid, "", faceExtractWebTaskID, recvmessage)
} else {
taskIDs := GetAllTaskByID(imagemsg.Cid)
for _, taskID := range taskIDs {
- logger.Debug("id: ", imagemsg.Cid, " taskid: ", taskID)
+ logger.Info("id: ", imagemsg.Cid, " taskid: ", taskID)
doTaskList(imagemsg.Cid, "", taskID, recvmessage)
}
}
@@ -166,6 +221,9 @@
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
@@ -177,7 +235,7 @@
func doTaskList(cid string, caddr string, taskid string, data []byte) {
// 鏁版嵁鍔犲伐(鎵撴爣绛�)
- logger.Debug("taskid: ", taskid, "has ", len(data), "data[]byte")
+ //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)
@@ -186,11 +244,19 @@
// 璁＄畻鍒嗗彂鐨勪富棰�
SendTopic := sdk.GetSdkSendTopic(sdkmsg)
- logger.Debug(SendTopic)
+ //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