lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-12-30 14:05:26 -05:00
Code Issues Releases Wiki Activity

rename 'this'

Browse Source
This commit is contained in:
Darien Raymond
2016-11-27 21:39:09 +01:00
parent d00f8eef56
commit f95c322677
135 changed files with 2351 additions and 2351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
common/protocol/server_picker.go
View File

@@ -13,32 +13,32 @@ func NewServerList() *ServerList {
return &ServerList{}
}
func (this *ServerList) AddServer(server *ServerSpec) {
this.Lock()
defer this.Unlock()
func (v *ServerList) AddServer(server *ServerSpec) {
v.Lock()
defer v.Unlock()
this.servers = append(this.servers, server)
v.servers = append(v.servers, server)
}
func (this *ServerList) Size() uint32 {
this.RLock()
defer this.RUnlock()
func (v *ServerList) Size() uint32 {
v.RLock()
defer v.RUnlock()
return uint32(len(this.servers))
return uint32(len(v.servers))
}
func (this *ServerList) GetServer(idx uint32) *ServerSpec {
this.RLock()
defer this.RUnlock()
func (v *ServerList) GetServer(idx uint32) *ServerSpec {
v.RLock()
defer v.RUnlock()
for {
if idx >= uint32(len(this.servers)) {
if idx >= uint32(len(v.servers)) {
return nil
}
server := this.servers[idx]
server := v.servers[idx]
if !server.IsValid() {
this.RemoveServer(idx)
v.RemoveServer(idx)
continue
}
@@ -47,10 +47,10 @@ func (this *ServerList) GetServer(idx uint32) *ServerSpec {
}
// Private: Visible for testing.
func (this *ServerList) RemoveServer(idx uint32) {
n := len(this.servers)
this.servers[idx] = this.servers[n-1]
this.servers = this.servers[:n-1]
func (v *ServerList) RemoveServer(idx uint32) {
n := len(v.servers)
v.servers[idx] = v.servers[n-1]
v.servers = v.servers[:n-1]
}
type ServerPicker interface {
@@ -70,21 +70,21 @@ func NewRoundRobinServerPicker(serverlist *ServerList) *RoundRobinServerPicker {
}
}
func (this *RoundRobinServerPicker) PickServer() *ServerSpec {
this.Lock()
defer this.Unlock()
func (v *RoundRobinServerPicker) PickServer() *ServerSpec {
v.Lock()
defer v.Unlock()
next := this.nextIndex
server := this.serverlist.GetServer(next)
next := v.nextIndex
server := v.serverlist.GetServer(next)
if server == nil {
next = 0
server = this.serverlist.GetServer(0)
server = v.serverlist.GetServer(0)
}
next++
if next >= this.serverlist.Size() {
if next >= v.serverlist.Size() {
next = 0
}
this.nextIndex = next
v.nextIndex = next
return server
}