注册ProcBundle时,可以透传参数

davyxu · davyxu · commit 530affbc87bc · 2019-06-19T15:01:05.000+08:00
diff --git a/proc/gorillaws/setup.go b/proc/gorillaws/setup.go
@@ -7,7 +7,7 @@ import (
 
 func init() {
 
-	proc.RegisterProcessor("gorillaws.ltv", func(bundle proc.ProcessorBundle, userCallback cellnet.EventCallback) {
+	proc.RegisterProcessor("gorillaws.ltv", func(bundle proc.ProcessorBundle, userCallback cellnet.EventCallback, args ...interface{}) {
 
 		bundle.SetTransmitter(new(WSMessageTransmitter))
 		bundle.SetHooker(new(MsgHooker))
diff --git a/proc/http/setup.go b/proc/http/setup.go
@@ -7,7 +7,7 @@ import (
 
 func init() {
 
-	proc.RegisterProcessor("http", func(bundle proc.ProcessorBundle, userCallback cellnet.EventCallback) {
+	proc.RegisterProcessor("http", func(bundle proc.ProcessorBundle, userCallback cellnet.EventCallback, args ...interface{}) {
 		// &#22914;&#26524;http&#30340;peer&#26377;&#38431;&#21015;&#65292;&#20381;&#28982;&#20250;&#22312;&#38431;&#21015;&#20013;&#25490;&#38431;&#25191;&#34892;
 		bundle.SetCallback(proc.NewQueuedEventCallback(userCallback))
 	})
diff --git a/proc/procreg.go b/proc/procreg.go
@@ -6,7 +6,7 @@ import (
 	"sort"
 )
 
-type ProcessorBinder func(bundle ProcessorBundle, userCallback cellnet.EventCallback)
+type ProcessorBinder func(bundle ProcessorBundle, userCallback cellnet.EventCallback, args ...interface{})
 
 var (
 	procByName = map[string]ProcessorBinder{}
@@ -49,13 +49,13 @@ func getPackageByCodecName(name string) string {
 }
 
 // &#32465;&#23450;&#22266;&#23450;&#22238;&#35843;&#22788;&#29702;&#22120;, procName&#26469;&#28304;&#20110;RegisterProcessor&#27880;&#20876;&#30340;&#22788;&#29702;&#22120;&#65292;&#24418;&#22914;: 'tcp.ltv'
-func BindProcessorHandler(peer cellnet.Peer, procName string, userCallback cellnet.EventCallback) {
+func BindProcessorHandler(peer cellnet.Peer, procName string, userCallback cellnet.EventCallback, args ...interface{}) {
 
 	if proc, ok := procByName[procName]; ok {
 
 		bundle := peer.(ProcessorBundle)
 
-		proc(bundle, userCallback)
+		proc(bundle, userCallback, args...)
 
 	} else {
 		panic(fmt.Sprintf("processor not found '%s'\ntry to add code below:\nimport (\n  _ \"%s\"\n)\n\n",
diff --git a/proc/tcp/setup.go b/proc/tcp/setup.go
@@ -7,7 +7,7 @@ import (
 
 func init() {
 
-	proc.RegisterProcessor("tcp.ltv", func(bundle proc.ProcessorBundle, userCallback cellnet.EventCallback) {
+	proc.RegisterProcessor("tcp.ltv", func(bundle proc.ProcessorBundle, userCallback cellnet.EventCallback, args ...interface{}) {
 
 		bundle.SetTransmitter(new(TCPMessageTransmitter))
 		bundle.SetHooker(new(MsgHooker))
diff --git a/proc/udp/setup.go b/proc/udp/setup.go
@@ -33,7 +33,7 @@ func (UDPMessageTransmitter) OnSendMessage(ses cellnet.Session, msg interface{})
 
 func init() {
 
-	proc.RegisterProcessor("udp.ltv", func(bundle proc.ProcessorBundle, userCallback cellnet.EventCallback) {
+	proc.RegisterProcessor("udp.ltv", func(bundle proc.ProcessorBundle, userCallback cellnet.EventCallback, args ...interface{}) {
 
 		bundle.SetTransmitter(new(UDPMessageTransmitter))
 		bundle.SetCallback(userCallback)
diff --git a/util/sys.go b/util/sys.go
@@ -14,8 +14,6 @@ func StackToString(count int) string {
 
 	var sb strings.Builder
 
-	var lastStr string
-
 	for i := startStack; i < startStack+count; i++ {
 		_, file, line, ok := runtime.Caller(i)
 
@@ -28,16 +26,16 @@ func StackToString(count int) string {
 		}
 
 		// &#25240;&#21472;??
-		if lastStr != "??" || str != "??" {
+		if str != "??" {
 			if i > startStack {
 				sb.WriteString(" -> ")
 			}
 
 			sb.WriteString(str)
+		} else {
+			break
 		}
 
-		lastStr = str
-
 	}
 
 	return sb.String()

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,6 @@ func StackToString(count int) string {`
`14`	`14`
`15`	`15`	`var sb strings.Builder`
`16`	`16`
`17`		`- var lastStr string`
`18`		`-`
`19`	`17`	`for i := startStack; i < startStack+count; i++ {`
`20`	`18`	`_, file, line, ok := runtime.Caller(i)`
`21`	`19`
`@@ -28,16 +26,16 @@ func StackToString(count int) string {`
`28`	`26`	`}`
`29`	`27`
`30`	`28`	`// 折叠??`
`31`		`- if lastStr != "??" \|\| str != "??" {`
	`29`	`+ if str != "??" {`
`32`	`30`	`if i > startStack {`
`33`	`31`	`sb.WriteString(" -> ")`
`34`	`32`	`}`
`35`	`33`
`36`	`34`	`sb.WriteString(str)`
	`35`	`+ } else {`
	`36`	`+ break`
`37`	`37`	`}`
`38`	`38`
`39`		`- lastStr = str`
`40`		`-`
`41`	`39`	`}`
`42`	`40`
`43`	`41`	`return sb.String()`