From aaa1c01fa7febe0de698b38ddae4cfe5fe7cc4ff Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 15 一月 2020 13:34:56 +0800
Subject: [PATCH] debug

---
 run.go |   68 ++++++++++++++++++++++++++-------
 1 files changed, 53 insertions(+), 15 deletions(-)

diff --git a/run.go b/run.go
index dc2ae58..126d96c 100644
--- a/run.go
+++ b/run.go
@@ -2,15 +2,24 @@
 
 import (
 	"context"
+	"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/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 {
@@ -24,7 +33,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
@@ -44,7 +53,7 @@
 		}
 	}
 
-	gpuM := sdkhelper.Atoi(cfg.Param[sGPU])
+	gpuM := common.Atoi(cfg.Param[sGPU])
 
 	rGPU := gpu
 
@@ -71,19 +80,47 @@
 func Run(ctx context.Context, i interface{}) {
 	s := i.(*reid)
 
-	c := deliver.NewClient(deliver.ReqRep, s.ipc)
-
-	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:
 
-			msg, err = c.Recv()
-			if err != nil {
+			if msg, err = sock.Recv(); err != nil {
+				s.fnLogger("REID~~~~~~Recv From HumanTrack error: ", err)
 				continue
 			}
 
@@ -103,13 +140,18 @@
 			if feat == nil {
 				// feat = make([]float32, 1)
 			} else {
-				s.fnLogger("REID~~~~~~Run Reid Use GPU: ", s.gpu)
 				for k := 0; k < 3; k++ {
 					s.fnLogger("REID~~~~~~extractor---human_feats------%f", feat[k+2000])
 				}
+				s.fnLogger("REID~~~~~~Run Reid Use GPU: ", s.gpu)
 			}
 			buf := float32SliceAsByteSlice(feat)
-			c.Send(buf)
+			ioutil.WriteFile("./reid-feat-byte.txt", buf, 0644)
+
+			if err = sock.Send(buf); err != nil {
+				s.fnLogger("REID~~~~~~Send HumanTrack error: ", err)
+			}
+
 		}
 
 	}
@@ -122,9 +164,5 @@
 
 	l := len(src) * 4
 	ptr := unsafe.Pointer(&src[0])
-	// It is important to keep in mind that the Go garbage collector
-	// will not interact with this data, and that if src if freed,
-	// the behavior of any Go code using the slice is nondeterministic.
-	// Reference: https://github.com/golang/go/wiki/cgo#turning-c-arrays-into-go-slices
 	return (*[1 << 26]byte)((*[1 << 26]byte)(ptr))[:l:l]
 }

--
Gitblit v1.8.0