Move clamp and max, and add min to misc.go

diff --git a/connection.go b/connection.go
index a12d8e65fde47f74c4314b9a61a3931e78b0077b..6f63945d16e20ec18e5a41b023896f12b4884eda 100644 (file)
--- a/connection.go
+++ b/connection.go
@@ -314,29 +314,6 @@ func (cn *connection) requestedMetadataPiece(index int) bool {
        return index < len(cn.metadataRequests) && cn.metadataRequests[index]
 }
 
-func clamp(min, value, max int64) int64 {
-       if min > max {
-               panic("harumph")
-       }
-       if value < min {
-               value = min
-       }
-       if value > max {
-               value = max
-       }
-       return value
-}
-
-func max(as ...int64) int64 {
-       ret := as[0]
-       for _, a := range as[1:] {
-               if a > ret {
-                       ret = a
-               }
-       }
-       return ret
-}
-
 // The actual value to use as the maximum outbound requests.
 func (cn *connection) nominalMaxRequests() (ret int) {
        return int(clamp(1, int64(cn.PeerMaxRequests), max(64, cn.stats.ChunksReadUseful-(cn.stats.ChunksRead-cn.stats.ChunksReadUseful))))

diff --git a/misc.go b/misc.go
index 2d00ba55ada75fd5eb94a3e1da04f6e93552cad1..c23910ea5aaafb332b5d5f67bb6a69156d577a20 100644 (file)
--- a/misc.go
+++ b/misc.go
@@ -130,3 +130,36 @@ func connIsIpv6(nc net.Conn) bool {
        rip := missinggo.AddrIP(ra)
        return rip.To4() == nil && rip.To16() != nil
 }
+
+func clamp(min, value, max int64) int64 {
+       if min > max {
+               panic("harumph")
+       }
+       if value < min {
+               value = min
+       }
+       if value > max {
+               value = max
+       }
+       return value
+}
+
+func max(as ...int64) int64 {
+       ret := as[0]
+       for _, a := range as[1:] {
+               if a > ret {
+                       ret = a
+               }
+       }
+       return ret
+}
+
+func min(as ...int64) int64 {
+       ret := as[0]
+       for _, a := range as[1:] {
+               if a < ret {
+                       ret = a
+               }
+       }
+       return ret
+}