From e8bfcf3115506b2c4109d912dd1bffc7e8c44d9b Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 27 十一月 2019 16:40:50 +0800
Subject: [PATCH] update
---
sdk/sdk.go | 63 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/sdk/sdk.go b/sdk/sdk.go
index bc0021a..8e5c723 100644
--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -1,9 +1,10 @@
package sdk
import (
- "github.com/gogo/protobuf/proto"
"taskpubsub/tasktag"
"taskpubsub/util"
+
+ "github.com/gogo/protobuf/proto"
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
@@ -30,13 +31,13 @@
}
func initInnerTopic() {
- for _, sendTopic := range innerSendTopic {
- createSdkSendServerAndListen(sendTopic)
- }
+ // for _, sendTopic := range innerSendTopic {
+ // createSdkSendServerAndListen(sendTopic)
+ // }
- for _, recvTopic := range innerRecvTopic {
- createSdkRecvServerAndListen(recvTopic)
- }
+ // for _, recvTopic := range innerRecvTopic {
+ // createSdkRecvServerAndListen(recvTopic)
+ // }
}
func Init(useShm bool) {
@@ -195,8 +196,8 @@
sendTopic = sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Ipcid
if "Yolo" != sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype &&
"FaceDetect" != sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype &&
- "FaceCompare" != sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype{
- //if sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype == "" {
+ "FaceCompare" != sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype {
+ //if sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype == "" {
logger.Info("----------Sdktype:yitusoutu")
logger.Info("鍒嗗彂鐨勪富棰�:", sendTopic, "!Sdktype锛�", sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype)
}
@@ -219,17 +220,19 @@
return
default:
if msg, err := socket.Sock.Recv(); err != nil {
- if socket.UseSHM {
- if tryCount > util.SHMMaxTryCount {
- socket, err = util.NewSocketListen(socket.Mode, socket.URL, socket.UseSHM)
- logger.Info("SDK RECV SHM TRY :", tryCount, " RESTART IT")
+ tryCount++
+ socket = util.MaybeRestartSocket(socket, &tryCount)
- tryCount = 0
-
- continue
- }
- tryCount++
- }
+ // if socket.UseSHM {
+ // if tryCount > util.SHMMaxTryCount {
+ // socket.Sock.Close()
+ // socket, err = util.NewSocketListen(socket.Mode, socket.URL, socket.UseSHM)
+ // logger.Info("SDK SEND SHM TRY :", util.SHMMaxTryCount, " RESTART IT")
+ // tryCount = 0
+ // continue
+ // }
+ // tryCount++
+ // }
continue
} else {
err = proto.Unmarshal(msg, &repsdkmsg)
@@ -271,17 +274,19 @@
logger.Error("failed send:sdkid=", sdkid)
}
- if socket.UseSHM {
- if tryCount > util.SHMMaxTryCount {
- socket, err = util.NewSocketListen(socket.Mode, socket.URL, socket.UseSHM)
- logger.Info("SDK SEND SHM TRY :", util.SHMMaxTryCount, " RESTART IT")
+ tryCount++
+ socket = util.MaybeRestartSocket(socket, &tryCount)
- tryCount = 0
-
- continue
- }
- tryCount++
- }
+ // if socket.UseSHM {
+ // if tryCount > util.SHMMaxTryCount {
+ // socket.Sock.Close()
+ // socket, err = util.NewSocketListen(socket.Mode, socket.URL, socket.UseSHM)
+ // logger.Info("SDK SEND SHM TRY :", util.SHMMaxTryCount, " RESTART IT")
+ // tryCount = 0
+ // continue
+ // }
+ // tryCount++
+ // }
continue
}
--
Gitblit v1.8.0