fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-04-30 17:22:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #896 from tendermint/normalize-priority-and-id

Browse Source 
normalize priority and id and remove pointers in ChannelDescriptor
This commit is contained in:
Ethan Buchman 2017-11-27 17:05:38 +00:00 committed by GitHub
commit 94e400a5d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glide.lock generated
View File

@ -1,5 +1,5 @@
hash: 223d8e42a118e7861cb673ea58a035e99d3a98c94e4b71fb52998d320f9c3b49 hash: 223d8e42a118e7861cb673ea58a035e99d3a98c94e4b71fb52998d320f9c3b49
updated: 2017-11-22T07:33:50.996598926-08:00 updated: 2017-11-25T22:00:24.612202481-08:00
imports: imports:
- name: github.com/btcsuite/btcd - name: github.com/btcsuite/btcd
version: 8cea3866d0f7fb12d567a20744942c0d078c7d15 version: 8cea3866d0f7fb12d567a20744942c0d078c7d15
@ -159,9 +159,7 @@ imports:
- lex/httplex - lex/httplex
- trace - trace
- name: golang.org/x/sys - name: golang.org/x/sys
version: 82aafbf43bf885069dc71b7e7c2f9d7a614d47da version: b98136db334ff9cb24f28a68e3be3cb6608f7630
subpackages:
- unix
- name: golang.org/x/text - name: golang.org/x/text
version: 88f656faf3f37f690df1a32515b479415e1a6769 version: 88f656faf3f37f690df1a32515b479415e1a6769
subpackages: subpackages:

27
p2p/connection.go
View File

@ -149,9 +149,8 @@ func NewMConnectionWithConfig(conn net.Conn, chDescs []*ChannelDescriptor, onRec
var channels = []*Channel{} var channels = []*Channel{}
for _, desc := range chDescs { for _, desc := range chDescs {
descCopy := *desc // copy the desc else unsafe access across connections channel := newChannel(mconn, *desc)
channel := newChannel(mconn, &descCopy) channelsIdx[channel.desc.ID] = channel
channelsIdx[channel.id] = channel
channels = append(channels, channel) channels = append(channels, channel)
} }
mconn.channels = channels mconn.channels = channels
@ -375,7 +374,7 @@ func (c *MConnection) sendMsgPacket() bool {
continue continue
} }
// Get ratio, and keep track of lowest ratio. // Get ratio, and keep track of lowest ratio.
ratio := float32(channel.recentlySent) / float32(channel.priority) ratio := float32(channel.recentlySent) / float32(channel.desc.Priority)
if ratio < leastRatio { if ratio < leastRatio {
leastRatio = ratio leastRatio = ratio
leastChannel = channel leastChannel = channel
@ -519,10 +518,10 @@ func (c *MConnection) Status() ConnectionStatus {
status.Channels = make([]ChannelStatus, len(c.channels)) status.Channels = make([]ChannelStatus, len(c.channels))
for i, channel := range c.channels { for i, channel := range c.channels {
status.Channels[i] = ChannelStatus{ status.Channels[i] = ChannelStatus{
ID: channel.id, ID: channel.desc.ID,
SendQueueCapacity: cap(channel.sendQueue), SendQueueCapacity: cap(channel.sendQueue),
SendQueueSize: int(channel.sendQueueSize), // TODO use atomic SendQueueSize: int(channel.sendQueueSize), // TODO use atomic
Priority: channel.priority, Priority: channel.desc.Priority,
RecentlySent: channel.recentlySent, RecentlySent: channel.recentlySent,
} }
} }
@ -539,7 +538,7 @@ type ChannelDescriptor struct {
RecvMessageCapacity int RecvMessageCapacity int
} }
func (chDesc *ChannelDescriptor) FillDefaults() { func (chDesc ChannelDescriptor) FillDefaults() (filled ChannelDescriptor) {
if chDesc.SendQueueCapacity == 0 { if chDesc.SendQueueCapacity == 0 {
chDesc.SendQueueCapacity = defaultSendQueueCapacity chDesc.SendQueueCapacity = defaultSendQueueCapacity
} }
@ -549,36 +548,34 @@ func (chDesc *ChannelDescriptor) FillDefaults() {
if chDesc.RecvMessageCapacity == 0 { if chDesc.RecvMessageCapacity == 0 {
chDesc.RecvMessageCapacity = defaultRecvMessageCapacity chDesc.RecvMessageCapacity = defaultRecvMessageCapacity
} }
filled = chDesc
return
} }
// TODO: lowercase. // TODO: lowercase.
// NOTE: not goroutine-safe. // NOTE: not goroutine-safe.
type Channel struct { type Channel struct {
conn *MConnection conn *MConnection
desc *ChannelDescriptor desc ChannelDescriptor
id byte
sendQueue chan []byte sendQueue chan []byte
sendQueueSize int32 // atomic. sendQueueSize int32 // atomic.
recving []byte recving []byte
sending []byte sending []byte
priority int
recentlySent int64 // exponential moving average recentlySent int64 // exponential moving average
maxMsgPacketPayloadSize int maxMsgPacketPayloadSize int
} }
func newChannel(conn *MConnection, desc *ChannelDescriptor) *Channel { func newChannel(conn *MConnection, desc ChannelDescriptor) *Channel {
desc.FillDefaults() desc = desc.FillDefaults()
if desc.Priority <= 0 { if desc.Priority <= 0 {
cmn.PanicSanity("Channel default priority must be a postive integer") cmn.PanicSanity("Channel default priority must be a postive integer")
} }
return &Channel{ return &Channel{
conn: conn, conn: conn,
desc: desc, desc: desc,
id: desc.ID,
sendQueue: make(chan []byte, desc.SendQueueCapacity), sendQueue: make(chan []byte, desc.SendQueueCapacity),
recving: make([]byte, 0, desc.RecvBufferCapacity), recving: make([]byte, 0, desc.RecvBufferCapacity),
priority: desc.Priority,
maxMsgPacketPayloadSize: conn.config.maxMsgPacketPayloadSize, maxMsgPacketPayloadSize: conn.config.maxMsgPacketPayloadSize,
} }
} }
@ -637,7 +634,7 @@ func (ch *Channel) isSendPending() bool {
// Not goroutine-safe // Not goroutine-safe
func (ch *Channel) nextMsgPacket() msgPacket { func (ch *Channel) nextMsgPacket() msgPacket {
packet := msgPacket{} packet := msgPacket{}
packet.ChannelID = byte(ch.id) packet.ChannelID = byte(ch.desc.ID)
maxSize := ch.maxMsgPacketPayloadSize maxSize := ch.maxMsgPacketPayloadSize
packet.Bytes = ch.sending[:cmn.MinInt(maxSize, len(ch.sending))] packet.Bytes = ch.sending[:cmn.MinInt(maxSize, len(ch.sending))]
if len(ch.sending) <= maxSize { if len(ch.sending) <= maxSize {