From 900aa626e68f1bbae95a0f343081133aab3381cb Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Thu, 25 Feb 2016 04:15:05 +0000
Subject: [PATCH] come at me bro
---
Godeps/Godeps.json | 8 ++++----
.../flowcontrol/flowcontrol.go} | 14 +++++++++++---
.../flowrate => tendermint/flowcontrol}/io.go | 4 ++--
.../flowrate => tendermint/flowcontrol}/util.go | 2 +-
.../tendermint/tendermint/blockchain/pool.go | 2 +-
.../tendermint/tendermint/p2p/connection.go | 2 +-
6 files changed, 20 insertions(+), 12 deletions(-)
rename Godeps/_workspace/src/github.com/{mxk/go-flowrate/flowrate/flowrate.go => tendermint/flowcontrol/flowcontrol.go} (96%)
rename Godeps/_workspace/src/github.com/{mxk/go-flowrate/flowrate => tendermint/flowcontrol}/io.go (97%)
rename Godeps/_workspace/src/github.com/{mxk/go-flowrate/flowrate => tendermint/flowcontrol}/util.go (98%)
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 1ce8351f..cead8403 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -53,10 +53,6 @@
"ImportPath": "github.com/mattn/go-isatty",
"Rev": "fdbe02a1b44e75977b2690062b83cf507d70c013"
},
- {
- "ImportPath": "github.com/mxk/go-flowrate/flowrate",
- "Rev": "cca7078d478f8520f85629ad7c68962d31ed7682"
- },
{
"ImportPath": "github.com/naoina/go-stringutil",
"Rev": "360db0db4b01d34e12a2ec042c09e7d37fece761"
@@ -81,6 +77,10 @@
"ImportPath": "github.com/tendermint/ed25519",
"Rev": "533fb6548e2071076888eda3c38749d707ba49bc"
},
+ {
+ "ImportPath": "github.com/tendermint/flowcontrol",
+ "Rev": "84d9671090430e8ec80e35b339907e0579b999eb"
+ },
{
"ImportPath": "github.com/tendermint/log15",
"Comment": "v2.3-36-g6e46075",
diff --git a/Godeps/_workspace/src/github.com/mxk/go-flowrate/flowrate/flowrate.go b/Godeps/_workspace/src/github.com/tendermint/flowcontrol/flowcontrol.go
similarity index 96%
rename from Godeps/_workspace/src/github.com/mxk/go-flowrate/flowrate/flowrate.go
rename to Godeps/_workspace/src/github.com/tendermint/flowcontrol/flowcontrol.go
index 1b727721..c94735db 100644
--- a/Godeps/_workspace/src/github.com/mxk/go-flowrate/flowrate/flowrate.go
+++ b/Godeps/_workspace/src/github.com/tendermint/flowcontrol/flowcontrol.go
@@ -2,9 +2,9 @@
// Written by Maxim Khitrov (November 2012)
//
-// Package flowrate provides the tools for monitoring and limiting the flow rate
-// of an arbitrary data stream.
-package flowrate
+// Package flowcontrol provides the tools for monitoring and limiting the
+// transfer rate of an arbitrary data stream.
+package flowcontrol
import (
"math"
@@ -72,6 +72,14 @@ func (m *Monitor) Update(n int) int {
return n
}
+// Hack to set the current rEMA.
+func (m *Monitor) SetREMA(rEMA float64) {
+ m.mu.Lock()
+ m.rEMA = rEMA
+ m.samples++
+ m.mu.Unlock()
+}
+
// IO is a convenience method intended to wrap io.Reader and io.Writer method
// execution. It calls m.Update(n) and then returns (n, err) unmodified.
func (m *Monitor) IO(n int, err error) (int, error) {
diff --git a/Godeps/_workspace/src/github.com/mxk/go-flowrate/flowrate/io.go b/Godeps/_workspace/src/github.com/tendermint/flowcontrol/io.go
similarity index 97%
rename from Godeps/_workspace/src/github.com/mxk/go-flowrate/flowrate/io.go
rename to Godeps/_workspace/src/github.com/tendermint/flowcontrol/io.go
index fbe09097..12a753dd 100644
--- a/Godeps/_workspace/src/github.com/mxk/go-flowrate/flowrate/io.go
+++ b/Godeps/_workspace/src/github.com/tendermint/flowcontrol/io.go
@@ -2,7 +2,7 @@
// Written by Maxim Khitrov (November 2012)
//
-package flowrate
+package flowcontrol
import (
"errors"
@@ -11,7 +11,7 @@ import (
// ErrLimit is returned by the Writer when a non-blocking write is short due to
// the transfer rate limit.
-var ErrLimit = errors.New("flowrate: flow rate limit exceeded")
+var ErrLimit = errors.New("flowcontrol: transfer rate limit exceeded")
// Limiter is implemented by the Reader and Writer to provide a consistent
// interface for monitoring and controlling data transfer.
diff --git a/Godeps/_workspace/src/github.com/mxk/go-flowrate/flowrate/util.go b/Godeps/_workspace/src/github.com/tendermint/flowcontrol/util.go
similarity index 98%
rename from Godeps/_workspace/src/github.com/mxk/go-flowrate/flowrate/util.go
rename to Godeps/_workspace/src/github.com/tendermint/flowcontrol/util.go
index 4caac583..91efd881 100644
--- a/Godeps/_workspace/src/github.com/mxk/go-flowrate/flowrate/util.go
+++ b/Godeps/_workspace/src/github.com/tendermint/flowcontrol/util.go
@@ -2,7 +2,7 @@
// Written by Maxim Khitrov (November 2012)
//
-package flowrate
+package flowcontrol
import (
"math"
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain/pool.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain/pool.go
index 4e501a1d..1bf33a33 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain/pool.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/blockchain/pool.go
@@ -5,7 +5,7 @@ import (
"sync"
"time"
- flow "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/mxk/go-flowrate/flowrate"
+ flow "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/flowcontrol"
. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/types"
)
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/connection.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/connection.go
index 45748da7..76435150 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/connection.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/p2p/connection.go
@@ -10,7 +10,7 @@ import (
"sync/atomic"
"time"
- flow "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/mxk/go-flowrate/flowrate"
+ flow "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/flowcontrol"
. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
"github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/wire" //"github.com/tendermint/log15"
)
--
GitLab