From 5459ba1d3f7f944aa97923ed9c09a5dbc7663928 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 14 一月 2020 18:01:24 +0800
Subject: [PATCH] update

---
 run.go |   83 +++++++++++++++++++++--------------------
 1 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/run.go b/run.go
index f4402e4..fd70be9 100644
--- a/run.go
+++ b/run.go
@@ -6,17 +6,23 @@
 	"fmt"
 	"io/ioutil"
 	"os"
+	"strings"
 	"time"
 	"unsafe"
 
-	"basic.com/libgowrapper/sdkhelper.git"
+	"reid/common"
+
 	"basic.com/valib/gogpu.git"
 
 	"basic.com/pubsub/protomsg.git"
 	"basic.com/valib/godraw.git"
 
-	"basic.com/valib/deliver.git"
 	"github.com/gogo/protobuf/proto"
+
+	"nanomsg.org/go-mangos"
+	"nanomsg.org/go-mangos/protocol/rep"
+	"nanomsg.org/go-mangos/transport/ipc"
+	"nanomsg.org/go-mangos/transport/tcp"
 )
 
 type reid struct {
@@ -30,7 +36,7 @@
 // Create Reid
 func Create(config string, typ, id string, gpu int, shm bool, ipc2Rule string, ruleMaxSize int, fn func(...interface{}), reserved map[string]interface{}) interface{} {
 
-	cfg, err := sdkhelper.ReadConfig(config)
+	cfg, err := common.ReadConfig(config)
 	if err != nil {
 		fn("Reid SDK Create Error When Read Config: ", err)
 		return nil
@@ -50,7 +56,7 @@
 		}
 	}
 
-	gpuM := sdkhelper.Atoi(cfg.Param[sGPU])
+	gpuM := common.Atoi(cfg.Param[sGPU])
 
 	rGPU := gpu
 
@@ -77,38 +83,47 @@
 func Run(ctx context.Context, i interface{}) {
 	s := i.(*reid)
 
-	c := deliver.NewClient(deliver.ReqRep, s.ipc)
-
-	sendTry := 0
-	recvTry := 0
-	maxTry := 30
-
-	var msg []byte
+	var sock mangos.Socket
 	var err error
+	var msg []byte
+
+	for {
+		if sock, err = rep.NewSocket(); err != nil {
+			s.fnLogger("can't get new rep socket: ", err)
+			time.Sleep(5 * time.Millisecond)
+		} else {
+			break
+		}
+	}
+
+	sock.AddTransport(ipc.NewTransport())
+	sock.AddTransport(tcp.NewTransport())
+
+	for {
+		if err = sock.Listen(s.ipc); err != nil {
+			suf := "ipc://"
+			p := strings.Index(s.ipc, suf)
+			if p >= 0 {
+				file := s.ipc[p+len(string(suf)):]
+				os.Remove(file)
+				s.fnLogger("remove:", file)
+			}
+			s.fnLogger("can't listen on rep socket: ", err)
+			time.Sleep(5 * time.Millisecond)
+		} else {
+			break
+		}
+	}
 
 	for {
 		select {
 		case <-ctx.Done():
+			sock.Close()
 			return
 		default:
 
-			for {
-				msg, err = c.Recv()
-				if err == nil {
-					recvTry = 0
-					break
-				}
-				recvTry++
-				if recvTry > maxTry {
-					break
-				}
+			if msg, err = sock.Recv(); err != nil {
 				s.fnLogger("REID~~~~~~Recv From HumanTrack error: ", err)
-				time.Sleep(5 * time.Millisecond)
-				continue
-			}
-
-			if recvTry > maxTry {
-				recvTry = 0
 				continue
 			}
 
@@ -155,20 +170,8 @@
 			buf := float32SliceAsByteSlice(feat)
 			ioutil.WriteFile("./reid-feat-byte.txt", buf, 0644)
 
-			for {
-				err = c.Send(buf)
-				if err == nil {
-					sendTry = 0
-					break
-				}
-				if sendTry > maxTry {
-					sendTry = 0
-					s.fnLogger("REID~~~~~~Send HumanTrack try: ", maxTry)
-					break
-				}
+			if err = sock.Send(buf); err != nil {
 				s.fnLogger("REID~~~~~~Send HumanTrack error: ", err)
-				time.Sleep(5 * time.Millisecond)
-				continue
 			}
 
 		}

--
Gitblit v1.8.0