Ma/origin
1
0
Fork 0
mirror of https://github.com/duanhf2012/origin.git synced 2026-02-03 22:45:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

框架修复

Browse Source
This commit is contained in:
lifeiyi
2020-03-28 19:53:03 +08:00
parent 9a43744551
commit bffc2b5f79
5 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
network/processor/pbprocessor.go
View File

@@ -71,13 +71,14 @@ func (slf *PBProcessor ) Unmarshal(data []byte) (interface{}, error) {
// must goroutine safe
func (slf *PBProcessor ) Marshal(msg interface{}) ([]byte, error){
bytes,err := proto.Marshal(msg.(proto.Message))
pMsg := msg.(*PBPackInfo)
bytes,err := proto.Marshal(pMsg.msg.(proto.Message))
if err != nil {
return nil,err
}
buff := make([]byte, 0, len(bytes)+MsgTypeSize)
pMsg := msg.(*PBPackInfo)
buff := make([]byte, 2, len(bytes)+MsgTypeSize)
if slf.LittleEndian == true {
binary.LittleEndian.PutUint16(buff[:2],pMsg.typ)
}else{

4
network/tcp_msg.go
View File

@@ -89,6 +89,7 @@ func (p *MsgParser) Read(conn *TCPConn) ([]byte, error) {
msgLen = binary.BigEndian.Uint32(bufMsgLen)
}
}
msgLen -= 2
// check len
if msgLen > p.maxMsgLen {
@@ -121,6 +122,7 @@ func (p *MsgParser) Write(conn *TCPConn, args ...[]byte) error {
return errors.New("message too short")
}
//msgLen -= 2
msg := make([]byte, uint32(p.lenMsgLen)+msgLen)
// write len
@@ -131,7 +133,7 @@ func (p *MsgParser) Write(conn *TCPConn, args ...[]byte) error {
if p.littleEndian {
binary.LittleEndian.PutUint16(msg, uint16(msgLen))
} else {
binary.BigEndian.PutUint16(msg, uint16(msgLen))
binary.BigEndian.PutUint16(msg, uint16(msgLen)+uint16(p.lenMsgLen))
}
case 4:
if p.littleEndian {

10
rpc/rpchandler.go
View File

@@ -40,6 +40,16 @@ type IRpcHandler interface {
GetRpcRequestChan() chan *RpcRequest
GetRpcResponeChan() chan *Call
CallMethod(ServiceMethod string,param interface{},reply interface{}) error
AsyncCall(serviceMethod string,args interface{},callback interface{}) error
GRAsyncCall(serviceMethod string,args interface{},callback interface{}) error
Call(serviceMethod string,args interface{},reply interface{}) error
GRCall(serviceMethod string,args interface{},reply interface{}) error
Go(serviceMethod string,args interface{}) error
GRGo(serviceMethod string,args interface{}) error
AsyncCallNode(nodeId int,serviceMethod string,args interface{},callback interface{}) error
CallNode(nodeId int,serviceMethod string,args interface{},reply interface{}) error
GoNode(nodeId int,serviceMethod string,args interface{}) error
}
func (slf *RpcHandler) GetRpcHandler() IRpcHandler{

5
service/service.go
View File

@@ -1,6 +1,7 @@
package service
import (
"github.com/duanhf2012/origin/event"
"github.com/duanhf2012/origin/rpc"
"github.com/duanhf2012/origin/util/timer"
"reflect"
@@ -94,8 +95,8 @@ func (slf *Service) Run() {
slf.GetRpcHandler().HandlerRpcRequest(rpcRequest)
case rpcResponeCB := <- rpcResponeCallBack:
slf.GetRpcHandler().HandlerRpcResponeCB(rpcResponeCB)
case event := <- eventChan:
slf.OnEventHandler(event)
case ev := <- eventChan:
slf.this.(event.IEventProcessor).OnEventHandler(ev)
case t := <- slf.dispatcher.ChanTimer:
t.Cb()
}

2
sysservice/tcpservice.go
View File

@@ -86,7 +86,7 @@ func (slf *TcpService) NewClient(conn *network.TCPConn) network.Agent {
continue
}
pClient := &Client{tcpConn:conn}
pClient := &Client{tcpConn:conn, id:slf.initClientId}
pClient.tcpService = slf
slf.mapClient[slf.initClientId] = pClient
return pClient