合并张蒙的共享内存，增加logger

chenshijun

2019-09-11 91ca2658d546bf5d9857b144e6beefa1019ba972

 sdk/sdk.go

@@ -1,18 +1,13 @@
package sdk

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"
   "basic.com/valib/logger.git"
)

const (
@@ -90,14 +85,14 @@
      logger.Info("create", id)
   }

   url := fmt.Sprintf("ipc:///tmp/%s%s.ipc", id, postPush)
   url := "ipc:///tmp/" + id + postPush + ".ipc"
   m := deliver.PushPull
   if shm {
      m = deliver.Shm
      url = id + postPush
   }

   fmt.Println("SDK URL: ", url)
   logger.Info("SDK URL: ", url)

   socket, err := util.NewSocketListen(int(m), url, shm)
   if err != nil {
@@ -116,7 +111,7 @@
      logger.Info("create", id)
   }

   url := fmt.Sprintf("ipc:///tmp/%s%s.ipc", id, postPull)
   url := "ipc:///tmp/" + id + postPull + ".ipc"
   m := deliver.PushPull
   if shm {
      m = deliver.Shm
@@ -198,11 +193,18 @@
func GetSdkSendTopic(sdkmsg protomsg.SdkMessage) (sendTopic string) {
   if int(sdkmsg.Tasklab.Index) < len(sdkmsg.Tasklab.Sdkinfos) {
      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 == "" {
         logger.Info("----------Sdktype:yitusoutu")
         logger.Info("分发的主题:", sendTopic, "!Sdktype：", sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Sdktype)
      }
   } else {
      sendTopic = "es"
   }
   logger.Debug("分发的主题: ", sendTopic, "位置：", int(sdkmsg.Tasklab.Index)+1, "/", len(sdkmsg.Tasklab.Sdkinfos))
   return

   return sendTopic
}

func Recv(socket util.SocketContext) {
@@ -220,7 +222,7 @@
            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")
                  logger.Info("SDK RECV SHM TRY :", tryCount, " RESTART IT")

                  tryCount = 0

@@ -238,6 +240,9 @@
            repsdkmsg.Tasklab.Index++
            //调用计算函数， 分发给下一个主题
            nexttopic := GetSdkSendTopic(repsdkmsg)
            if "facedetect-sdk-no-track" == nexttopic || "virtual-faceextract-sdk-pull" == nexttopic {
               logger.Info("nexttopic:", nexttopic)
            }
            SdkMap[nexttopic] <- repsdkmsg
         }
      }
@@ -262,12 +267,14 @@
            }

            if err := socket.Sock.Send(data); err != nil {
               logger.Error("failed send:sdkid=", sdkid)
               if "facedetect-sdk-no-track" == sdkid || "virtual-faceextract-sdk-pull" == sdkid {
                  logger.Error("failed send:sdkid=", sdkid)
               }

               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")
                     logger.Info("SDK SEND SHM TRY :", util.SHMMaxTryCount, " RESTART IT")

                     tryCount = 0

@@ -275,9 +282,12 @@
                  }
                  tryCount++
               }

               continue
            }
            logger.Debug(sdkid, " send success: ", len(data))
            if "facedetect-sdk-no-track" == sdkid || "virtual-faceextract-sdk-pull" == sdkid {
               logger.Info(sdkid, " send success: ", len(data))
            }
         } else {
            logger.Debug(sdkid, " 主题关闭, 关闭send()")
            return