新增对连续buff内存中指定索引位打标记函数

cluster/cluster.go

@@ -465,7 +465,7 @@ func GetNodeByServiceName(serviceName string) map[int]struct{} {
 		return nil
 	}
 
-	var mapNodeId map[int]struct{}
+	mapNodeId := map[int]struct{}{}
 	for nodeId,_ := range mapNode {
 		mapNodeId[nodeId] = struct{}{}
 	}

cluster/parsecfg.go

@@ -5,7 +5,7 @@ import (
 	"github.com/duanhf2012/origin/log"
 	"github.com/duanhf2012/origin/rpc"
 	jsoniter "github.com/json-iterator/go"
-	"io/ioutil"
+	"os"
 	"strings"
 )
 
@@ -18,7 +18,7 @@ type NodeInfoList struct {
 
 func (cls *Cluster) ReadClusterConfig(filepath string) (*NodeInfoList, error) {
 	c := &NodeInfoList{}
-	d, err := ioutil.ReadFile(filepath)
+	d, err := os.ReadFile(filepath)
 	if err != nil {
 		return nil, err
 	}
@@ -33,7 +33,7 @@ func (cls *Cluster) ReadClusterConfig(filepath string) (*NodeInfoList, error) {
 func (cls *Cluster) readServiceConfig(filepath string) (interface{}, map[string]interface{}, map[int]map[string]interface{}, error) {
 	c := map[string]interface{}{}
 	//读取配置
-	d, err := ioutil.ReadFile(filepath)
+	d, err := os.ReadFile(filepath)
 	if err != nil {
 		return nil, nil, nil, err
 	}
@@ -69,7 +69,7 @@ func (cls *Cluster) readLocalClusterConfig(nodeId int) ([]NodeInfo, []NodeInfo,
 	var nodeInfoList []NodeInfo
 	var masterDiscoverNodeList []NodeInfo
 	clusterCfgPath := strings.TrimRight(configDir, "/") + "/cluster"
-	fileInfoList, err := ioutil.ReadDir(clusterCfgPath)
+	fileInfoList, err := os.ReadDir(clusterCfgPath)
 	if err != nil {
 		return nil, nil, fmt.Errorf("Read dir %s is fail :%+v", clusterCfgPath, err)
 	}
@@ -111,7 +111,7 @@ func (cls *Cluster) readLocalClusterConfig(nodeId int) ([]NodeInfo, []NodeInfo,
 
 func (cls *Cluster) readLocalService(localNodeId int) error {
 	clusterCfgPath := strings.TrimRight(configDir, "/") + "/cluster"
-	fileInfoList, err := ioutil.ReadDir(clusterCfgPath)
+	fileInfoList, err := os.ReadDir(clusterCfgPath)
 	if err != nil {
 		return fmt.Errorf("Read dir %s is fail :%+v", clusterCfgPath, err)
 	}

network/ws_client.go

@@ -14,6 +14,7 @@ type WSClient struct {
 	ConnectInterval  time.Duration
 	PendingWriteNum  int
 	MaxMsgLen        uint32
+	MessageType		 int
 	HandshakeTimeout time.Duration
 	AutoReconnect    bool
 	NewAgent         func(*WSConn) Agent
@@ -21,7 +22,7 @@ type WSClient struct {
 	cons             WebsocketConnSet
 	wg               sync.WaitGroup
 	closeFlag        bool
-	messageType int
+
 }
 
 func (client *WSClient) Start() {
@@ -63,7 +64,11 @@ func (client *WSClient) init() {
 	if client.cons != nil {
 		log.SFatal("client is running")
 	}
-	client.messageType = websocket.TextMessage
+
+	if client.MessageType == 0 {
+		client.MessageType = websocket.TextMessage
+	}
+
 	client.cons = make(WebsocketConnSet)
 	client.closeFlag = false
 	client.dialer = websocket.Dialer{
@@ -84,9 +89,6 @@ func (client *WSClient) dial() *websocket.Conn {
 	}
 }
 
-func (client *WSClient) SetMessageType(messageType int){
-	client.messageType = messageType
-}
 func (client *WSClient) connect() {
 	defer client.wg.Done()
 
@@ -106,7 +108,7 @@ reconnect:
 	client.cons[conn] = struct{}{}
 	client.Unlock()
 
-	wsConn := newWSConn(conn, client.PendingWriteNum, client.MaxMsgLen,client.messageType)
+	wsConn := newWSConn(conn, client.PendingWriteNum, client.MaxMsgLen,client.MessageType)
 	agent := client.NewAgent(wsConn)
 	agent.Run()
 

network/ws_server.go

@@ -139,6 +139,7 @@ func (server *WSServer) Start() {
 		maxMsgLen:       server.MaxMsgLen,
 		newAgent:        server.NewAgent,
 		conns:           make(WebsocketConnSet),
+		messageType:server.messageType,
 		upgrader: websocket.Upgrader{
 			HandshakeTimeout: server.HTTPTimeout,
 			CheckOrigin:      func(_ *http.Request) bool { return true },

node/node.go

@@ -8,9 +8,9 @@ import (
 	"github.com/duanhf2012/origin/log"
 	"github.com/duanhf2012/origin/profiler"
 	"github.com/duanhf2012/origin/service"
-	"github.com/duanhf2012/origin/util/timer"
 	"github.com/duanhf2012/origin/util/buildtime"
-	"io/ioutil"
+	"github.com/duanhf2012/origin/util/timer"
+	"io"
 	slog "log"
 	"net/http"
 	_ "net/http/pprof"
@@ -31,6 +31,13 @@ var bValid bool
 var configDir = "./config/"
 var logLevel string = "debug"
 var logPath string
+type BuildOSType = int8
+
+const(
+	Windows BuildOSType = 0
+	Linux 	BuildOSType = 1
+	Mac   	BuildOSType = 2
+)
 
 func init() {
 
@@ -107,7 +114,7 @@ func  getRunProcessPid(nodeId int) (int,error) {
 		return 0, err
 	}
 
-	pidByte,errs := ioutil.ReadAll(f)
+	pidByte, errs := io.ReadAll(f)
 	if errs != nil {
 		return 0, errs
 	}
@@ -274,7 +281,6 @@ func startNode(args interface{}) error{
 	return nil
 }
 
-
 func Setup(s ...service.IService) {
 	for _, sv := range s {
 		sv.OnSetup(sv)

node/node_linux.go

@@ -15,3 +15,7 @@ func KillProcess(processId int){
 		fmt.Printf("kill processid %d is successful.\n",processId)
 	}
 }
+
+func GetBuildOSType() BuildOSType{
+	return Linux
+}

node/node_mac.go

@@ -15,3 +15,7 @@ func KillProcess(processId int){
 		fmt.Printf("kill processid %d is successful.\n",processId)
 	}
 }
+
+func GetBuildOSType() BuildOSType{
+	return Mac
+}

node/node_win.go

@@ -5,3 +5,7 @@ package node
 func KillProcess(processId int){
 
 }
+
+func GetBuildOSType() BuildOSType{
+	return Windows
+}

sysmodule/httpclientmodule/httpclientpoolmodule.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"crypto/tls"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net"
 	"net/http"
 	"net/url"
@@ -103,7 +103,7 @@ func (m *HttpClientModule) Request(method string, url string, body []byte, heade
 	}
 	defer rsp.Body.Close()
 
-	ret.Body, err = ioutil.ReadAll(rsp.Body)
+	ret.Body, err = io.ReadAll(rsp.Body)
 	if err != nil {
 		ret.Err = err
 		return ret

sysservice/httpservice/httpservice.go

@@ -8,7 +8,6 @@ import (
 	"github.com/duanhf2012/origin/util/uuid"
 	jsoniter "github.com/json-iterator/go"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"strings"
@@ -85,7 +84,6 @@ type HttpSession struct {
 	sessionDone  chan *HttpSession
 }
 
-
 type HttpService struct {
 	service.Service
 
@@ -496,7 +494,7 @@ func (httpService *HttpService) ServeHTTP(w http.ResponseWriter, r *http.Request
 	session.w = w
 
 	defer r.Body.Close()
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		session.WriteStatusCode(http.StatusGatewayTimeout)
 		session.flush()

util/algorithms/BiSearch.go

@@ -10,7 +10,7 @@ type Element[ValueType NumberType] interface {
 }
 
 //BiSearch 二分查找,切片必需有序号。matchUp表示是否向上范围查找。比如：数列10 20  30 ，当value传入25时，返回结果是2,表示落到3的范围
-func BiSearch[ValueType NumberType, T Element[ValueType]](sElement []T, value ValueType, matchUp bool) int {
+func BiSearch[ValueType NumberType, T Element[ValueType]](sElement []T, value ValueType, matchUp int) int {
 	low, high := 0, len(sElement)-1
 	if high == -1 {
 		return -1
@@ -28,12 +28,29 @@ func BiSearch[ValueType NumberType, T Element[ValueType]](sElement []T, value Va
 		}
 	}
 
-	if matchUp == true {
+	switch matchUp {
+	case 1:
 		if (sElement[mid].GetValue()) < value &&
 			(mid+1 < len(sElement)-1) {
 			return mid + 1
 		}
 		return mid
+	case -1:
+		if (sElement[mid].GetValue()) > value {
+			if mid - 1 < 0 {
+				return -1
+			} else {
+				return mid - 1
+			}
+		} else if (sElement[mid].GetValue()) < value {
+			if (mid+1 < len(sElement)-1) {
+				return mid + 1
+			} else {
+				return mid
+			}
+		} else {
+			return mid
+		}
 	}
 
 	return -1

util/algorithms/BitwiseOperation.go

@@ -0,0 +1,61 @@
+package algorithms
+
+import (
+	"errors"
+	"unsafe"
+)
+
+type BitNumber interface {
+	int | int8 | int16 | int32 | int64 | uint | uint8 | uint16 | uint32 | uint64 | uintptr
+}
+
+type UnsignedNumber interface {
+	uint | uint8 | uint16 | uint32 | uint64 | uintptr
+}
+
+func getBitTagIndex[Number BitNumber, UNumber UnsignedNumber](bitBuff []Number, bitPositionIndex UNumber) (uintptr, uintptr, bool) {
+	sliceIndex := uintptr(bitPositionIndex) / (8 * unsafe.Sizeof(bitBuff[0]))
+	sliceBitIndex := uintptr(bitPositionIndex) % (8 * unsafe.Sizeof(bitBuff[0]))
+
+	//位index不能越界
+	if uintptr(bitPositionIndex) >= uintptr(len(bitBuff))*unsafe.Sizeof(bitBuff[0])*8 {
+		return 0, 0, false
+	}
+	return sliceIndex, sliceBitIndex, true
+}
+
+func setBitTagByIndex[Number BitNumber, UNumber UnsignedNumber](bitBuff []Number, bitPositionIndex UNumber, setTag bool) bool {
+	sliceIndex, sliceBitIndex, ret := getBitTagIndex(bitBuff, bitPositionIndex)
+	if ret == false {
+		return ret
+	}
+
+	if setTag {
+		bitBuff[sliceIndex] = bitBuff[sliceIndex] | 1<<sliceBitIndex
+	} else {
+		bitBuff[sliceIndex] = bitBuff[sliceIndex] &^ (1 << sliceBitIndex)
+	}
+
+	return true
+}
+
+func GetBitwiseTag[Number BitNumber, UNumber UnsignedNumber](bitBuff []Number, bitPositionIndex UNumber) (bool, error) {
+	sliceIndex, sliceBitIndex, ret := getBitTagIndex(bitBuff, bitPositionIndex)
+	if ret == false {
+		return false, errors.New("Invalid parameter")
+	}
+
+	return (bitBuff[sliceIndex] & (1 << sliceBitIndex)) > 0, nil
+}
+
+func SetBitwiseTag[Number BitNumber, UNumber UnsignedNumber](bitBuff []Number, bitPositionIndex UNumber) bool {
+	return setBitTagByIndex(bitBuff, bitPositionIndex, true)
+}
+
+func ClearBitwiseTag[Number BitNumber, UNumber UnsignedNumber](bitBuff []Number, bitPositionIndex UNumber) bool {
+	return setBitTagByIndex(bitBuff, bitPositionIndex, false)
+}
+
+func GetBitwiseNum[Number BitNumber](bitBuff []Number) int {
+	return len(bitBuff) * int(unsafe.Sizeof(bitBuff[0])*8)
+}

util/algorithms/BitwiseOperation_test.go

@@ -0,0 +1,37 @@
+package algorithms
+
+import "testing"
+
+func Test_Bitwise(t *testing.T) {
+	//1.预分配10个byte切片，用于存储位标识
+	byteBuff := make([]byte, 10)
+
+	//2.获取buff总共位数
+	bitNum := GetBitwiseNum(byteBuff)
+	t.Log(bitNum)
+
+	//3..对索引79位打标记，注意是从0开始，79即为最后一个位
+	idx := uint(79)
+
+	//4.对byteBuff索引idx位置打上标记
+	SetBitwiseTag(byteBuff, idx)
+
+	//5.获取索引idx位置标记
+	isTag, ret := GetBitwiseTag(byteBuff, idx)
+	t.Log("set index ", idx, "  :", isTag, ret)
+	if isTag != true {
+		t.Fatal("error")
+	}
+
+	//6.清除掉索引idx位标记
+	ClearBitwiseTag(byteBuff, idx)
+
+	//7.获取索引idx位置标记
+	isTag, ret = GetBitwiseTag(byteBuff, idx)
+	t.Log("get index ", idx, "  :", isTag, ret)
+
+	if isTag != false {
+		t.Fatal("error")
+	}
+
+}

util/buildtime/build.go

@@ -6,10 +6,15 @@ go tool nm ./originserver.exe |grep buildtime
 
 //编译传入编译时间信息
 go build -ldflags "-X 'github.com/duanhf2012/origin/util/buildtime.BuildTime=20200101'"
+go build -ldflags "-X github.com/duanhf2012/origin/util/buildtime.BuildTime=20200101 -X github.com/duanhf2012/origin/util/buildtime.BuildTag=debug"
 */
 var BuildTime string
-
+var BuildTag  string
 
 func GetBuildDateTime() string {
 	return BuildTime
 }
+
+func GetBuildTag() string {
+	return BuildTag
+}

util/coroutine/coroutine.go

@@ -2,6 +2,7 @@ package coroutine
 
 import (
 	"fmt"
+	"github.com/duanhf2012/origin/log"
 	"reflect"
 	"runtime/debug"
 )
@@ -12,10 +13,11 @@ func F(callback interface{},recoverNum int, args ...interface{}) {
 			var coreInfo string
 			coreInfo = string(debug.Stack())
 			coreInfo += "\n" + fmt.Sprintf("Core information is %v\n", r)
-			fmt.Print(coreInfo)
+			log.SError(coreInfo)
-
+			if recoverNum > 0{
-			if recoverNum==-1 ||recoverNum-1 >= 0 {
 				recoverNum -= 1
+			}
+			if recoverNum == -1 || recoverNum > 0 {
 				go F(callback,recoverNum, args...)
 			}
 		}

util/math/math.go

@@ -1,5 +1,7 @@
 package math
 
+import "github.com/duanhf2012/origin/log"
+
 type NumberType interface {
 	int | int8 | int16 | int32 | int64 | float32 | float64 | uint | uint8 | uint16 | uint32 | uint64
 }
@@ -35,3 +37,42 @@ func Abs[NumType SignedNumberType](Num NumType) NumType {
 
 	return Num
 }
+
+
+func Add[NumType NumberType](number1 NumType, number2 NumType) NumType {
+	ret := number1 + number2
+	if number2> 0 && ret < number1 {
+		log.SStack("Calculation overflow , number1 is ",number1," number2 is ",number2)
+	}else if (number2<0 && ret > number1){
+		log.SStack("Calculation overflow , number1 is ",number1," number2 is ",number2)
+	}
+
+	return ret
+}
+
+func Sub[NumType NumberType](number1 NumType, number2 NumType) NumType {
+	ret := number1 - number2
+	if number2> 0 && ret > number1 {
+		log.SStack("Calculation overflow , number1 is ",number1," number2 is ",number2)
+	}else if (number2<0 && ret < number1){
+		log.SStack("Calculation overflow , number1 is ",number1," number2 is ",number2)
+	}
+
+	return ret
+}
+
+
+func Mul[NumType NumberType](number1 NumType, number2 NumType) NumType {
+	ret := number1 * number2
+	if number1 == 0 || number2 == 0 {
+		return ret
+	}
+
+	if ret / number2 == number1 {
+		return ret
+	}
+	
+	log.SStack("Calculation overflow , number1 is ",number1," number2 is ",number2)
+	return ret
+}
+