优化工程结构

2026-02-03 22:45:13 +08:00 · 2020-10-30 16:32:37 +08:00
parent 3025eaebd5
commit d2f52b382d
33 changed files with 1087 additions and 1210 deletions
--- a/service/module.go
+++ b/service/module.go
@@ -9,10 +9,8 @@ import (
 	"runtime"
 	"time"
 )
-
 const InitModuleId = 1e17

-
 type IModule interface {
 	SetModuleId(moduleId int64) bool
 	GetModuleId() int64
@@ -31,102 +29,96 @@ type IModule interface {
 	NotifyEvent(ev *event.Event)
 }

-
-
 //1.管理各模块树层关系
 //2.提供定时器常用工具
 type Module struct {
-	moduleId int64
-	parent IModule        //父亲
-	self IModule        //自己
-	child map[int64]IModule //孩子们
+	moduleId int64                              //模块Id
+	moduleName string                           //模块名称
+	parent IModule        						//父亲
+	self IModule        						//自己
+	child map[int64]IModule 					//孩子们
 	mapActiveTimer map[*timer.Timer]interface{}
 	mapActiveCron map[*timer.Cron]interface{}
-
-	dispatcher         *timer.Dispatcher //timer
+	dispatcher         *timer.Dispatcher 		//timer

 	//根结点
-	ancestor IModule      //始祖
-	seedModuleId int64    //模块id种子
-	descendants map[int64]IModule//始祖的后裔们
+	ancestor IModule      						//始祖
+	seedModuleId int64    						//模块id种子
+	descendants map[int64]IModule				//始祖的后裔们

 	//事件管道
-	moduleName string
 	eventHandler event.IEventHandler
-	//eventHandler event.EventHandler
 }

-
-func (slf *Module) SetModuleId(moduleId int64) bool{
-	if slf.moduleId > 0 {
+func (m *Module) SetModuleId(moduleId int64) bool{
+	if m.moduleId > 0 {
 		return false
 	}

-	slf.moduleId = moduleId
+	m.moduleId = moduleId
 	return true
 }

-func (slf *Module) GetModuleId() int64{
-	return slf.moduleId
+func (m *Module) GetModuleId() int64{
+	return m.moduleId
 }

-func (slf *Module) GetModuleName() string{
-	return slf.moduleName
+func (m *Module) GetModuleName() string{
+	return m.moduleName
 }

-func (slf *Module) OnInit() error{
-//	slf.eventHandler = event.NewEventHandler()
+func (m *Module) OnInit() error{
 	return nil
 }

-func (slf *Module) AddModule(module IModule) (int64,error){
+func (m *Module) AddModule(module IModule) (int64,error){
 	//没有事件处理器不允许加入其他模块
-	if slf.GetEventProcessor() == nil {
-		return 0,fmt.Errorf("module %+v is not Event Processor is nil",slf.self)
+	if m.GetEventProcessor() == nil {
+		return 0,fmt.Errorf("module %+v is not Event Processor is nil", m.self)
 	}
 	pAddModule := module.getBaseModule().(*Module)
 	if pAddModule.GetModuleId()==0 {
-		pAddModule.moduleId = slf.NewModuleId()
+		pAddModule.moduleId = m.NewModuleId()
 	}

-	if slf.child == nil {
-		slf.child = map[int64]IModule{}
+	if m.child == nil {
+		m.child = map[int64]IModule{}
 	}
-	_,ok := slf.child[module.GetModuleId()]
+	_,ok := m.child[module.GetModuleId()]
 	if ok == true {
 		return 0,fmt.Errorf("Exists module id %d",module.GetModuleId())
 	}

 	pAddModule.self = module
-	pAddModule.parent = slf.self
-	pAddModule.dispatcher = slf.GetAncestor().getBaseModule().(*Module).dispatcher
-	pAddModule.ancestor = slf.ancestor
+	pAddModule.parent = m.self
+	pAddModule.dispatcher = m.GetAncestor().getBaseModule().(*Module).dispatcher
+	pAddModule.ancestor = m.ancestor
 	pAddModule.moduleName = reflect.Indirect(reflect.ValueOf(module)).Type().Name()
 	pAddModule.eventHandler = event.NewEventHandler()
-	pAddModule.eventHandler.Init(slf.eventHandler.GetEventProcessor())
+	pAddModule.eventHandler.Init(m.eventHandler.GetEventProcessor())
 	err := module.OnInit()
 	if err != nil {
 		return 0,err
 	}

-	slf.child[module.GetModuleId()] = module
-	slf.ancestor.getBaseModule().(*Module).descendants[module.GetModuleId()] = module
+	m.child[module.GetModuleId()] = module
+	m.ancestor.getBaseModule().(*Module).descendants[module.GetModuleId()] = module

-	log.Debug("Add module %s completed",slf.GetModuleName())
+	log.Debug("Add module %s completed", m.GetModuleName())
 	return module.GetModuleId(),nil
 }

-func (slf *Module) ReleaseModule(moduleId int64){
-	pModule := slf.GetModule(moduleId).getBaseModule().(*Module)
+func (m *Module) ReleaseModule(moduleId int64){
+	pModule := m.GetModule(moduleId).getBaseModule().(*Module)

 	//释放子孙
 	for id,_ := range pModule.child {
-		slf.ReleaseModule(id)
+		m.ReleaseModule(id)
 	}

 	pModule.GetEventHandler().Destroy()
 	pModule.self.OnRelease()
-	log.Debug("Release module %s.",slf.GetModuleName())
+	log.Debug("Release module %s.", m.GetModuleName())
 	for pTimer,_ := range pModule.mapActiveTimer {
 		pTimer.Close()
 	}
@@ -135,8 +127,8 @@ func (slf *Module) ReleaseModule(moduleId int64){
 		pCron.Close()
 	}

-	delete(slf.child,moduleId)
-	delete (slf.ancestor.getBaseModule().(*Module).descendants,moduleId)
+	delete(m.child,moduleId)
+	delete (m.ancestor.getBaseModule().(*Module).descendants,moduleId)

 	//清理被删除的Module
 	pModule.self = nil
@@ -149,75 +141,74 @@ func (slf *Module) ReleaseModule(moduleId int64){
 	pModule.descendants = nil
 }

-func (slf *Module) NewModuleId() int64{
-	slf.ancestor.getBaseModule().(*Module).seedModuleId+=1
-	return slf.ancestor.getBaseModule().(*Module).seedModuleId
+func (m *Module) NewModuleId() int64{
+	m.ancestor.getBaseModule().(*Module).seedModuleId+=1
+	return m.ancestor.getBaseModule().(*Module).seedModuleId
 }

-func (slf *Module) GetAncestor()IModule{
-	return slf.ancestor
+func (m *Module) GetAncestor()IModule{
+	return m.ancestor
 }

-func (slf *Module) GetModule(moduleId int64) IModule{
-	iModule,ok := slf.GetAncestor().getBaseModule().(*Module).descendants[moduleId]
+func (m *Module) GetModule(moduleId int64) IModule{
+	iModule,ok := m.GetAncestor().getBaseModule().(*Module).descendants[moduleId]
 	if ok == false{
 		return nil
 	}
 	return iModule
 }

-func (slf *Module) getBaseModule() IModule{
-	return slf
+func (m *Module) getBaseModule() IModule{
+	return m
 }

-
-func (slf *Module) GetParent()IModule{
-	return slf.parent
+func (m *Module) GetParent()IModule{
+	return m.parent
 }

-func (slf *Module) AfterFunc(d time.Duration, cb func()) *timer.Timer {
-	if slf.mapActiveTimer == nil {
-		slf.mapActiveTimer =map[*timer.Timer]interface{}{}
+func (m *Module) AfterFunc(d time.Duration, cb func()) *timer.Timer {
+	if m.mapActiveTimer == nil {
+		m.mapActiveTimer =map[*timer.Timer]interface{}{}
 	}

 	funName :=  runtime.FuncForPC(reflect.ValueOf(cb).Pointer()).Name()
-	 tm := slf.dispatcher.AfterFuncEx(funName,d,func(t *timer.Timer){
+	 tm := m.dispatcher.AfterFuncEx(funName,d,func(t *timer.Timer){
 		cb()
-		delete(slf.mapActiveTimer,t)
+		delete(m.mapActiveTimer,t)
 	 })

-	 slf.mapActiveTimer[tm] = nil
+	 m.mapActiveTimer[tm] = nil
 	 return tm
 }

-func (slf *Module) CronFunc(cronExpr *timer.CronExpr, cb func()) *timer.Cron {
-	if slf.mapActiveCron == nil {
-		slf.mapActiveCron =map[*timer.Cron]interface{}{}
+func (m *Module) CronFunc(cronExpr *timer.CronExpr, cb func()) *timer.Cron {
+	if m.mapActiveCron == nil {
+		m.mapActiveCron =map[*timer.Cron]interface{}{}
 	}

-	cron := slf.dispatcher.CronFuncEx(cronExpr, func(cron *timer.Cron) {
+	cron := m.dispatcher.CronFuncEx(cronExpr, func(cron *timer.Cron) {
 		cb()
 	})

-	slf.mapActiveCron[cron] = nil
+	m.mapActiveCron[cron] = nil
 	return cron
 }

-func (slf *Module) OnRelease(){
+func (m *Module) OnRelease(){
 }

-func (slf *Module) GetService() IService {
-	return slf.GetAncestor().(IService)
+func (m *Module) GetService() IService {
+	return m.GetAncestor().(IService)
 }

-func (slf *Module) GetEventProcessor() event.IEventProcessor{
-	return slf.eventHandler.GetEventProcessor()
+func (m *Module) GetEventProcessor() event.IEventProcessor{
+	return m.eventHandler.GetEventProcessor()
 }

-func (slf *Module) NotifyEvent(ev *event.Event){
-	slf.eventHandler.NotifyEvent(ev)
+func (m *Module) NotifyEvent(ev *event.Event){
+	m.eventHandler.NotifyEvent(ev)
 }

-func (slf *Module) GetEventHandler() event.IEventHandler{
-	return slf.eventHandler
+func (m *Module) GetEventHandler() event.IEventHandler{
+	return m.eventHandler
 }
--- a/service/service.go
+++ b/service/service.go
@@ -19,10 +19,10 @@ var closeSig chan bool
 var timerDispatcherLen = 10000

 type IService interface {
-	Init(iservice IService,getClientFun rpc.FuncRpcClient,getServerFun rpc.FuncRpcServer,serviceCfg interface{})
+	Init(iService IService,getClientFun rpc.FuncRpcClient,getServerFun rpc.FuncRpcServer,serviceCfg interface{})
 	SetName(serviceName string)
 	GetName() string
-	OnSetup(iservice IService)
+	OnSetup(iService IService)
 	OnInit() error
 	OnRelease()
 	Wait()
@@ -33,115 +33,112 @@ type IService interface {
 	GetProfiler() *profiler.Profiler
 }

-
 type Service struct {
 	Module
-	rpc.RpcHandler   //rpc
-	name string    //service name
-	wg      sync.WaitGroup
-	serviceCfg interface{}
-	gorouterNum int32
-	startStatus bool
+	rpc.RpcHandler           //rpc
+	name           string    //service name
+	wg             sync.WaitGroup
+	serviceCfg     interface{}
+	goroutineNum   int32
+	startStatus    bool
 	eventProcessor event.IEventProcessor
-
-	//eventProcessor event.EventProcessor //事件接收者
 	profiler *profiler.Profiler //性能分析器
 }

-func (slf *Service) OnSetup(iservice IService){
-	if iservice.GetName() == "" {
-		slf.name = reflect.Indirect(reflect.ValueOf(iservice)).Type().Name()
+func (s *Service) OnSetup(iService IService){
+	if iService.GetName() == "" {
+		s.name = reflect.Indirect(reflect.ValueOf(iService)).Type().Name()
 	}
 }

-func (slf *Service) OpenProfiler()  {
-	slf.profiler = profiler.RegProfiler(slf.GetName())
-	if slf.profiler==nil {
-		log.Fatal("rofiler.RegProfiler %s fail.",slf.GetName())
+func (s *Service) OpenProfiler()  {
+	s.profiler = profiler.RegProfiler(s.GetName())
+	if s.profiler==nil {
+		log.Fatal("rofiler.RegProfiler %s fail.", s.GetName())
 	}
 }

-func (slf *Service) Init(iservice IService,getClientFun rpc.FuncRpcClient,getServerFun rpc.FuncRpcServer,serviceCfg interface{}) {
-	slf.dispatcher =timer.NewDispatcher(timerDispatcherLen)
+func (s *Service) Init(iService IService,getClientFun rpc.FuncRpcClient,getServerFun rpc.FuncRpcServer,serviceCfg interface{}) {
+	s.dispatcher =timer.NewDispatcher(timerDispatcherLen)

-	slf.InitRpcHandler(iservice.(rpc.IRpcHandler),getClientFun,getServerFun)
-	slf.self = iservice.(IModule)
+	s.InitRpcHandler(iService.(rpc.IRpcHandler),getClientFun,getServerFun)
+	s.self = iService.(IModule)
 	//初始化祖先
-	slf.ancestor = iservice.(IModule)
-	slf.seedModuleId =InitModuleId
-	slf.descendants = map[int64]IModule{}
-	slf.serviceCfg = serviceCfg
-	slf.gorouterNum = 1
-	slf.eventProcessor = event.NewEventProcessor()
-	slf.eventHandler =  event.NewEventHandler()
-	slf.eventHandler.Init(slf.eventProcessor)
+	s.ancestor = iService.(IModule)
+	s.seedModuleId =InitModuleId
+	s.descendants = map[int64]IModule{}
+	s.serviceCfg = serviceCfg
+	s.goroutineNum = 1
+	s.eventProcessor = event.NewEventProcessor()
+	s.eventHandler =  event.NewEventHandler()
+	s.eventHandler.Init(s.eventProcessor)
 }

-func (slf *Service) SetGoRouterNum(gorouterNum int32) bool {
+func (s *Service) SetGoRouterNum(goroutineNum int32) bool {
 	//已经开始状态不允许修改协程数量,打开性能分析器不允许开多线程
-	if slf.startStatus == true || slf.profiler!=nil {
+	if s.startStatus == true || s.profiler!=nil {
 		log.Error("open profiler mode is not allowed to set Multi-coroutine.")
 		return false
 	}

-	slf.gorouterNum = gorouterNum
+	s.goroutineNum = goroutineNum
 	return true
 }

-func (slf *Service) Start() {
-	slf.startStatus = true
-	for i:=int32(0);i<slf.gorouterNum;i++{
-		slf.wg.Add(1)
+func (s *Service) Start() {
+	s.startStatus = true
+	for i:=int32(0);i< s.goroutineNum;i++{
+		s.wg.Add(1)
 		go func(){
-			slf.Run()
+			s.Run()
 		}()
 	}
 }

-func (slf *Service) Run() {
-	log.Debug("Start running Service %s.",slf.GetName())
-	defer slf.wg.Done()
+func (s *Service) Run() {
+	log.Debug("Start running Service %s.", s.GetName())
+	defer s.wg.Done()
 	var bStop = false
 	for{
-		rpcRequestChan := slf.GetRpcRequestChan()
-		rpcResponeCallBack := slf.GetRpcResponeChan()
-		eventChan := slf.eventProcessor.GetEventChan()
+		rpcRequestChan := s.GetRpcRequestChan()
+		rpcResponseCallBack := s.GetRpcResponseChan()
+		eventChan := s.eventProcessor.GetEventChan()
 		var analyzer *profiler.Analyzer
 		select {
 		case <- closeSig:
 			bStop = true
 		case rpcRequest :=<- rpcRequestChan:
-			if slf.profiler!=nil {
-				analyzer = slf.profiler.Push("Req_"+rpcRequest.RpcRequestData.GetServiceMethod())
+			if s.profiler!=nil {
+				analyzer = s.profiler.Push("Req_"+rpcRequest.RpcRequestData.GetServiceMethod())
 			}

-			slf.GetRpcHandler().HandlerRpcRequest(rpcRequest)
+			s.GetRpcHandler().HandlerRpcRequest(rpcRequest)
 			if analyzer!=nil {
 				analyzer.Pop()
 				analyzer = nil
 			}
-		case rpcResponeCB := <- rpcResponeCallBack:
-			if slf.profiler!=nil {
-				analyzer = slf.profiler.Push("Res_" + rpcResponeCB.ServiceMethod)
+		case rpcResponseCB := <-rpcResponseCallBack:
+			if s.profiler!=nil {
+				analyzer = s.profiler.Push("Res_" + rpcResponseCB.ServiceMethod)
 			}
-			slf.GetRpcHandler().HandlerRpcResponeCB(rpcResponeCB)
+			s.GetRpcHandler().HandlerRpcResponseCB(rpcResponseCB)
 			if analyzer!=nil {
 				analyzer.Pop()
 				analyzer = nil
 			}
 		case ev := <- eventChan:
-			if slf.profiler!=nil {
-				analyzer = slf.profiler.Push(fmt.Sprintf("Event_%d", int(ev.Type)))
+			if s.profiler!=nil {
+				analyzer = s.profiler.Push(fmt.Sprintf("Event_%d", int(ev.Type)))
 			}
-			slf.eventProcessor.EventHandler(ev)
+			s.eventProcessor.EventHandler(ev)
 			if analyzer!=nil {
 				analyzer.Pop()
 				analyzer = nil
 			}
-		case t := <- slf.dispatcher.ChanTimer:
+		case t := <- s.dispatcher.ChanTimer:
 			if t.IsClose() == false {
-				if slf.profiler != nil {
-					analyzer = slf.profiler.Push(fmt.Sprintf("Timer_%s", t.AdditionData.(*timer.Timer).GetFunctionName()))
+				if s.profiler != nil {
+					analyzer = s.profiler.Push(fmt.Sprintf("Timer_%s", t.AdditionData.(*timer.Timer).GetFunctionName()))
 				}
 				t.AdditionData.(*timer.Timer).Cb()
 				if analyzer != nil {
@@ -153,26 +150,25 @@ func (slf *Service) Run() {
 		}

 		if bStop == true {
-			if atomic.AddInt32(&slf.gorouterNum,-1)<=0 {
-				slf.startStatus = false
-				slf.Release()
-				slf.OnRelease()
+			if atomic.AddInt32(&s.goroutineNum,-1)<=0 {
+				s.startStatus = false
+				s.Release()
+				s.OnRelease()
 			}
 			break
 		}
 	}
 }

-func (slf *Service) GetName() string{
-	return slf.name
+func (s *Service) GetName() string{
+	return s.name
 }

-func (slf *Service) SetName(serviceName string) {
-	slf.name = serviceName
+func (s *Service) SetName(serviceName string) {
+	s.name = serviceName
 }

-
-func (slf *Service) Release(){
+func (s *Service) Release(){
 	defer func() {
 		if r := recover(); r != nil {
 			buf := make([]byte, 4096)
@@ -181,36 +177,37 @@ func (slf *Service) Release(){
 			log.Error("core dump info:%+v\n",err)
 		}
 	}()
-	slf.self.OnRelease()
-	log.Debug("Release Service %s.",slf.GetName())
+	s.self.OnRelease()
+	log.Debug("Release Service %s.", s.GetName())
 }

-func (slf *Service) OnRelease(){
+func (s *Service) OnRelease(){
 }

-func (slf *Service) OnInit() error {
+func (s *Service) OnInit() error {
 	return nil
 }

-func (slf *Service) Wait(){
-	slf.wg.Wait()
+func (s *Service) Wait(){
+	s.wg.Wait()
 }

-func (slf *Service) GetServiceCfg()interface{}{
-	return slf.serviceCfg
+func (s *Service) GetServiceCfg()interface{}{
+	return s.serviceCfg
 }

-func (slf *Service) GetProfiler() *profiler.Profiler{
-	return slf.profiler
+func (s *Service) GetProfiler() *profiler.Profiler{
+	return s.profiler
 }

-func (slf *Service) RegEventReciverFunc(eventType event.EventType,reciver event.IEventHandler,callback event.EventCallBack){
-	slf.eventProcessor.RegEventReciverFunc(eventType,reciver,callback)
+func (s *Service) RegEventReceiverFunc(eventType event.EventType, receiver event.IEventHandler,callback event.EventCallBack){
+	s.eventProcessor.RegEventReciverFunc(eventType, receiver,callback)
 }

-func (slf *Service) UnRegEventReciverFun(eventType event.EventType,reciver event.IEventHandler){
-	slf.eventProcessor.UnRegEventReciverFun(eventType,reciver)
+func (s *Service) UnRegEventReceiverFunc(eventType event.EventType, receiver event.IEventHandler){
+	s.eventProcessor.UnRegEventReciverFun(eventType, receiver)
 }
-func (slf *Service) IsSingleCoroutine() bool {
-	return slf.gorouterNum == 1
+
+func (s *Service) IsSingleCoroutine() bool {
+	return s.goroutineNum == 1
 }
--- a/service/servicemgr.go
+++ b/service/servicemgr.go
@@ -15,7 +15,6 @@ func Init(chanCloseSig chan bool) {
 	}
 }

-
 func Setup(s IService) bool {
 	_,ok := mapServiceName[s.GetName()]
 	if ok == true {
@@ -26,8 +25,8 @@ func Setup(s IService) bool {
 	return true
 }

-func GetService(servicename string) IService {
-	s,ok := mapServiceName[servicename]
+func GetService(serviceName string) IService {
+	s,ok := mapServiceName[serviceName]
 	if ok == false {
 		return nil
 	}
@@ -35,7 +34,6 @@ func GetService(servicename string) IService {
 	return s
 }

-
 func Start(){
 	for _,s := range mapServiceName {
 		s.Start()
@@ -47,4 +45,3 @@ func WaitStop(){
 		s.Wait()
 	}
 }
-