From c7c180fcbe012173e56bde6141ae4b2ed3827ab4 Mon Sep 17 00:00:00 2001
From: 龙赣华 <slongertian@gmail.com>
Date: 星期一, 20 五月 2019 17:45:31 +0800
Subject: [PATCH] add common socket protocol
---
sdk/sdk.go | 73 +++++++++++++-----------------------
1 files changed, 26 insertions(+), 47 deletions(-)
diff --git a/sdk/sdk.go b/sdk/sdk.go
index b97d132..4371c1f 100644
--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -2,26 +2,23 @@
import (
"context"
+ "errors"
"fmt"
- "time"
"github.com/long/test/httpclient"
"github.com/long/test/protomsg"
"github.com/long/test/tasktag"
"github.com/long/test/util"
- "nanomsg.org/go-mangos"
- "nanomsg.org/go-mangos/protocol/pair"
- "nanomsg.org/go-mangos/transport/ipc"
- "nanomsg.org/go-mangos/transport/tcp"
-
"github.com/golang/protobuf/proto"
+ "github.com/long/test/deliver"
)
+//var doOnce sync.Once
var SocketManage = make(map[string]SocketContext)
type SocketContext struct {
- Sock mangos.Socket
+ Sock deliver.Deliver
Context context.Context
Cancel context.CancelFunc
}
@@ -34,16 +31,14 @@
SdkCreateTopic(sdklist) // 鍒涘缓涓婚
for _, sdkid := range sdklist { // 鍒涘缓sdk server
- sdkid, socket, err := NewSdkListen(sdkid, "tcp", "192.168.1.124", 0)
+ url := fmt.Sprintf("%s%d", "tcp://192.168.1.124:", UrlPort)
+ sdkid, socket, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
if err != nil {
continue
}
- // 鎺ュ彈绠￠亾鏁版嵁 ==銆� 鍙戦�佺粰 瀵瑰簲鐨勮繘绋�
- go send(sdkid, socket, SdkMap[sdkid])
-
- //浠庡搴旇繘绋嬫帴鍙楁暟鎹� == 銆� 閲嶆柊閫佸洖鍒扮閬�
- go Recv(socket)
-
+ go Send(sdkid, socket, SdkMap[sdkid])
+ //break
+ // Recv(socket)
}
go es(SdkMap["es"])
@@ -129,50 +124,28 @@
var UrlPort = 9000
-// 鍒涘缓 sdk server listen
-func NewSdkListen(sdkid string, protocol string, ip string, port int) (sid string, socket SocketContext, err error) {
-
+// create server
+func NewSdkSocketListen(mode int, sdkid string, url string) (sid string, socket SocketContext, err error) {
+ fmt.Println("url is: ", url)
ctx, cancel := context.WithCancel(context.Background())
-
- var url string
socket.Context = ctx
socket.Cancel = cancel
- switch protocol {
- case "tcp":
- if port == 0 {
- port = UrlPort
- UrlPort++
- }
- url = fmt.Sprintf("%s://%s:%d", protocol, ip, port)
+ socket.Sock = deliver.NewServer(deliver.Mode(mode), url)
+ fmt.Println(sdkid, socket.Sock)
- case "ipc":
- url = fmt.Sprintf("%s://%s", sdkid)
- }
- fmt.Printf("sdkid= %s url=%s\n", sdkid, url)
-
- if socket.Sock, err = pair.NewSocket(); err != nil {
- fmt.Println(sdkid, "can't get new pair socket: ", err.Error())
- return sdkid, socket, err
+ if socket.Sock == nil {
+ return sdkid, socket, errors.New("create listen error")
}
- socket.Sock.SetOption(mangos.OptionMaxRecvSize, 32*1024*1024)
- socket.Sock.SetOption(mangos.OptionWriteQLen, 10)
- socket.Sock.SetOption(mangos.OptionReadQLen, 10)
-
- socket.Sock.AddTransport(tcp.NewTransport())
- socket.Sock.AddTransport(ipc.NewTransport())
-
- if err = socket.Sock.Listen(url); err != nil {
- fmt.Println("socket lisnte error ", sdkid)
- }
SocketManage[sdkid] = socket
- return sdkid, socket, err
+ UrlPort++
+ return sdkid, socket, nil
}
func Recv(socket SocketContext) {
- socket.Sock.SetOption(mangos.OptionRecvDeadline, 1*time.Second)
+ //socket.Sock.SetOption(mangos.OptionRecvDeadline, 1*time.Second)
var repsdkmsg = &protomsg.SdkMessage{}
for {
@@ -198,7 +171,7 @@
}
}
-func send(sdkid string, socket SocketContext, in chan *protomsg.SdkMessage) {
+func Send(sdkid string, socket SocketContext, in chan *protomsg.SdkMessage) {
var v *protomsg.SdkMessage
for {
@@ -211,11 +184,17 @@
fmt.Println("proto marshal error ", err)
}
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")
}
fmt.Printf("sdkid = %s ,send success:%d \n", sdkid, len(data))
+ // go func(sock SocketContext) {
+ // doOnce.Do(func() { Recv(sock) })
+
+ // }(socket)
}
}
}
--
Gitblit v1.8.0