fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-05-20 02:01:20 +00:00
Code Issues Projects Releases Wiki Activity

fix p.sent adjustment

Browse Source
This commit is contained in:
Jae Kwon 2014-08-06 11:49:26 -07:00
parent 7b07ed9d45
commit ed1ebec709
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sim/bench_block.go
View File

@ -36,7 +36,10 @@ func (p *Peer) sendEventData(event EventData) bool {
minRecvTime := p.sent + partTxMS + latencyMS minRecvTime := p.sent + partTxMS + latencyMS
if desiredRecvTime >= minRecvTime { if desiredRecvTime >= minRecvTime {
p.node.sendEvent(event) p.node.sendEvent(event)
p.sent += partTxMS // p.sent + latencyMS == desiredRecvTime
// when desiredRecvTime == minRecvTime,
// p.sent += partTxMS
p.sent = desiredRecvTime - latencyMS
return true return true
} else { } else {
if (minRecvTime-desiredRecvTime)/partTxMS > sendQueueCapacity { if (minRecvTime-desiredRecvTime)/partTxMS > sendQueueCapacity {

16
sim/bench_votes.go
View File

@ -11,13 +11,13 @@ import (
const seed = 0 const seed = 0
const numNodes = 6400 // Total number of nodes to simulate const numNodes = 6400 // Total number of nodes to simulate
const numNodes8 = (numNodes + 7) / 8 const numNodes8 = (numNodes + 7) / 8
const minNumPeers = 7 // Each node should be connected to at least this many peers const minNumPeers = 8 // Each node should be connected to at least this many peers
const maxNumPeers = 10 // ... and at most this many const maxNumPeers = 12 // ... and at most this many
const latencyMS = int32(500) // One way packet latency const latencyMS = int32(500) // One way packet latency
const partTxMS = int32(3) // Transmission time per peer of 100B of data. const partTxMS = int32(3) // Transmission time per peer of 100B of data.
const sendQueueCapacity = 40 // Amount of messages to queue between peers. const sendQueueCapacity = 3200 // Amount of messages to queue between peers.
const maxAllowableRank = 2 // After this, the data is considered waste. const maxAllowableRank = 2 // After this, the data is considered waste.
const tryUnsolicited = 0.1 // Chance of sending an unsolicited piece of data. const tryUnsolicited = 0.02 // Chance of sending an unsolicited piece of data.
var log *bufio.Writer var log *bufio.Writer
@ -73,7 +73,10 @@ func (p *Peer) sendEventData(event EventData) bool {
minRecvTime := p.sent + partTxMS + latencyMS minRecvTime := p.sent + partTxMS + latencyMS
if desiredRecvTime >= minRecvTime { if desiredRecvTime >= minRecvTime {
p.node.sendEvent(event) p.node.sendEvent(event)
p.sent += partTxMS // p.sent + latencyMS == desiredRecvTime
// when desiredRecvTime == minRecvTime,
// p.sent += partTxMS
p.sent = desiredRecvTime - latencyMS
return true return true
} else { } else {
if (minRecvTime-desiredRecvTime)/partTxMS > sendQueueCapacity { if (minRecvTime-desiredRecvTime)/partTxMS > sendQueueCapacity {
@ -413,6 +416,7 @@ func main() {
} else { } else {
//fmt.Print("!") //fmt.Print("!")
// Peer doesn't want it, but sporadically we'll try sending it anyways. // Peer doesn't want it, but sporadically we'll try sending it anyways.
/*
if rand.Float32() < tryUnsolicited { if rand.Float32() < tryUnsolicited {
sent := peer.sendEventData(EventData{ sent := peer.sendEventData(EventData{
time: event.time + latencyMS + partTxMS, time: event.time + latencyMS + partTxMS,
@ -427,7 +431,7 @@ func main() {
//logWrite(fmt.Sprintf("[%v] t:%v S:%v n:%v -> p:%v %v TF\n", len(runStats), event.time, srcPeer.node.index, node.index, peer.node.index, event.part)) //logWrite(fmt.Sprintf("[%v] t:%v S:%v n:%v -> p:%v %v TF\n", len(runStats), event.time, srcPeer.node.index, node.index, peer.node.index, event.part))
// numSendFailure++ // numSendFailure++
} }
} }*/
} }
} }