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

修改module模块使用

Browse Source
This commit is contained in:
boyce
2019-02-20 15:38:30 +08:00
parent 5b932edd74
commit 9384227cf6
4 changed files with 99 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

137
service/Service.go
View File

@@ -18,16 +18,17 @@ type MethodInfo struct {
}
type IModule interface {
SetModuleType(moduleType uint32)
GetModuleType() uint32
DynamicRun(module IModule)
RunModule(module IModule, exit chan bool, pwaitGroup *sync.WaitGroup) error
InitModule(module IModule) error
SetModuleId(moduleId uint32) bool
GetModuleId() uint32
GetModuleById(moduleId uint32) IModule
AddModule(module IModule) uint32
//DynamicAddModule(module IModule) uint32
RunModule(module IModule) error
InitModule(exit chan bool, pwaitGroup *sync.WaitGroup) error
OnInit() error
OnRun() bool
OnEndRun()
AddModule(module IModule) bool
GetModuleByType(moduleType uint32) IModule
GetOwnerService() IService
SetOwnerService(iservice IService)
}
@@ -35,7 +36,6 @@ type IModule interface {
type IService interface {
Init(Iservice IService, servicetype int) error
OnInit() error
OnEndInit() error
OnRun() bool
OnFetchService(iservice IService) error
OnSetupService(iservice IService) //其他服务被安装
@@ -70,19 +70,20 @@ type BaseService struct {
serviceid int
servicename string
servicetype int
Status int
Status int
}
type BaseModule struct {
moduleType uint32
mapModule map[uint32]IModule
moduleId uint32
mapModule map[uint32]IModule
ownerService IService
tickTime int64
ExitChan chan bool
WaitGroup *sync.WaitGroup
CurrMaxModuleId uint32
}
func (slf *BaseService) GetServiceId() int {
@@ -106,10 +107,6 @@ func (slf *BaseService) GetStatus() int {
return slf.Status
}
func (slf *BaseService) OnEndInit() error {
return nil
}
func (slf *BaseService) OnFetchService(iservice IService) error {
return nil
}
@@ -152,39 +149,20 @@ func (slf *BaseService) IsTimeOutTick(microSecond int64) bool {
nowtm := time.Now().UnixNano() / 1e6
return nowtm-slf.tickTime >= microSecond
}
func (slf *BaseModule) SetModuleType(moduleType uint32) {
slf.moduleType = moduleType
}
func (slf *BaseModule) SetModuleId(moduleId uint32) bool {
func (slf *BaseModule) GetModuleType() uint32 {
return slf.moduleType
}
func (slf *BaseModule) AddModule(module IModule) bool {
if module.GetModuleType() == 0 {
return false
}
module.SetOwnerService(slf.ownerService)
if slf.mapModule == nil {
slf.mapModule = make(map[uint32]IModule)
}
_, ok := slf.mapModule[module.GetModuleType()]
if ok == true {
return false
}
slf.mapModule[module.GetModuleType()] = module
slf.moduleId = moduleId
return true
}
func (slf *BaseModule) GetModuleByType(moduleType uint32) IModule {
ret, ok := slf.mapModule[moduleType]
func (slf *BaseModule) GetModuleId() uint32 {
return slf.moduleId
}
func (slf *BaseModule) GetModuleById(moduleId uint32) IModule {
ret, ok := slf.mapModule[moduleId]
if ok == false {
return nil
}
@@ -192,18 +170,50 @@ func (slf *BaseModule) GetModuleByType(moduleType uint32) IModule {
return ret
}
func (slf *BaseModule) genModuleId() uint32 {
slf.CurrMaxModuleId++
return slf.CurrMaxModuleId
}
func (slf *BaseModule) AddModule(module IModule) uint32 {
if slf.WaitGroup == nil {
GetLogger().Printf(LEVER_FATAL, "AddModule error %s...", fmt.Sprintf("%T", module))
}
if module.GetModuleId() > 100000000 {
return 0
}
if module.GetModuleId() == 0 {
module.SetModuleId(slf.genModuleId())
}
module.SetOwnerService(slf.ownerService)
module.InitModule(slf.ExitChan, slf.WaitGroup)
if slf.mapModule == nil {
slf.mapModule = make(map[uint32]IModule)
}
_, ok := slf.mapModule[module.GetModuleId()]
if ok == true {
return 0
}
slf.mapModule[module.GetModuleId()] = module
go module.RunModule(module)
return module.GetModuleId()
}
func (slf *BaseModule) OnInit() error {
return fmt.Errorf("not implement OnInit moduletype %d ", slf.GetModuleType())
return fmt.Errorf("not implement OnInit moduletype %d ", slf.GetModuleId())
}
func (slf *BaseModule) OnRun() bool {
return false
}
func (slf *BaseModule) OnEndRun() {
}
func (slf *BaseModule) GetOwnerService() IService {
return slf.ownerService
}
@@ -212,33 +222,27 @@ func (slf *BaseModule) SetOwnerService(iservice IService) {
slf.ownerService = iservice
}
func (slf *BaseModule) InitModule(module IModule) error {
module.OnInit()
for _, subModule := range slf.mapModule {
go subModule.OnInit()
}
func (slf *BaseModule) InitModule(exit chan bool, pwaitGroup *sync.WaitGroup) error {
slf.CurrMaxModuleId = 100000
slf.WaitGroup = pwaitGroup
slf.ExitChan = exit
return nil
}
func (slf *BaseModule) DynamicRun(module IModule) {
module.InitModule(module)
module.RunModule(module, slf.ExitChan, slf.WaitGroup)
}
func (slf *BaseModule) RunModule(module IModule) error {
module.OnInit()
func (slf *BaseModule) RunModule(module IModule, exit chan bool, pwaitGroup *sync.WaitGroup) error {
slf.ExitChan = exit
slf.WaitGroup = pwaitGroup
//运行所有子模块
for _, subModule := range slf.mapModule {
go subModule.RunModule(subModule, exit, pwaitGroup)
go subModule.RunModule(subModule)
}
pwaitGroup.Add(1)
defer pwaitGroup.Done()
slf.WaitGroup.Add(1)
defer slf.WaitGroup.Done()
for {
select {
case <-exit:
case <-slf.ExitChan:
GetLogger().Printf(LEVER_WARN, "stopping module %s...", fmt.Sprintf("%T", slf))
fmt.Println("stopping module %s...", fmt.Sprintf("%T", slf))
return nil
@@ -250,6 +254,5 @@ func (slf *BaseModule) RunModule(module IModule, exit chan bool, pwaitGroup *syn
slf.tickTime = time.Now().UnixNano() / 1e6
}
module.OnEndRun()
return nil
}

18
service/servicemanager.go
View File

@@ -44,30 +44,22 @@ func (slf *CServiceManager) FetchService(s FetchService) IService {
return nil
}
func (slf *CServiceManager) Init(logger ILogger) bool {
func (slf *CServiceManager) Init(logger ILogger, exit chan bool, pwaitGroup *sync.WaitGroup) bool {
slf.logger = logger
for _, s := range slf.localserviceMap {
(s.(IModule)).InitModule(s.(IModule))
}
// 初始化结束
for _, s := range slf.localserviceMap {
if s.OnEndInit() != nil {
return false
}
(s.(IModule)).InitModule(exit, pwaitGroup)
//(s.(IModule)).OnInit()
}
return true
}
func (slf *CServiceManager) Start(exit chan bool, pwaitGroup *sync.WaitGroup) bool {
func (slf *CServiceManager) Start() bool {
for _, s := range slf.localserviceMap {
go (s.(IModule)).RunModule(s.(IModule), exit, pwaitGroup)
go (s.(IModule)).RunModule(s.(IModule))
}
pwaitGroup.Add(1)
//go slf.CheckServiceTimeTimeout(exit, pwaitGroup)
return true
}