From 8c7dd4313817f6854461a64a7cadb7d970fb3e88 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 27 八月 2019 09:56:37 +0800
Subject: [PATCH] run nomally
---
sdk/sdk.go | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/sdk/sdk.go b/sdk/sdk.go
index 0998b97..42bff5d 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!")
--
Gitblit v1.8.0