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

优化协议的Processor函数参数

Browse Source
This commit is contained in:
duanhf2012
2022-01-11 13:57:39 +08:00
parent 313cc032a1
commit e676587b4d
5 changed files with 55 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sysservice/tcpservice/tcpservice.go
View File

@@ -10,6 +10,7 @@ import (
"github.com/duanhf2012/origin/service"
"sync"
"time"
"runtime"
)
type TcpService struct {
@@ -143,9 +144,9 @@ func (tcpService *TcpService) TcpEventHandler(ev event.IEvent) {
case TPT_DisConnected:
tcpService.process.DisConnectedRoute(pack.ClientId)
case TPT_UnknownPack:
tcpService.process.UnknownMsgRoute(pack.Data,pack.ClientId)
tcpService.process.UnknownMsgRoute(pack.ClientId,pack.Data)
case TPT_Pack:
tcpService.process.MsgRoute(pack.Data, pack.ClientId)
tcpService.process.MsgRoute(pack.ClientId,pack.Data)
}
}
@@ -180,6 +181,15 @@ func (slf *Client) GetId() uint64 {
}
func (slf *Client) Run() {
defer func() {
if r := recover(); r != nil {
buf := make([]byte, 4096)
l := runtime.Stack(buf, false)
errString := fmt.Sprint(r)
log.SError("core dump info[",errString,"]\n",string(buf[:l]))
}
}()
slf.tcpService.NotifyEvent(&event.Event{Type:event.Sys_Event_Tcp,Data:TcpPack{ClientId:slf.id,Type:TPT_Connected}})
for{
if slf.tcpConn == nil {
@@ -192,7 +202,7 @@ func (slf *Client) Run() {
log.SDebug("read client id ",slf.id," is error:",err.Error())
break
}
data,err:=slf.tcpService.process.Unmarshal(bytes)
data,err:=slf.tcpService.process.Unmarshal(slf.id,bytes)
if err != nil {
slf.tcpService.NotifyEvent(&event.Event{Type:event.Sys_Event_Tcp,Data:TcpPack{ClientId:slf.id,Type:TPT_UnknownPack,Data:bytes}})
@@ -218,7 +228,7 @@ func (tcpService *TcpService) SendMsg(clientId uint64,msg interface{}) error{
}
tcpService.mapClientLocker.Unlock()
bytes,err := tcpService.process.Marshal(msg)
bytes,err := tcpService.process.Marshal(clientId,msg)
if err != nil {
return err
}
@@ -262,7 +272,7 @@ func (tcpService *TcpService) SendRawMsg(clientId uint64,msg []byte) error{
}
tcpService.mapClientLocker.Unlock()
client.tcpConn.SetWriteDeadline(tcpService.WriteDeadline)
return client.tcpConn.WriteMsg(msg)
return client.tcpConn.WriteRawMsg(msg)
}
func (tcpService *TcpService) GetConnNum() int {