From e87bc90683436ee856c1d14ecab1f16940a20471 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期四, 05 十二月 2019 13:20:20 +0800
Subject: [PATCH] update
---
sdk/sdk.go | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/sdk/sdk.go b/sdk/sdk.go
index bc0021a..88c0445 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)
}
@@ -215,17 +216,22 @@
for {
select {
case <-socket.Context.Done():
+ socket.Sock.Close()
+
logger.Info("socket close")
return
default:
if msg, err := socket.Sock.Recv(); err != nil {
+
+ // tryCount++
+ // socket = util.MaybeRestartSocket(socket, &tryCount)
+
if socket.UseSHM {
- if tryCount > util.SHMMaxTryCount {
+ if tryCount > util.ShmMaxTryCount {
+ socket.Sock.Close()
socket, err = util.NewSocketListen(socket.Mode, socket.URL, socket.UseSHM)
- logger.Info("SDK RECV SHM TRY :", tryCount, " RESTART IT")
-
+ logger.Info("SDK SEND SHM TRY :", util.ShmMaxTryCount, " RESTART IT")
tryCount = 0
-
continue
}
tryCount++
@@ -256,6 +262,8 @@
for {
select {
case <-socket.Context.Done():
+ socket.Sock.Close()
+
logger.Info("socket is close")
return
case v, ok := <-in:
@@ -271,13 +279,15 @@
logger.Error("failed send:sdkid=", sdkid)
}
+ // tryCount++
+ // socket = util.MaybeRestartSocket(socket, &tryCount)
+
if socket.UseSHM {
- if tryCount > util.SHMMaxTryCount {
+ 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")
-
+ logger.Info("SDK SEND SHM TRY :", util.ShmMaxTryCount, " RESTART IT")
tryCount = 0
-
continue
}
tryCount++
--
Gitblit v1.8.0