-
Notifications
You must be signed in to change notification settings - Fork 319
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Further threa-safety improvements Optimized inbound packet demuxing Resolves #74
- Loading branch information
Showing
7 changed files
with
491 additions
and
131 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| package client | ||
|
|
||
| import ( | ||
| "net" | ||
| "sync" | ||
| "sync/atomic" | ||
| ) | ||
|
|
||
| // Chanel number: | ||
| // 0x4000 through 0x7FFF: These values are the allowed channel | ||
| // numbers (16,383 possible values). | ||
| const ( | ||
| minChannelNumber uint16 = 0x4000 | ||
| maxChannelNumber uint16 = 0x7fff | ||
| ) | ||
|
|
||
| type bindingState int32 | ||
|
|
||
| const ( | ||
| bindingStateIdle bindingState = iota | ||
| bindingStateReady | ||
| bindingStateFailed | ||
| ) | ||
|
|
||
| type binding struct { | ||
| st bindingState // thread-safe (atomic op) | ||
| addr net.Addr // read-only | ||
| number uint16 // read-only | ||
| mgr *bindingManager // read-only | ||
| mutex sync.Mutex // thread-safe, used in UDPConn | ||
| } | ||
|
|
||
| func (b *binding) setState(state bindingState) { | ||
| atomic.StoreInt32((*int32)(&b.st), int32(state)) | ||
| } | ||
|
|
||
| func (b *binding) state() bindingState { | ||
| return bindingState(atomic.LoadInt32((*int32)(&b.st))) | ||
| } | ||
|
|
||
| // Thread-safe binding map | ||
| type bindingManager struct { | ||
| chanMap map[uint16]*binding | ||
| addrMap map[string]*binding | ||
| next uint16 | ||
| mutex sync.RWMutex | ||
| } | ||
|
|
||
| func newBindingManager() *bindingManager { | ||
| return &bindingManager{ | ||
| chanMap: map[uint16]*binding{}, | ||
| addrMap: map[string]*binding{}, | ||
| next: minChannelNumber, | ||
| } | ||
| } | ||
|
|
||
| func (mgr *bindingManager) assignChannelNumber() uint16 { | ||
| n := mgr.next | ||
| if mgr.next == maxChannelNumber { | ||
| mgr.next = minChannelNumber | ||
| } else { | ||
| mgr.next++ | ||
| } | ||
| return n | ||
| } | ||
|
|
||
| func (mgr *bindingManager) create(addr net.Addr) *binding { | ||
| mgr.mutex.Lock() | ||
| defer mgr.mutex.Unlock() | ||
|
|
||
| b := &binding{ | ||
| addr: addr, | ||
| number: mgr.assignChannelNumber(), | ||
| mgr: mgr, | ||
| } | ||
|
|
||
| mgr.chanMap[b.number] = b | ||
| mgr.addrMap[b.addr.String()] = b | ||
| return b | ||
| } | ||
|
|
||
| func (mgr *bindingManager) findByAddr(addr net.Addr) (*binding, bool) { | ||
| mgr.mutex.RLock() | ||
| defer mgr.mutex.RUnlock() | ||
|
|
||
| b, ok := mgr.addrMap[addr.String()] | ||
| return b, ok | ||
| } | ||
|
|
||
| func (mgr *bindingManager) findByNumber(number uint16) (*binding, bool) { | ||
| mgr.mutex.RLock() | ||
| defer mgr.mutex.RUnlock() | ||
|
|
||
| b, ok := mgr.chanMap[number] | ||
| return b, ok | ||
| } | ||
|
|
||
| func (mgr *bindingManager) deleteByAddr(addr net.Addr) bool { | ||
| mgr.mutex.Lock() | ||
| defer mgr.mutex.Unlock() | ||
|
|
||
| b, ok := mgr.addrMap[addr.String()] | ||
| if !ok { | ||
| return false | ||
| } | ||
|
|
||
| delete(mgr.addrMap, addr.String()) | ||
| delete(mgr.chanMap, b.number) | ||
| return true | ||
| } | ||
|
|
||
| func (mgr *bindingManager) deleteByNumber(number uint16) bool { | ||
| mgr.mutex.Lock() | ||
| defer mgr.mutex.Unlock() | ||
|
|
||
| b, ok := mgr.chanMap[number] | ||
| if !ok { | ||
| return false | ||
| } | ||
|
|
||
| delete(mgr.addrMap, b.addr.String()) | ||
| delete(mgr.chanMap, number) | ||
| return true | ||
| } | ||
|
|
||
| func (mgr *bindingManager) size() int { | ||
| mgr.mutex.RLock() | ||
| defer mgr.mutex.RUnlock() | ||
|
|
||
| return len(mgr.chanMap) | ||
| } |
Oops, something went wrong.