From 91ca2658d546bf5d9857b144e6beefa1019ba972 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 11 九月 2019 18:47:03 +0800
Subject: [PATCH] 合并张蒙的共享内存，增加logger
---
camera/camera.go | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/camera/camera.go b/camera/camera.go
index ae7b05e..06f464e 100644
--- a/camera/camera.go
+++ b/camera/camera.go
@@ -16,6 +16,8 @@
var SocketManage = make(map[string]util.SocketContext)
+var shm bool = false
+
var innerRecvTopic = []string{
"virtual-faceextract-sdk-pull_2", //to web 浠ュ浘鎼滃浘
}
@@ -26,7 +28,9 @@
}
}
-func Init() {
+func Init(useShm bool) {
+ shm = useShm
+
logger.Info("============ camera info ====================")
for _, cd := range util.CameraIds {
logger.Info(cd)
@@ -49,7 +53,15 @@
if _, isExist := SocketManage[id]; !isExist { //涓嶅瓨鍦�
url := "ipc:///tmp/" + id + ".ipc"
- socket, err := util.NewSocketListen(int(deliver.PushPull), url)
+ 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
@@ -104,6 +116,8 @@
func Recv(socket util.SocketContext) {
+ tryCount := 0
+
var recvmessage []byte
var imagemsg protomsg.Image
var err error
@@ -115,6 +129,18 @@
default:
if recvmessage, err = socket.Sock.Recv(); err != nil {
//logger.Error("[camera] err is: ", err)
+
+ if socket.UseSHM {
+ if tryCount > util.SHMMaxTryCount {
+ socket, err = util.NewSocketListen(socket.Mode, socket.URL, socket.UseSHM)
+ logger.Info("CAMERA SHM TRY :", tryCount, " RESTART IT")
+
+ tryCount = 0
+
+ continue
+ }
+ tryCount++
+ }
continue
}
@@ -134,7 +160,7 @@
} else {
taskIDs := GetAllTaskByID(imagemsg.Cid)
for _, taskID := range taskIDs {
- //logger.Info("id: ", imagemsg.Cid, " taskid: ", taskID)
+ logger.Debug("id: ", imagemsg.Cid, " taskid: ", taskID)
doTaskList(imagemsg.Cid, "", taskID, recvmessage)
}
}
@@ -147,6 +173,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
--
Gitblit v1.8.0