update

zhangmeng

2019-11-27 e8bfcf3115506b2c4109d912dd1bffc7e8c44d9b

 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
            }