From 5a0e125d6b05c42cf26d3e341249be7a2fd80d6d Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期一, 22 七月 2019 13:39:28 +0800
Subject: [PATCH] release without log
---
camera/camera.go | 111 +++++++++++++++++++++++++++++++------------------------
1 files changed, 63 insertions(+), 48 deletions(-)
diff --git a/camera/camera.go b/camera/camera.go
index b24b337..5719fd4 100644
--- a/camera/camera.go
+++ b/camera/camera.go
@@ -7,18 +7,18 @@
"github.com/long/test/sdk"
"github.com/long/test/util"
+ "github.com/gogo/protobuf/proto"
"basic.com/pubsub/protomsg.git"
"context"
"fmt"
"sync"
- // "time"
+ //"time"
+ "os"
+
)
-//var SocketManage = make(map[string]SocketContext)
var SocketManage sync.Map
-
-var Initchannel = make(chan protomsg.Camera )
type SocketContext struct {
Sock deliver.Deliver
@@ -27,39 +27,36 @@
}
func Init() {
-
fmt.Println("============ camera info ====================")
for _, cd := range util.CameraIds {
fmt.Println(cd)
fmt.Println()
}
- go CreateCamera(Initchannel)
- go AutoDelCamera(util.Cameraflag)
-
+ // 鎽勫儚鏈哄垵濮嬪寲
for _, cam := range util.CameraIds {
- Initchannel <- cam
+ CreateCamera(cam.Id, "camera")
}
+
+ // web绔垵濮嬪寲
+ CreateCamera("virtual-faceextract-sdk-pull_2" , "web")
+
+// go AutoDelCamera(util.Cameraflag)
}
-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)
+// camera 鎺ュ彈鏁版嵁
+func CreateCamera(id string, remote string) {
+ if _, ok := SocketManage.Load(id); !ok {
+ url := fmt.Sprintf("ipc:///tmp/%s.ipc", id)
- id, socketlisten, err := NewCamerSocketListen(deliver.PushPull, camid, url)
+ socketlisten, err := NewCamerSocketListen(deliver.PushPull, id, url)
if err != nil {
fmt.Println("create socket error")
- continue
+ return
}
-
- go func(cid string, cameraaddr string, sock SocketContext) {
- Recv(cid, cameraaddr, sock)
- }(id, caddr, socketlisten)
+
+ go Recv(socketlisten, remote)
}
- }
}
//鍔ㄦ�佸鐞�
@@ -76,22 +73,17 @@
return true
})
- var newcamera []string
-
- for _, value := range util.CameraIds {
- newcamera = append(newcamera, value.Id)
- }
+ var newcamera []string
+ newcamera = append(newcamera, util.Sdklist...)
cameraChanDel := util.Difference(oldcamera, newcamera)
fmt.Println(cameraChanDel)
for key, op := range cameraChanDel {
if op == "add" {
- for _, value := range util.CameraIds {
- if key == value.Id{
- Initchannel <- value
- }
- }
+ CreateCamera(key, "camera")
+ fmt.Println("add new camera id=========================")
+ os.Exit(1)
} else {
if sock, ok := SocketManage.Load(key); ok {
if socket, sok := sock.(SocketContext); sok {
@@ -106,7 +98,7 @@
}
// create server
-func NewCamerSocketListen(mode int, cameraid string, url string) (cid string, socket SocketContext, err error) {
+func NewCamerSocketListen(mode int, cameraid string, url string) (socket SocketContext, err error) {
ctx, cancel := context.WithCancel(context.Background())
socket.Context = ctx
@@ -116,33 +108,53 @@
fmt.Println("new socket.Sock: ", socket.Sock)
if socket.Sock == nil {
- return cameraid, socket, errors.New("create listen error")
+ return socket, errors.New("create listen error")
}
SocketManage.Store(cameraid, socket)
- return cameraid, socket, nil
+ return socket, nil
}
-func Recv(cameraid string, caddr string , socket SocketContext) {
- var msg []byte
- var err error
+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.Println("err is: ", cameraid, err)
+ if recvmessage, err = socket.Sock.Recv(); err != nil {
+ fmt.Println("err is: ", err)
continue
- } 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)
- }
}
+
+ 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":
+ fmt.Printf("=== cid: has %d task\n", len(GetAlltask(imagemsg.Cid)))
+ 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)
+ }
}
}
}
@@ -163,6 +175,7 @@
func Taskdolist(cid string, caddr string, taskid string, data []byte) {
// 鏁版嵁鍔犲伐(鎵撴爣绛�)
+ fmt.Printf("taskid %s: has %d data[]byte\n", taskid, len(data))
sdkmsg := sdk.SdkData(cid, caddr, taskid, data)
if sdkmsg.Tasklab == nil {
fmt.Printf("cid:%s 娌℃湁浠诲姟%s\n", cid, taskid)
@@ -171,8 +184,10 @@
// 璁＄畻鍒嗗彂鐨勪富棰�
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