From 8c7dd4313817f6854461a64a7cadb7d970fb3e88 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 27 八月 2019 09:56:37 +0800
Subject: [PATCH] run nomally
---
camera/camera.go | 277 +++++++++++++++++++++++++++++--------------------------
1 files changed, 145 insertions(+), 132 deletions(-)
diff --git a/camera/camera.go b/camera/camera.go
index 0fc7724..d039361 100644
--- a/camera/camera.go
+++ b/camera/camera.go
@@ -1,136 +1,171 @@
package camera
import (
- "errors"
+ "basic.com/valib/deliver.git"
+ //"sync"
+ "taskpubsub/logger"
- "github.com/long/test/deliver"
- "github.com/long/test/httpclient"
- "github.com/long/test/sdk"
+ "taskpubsub/sdk"
+ "taskpubsub/util"
- "context"
- "encoding/json"
+ "basic.com/pubsub/protomsg.git"
+ "github.com/gogo/protobuf/proto"
+
+ // "golang.org/x/sys/unix"
+
"fmt"
- "time"
+ //"time"
)
-/*
-* 1. 鑾峰彇 cid
-* 2. 鑾峰彇 cid鍜� taskid鍏崇郴
-* 3. 鑾峰彇 cid ipc communication
- */
-var SocketManage = make(map[string]SocketContext)
-var Initchannel = make(chan Camerdata)
-var UrlPort = 7000
+const (
+ faceExtractWebCID = "virtual-face-extract-web-camera-id"
+ faceExtractWebTaskID = "92496BDF-2BFA-98F2-62E8-96DD9866ABD2"
+)
-type Camerdata struct {
- Cameraid string
- Rtsp string
+var SocketManage = make(map[string]util.SocketContext)
+
+var shm bool = false
+
+var innerRecvTopic = []string{
+ "virtual-faceextract-sdk-pull_2", //to web 浠ュ浘鎼滃浘
}
-type SocketContext struct {
- Sock deliver.Deliver
- Context context.Context
- Cancel context.CancelFunc
+func initInnerTopic() {
+ for _, recvTopic := range innerRecvTopic {
+ createCameraRecvServerAndListen(recvTopic)
+ }
}
-func Taskdolist(cid string, taskid string, data []byte) {
+func Init(useShm bool) {
+ shm = useShm
- fmt.Println("======================================")
- // 鏁版嵁鍔犲伐(鎵撴爣绛�)
- sdkmsg := sdk.SdkData(cid, taskid, data)
- if sdkmsg.Tasklab == nil {
- fmt.Println("cid:%s 娌℃湁浠诲姟%s", cid, taskid)
- return
+ logger.Info("============ camera info ====================")
+ for _, cd := range util.CameraIds {
+ logger.Info(cd)
+ logger.Info()
}
- // 璁＄畻鍒嗗彂鐨勪富棰�
- SendTopic := sdk.SdkSendTopic(sdkmsg)
- if _, ok := sdk.SdkMap[SendTopic]; ok {
- fmt.Println("鍒嗗彂鐨勪富棰樺瓨鍦�")
- sdk.SdkMap[SendTopic] <- sdkmsg
- //fmt.Println("閲嶆柊寮�濮嬪惊鐜�: ", sdk.SdkMap)
- } else {
- fmt.Println("鍒嗗彂鐨勪富棰樹笉瀛樺湪")
+ // 鎽勫儚鏈哄垵濮嬪寲
+ for _, cam := range util.CameraIds {
+ createCameraRecvServerAndListen(cam.Id)
}
+ // 鎵嬪姩杈撳叆鐨勪富棰�
+ initInnerTopic()
+
+ go autoUpdateCamera(util.Cameraflag)
}
-func Init() {
+// camera 鎺ュ彈鏁版嵁
+func createCameraRecvServerAndListen(id string) {
+ if _, isExist := SocketManage[id]; !isExist { //涓嶅瓨鍦�
- CameraRelative()
- fmt.Println()
- fmt.Println("cid,taskid , sid: ", CtsId)
+ url := fmt.Sprintf("ipc:///tmp/%s.ipc", id)
+ m := deliver.PushPull
+ if shm {
+ m = deliver.Shm
+ url = id
- url := fmt.Sprintf("%s%d", "tcp://192.168.1.124:", UrlPort)
- _, socket, err := NewCamerSocketListen(deliver.Pair, "init", url)
- if err != nil {
- return
+ }
+
+ 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)
}
- UrlPort++
+}
- go SendRecv(socket, Initchannel)
+func deleteCameraRecvServer(id string) {
+ if _, isExist := SocketManage[id]; isExist { //瀛樺湪
+ SocketManage[id].Cancel()
+ delete(SocketManage, id)
+ logger.Info("鍒犻櫎server sdk: ", id)
+ }
+}
- var cameratodecode Camerdata
- for {
- time.Sleep(2 * time.Second)
- i := 0
- for _, cam := range CtsId {
+//鍔ㄦ�佸鐞�
+func autoUpdateCamera(cameraflag chan bool) {
- if i < 2 {
- cameratodecode.Cameraid = cam.Cameraid
- cameratodecode.Rtsp = cam.RtspUrl
- Initchannel <- cameratodecode
+ for _ = range cameraflag {
+ logger.Info("test autodelcameraflag")
+ var oldcameras []string
+
+ for key := range SocketManage {
+ oldcameras = append(oldcameras, key)
+ }
+
+ var newcameras []string
+ for _, camnew := range util.CameraIds {
+ newcameras = append(newcameras, camnew.Id)
+ }
+
+ // 鎵嬪姩娣诲姞鐨勫叏閮ㄥ姞涓�
+ for _, recvTopic := range innerRecvTopic {
+ newcameras = append(newcameras, recvTopic)
+ }
+
+ cameraListUpdate := util.Difference(oldcameras, newcameras)
+ logger.Info(cameraListUpdate)
+
+ for key, op := range cameraListUpdate {
+ if op == "add" {
+ createCameraRecvServerAndListen(key)
+ } else {
+ deleteCameraRecvServer(key)
}
- i++
}
}
}
-func send(socket SocketContext, cam Camerdata) {
- b, err := json.Marshal(cam)
- if err != nil {
- fmt.Println("can not json convert !", cam)
- }
- if err := socket.Sock.Send(b); err != nil {
- fmt.Println("camera info: failed send")
- }
-}
+func Recv(socket util.SocketContext) {
-func SendRecv(socket SocketContext, camera chan Camerdata) {
- //socket.Sock.SetOption(mangos.OptionRecvDeadline, 5*time.Second)
- for cam := range camera {
- send(socket, cam)
- if _, ok := SocketManage[cam.Cameraid]; !ok {
- go func(id string, urlport int) {
- fmt.Println("create cid server: ", id)
- url := fmt.Sprintf("%s%d", "tcp://192.168.1.124:", urlport)
- cid, socketlisten, err := NewCamerSocketListen(deliver.PushPull, id, url)
+ var recvmessage []byte
+ var imagemsg protomsg.Image
+ var err error
+ for {
+ select {
+ case <-socket.Context.Done():
+ logger.Error("listen recv quit")
+ return
+ default:
+ if recvmessage, err = socket.Sock.Recv(); err != nil {
+ //logger.Error("[camera] err is: ", err)
+ continue
+ }
- if err != nil {
- return
+ 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 {
+ taskIDs := GetAllTaskByID(imagemsg.Cid)
+ for _, taskID := range taskIDs {
+ logger.Debug("id: ", imagemsg.Cid, " taskid: ", taskID)
+ doTaskList(imagemsg.Cid, "", taskID, recvmessage)
}
- fmt.Println("input id: ", id, " output id :", cid)
- Recv(cid, socketlisten)
-
- }(cam.Cameraid, UrlPort)
-
- UrlPort++
+ }
}
}
}
-// 鑾峰彇 cid 锛� taskid, sdkid 鍏崇郴
-var CtsId []httpclient.Camerasingle
-
-func CameraRelative() {
- CtsId = httpclient.GetEsDataReq("http://127.0.0.1:8000/data/api-v/camera/queryCameraAndTaskInfo")
-}
-
-// 鏍规嵁cid 鑾峰彇 鎵�鏈夌殑浠诲姟
-func GetAlltask(cid string) (tasks []string) {
- for _, camsingle := range CtsId {
- if cid == camsingle.Cameraid {
- for _, tasksingle := range camsingle.TaskList {
+// 鎹甤id 鑾峰彇 鎵�鏈夌殑浠诲姟
+func GetAllTaskByID(cid string) (tasks []string) {
+ for _, camsingle := range util.CameraTasks {
+ if cid == camsingle.Camera.Id {
+ for _, tasksingle := range camsingle.Tasks {
tasks = append(tasks, tasksingle.Taskid)
}
return
@@ -139,45 +174,23 @@
return
}
-// create server
-func NewCamerSocketListen(mode int, cameraid string, url string) (cid string, socket SocketContext, err error) {
- fmt.Println("url is: ", url)
- ctx, cancel := context.WithCancel(context.Background())
+func doTaskList(cid string, caddr string, taskid string, data []byte) {
- socket.Context = ctx
- socket.Cancel = cancel
-
- 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")
+ // 鏁版嵁鍔犲伐(鎵撴爣绛�)
+ 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)
+ return
}
- SocketManage[cameraid] = socket
- return cameraid, socket, nil
-}
-
-func Recv(cameraid string, socket SocketContext) {
- // socket.Sock.SetOption(mangos.OptionRecvDeadline, 5*time.Second)
- var msg []byte
- var err error
- for {
- select {
- case <-socket.Context.Done():
- fmt.Println("listen recv quit")
- return
- default:
- if msg, err = socket.Sock.Recv(); err != nil {
- //fmt.Printf("%s ", err)
- continue
- } else {
- fmt.Println("cameraid: ", len(msg))
- for _, taskid := range GetAlltask(cameraid) {
- Taskdolist(cameraid, taskid, msg)
- // fmt.Println("receive: ", len(msg), "cameraid: ", cameraid, "taskid: ", taskid)
- }
- }
- }
+ // 璁＄畻鍒嗗彂鐨勪富棰�
+ SendTopic := sdk.GetSdkSendTopic(sdkmsg)
+ logger.Debug(SendTopic)
+ if _, ok := sdk.SdkMap[SendTopic]; ok {
+ sdk.SdkMap[SendTopic] <- sdkmsg
+ logger.Debug("dispute sendtopic success", SendTopic)
+ } else {
+ logger.Debug("鍒嗗彂鐨勪富棰樹笉瀛樺湪")
}
}
--
Gitblit v1.8.0