From a735e666cff14e4e485110d2a59d401b4be61b9b Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期四, 29 八月 2019 17:50:09 +0800
Subject: [PATCH] add recover
---
camera/camera.go | 232 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 131 insertions(+), 101 deletions(-)
diff --git a/camera/camera.go b/camera/camera.go
index b24b337..727e017 100644
--- a/camera/camera.go
+++ b/camera/camera.go
@@ -1,146 +1,173 @@
package camera
import (
- "errors"
-
"basic.com/valib/deliver.git"
+ //"sync"
+ "taskpubsub/logger"
- "github.com/long/test/sdk"
- "github.com/long/test/util"
- "basic.com/pubsub/protomsg.git"
+ "taskpubsub/sdk"
+ "taskpubsub/util"
- "context"
+ "basic.com/pubsub/protomsg.git"
+ "github.com/gogo/protobuf/proto"
+
+ // "golang.org/x/sys/unix"
+
"fmt"
- "sync"
- // "time"
+ //"time"
)
-//var SocketManage = make(map[string]SocketContext)
-var SocketManage sync.Map
+const (
+ faceExtractWebCID = "virtual-face-extract-web-camera-id"
+ faceExtractWebTaskID = "92496BDF-2BFA-98F2-62E8-96DD9866ABD2"
+)
-var Initchannel = make(chan protomsg.Camera )
+var SocketManage = make(map[string]util.SocketContext)
-type SocketContext struct {
- Sock deliver.Deliver
- Context context.Context
- Cancel context.CancelFunc
+var shm bool = false
+
+var innerRecvTopic = []string{
+ "virtual-faceextract-sdk-pull_2", //to web 浠ュ浘鎼滃浘
}
-func Init() {
+func initInnerTopic() {
+ for _, recvTopic := range innerRecvTopic {
+ createCameraRecvServerAndListen(recvTopic)
+ }
+}
- fmt.Println("============ camera info ====================")
+func Init(useShm bool) {
+ shm = useShm
+
+ logger.Info("============ camera info ====================")
for _, cd := range util.CameraIds {
- fmt.Println(cd)
- fmt.Println()
+ logger.Info(cd)
+ logger.Info()
}
- go CreateCamera(Initchannel)
- go AutoDelCamera(util.Cameraflag)
-
+ // 鎽勫儚鏈哄垵濮嬪寲
for _, cam := range util.CameraIds {
- Initchannel <- cam
+ createCameraRecvServerAndListen(cam.Id)
+ }
+
+ // 鎵嬪姩杈撳叆鐨勪富棰�
+ initInnerTopic()
+
+ go autoUpdateCamera(util.Cameraflag)
+}
+
+// camera 鎺ュ彈鏁版嵁
+func createCameraRecvServerAndListen(id string) {
+ if _, isExist := SocketManage[id]; !isExist { //涓嶅瓨鍦�
+
+ url := fmt.Sprintf("ipc:///tmp/%s.ipc", id)
+ m := deliver.PushPull
+ if shm {
+ m = deliver.Shm
+ url = id
+
+ }
+
+ fmt.Println("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 CreateCamera(camera chan protomsg.Camera) {
- for cam := range camera {
- camid := cam.Id
- caddr := cam.Addr
- if _, ok := SocketManage.Load(camid); !ok {
- url := fmt.Sprintf("ipc:///tmp/%s.ipc", camid)
-
- id, socketlisten, err := NewCamerSocketListen(deliver.PushPull, camid, url)
- if err != nil {
- fmt.Println("create socket error")
- continue
- }
-
- go func(cid string, cameraaddr string, sock SocketContext) {
- Recv(cid, cameraaddr, sock)
- }(id, caddr, socketlisten)
- }
+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 {
- fmt.Println("test autodelcameraflag")
- var oldcamera []string
+ logger.Info("test autodelcameraflag")
+ var oldcameras []string
- SocketManage.Range(func(k, v interface{}) bool {
- if str, ok := k.(string); ok {
- oldcamera = append(oldcamera, str)
- }
- return true
- })
-
- var newcamera []string
-
- for _, value := range util.CameraIds {
- newcamera = append(newcamera, value.Id)
+ for key := range SocketManage {
+ oldcameras = append(oldcameras, key)
}
- cameraChanDel := util.Difference(oldcamera, newcamera)
- fmt.Println(cameraChanDel)
+ var newcameras []string
+ for _, camnew := range util.CameraIds {
+ newcameras = append(newcameras, camnew.Id)
+ }
- for key, op := range cameraChanDel {
+ // 鎵嬪姩娣诲姞鐨勫叏閮ㄥ姞涓�
+ for _, recvTopic := range innerRecvTopic {
+ newcameras = append(newcameras, recvTopic)
+ }
+
+ cameraListUpdate := util.Difference(oldcameras, newcameras)
+ logger.Info(cameraListUpdate)
+
+ for key, op := range cameraListUpdate {
if op == "add" {
- for _, value := range util.CameraIds {
- if key == value.Id{
- Initchannel <- value
- }
- }
+ createCameraRecvServerAndListen(key)
} else {
- if sock, ok := SocketManage.Load(key); ok {
- if socket, sok := sock.(SocketContext); sok {
- socket.Cancel()
- SocketManage.Delete(key)
- }
- }
- fmt.Println("鍒犻櫎camera server : ", key)
+ deleteCameraRecvServer(key)
}
}
}
}
-// create server
-func NewCamerSocketListen(mode int, cameraid string, url string) (cid string, socket SocketContext, err error) {
- ctx, cancel := context.WithCancel(context.Background())
+func Recv(socket util.SocketContext) {
- socket.Context = ctx
- socket.Cancel = cancel
+ tryCount := 0
- socket.Sock = deliver.NewServer(deliver.Mode(mode), url)
- fmt.Println("new socket.Sock: ", socket.Sock)
-
- if socket.Sock == nil {
- return cameraid, socket, errors.New("create listen error")
- }
- SocketManage.Store(cameraid, socket)
- return cameraid, socket, nil
-}
-
-func Recv(cameraid string, caddr string , socket SocketContext) {
- var msg []byte
+ var recvmessage []byte
+ var imagemsg protomsg.Image
var err error
for {
select {
case <-socket.Context.Done():
- fmt.Println("listen recv quit")
+ logger.Error("listen recv quit")
return
default:
- if msg, err = socket.Sock.Recv(); err != nil {
- fmt.Println("err is: ", cameraid, err)
+ 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)
+ fmt.Println("CAMERA SHM TRY :", tryCount, " RESTART IT")
+
+ tryCount = 0
+
+ continue
+ }
+ tryCount++
+ }
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
+ }
+ if faceExtractWebCID == imagemsg.Cid { //浠ュ浘鎼滃浘
+ doTaskList(imagemsg.Cid, "", faceExtractWebTaskID, recvmessage)
} else {
- fmt.Println()
- fmt.Println("============== one msg input ==========")
- for _, taskid := range GetAlltask(cameraid) {
- // time.Sleep(5 * time.Second)
- fmt.Println("cameraid: ", cameraid, " taskid: ", taskid)
- Taskdolist(cameraid, caddr, taskid, msg)
+ taskIDs := GetAllTaskByID(imagemsg.Cid)
+ for _, taskID := range taskIDs {
+ logger.Debug("id: ", imagemsg.Cid, " taskid: ", taskID)
+ doTaskList(imagemsg.Cid, "", taskID, recvmessage)
}
}
}
@@ -148,7 +175,7 @@
}
// 鎹甤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 {
@@ -160,20 +187,23 @@
return
}
-func Taskdolist(cid string, caddr string, taskid string, data []byte) {
+func doTaskList(cid string, caddr string, taskid string, 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 {
- fmt.Printf("cid:%s 娌℃湁浠诲姟%s\n", cid, taskid)
+ logger.Error(cid, " not have taskid: ", taskid)
return
}
// 璁＄畻鍒嗗彂鐨勪富棰�
- SendTopic := sdk.SdkSendTopic(sdkmsg)
+ SendTopic := sdk.GetSdkSendTopic(sdkmsg)
+ logger.Debug(SendTopic)
if _, ok := sdk.SdkMap[SendTopic]; ok {
sdk.SdkMap[SendTopic] <- sdkmsg
+ logger.Debug("dispute sendtopic success", SendTopic)
} else {
- fmt.Println("鍒嗗彂鐨勪富棰樹笉瀛樺湪")
+ logger.Debug("鍒嗗彂鐨勪富棰樹笉瀛樺湪")
}
}
--
Gitblit v1.8.0