From 7183fd16c435d2aaf85e24d3608c5c43645ee608 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 10 七月 2019 09:42:27 +0800
Subject: [PATCH] remove sdkname, sdkid, add ipc_id
---
camera/camera.go | 293 ++++++++++++++++++++++++++++------------------------------
1 files changed, 140 insertions(+), 153 deletions(-)
diff --git a/camera/camera.go b/camera/camera.go
index 7a98f50..db904fc 100644
--- a/camera/camera.go
+++ b/camera/camera.go
@@ -1,196 +1,163 @@
package camera
import (
- "github.com/long/test/httpclient"
- "github.com/long/test/sdk"
+ "errors"
- "nanomsg.org/go-mangos"
- "nanomsg.org/go-mangos/protocol/pair"
- "nanomsg.org/go-mangos/transport/ipc"
- "nanomsg.org/go-mangos/transport/tcp"
+ "basic.com/valib/deliver.git"
+
+ "github.com/long/test/sdk"
+ "github.com/long/test/util"
+ "github.com/gogo/protobuf/proto"
+ "basic.com/pubsub/protomsg.git"
"context"
- "encoding/json"
"fmt"
- "time"
+ "sync"
+ // "time"
)
-/*
-* 1. 鑾峰彇 cid
-* 2. 鑾峰彇 cid鍜� taskid鍏崇郴
-* 3. 鑾峰彇 cid ipc communication
- */
-var SocketManage = make(map[string]SocketContext)
-var Initchannel = make(chan Camerdata)
-var UrlPort = 7000
-
-type Camerdata struct {
- Cameraid string
- Rtsp string
-}
+var SocketManage sync.Map
type SocketContext struct {
- Sock mangos.Socket
+ Sock deliver.Deliver
Context context.Context
Cancel context.CancelFunc
}
-func Taskdolist(cid string, taskid string, data []byte) {
-
- fmt.Println("======================================")
- fmt.Println()
- // 鏁版嵁鍔犲伐(鎵撴爣绛�)
- sdkmsg := sdk.SdkData(cid, taskid, data)
- if sdkmsg.Tasklab == nil {
- fmt.Println("cid:%s 娌℃湁浠诲姟%s", cid, taskid)
- return
+func Init() {
+ fmt.Println("============ camera info ====================")
+ for _, cd := range util.CameraIds {
+ fmt.Println(cd)
+ fmt.Println()
}
- // 璁＄畻鍒嗗彂鐨勪富棰�
- 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 {
+ CreateCamera(cam.Id, "camera")
}
+ // web绔垵濮嬪寲
+ CreateCamera("virtual-faceextract-sdk-pull_2" , "web")
+
+// go AutoDelCamera(util.Cameraflag)
}
-func Init() {
+// camera 鎺ュ彈鏁版嵁
+func CreateCamera(id string, remote string) {
+ if _, ok := SocketManage.Load(id); !ok {
+ url := fmt.Sprintf("ipc:///tmp/%s.ipc", id)
- CameraRelative()
- fmt.Println()
- fmt.Println("cid,taskid , sid: ", CtsId)
-
- _, socket, err := NewCamerSocketListen("init", "tcp", "192.168.1.124", 0)
- if err != nil {
- return
- }
-
- go SendRecv(socket, Initchannel)
-
- var cameratodecode Camerdata
- for {
- time.Sleep(2 * time.Second)
- i := 0
- for _, cam := range CtsId {
-
- if i < 2 {
- cameratodecode.Cameraid = cam.Cameraid
- cameratodecode.Rtsp = cam.RtspUrl
- Initchannel <- cameratodecode
+ socketlisten, err := NewCamerSocketListen(deliver.PushPull, id, url)
+ if err != nil {
+ fmt.Println("create socket error")
+ return
}
- i++
+ go Recv(socketlisten, remote)
+ }
+}
+
+//鍔ㄦ�佸鐞�
+func AutoDelCamera(cameraflag chan bool) {
+
+ for _ = range cameraflag {
+ fmt.Println("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
+ newcamera = append(newcamera, util.Sdklist...)
+
+ cameraChanDel := util.Difference(oldcamera, newcamera)
+ fmt.Println(cameraChanDel)
+
+ for key, op := range cameraChanDel {
+ if op == "add" {
+ CreateCamera(key, "camera")
+ } else {
+ if sock, ok := SocketManage.Load(key); ok {
+ if socket, sok := sock.(SocketContext); sok {
+ socket.Cancel()
+ SocketManage.Delete(key)
+ }
+ }
+ fmt.Println("鍒犻櫎camera server : ", key)
+ }
}
}
}
-func Recv(cameraid string, socket SocketContext) {
- socket.Sock.SetOption(mangos.OptionRecvDeadline, 5*time.Second)
- var msg []byte
- var err error
+// create server
+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.Sock = deliver.NewServer(deliver.Mode(mode), url)
+ fmt.Println("new socket.Sock: ", socket.Sock)
+
+ if socket.Sock == nil {
+ return socket, errors.New("create listen error")
+ }
+ SocketManage.Store(cameraid, socket)
+ return socket, nil
+}
+
+func Recv(socket SocketContext, remote string ) {
+
+ var recvmessage []byte
+ var imagemsg protomsg.Image
+ 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)
+ if recvmessage, err = socket.Sock.Recv(); err != nil {
+ fmt.Println("err is: ", err)
continue
- } else {
- for _, taskid := range GetAlltask(cameraid) {
- go Taskdolist(cameraid, taskid, msg)
- fmt.Println("receive: ", len(msg), "cameraid: ", cameraid, "taskid: ", taskid)
- }
}
+
+ unmsg, err := util.UnCompress(recvmessage)
+ if err != nil {
+ fmt.Println(err)
+ continue
+ }
+
+ if err := proto.Unmarshal(unmsg,&imagemsg); err != nil {
+ fmt.Println("recv msg is not protomsgImage")
+ continue
+ }
+
+ // fmt.Println("============== one msg input ==========")
+ // fmt.Println(imagemsg.Cid)
+ switch remote {
+ case "camera":
+ for _, taskid := range GetAlltask(imagemsg.Cid) {
+ // time.Sleep(5 * time.Second)
+ fmt.Println("id: ", imagemsg.Cid, " taskid: ", taskid)
+ Taskdolist(imagemsg.Cid, "", taskid, recvmessage)
+ }
+ case "web":
+ fmt.Println("id: ", imagemsg.Cid , " taskid: ", "92496BDF-2BFA-98F2-62E8-96DD9866ABD2")
+ Taskdolist(imagemsg.Cid,"", "92496BDF-2BFA-98F2-62E8-96DD9866ABD2", recvmessage)
+ }
}
}
}
-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("failed send")
- }
-}
-
-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) {
- fmt.Println("create cid server: ", id)
- cid, socketlisten, _ := NewCamerSocketListen(id, "tcp", "192.168.1.124", 0)
- fmt.Println("input id: ", id, " output id :", cid)
- Recv(cid, socketlisten)
-
- }(cam.Cameraid)
- }
- }
-}
-
-// new camera server
-func NewCamerSocketListen(cameraid string, protocol string, ip string, port int) (cid string, socket SocketContext, err error) {
-
- ctx, cancel := context.WithCancel(context.Background())
-
- var url string
-
- socket.Context = ctx
- socket.Cancel = cancel
-
- switch protocol {
- case "tcp":
- if port == 0 {
- port = UrlPort
- UrlPort++
- }
- url = fmt.Sprintf("%s://%s:%d", protocol, ip, port)
- case "ipc":
- url = fmt.Sprintf("%s://%s", cameraid)
- }
- fmt.Println(url)
-
- if socket.Sock, err = pair.NewSocket(); err != nil {
- fmt.Println(cameraid, "can't get new pair socket: ", err.Error())
- return cameraid, socket, err
- }
- socket.Sock.AddTransport(tcp.NewTransport())
- socket.Sock.AddTransport(ipc.NewTransport())
-
- socket.Sock.SetOption(mangos.OptionMaxRecvSize, 32*1024*1024)
- socket.Sock.SetOption(mangos.OptionWriteQLen, 10)
- socket.Sock.SetOption(mangos.OptionReadQLen, 10)
-
- if err = socket.Sock.Listen(url); err != nil {
- fmt.Println("socket lisnte error ", cameraid)
- }
- fmt.Println(cameraid, "success")
-
- SocketManage[cameraid] = socket
-
- return cameraid, socket, err
-}
-
-// 鑾峰彇 cid 锛� taskid, sdkid 鍏崇郴
-var CtsId []httpclient.Camerasingle
-
-func CameraRelative() {
- CtsId = httpclient.GetEsDataReq("http://127.0.0.1:8000/data/api-v/camera/queryCameraAndTaskInfo")
-}
-
-// 鏍规嵁cid 鑾峰彇 鎵�鏈夌殑浠诲姟
+// 鎹甤id 鑾峰彇 鎵�鏈夌殑浠诲姟
func GetAlltask(cid string) (tasks []string) {
- for _, camsingle := range CtsId {
- if cid == camsingle.Cameraid {
- for _, tasksingle := range camsingle.TaskList {
+ for _, camsingle := range util.CameraTasks {
+ if cid == camsingle.Camera.Id {
+ for _, tasksingle := range camsingle.Tasks {
tasks = append(tasks, tasksingle.Taskid)
}
return
@@ -198,3 +165,23 @@
}
return
}
+
+func Taskdolist(cid string, caddr string, taskid string, data []byte) {
+
+ // 鏁版嵁鍔犲伐(鎵撴爣绛�)
+ sdkmsg := sdk.SdkData(cid, caddr, taskid, data)
+ if sdkmsg.Tasklab == nil {
+ fmt.Printf("cid:%s 娌℃湁浠诲姟%s\n", cid, taskid)
+ return
+ }
+
+ // 璁＄畻鍒嗗彂鐨勪富棰�
+ SendTopic := sdk.SdkSendTopic(sdkmsg)
+ fmt.Println(SendTopic)
+ if _, ok := sdk.SdkMap[SendTopic]; ok {
+ sdk.SdkMap[SendTopic] <- sdkmsg
+ fmt.Println("dispute sendtopic success", SendTopic)
+ } else {
+ fmt.Println("鍒嗗彂鐨勪富棰樹笉瀛樺湪")
+ }
+}
--
Gitblit v1.8.0