From 9307cbbe2720d833739721bf6f178cfe041e17e6 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 02 九月 2019 13:54:42 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.1.14:29418/pubsub/task
---
sdk/sdk.go | 73 ++++++++++++++++++++++++++++++++----
1 files changed, 64 insertions(+), 9 deletions(-)
diff --git a/sdk/sdk.go b/sdk/sdk.go
index 0998b97..43e7c64 100644
--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -2,23 +2,28 @@
import (
"fmt"
+ // "golang.org/x/sys/unix"
- "github.com/gogo/protobuf/proto"
"taskpubsub/tasktag"
"taskpubsub/util"
+ "github.com/gogo/protobuf/proto"
+
+ "taskpubsub/logger"
+
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
- "taskpubsub/logger"
)
const (
- postPush = "_1.ipc"
- postPull = "_2.ipc"
+ postPush = "_1"
+ postPull = "_2"
)
var SocketManage = make(map[string]util.SocketContext)
var SdkMap = make(map[string]chan protomsg.SdkMessage)
+
+var shm bool = false
var innerRecvTopic = []string{
"facedetect-sdk-no-track", //to sdk-no-track 浠ュ浘鎼滃浘
@@ -39,7 +44,9 @@
}
}
-func Init() {
+func Init(useShm bool) {
+
+ shm = useShm
logger.Info("============= init sdk info =====================")
for _, sdkid := range util.Sdklist { // 鍒涘缓sdk server
@@ -83,8 +90,16 @@
logger.Info("create", id)
}
- url := fmt.Sprintf("ipc:///tmp/%s%s", id, postPush)
- socket, err := util.NewSocketListen(int(deliver.PushPull), url)
+ url := fmt.Sprintf("ipc:///tmp/%s%s.ipc", id, postPush)
+ m := deliver.PushPull
+ if shm {
+ m = deliver.Shm
+ url = id + postPush
+ }
+
+ fmt.Println("SDK URL: ", url)
+
+ socket, err := util.NewSocketListen(int(m), url, shm)
if err != nil {
delete(SdkMap, id)
logger.Error(id, "create socket error!")
@@ -101,8 +116,16 @@
logger.Info("create", id)
}
- url := fmt.Sprintf("ipc:///tmp/%s%s", id, postPull)
- socket, err := util.NewSocketListen(int(deliver.PushPull), url)
+ url := fmt.Sprintf("ipc:///tmp/%s%s.ipc", id, postPull)
+ m := deliver.PushPull
+ if shm {
+ m = deliver.Shm
+ url = id + postPull
+
+ }
+
+ socket, err := util.NewSocketListen(int(m), url, shm)
+
if err != nil {
delete(SdkMap, id)
logger.Error(id, "create socket error!")
@@ -183,6 +206,9 @@
}
func Recv(socket util.SocketContext) {
+
+ tryCount := 0
+
var repsdkmsg = protomsg.SdkMessage{}
for {
select {
@@ -191,6 +217,18 @@
return
default:
if msg, err := socket.Sock.Recv(); err != nil {
+ // fmt.Println("SDK RECV ERROR: ", err)
+ if socket.UseSHM {
+ if tryCount > util.SHMMaxTryCount {
+ socket, err = util.NewSocketListen(socket.Mode, socket.URL, socket.UseSHM)
+ fmt.Println("SDK RECV SHM TRY :", tryCount, " RESTART IT")
+
+ tryCount = 0
+
+ continue
+ }
+ tryCount++
+ }
continue
} else {
err = proto.Unmarshal(msg, &repsdkmsg)
@@ -209,6 +247,8 @@
func Send(sdkid string, socket util.SocketContext, in chan protomsg.SdkMessage) {
+ tryCount := 0
+
for {
select {
case <-socket.Context.Done():
@@ -224,6 +264,21 @@
if err := socket.Sock.Send(data); err != nil {
logger.Error("failed send:sdkid=", sdkid)
+
+ // fmt.Println("SDK SEND ERROR: ", err)
+
+ if socket.UseSHM {
+ if tryCount > util.SHMMaxTryCount {
+ socket, err = util.NewSocketListen(socket.Mode, socket.URL, socket.UseSHM)
+ fmt.Println("SDK SEND SHM TRY :", util.SHMMaxTryCount, " RESTART IT")
+
+ tryCount = 0
+
+ continue
+ }
+ tryCount++
+ }
+
continue
}
logger.Debug(sdkid, " send success: ", len(data))
--
Gitblit v1.8.0