all: use built-in min, max functions

Change-Id: Ie76ebb556d635068342747f3f91dd7dc423df531
GitHub-Last-Rev: aea61fb3a054e6bd24f4684f90fb353d5682cd0b
GitHub-Pull-Request: golang/go#73340
Reviewed-on: https://go-review.googlesource.com/c/go/+/664677
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Keith Randall <khr@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Keith Randall <khr@google.com>
This commit is contained in:
Marcel Meyer 2025-04-11 22:19:49 +00:00 committed by Gopher Robot
parent 56fad21c22
commit 03640f688b
4 changed files with 13 additions and 20 deletions

View File

@ -16,10 +16,7 @@ func CopyFileRange(dst, src *FD, remain int64) (written int64, handled bool, err
} }
for remain > 0 { for remain > 0 {
max := remain max := min(remain, maxCopyFileRangeRound)
if max > maxCopyFileRangeRound {
max = maxCopyFileRangeRound
}
n, e := copyFileRange(dst, src, int(max)) n, e := copyFileRange(dst, src, int(max))
if n > 0 { if n > 0 {
remain -= n remain -= n

View File

@ -272,9 +272,7 @@ func readlinkat(fd int, name string) (string, error) {
if e != nil { if e != nil {
return "", e return "", e
} }
if n < 0 { n = max(n, 0)
n = 0
}
if n < len { if n < len {
return string(b[0:n]), nil return string(b[0:n]), nil
} }

View File

@ -18,7 +18,7 @@ func TestReadGCStats(t *testing.T) {
var stats GCStats var stats GCStats
var mstats runtime.MemStats var mstats runtime.MemStats
var min, max time.Duration var minimum, maximum time.Duration
// First ReadGCStats will allocate, second should not, // First ReadGCStats will allocate, second should not,
// especially if we follow up with an explicit garbage collection. // especially if we follow up with an explicit garbage collection.
@ -52,11 +52,11 @@ func TestReadGCStats(t *testing.T) {
if dt != time.Duration(mstats.PauseNs[off]) { if dt != time.Duration(mstats.PauseNs[off]) {
t.Errorf("stats.Pause[%d] = %d, want %d", i, dt, mstats.PauseNs[off]) t.Errorf("stats.Pause[%d] = %d, want %d", i, dt, mstats.PauseNs[off])
} }
if max < dt { maximum = max(maximum, dt)
max = dt if i == 0 {
} minimum = dt
if min > dt || i == 0 { } else {
min = dt minimum = min(minimum, dt)
} }
off = (off + len(mstats.PauseNs) - 1) % len(mstats.PauseNs) off = (off + len(mstats.PauseNs) - 1) % len(mstats.PauseNs)
} }
@ -64,8 +64,8 @@ func TestReadGCStats(t *testing.T) {
q := stats.PauseQuantiles q := stats.PauseQuantiles
nq := len(q) nq := len(q)
if q[0] != min || q[nq-1] != max { if q[0] != minimum || q[nq-1] != maximum {
t.Errorf("stats.PauseQuantiles = [%d, ..., %d], want [%d, ..., %d]", q[0], q[nq-1], min, max) t.Errorf("stats.PauseQuantiles = [%d, ..., %d], want [%d, ..., %d]", q[0], q[nq-1], minimum, maximum)
} }
for i := 0; i < nq-1; i++ { for i := 0; i < nq-1; i++ {

View File

@ -968,17 +968,15 @@ func BenchmarkParallelTimerLatency(b *testing.B) {
} }
var total float64 var total float64
var samples float64 var samples float64
max := Duration(0) maximum := Duration(0)
for _, s := range stats { for _, s := range stats {
if s.max > max { maximum = max(maximum, s.max)
max = s.max
}
total += s.sum total += s.sum
samples += float64(s.count) samples += float64(s.count)
} }
b.ReportMetric(0, "ns/op") b.ReportMetric(0, "ns/op")
b.ReportMetric(total/samples, "avg-late-ns") b.ReportMetric(total/samples, "avg-late-ns")
b.ReportMetric(float64(max.Nanoseconds()), "max-late-ns") b.ReportMetric(float64(maximum.Nanoseconds()), "max-late-ns")
} }
// Benchmark timer latency with staggered wakeup times and varying CPU bound // Benchmark timer latency with staggered wakeup times and varying CPU bound