From 2bc5d0350ba5bb948aeaf54ecfa59f33eeb6004b Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 24 七月 2019 14:25:55 +0800
Subject: [PATCH] github.com/long/taskpubsub ==> taskpubsub
---
camera/camera.go | 274 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 164 insertions(+), 110 deletions(-)
diff --git a/camera/camera.go b/camera/camera.go
index e24cf2f..65b24df 100644
--- a/camera/camera.go
+++ b/camera/camera.go
@@ -1,141 +1,195 @@
package camera
import (
- "errors"
+ "errors"
- "basic.com/dbapi.git"
- "basic.com/valib/deliver.git"
- "basic.com/pubsub/protomsg.git"
+ "basic.com/valib/deliver.git"
+ "taskpubsub/logger"
- "github.com/long/test/sdk"
+ "taskpubsub/sdk"
+ "taskpubsub/util"
+ "github.com/gogo/protobuf/proto"
+ "basic.com/pubsub/protomsg.git"
- "context"
- "fmt"
- "sync"
- "time"
- )
+ "context"
+ "fmt"
+ "sync"
+ //"time"
-//var SocketManage = make(map[string]SocketContext)
+)
+
var SocketManage sync.Map
-var Initchannel = make(chan string)
-
- type SocketContext struct {
- Sock deliver.Deliver
- Context context.Context
- Cancel context.CancelFunc
- }
-
-var camval dbapi.CameraApi
-
-//get camera with task
-var cameraTasks []protomsg.CameraAndTaskInfo
-
-func Init() {
-
- fmt.Println("============ camera info ====================")
- ctsid := camval.FindAll()
-
- fmt.Println("==============camera camera with task ================")
- cameraTasks=camval.FindAllCameraAndTask()
-
- go CreateCamera(Initchannel)
-
- for _, cam := range ctsid {
- Initchannel <- cam.Id
- }
+type SocketContext struct {
+ Sock deliver.Deliver
+ Context context.Context
+ Cancel context.CancelFunc
}
-func CreateCamera(camera chan string) {
- for camid := range camera {
- if _, ok := SocketManage.Load(camid); !ok {
- url := fmt.Sprintf("ipc:///tmp/%s.ipc", camid)
+func Init() {
+ logger.Info("============ camera info ====================")
+ for _, cd := range util.CameraIds {
+ logger.Info(cd)
+ logger.Info()
+ }
- id, socketlisten, err := NewCamerSocketListen(deliver.PushPull, camid, url)
- if err != nil {
- fmt.Println("create socket error")
- continue
- }
+ // 鎽勫儚鏈哄垵濮嬪寲
+ for _, cam := range util.CameraIds {
+ CreateCamera(cam.Id, "camera")
+ }
- go func(cid string, sock SocketContext ){
- Recv(cid,sock)
- }(id,socketlisten)
+ // web绔垵濮嬪寲
+ CreateCamera("virtual-faceextract-sdk-pull_2" , "web")
+
+ go AutoDelCamera(util.Cameraflag)
+}
+
+// camera 鎺ュ彈鏁版嵁
+func CreateCamera(id string, remote string) {
+ if _, ok := SocketManage.Load(id); !ok {
+ url := fmt.Sprintf("ipc:///tmp/%s.ipc", id)
+
+ socketlisten, err := NewCamerSocketListen(deliver.PushPull, id, url)
+ if err != nil {
+ logger.Error("create socket error")
+ return
+ }
+
+ go Recv(socketlisten, remote)
+ }
+}
+
+//鍔ㄦ�佸鐞�
+func AutoDelCamera(cameraflag chan bool) {
+
+ for _ = range cameraflag {
+ logger.Info("test autodelcameraflag")
+ var oldcamera []string
+
+ SocketManage.Range(func(k, v interface{}) bool {
+ if str, ok := k.(string); ok {
+ oldcamera = append(oldcamera, str)
+ }
+ return true
+ })
+
+ var newcamera []string
+
+ for _, camnew := range util.CameraIds {
+ newcamera = append(newcamera, camnew.Id)
}
- }
+ newcamera = append(newcamera, "virtual-faceextract-sdk-pull_2")
+
+
+ cameraChanDel := util.Difference(oldcamera, newcamera)
+ logger.Info(cameraChanDel)
+
+ for key, op := range cameraChanDel {
+ if op == "add" {
+ CreateCamera(key, "camera")
+ logger.Info("add new camera id=========================", 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)
+ }
+ }
+ }
}
// create server
-func NewCamerSocketListen(mode int, cameraid string, url string) (cid string, socket SocketContext, err error) {
- ctx, cancel := context.WithCancel(context.Background())
+func NewCamerSocketListen(mode int, cameraid string, url string) (socket SocketContext, err error) {
+ ctx, cancel := context.WithCancel(context.Background())
- socket.Context = ctx
- socket.Cancel = cancel
+ socket.Context = ctx
+ socket.Cancel = cancel
- socket.Sock = deliver.NewServer(deliver.Mode(mode), url)
- fmt.Println("new socket.Sock: ", socket.Sock)
+ socket.Sock = deliver.NewServer(deliver.Mode(mode), url)
+ logger.Info("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
+ if socket.Sock == nil {
+ return socket, errors.New("create listen error")
+ }
+ SocketManage.Store(cameraid, socket)
+ return socket, nil
}
-func Recv(cameraid string, socket SocketContext) {
- 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.Println("err is: ", cameraid, err)
- continue
- } else {
- fmt.Println()
- fmt.Println("============== one msg input ==========")
- fmt.Println("cameraid: ",cameraid, len(msg))
- for _, taskid := range GetAlltask(cameraid) {
- time.Sleep(5* time.Second)
- fmt.Println("cameraid: ",cameraid," taskid: ", taskid)
- Taskdolist(cameraid, taskid, msg)
- }
- }
+func Recv(socket SocketContext, remote string ) {
+
+ 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
+ }
+
+ 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)
+ }
+ }
+ }
}
-// 鏍规嵁cid 鑾峰彇 鎵�鏈夌殑浠诲姟
+// 鎹甤id 鑾峰彇 鎵�鏈夌殑浠诲姟
func GetAlltask(cid string) (tasks []string) {
- for _, camsingle := range cameraTasks {
- if cid == camsingle.Camera.Id {
- for _, tasksingle := range camsingle.Tasks {
- tasks = append(tasks, tasksingle.Taskid)
- }
- return
- }
- }
- return
+ for _, camsingle := range util.CameraTasks {
+ if cid == camsingle.Camera.Id {
+ for _, tasksingle := range camsingle.Tasks {
+ tasks = append(tasks, tasksingle.Taskid)
+ }
+ return
+ }
+ }
+ return
}
-func Taskdolist(cid string, taskid string, data []byte) {
+func Taskdolist(cid string, caddr string, taskid string, data []byte) {
- // 鏁版嵁鍔犲伐(鎵撴爣绛�)
- sdkmsg := sdk.SdkData(cid, taskid, data)
- if sdkmsg.Tasklab == nil {
- fmt.Println("cid:%s 娌℃湁浠诲姟%s", cid, taskid)
- return
- }
+ // 鏁版嵁鍔犲伐(鎵撴爣绛�)
+ logger.Debug("taskid: ",taskid, "has ", len(data), "data[]byte")
+ sdkmsg := sdk.SdkData(cid, caddr, taskid, data)
+ if sdkmsg.Tasklab == nil {
+ logger.Error(cid, " not have taskid: ", taskid )
+ return
+ }
- // 璁＄畻鍒嗗彂鐨勪富棰�
- SendTopic := sdk.SdkSendTopic(sdkmsg)
- if _, ok := sdk.SdkMap[SendTopic]; ok {
- fmt.Println("鍒嗗彂鐨勪富棰樺瓨鍦�")
- sdk.SdkMap[SendTopic] <- sdkmsg
- //fmt.Println("閲嶆柊寮�濮嬪惊鐜�: ", sdk.SdkMap)
- } else {
- fmt.Println("鍒嗗彂鐨勪富棰樹笉瀛樺湪")
- }
+ // 璁＄畻鍒嗗彂鐨勪富棰�
+ SendTopic := sdk.SdkSendTopic(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