facat
/
transx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

统计中没有用List的指针，造成了问题。应该是与结构拷贝有关。已解决。

This commit is contained in:
dmy@lab 2016-01-13 22:17:12 +08:00
parent 8599c87f0c
commit 8faca5dd52
1 changed files with 67 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
stat/tunnelstatus.go
View File

@ -8,9 +8,11 @@ import (
"sync"
)
var mux sync.Mutex
type TunnelStatusManager struct {
mux sync.Mutex
tunnelList list.List
// mux sync.Mutex
tunnelList *list.List
regChan chan interface{}
unregChan chan interface{}
}
@ -19,6 +21,7 @@ func NewTunnelStatusManager() *TunnelStatusManager {
t := new(TunnelStatusManager)
t.regChan = make(chan interface{})
t.unregChan = make(chan interface{})
t.tunnelList = new(list.List)
go t.chanListener()
return t
}
@ -32,33 +35,75 @@ func (this *TunnelStatusManager) GetUnregChan() chan interface{} {
}
func (this *TunnelStatusManager) register(t interface{}) {
this.mux.Lock()
defer this.mux.Unlock()
// this.mux.Lock()
// defer this.mux.Unlock()
mux.Lock()
defer mux.Unlock()
this.tunnelList.PushBack(t)
l := this.tunnelList
// c := 0
// for e := l.Front(); e != nil; e = e.Next() {
// c++
// if c > l.Len() {
// log.Error("out of bound of list")
// }
// if e.Value == nil {
// log.Debug("a nil len of list %d c %d", l.Len(), c)
// back := l.Back()
// if back == nil {
// log.Debug("back is nill")
// }
// }
// }
m := t.(*model.Tunnel)
log.Info("tunnel %s registerd len %d", m.GetID(), l.Len())
}
func (this *TunnelStatusManager) unregister(t interface{}) {
this.mux.Lock()
defer this.mux.Unlock()
// this.mux.Lock()
// defer this.mux.Unlock()
mux.Lock()
defer mux.Unlock()
l := this.tunnelList
log.Debug("%d tunnels before remove.", this.tunnelList.Len())
n := 0
// n := 0
nl := new(list.List)
// tn := ""
for e := l.Front(); e != nil; e = e.Next() {
if e.Value != t {
// log.Debug("Found")
// l.Remove(e)
// break
n++
// n++
nl.PushBack(e.Value)
// en := 0
// for ee := nl.Front(); ee != nil; ee = ee.Next() {
// en++
// }
// if en > nl.Len() {
// log.Error("en > ee")
// }
// v := e.Value
// if v == nil {
// continue
// }
// m_ := v.(*model.Tunnel)
// tn = tn + m_.GetID()
}
}
if n == this.tunnelList.Len() {
m := t.(*model.Tunnel)
log.Debug("check tunntel %s", m.GetID())
}
this.tunnelList = *nl
// log.Debug("display tunnels %s", tn)
// if n == this.tunnelList.Len() {
// m := t.(*model.Tunnel)
// log.Debug("check tunntel %s", m.GetID())
// }
this.tunnelList = nl
log.Debug("%d tunnels after remove.", this.tunnelList.Len())
}
@ -68,17 +113,22 @@ func (this *TunnelStatusManager) chanListener() {
select {
case r := <-this.regChan:
this.register(r)
log.Debug("A tunnel registered")
m := r.(*model.Tunnel)
log.Debug("A tunnel registered id %s", m.GetID())
log.Debug(this.QueryStatString())
case ur := <-this.unregChan:
this.unregister(ur)
log.Debug("A tunnel unregistered")
m := ur.(*model.Tunnel)
log.Debug("A tunnel unregistered id %s", m.GetID())
}
}
}
func (this *TunnelStatusManager) QueryStatString() string {
this.mux.Lock()
defer this.mux.Unlock()
// this.mux.Lock()
// defer this.mux.Unlock()
mux.Lock()
defer mux.Unlock()
return fmt.Sprintf("There %d tunnels running.\n", this.tunnelList.Len())
}