From 40d864645ff608e3a81d115fef26bba87954be2c Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期一, 22 七月 2019 18:42:06 +0800
Subject: [PATCH] add log and fix pubusb
---
sdk/sdk.go | 265 +++++++++++++++++++++++++++++------------------------
1 files changed, 145 insertions(+), 120 deletions(-)
diff --git a/sdk/sdk.go b/sdk/sdk.go
index 19fcec1..e8bce98 100644
--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -5,17 +5,23 @@
"errors"
"fmt"
- "github.com/long/test/httpclient"
- "github.com/long/test/protomsg"
+ // "github.com/long/test/httpclient"
"github.com/long/test/tasktag"
"github.com/long/test/util"
+ "github.com/gogo/protobuf/proto"
- "github.com/golang/protobuf/proto"
- "github.com/long/test/deliver"
+ "basic.com/pubsub/protomsg.git"
+ "basic.com/valib/deliver.git"
+ "github.com/long/test/logger"
)
-//var doOnce sync.Once
+const (
+ postPull = "_1.ipc"
+ postPush = "_2.ipc"
+)
+
var SocketManage = make(map[string]SocketContext)
+var SdkMap = make(map[string]chan protomsg.SdkMessage)
type SocketContext struct {
Sock deliver.Deliver
@@ -25,142 +31,162 @@
func Init() {
- sdklist := SdkAll() //鑾峰彇鎵�鏈塻dk
- fmt.Println("sdk list have: ", sdklist)
-
- SdkCreateTopic(sdklist) // 鍒涘缓涓婚
-
- for _, sdkid := range sdklist { // 鍒涘缓sdk server
- url := fmt.Sprintf("%s%d", "tcp://192.168.1.124:", UrlPort)
- sdkidser, socketser, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
- if err != nil {
- continue
- }
- UrlPort++
- go Send(sdkidser, socketser, SdkMap[sdkid])
-
- url = fmt.Sprintf("%s%d", "tcp://192.168.1.124:", UrlPortR)
- _, socketdial, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
- if err != nil {
- continue
- }
- UrlPortR++
- go Recv(socketdial)
-
+ logger.Info("============= init sdk info =====================")
+ for _, sdkid := range util.Sdklist { // 鍒涘缓sdk server
+ CreatesdkTopicandServer(sdkid)
+ logger.Info()
}
- go es(SdkMap["es"])
+ // 鎵嬪姩杈撳叆鐨勪富棰�
+ SdkMap["es"] = make(chan protomsg.SdkMessage)
+ logger.Info("create es channel: ")
+ SdkMap["virtual-faceextract-sdk-pull"] = make(chan protomsg.SdkMessage)
+ logger.Info("create virtual-faceextract-sdk-pull")
+
+ Createwebserver("virtual-faceextract-sdk-pull")
+
+ go Dealextern()
+ go AutoDelSdk(util.Sdkflag)
+}
+
+func CreatesdkTopicandServer(sdkid string) {
+
+ SdkMap[sdkid] = make(chan protomsg.SdkMessage)
+ logger.Info("create sdk channel: ", sdkid)
+
+ url := fmt.Sprintf("ipc:///tmp/%s%s", sdkid, postPull)
+ socketser, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
+ if err != nil {
+ delete(SdkMap, sdkid)
+ logger.Error(sdkid, "create server error!")
+ return
+ }
+
+
+ go Send(sdkid, socketser, SdkMap[sdkid])
+
+ url = fmt.Sprintf("ipc:///tmp/%s%s", sdkid, postPush)
+ socketdial, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
+ if err != nil {
+ delete(SdkMap, sdkid)
+ logger.Error(sdkid, "create dial error!")
+ return
+ }
+ go Recv(socketdial)
+
+}
+
+// web 鎺ュ彈绔鐞�
+func Createwebserver(webid string ){
+ url := fmt.Sprintf("ipc:///tmp/%s%s", webid, postPull)
+ socketser, err := NewSdkSocketListen(deliver.PushPull, webid, url)
+ if err != nil {
+ logger.Error(webid, "create server error!")
+ return
+ }
+ go Send(webid, socketser, SdkMap[webid])
+}
+
+func DeletesdkTopicandServer(sdkid string) {
+ close(SdkMap[sdkid])
+ delete(SdkMap, sdkid)
+ logger.Info("鍒犻櫎涓婚 sdk: ", sdkid)
+
+ SocketManage[sdkid].Cancel()
+ delete(SocketManage, sdkid)
+ logger.Info("鍒犻櫎server sdk: ", sdkid)
}
//鍗曠嫭澶勭悊 es 涓婚鐨勬儏鍐�
-func es(sdkmsgchan chan *protomsg.SdkMessage) {
- for _ = range sdkmsgchan {
- fmt.Println("this data is finish all sdk! ")
- }
-
+func Dealextern() {
+ for {
+ select {
+ case <-SdkMap["es"]:
+ //logger.Info("es finanl sdk!")
+ }
+ }
}
//鍔ㄦ�佸鐞�
-func AutoDelSdk(Newsdklist []string) {
- var oldSdk []string
- for key, _ := range SdkMap {
- oldSdk = append(oldSdk, key)
- }
- sdkChanDel := util.Difference(oldSdk, Newsdklist)
+func AutoDelSdk(sdkflag chan bool) {
- for key, op := range sdkChanDel {
- if op == "add" {
- SdkMap[key] = make(chan *protomsg.SdkMessage)
- fmt.Println("鍒涘缓涓婚 sdk: ", key)
- } else {
- close(SdkMap[key])
- delete(SdkMap, key)
- fmt.Println("鍒犻櫎涓婚 sdk: ", key)
+ for _ = range sdkflag {
+ logger.Info("test autodelsdk")
+ var oldSdk []string
+ for key, _ := range SdkMap {
+ oldSdk = append(oldSdk, key)
+ }
+ util.Sdklist = append(util.Sdklist, "es")
+ util.Sdklist = append(util.Sdklist, "virtual-faceextract-sdk-pull")
+ sdkChanDel := util.Difference(oldSdk, util.Sdklist)
+ logger.Info(sdkChanDel)
+
+ for key, op := range sdkChanDel {
+ if op == "add" {
+ CreatesdkTopicandServer(key)
+ } else {
+ DeletesdkTopicandServer(key)
+ logger.Info("鍒犻櫎涓婚 sdk: ", key)
+ }
}
}
}
-//涓婚
-var SdkMap = make(map[string]chan *protomsg.SdkMessage)
//sdk鏁版嵁 鍔犲伐鍣�
-func SdkData(cid string, taskid string, data []byte) *protomsg.SdkMessage {
- var sdkmsg = &protomsg.SdkMessage{}
+func SdkData(cid string,caddr string, taskid string, data []byte) protomsg.SdkMessage {
+ var sdkmsg = protomsg.SdkMessage{}
sdkmsg.Cid = cid
- if _, ok := tasktag.TaskMapLab[taskid]; !ok {
+ sdkmsg.Caddr =caddr
+ if val, ok := tasktag.TaskMapLab.Load(taskid); !ok {
sdkmsg.Tasklab = nil
return sdkmsg
- }
- sdkmsg.Tasklab = tasktag.TaskMapLab[taskid]
- sdkmsg.Data = data
+ } else {
+
+ sdkmsg.Tasklab = val.(*protomsg.TaskLabel)
+ sdkmsg.Data = data
+ }
return sdkmsg
}
//sdk鏁版嵁鍒嗗彂鍣�
-func SdkSendTopic(sdkmsg *protomsg.SdkMessage) (sdksend string) {
- if int(sdkmsg.Tasklab.Index) < len(sdkmsg.Tasklab.Sdkids) {
- sdksend = sdkmsg.Tasklab.Sdkids[sdkmsg.Tasklab.Index]
+func SdkSendTopic(sdkmsg protomsg.SdkMessage) (sdksend string) {
+ if int(sdkmsg.Tasklab.Index) < len(sdkmsg.Tasklab.Sdkinfos) {
+ sdksend = sdkmsg.Tasklab.Sdkinfos[sdkmsg.Tasklab.Index].Ipcid
} else {
sdksend = "es"
}
- fmt.Println()
- fmt.Println("鍒嗗彂鐨勪富棰樻槸锛� ", sdksend)
- fmt.Println()
+ logger.Debug("鍒嗗彂鐨勪富棰�: ", sdksend , "浣嶇疆锛�", int(sdkmsg.Tasklab.Index)+1,"/", len(sdkmsg.Tasklab.Sdkinfos))
return
}
-
-// 璋冪敤 http 鍊熷彛鑾峰彇鎽勫儚鏈轰俊鎭�
-func SdkAll() (sdklist []string) {
- sdklist = httpclient.GetSdk("http://127.0.0.1:8000/data/api-v/sdk/findskdid")
- return
-}
-
-// 鍒涘缓涓婚
-func SdkCreateTopic(sdklist []string) (err error) {
- for _, sdkid := range sdklist {
- SdkMap[sdkid] = make(chan *protomsg.SdkMessage)
- fmt.Println("create sdk channel: ", sdkid)
- }
-
- SdkMap["es"] = make(chan *protomsg.SdkMessage)
- fmt.Println("create es channel: ")
-
- return nil
-}
-
-var UrlPort = 9000
-var UrlPortR = 9500
// create server
-func NewSdkSocketListen(mode int, sdkid string, url string) (sid string, socket SocketContext, err error) {
- fmt.Println("url is: ", url)
+func NewSdkSocketListen(mode int, sdkid string, url string) (socket SocketContext, err error) {
+ logger.Info("url is: ", url)
ctx, cancel := context.WithCancel(context.Background())
socket.Context = ctx
socket.Cancel = cancel
-
socket.Sock = deliver.NewServer(deliver.Mode(mode), url)
- fmt.Println(sdkid, socket.Sock)
if socket.Sock == nil {
- return sdkid, socket, errors.New("create listen error")
+ return socket, errors.New("create listen error")
}
SocketManage[sdkid] = socket
- return sdkid, socket, nil
+ return socket, nil
}
func NewSdkSocketDial(mode int, sdkid string, url string) (sid string, socket SocketContext, err error) {
- fmt.Println("url is: ", url)
+ logger.Info("url is: ", url)
ctx, cancel := context.WithCancel(context.Background())
socket.Context = ctx
socket.Cancel = cancel
socket.Sock = deliver.NewClient(deliver.Mode(mode), url)
- fmt.Println(sdkid, socket.Sock)
if socket.Sock == nil {
return sdkid, socket, errors.New("create listen error")
@@ -171,55 +197,54 @@
}
func Recv(socket SocketContext) {
- //socket.Sock.SetOption(mangos.OptionRecvDeadline, 1*time.Second)
-
- var repsdkmsg = &protomsg.SdkMessage{}
+ var repsdkmsg = protomsg.SdkMessage{}
for {
select {
case <-socket.Context.Done():
- fmt.Println("socket close")
+ logger.Info("socket close")
return
default:
if msg, err := socket.Sock.Recv(); err != nil {
- //fmt.Printf("%s ", err)
continue
} else {
- err = proto.Unmarshal(msg, repsdkmsg)
- fmt.Println("receive len: ", len(msg))
+ err = proto.Unmarshal(msg, &repsdkmsg)
if err != nil {
- fmt.Println("unmarshal error: ", err)
+ logger.Error("unmarshal error: ", err)
continue
- }
- //璋冪敤璁＄畻鍑芥暟锛� 鍒嗗彂缁欎笅涓�涓富棰�
- nexttopic := SdkSendTopic(repsdkmsg)
- SdkMap[nexttopic] <- repsdkmsg
+ }
+ repsdkmsg.Tasklab.Index++
+ //璋冪敤璁＄畻鍑芥暟锛� 鍒嗗彂缁欎笅涓�涓富棰�
+ nexttopic := SdkSendTopic(repsdkmsg)
+ SdkMap[nexttopic] <- repsdkmsg
}
}
}
}
-func Send(sdkid string, socket SocketContext, in chan *protomsg.SdkMessage) {
- var v *protomsg.SdkMessage
+func Send(sdkid string, socket SocketContext, in chan protomsg.SdkMessage) {
for {
select {
case <-socket.Context.Done():
- fmt.Println("socket is close")
- case v = <-in:
- data, err := proto.Marshal(v)
- if err != nil {
- fmt.Println("proto marshal error ", err)
- continue
+ logger.Info("socket is close")
+ return
+ case v, ok := <-in:
+ if ok {
+ data, err :=v.Marshal()
+ if err != nil {
+ logger.Error("proto marshal error ", err)
+ continue
+ }
+
+ if err := socket.Sock.Send(data); err != nil {
+ logger.Error("failed send")
+ continue
+ }
+ logger.Debug(sdkid, " send success: ", len(data))
+ } else {
+ logger.Debug(sdkid, " 涓婚鍏抽棴, 鍏抽棴send()")
+ return
}
- fmt.Printf("浠庣閬搒dkid=%s 鎺ュ彈鏁版嵁 %d\n", sdkid, len(data))
- fmt.Println()
-
- fmt.Println("send len of data: ", len(data))
- if err := socket.Sock.Send(data); err != nil {
- fmt.Println("failed send")
- continue
- }
- fmt.Printf("sdkid = %s ,send success:%d \n", sdkid, len(data))
}
}
}
--
Gitblit v1.8.0