From 2ed59d1db29aa1a58f0cca02346eb7ae722eab27 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 13 十二月 2019 11:10:26 +0800
Subject: [PATCH] 关掉多协程调测
---
labelFilter/req.go | 99 +++++++++++++++++++++++--------------------------
1 files changed, 46 insertions(+), 53 deletions(-)
diff --git a/labelFilter/req.go b/labelFilter/req.go
index a105421..2677ef6 100644
--- a/labelFilter/req.go
+++ b/labelFilter/req.go
@@ -4,24 +4,23 @@
"basic.com/dbapi.git"
"basic.com/valib/logger.git"
"fmt"
- "github.com/golang/protobuf/proto"
"nanomsg.org/go-mangos"
"nanomsg.org/go-mangos/protocol/rep"
"nanomsg.org/go-mangos/protocol/req"
"nanomsg.org/go-mangos/transport/ipc"
"nanomsg.org/go-mangos/transport/tcp"
- "ruleprocess/structure"
"time"
)
-var urlChans = make([]urlChan,100)
-type urlChan struct {
- url string
- ch chan *structure.ResultMsg
-}
-var pool chan *structure.ResultMsg = make(chan *structure.ResultMsg)
+var urlPool = make(map[string]chan []byte,100)
+//var urlChans = make([]urlChan,100)
+//type urlChan struct {
+// url string
+// ch chan *structure.ResultMsg
+//}
+//var pool chan *structure.ResultMsg = make(chan *structure.ResultMsg)
func Die(format string, v ...interface{}) {
- logger.Info("+++++++",format)
+ logger.Info("+++++++",format,v)
//os.Exit(1)
}
@@ -63,7 +62,7 @@
var api dbapi.EventPushApi
b, allRules := api.FindAllDetails()
- logger.Info("鍒濆鍖栦簨浠舵帹閫侊紝鏌ョ湅鎵�鏈夎鍒欑粍锛�", allRules)
+ //logger.Info("鍒濆鍖栦簨浠舵帹閫侊紝鏌ョ湅鎵�鏈夎鍒欑粍锛�", allRules)
if !b {
logger.Error("鏌ヨ鏃堕棿鎺ㄩ�佽鍒欏け璐ワ紒")
}
@@ -71,16 +70,18 @@
if ruleGroup.Enable { // 澶ц鍒欏紑鍏冲紑鍚姸鎬�
for _, url := range ruleGroup.Urls {
// 涓烘瘡涓猽rl寤虹珛涓�涓猚han
- ch := make(chan *structure.ResultMsg,10)
- var urlCh = urlChan{url.Url,ch}
- urlChans = append(urlChans,urlCh)
- go GoPush(url.Url)
+ if urlPool[url.Url] == nil {
+ urlPool[url.Url] = make(chan []byte,100)
+ //logger.Info("鍒濆鍖栦俊鎭細",urlPool)
+ go GoPush(url.Url)
+ }
}
}
}
}
func GoPush(url string) {
+
var err error
var msg []byte
var sock mangos.Socket
@@ -92,61 +93,53 @@
logger.Error("浼犺緭鐨勬暟鎹秴杩囧ぇ灏忛檺鍒�")
return
}
- errTimeOut := sock.SetOption(mangos.OptionRecvDeadline,time.Millisecond * 2000)
+ errTimeOut := sock.SetOption(mangos.OptionRecvDeadline,time.Millisecond * 1500)
if errTimeOut != nil {
logger.Error("鎺ユ敹鍝嶅簲瓒呮椂")
return
}
- //errWrite := sock.SetOption(mangos.OptionWriteQLen,10)
- //if errWrite != nil {
- // logger.Error("璁剧疆浼犺緭缂撳瓨澶у皬澶辫触")
- // return
- //}
- //errRead := sock.SetOption(mangos.OptionReadQLen,10)
- //if errRead != nil {
- // logger.Error("璁剧疆浼犺緭缂撳瓨澶у皬澶辫触")
- // return
- //}
+ errTimeOut1 := sock.SetOption(mangos.OptionSendDeadline,time.Millisecond * 1500)
+ if errTimeOut1 != nil {
+ logger.Error("鍙戦�佽秴鏃�")
+ return
+ }
+ errWrite := sock.SetOption(mangos.OptionWriteQLen,5)
+ if errWrite != nil {
+ logger.Error("璁剧疆浼犺緭缂撳瓨澶у皬澶辫触")
+ return
+ }
+ errRead := sock.SetOption(mangos.OptionReadQLen,5)
+ if errRead != nil {
+ logger.Error("璁剧疆浼犺緭缂撳瓨澶у皬澶辫触")
+ return
+ }
sock.AddTransport(tcp.NewTransport())
if err = sock.Dial("tcp://"+url); err != nil {
logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: ", err.Error())
}
logger.Info("搴忓垪鍖栨暟鎹�")
- //for v := range pool{
- // logger.Info("鏃犻檺寰幆",v.Cid)
- //}
- var ch chan *structure.ResultMsg
- for _, v := range urlChans {
- if v.url == url{
- ch = v.ch
- }
- }
for {
select {
// case <-ctx.Done():
// return
- case data := <- ch:
- logger.Info("鎺ユ敹鍒版暟鎹�",data.Cid)
- bytes,err1 := proto.Marshal(data)
- logger.Info("鏁版嵁闀垮害涓猴細",len(bytes))
- if err1 != nil {
- logger.Info("搴忓垪鍖栧け璐ワ細",err1)
- }
- logger.Debug("groutine"+url+"鎺ㄩ�佹暟鎹�")
- //bytes := []byte("ndfasojdfaidsos")
- if err = sock.Send(bytes); err != nil {
- Die("groutine"+url+"鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: ", err.Error())
- }
- msg, err = sock.Recv();
- if err != nil {
- Die("groutine"+url+"鎺ユ敹鍝嶅簲澶辫触: ", err.Error())
- } else {
- logger.Debug("浜嬩欢鎺ㄩ�佹垚鍔燂紒groutine"+url+"鏀跺埌鍝嶅簲",string(msg))
- }
+ case data := <- urlPool[url]:
+ go func(data []byte) {
+ start := time.Now()
+ if err = sock.Send(data); err != nil {
+ Die("groutine"+url+"鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: ", err.Error())
+ }
+ pushTime := time.Since(start)
+ msg, err = sock.Recv();
+ if err != nil {
+ Die("groutine"+url+"鎺ユ敹鍝嶅簲澶辫触: ", err.Error(),pushTime,time.Since(start))
+ } else {
+ //logger.Debug("浜嬩欢鎺ㄩ�佹垚鍔燂紒groutine"+url+"鏀跺埌鍝嶅簲",string(msg),pushTime,time.Since(start))
+ }
+ }(data)
default:
-
+ time.Sleep(time.Millisecond * 10)
}
}
sock.Close()
--
Gitblit v1.8.0