summaryrefslogtreecommitdiff
path: root/rpm
diff options
context:
space:
mode:
Diffstat (limited to 'rpm')
-rw-r--r--rpm/calculations.go2
-rw-r--r--rpm/parameters.go8
-rw-r--r--rpm/parameters_test.go41
3 files changed, 35 insertions, 16 deletions
diff --git a/rpm/calculations.go b/rpm/calculations.go
index 4b61413..8b3cf92 100644
--- a/rpm/calculations.go
+++ b/rpm/calculations.go
@@ -36,7 +36,7 @@ type Rpm[Data utilities.Number] struct {
}
func CalculateRpm[Data utilities.Number, Bucket constraints.Ordered](
- selfRtts series.WindowSeries[Data, Bucket], aggregatedForeignRtts series.WindowSeries[Data, Bucket], trimming uint, percentile int,
+ selfRtts series.WindowSeries[Data, Bucket], aggregatedForeignRtts series.WindowSeries[Data, Bucket], trimming uint, percentile uint,
) Rpm[Data] {
// There may be more than one round trip accumulated together. If that is the case,
// we will blow them apart in to three separate measurements and each one will just
diff --git a/rpm/parameters.go b/rpm/parameters.go
index aff8639..1d7e065 100644
--- a/rpm/parameters.go
+++ b/rpm/parameters.go
@@ -30,9 +30,10 @@ type SpecParameters struct {
MaxParallelConns int
ProbeInterval time.Duration
ProbeCapacityPct float64
+ Percentile uint
}
-func SpecParametersFromArguments(timeout int, mad int, id int, tmp uint, sdt float64, mnp int, mps int, ptc float64) (*SpecParameters, error) {
+func SpecParametersFromArguments(timeout int, mad int, id int, tmp uint, sdt float64, mnp int, mps int, ptc float64, p int) (*SpecParameters, error) {
if timeout <= 0 {
return nil, fmt.Errorf("cannot specify a 0 or negative timeout for the test")
}
@@ -57,6 +58,9 @@ func SpecParametersFromArguments(timeout int, mad int, id int, tmp uint, sdt flo
if ptc <= 0 {
return nil, fmt.Errorf("cannot specify a 0 or negative probe capacity for the test")
}
+ if p < 1 || p >= 100 {
+ return nil, fmt.Errorf("percentile for statistical calculations (%v) is invalid", p)
+ }
testTimeout := time.Second * time.Duration(timeout)
evalInterval := time.Second * time.Duration(id)
probeInterval := utilities.PerSecondToInterval(int64(mps))
@@ -64,7 +68,7 @@ func SpecParametersFromArguments(timeout int, mad int, id int, tmp uint, sdt flo
params := SpecParameters{
TestTimeout: testTimeout, MovingAvgDist: mad,
EvalInterval: evalInterval, TrimmedMeanPct: tmp, StdDevTolerance: sdt,
- MaxParallelConns: mnp, ProbeInterval: probeInterval, ProbeCapacityPct: ptc,
+ MaxParallelConns: mnp, ProbeInterval: probeInterval, ProbeCapacityPct: ptc, Percentile: uint(p),
}
return &params, nil
}
diff --git a/rpm/parameters_test.go b/rpm/parameters_test.go
index 4a955c5..2035a99 100644
--- a/rpm/parameters_test.go
+++ b/rpm/parameters_test.go
@@ -20,74 +20,89 @@ import (
)
func TestSpecParametersFromArgumentsBadTimeout(t *testing.T) {
- _, err := SpecParametersFromArguments(0, 0, 0, 0, 0, 0, 0, 0)
+ _, err := SpecParametersFromArguments(0, 0, 0, 0, 0, 0, 0, 0, 0)
if err == nil || !strings.Contains(err.Error(), "timeout") {
t.Fatalf("0 timeout improperly allowed.")
}
- _, err = SpecParametersFromArguments(-1, 0, 0, 0, 0, 0, 0, 0)
+ _, err = SpecParametersFromArguments(-1, 0, 0, 0, 0, 0, 0, 0, 0)
if err == nil || !strings.Contains(err.Error(), "timeout") {
t.Fatalf("negative timeout improperly allowed.")
}
}
func TestSpecParametersFromArgumentsBadMad(t *testing.T) {
- _, err := SpecParametersFromArguments(1, 0, 0, 0, 0, 0, 0, 0)
+ _, err := SpecParametersFromArguments(1, 0, 0, 0, 0, 0, 0, 0, 0)
if err == nil || !strings.Contains(err.Error(), "moving-average") {
t.Fatalf("0 mad improperly allowed.")
}
- _, err = SpecParametersFromArguments(1, 0, 0, 0, 0, 0, 0, 0)
+ _, err = SpecParametersFromArguments(1, 0, 0, 0, 0, 0, 0, 0, 0)
if err == nil || !strings.Contains(err.Error(), "moving-average") {
t.Fatalf("negative mad improperly allowed.")
}
}
func TestSpecParametersFromArgumentsBadId(t *testing.T) {
- _, err := SpecParametersFromArguments(1, 1, 0, 0, 0, 0, 0, 0)
+ _, err := SpecParametersFromArguments(1, 1, 0, 0, 0, 0, 0, 0, 0)
if err == nil || !strings.Contains(err.Error(), "reevaluation") {
t.Fatalf("0 id improperly allowed.")
}
- _, err = SpecParametersFromArguments(1, 1, -1, 0, 0, 0, 0, 0)
+ _, err = SpecParametersFromArguments(1, 1, -1, 0, 0, 0, 0, 0, 0)
if err == nil || !strings.Contains(err.Error(), "reevaluation") {
t.Fatalf("negative id improperly allowed.")
}
}
func TestSpecParametersFromArgumentsBadSdt(t *testing.T) {
- _, err := SpecParametersFromArguments(1, 1, 1, 1, -1, 0, 0, 0)
+ _, err := SpecParametersFromArguments(1, 1, 1, 1, -1, 0, 0, 0, 0)
if err == nil || !strings.Contains(err.Error(), "deviation") {
t.Fatalf("0 sdt improperly allowed.")
}
}
func TestSpecParametersFromArgumentsBadMnp(t *testing.T) {
- _, err := SpecParametersFromArguments(1, 1, 1, 1, 1, 0, 0, 0)
+ _, err := SpecParametersFromArguments(1, 1, 1, 1, 1, 0, 0, 0, 0)
if err == nil || !strings.Contains(err.Error(), "parallel") {
t.Fatalf("0 mnp improperly allowed.")
}
- _, err = SpecParametersFromArguments(1, 1, 1, 1, 1, -1, 0, 0)
+ _, err = SpecParametersFromArguments(1, 1, 1, 1, 1, -1, 0, 0, 0)
if err == nil || !strings.Contains(err.Error(), "parallel") {
t.Fatalf("negative mnp improperly allowed.")
}
}
func TestSpecParametersFromArgumentsBadMps(t *testing.T) {
- _, err := SpecParametersFromArguments(1, 1, 1, 1, 1, 1, 0, 0)
+ _, err := SpecParametersFromArguments(1, 1, 1, 1, 1, 1, 0, 0, 0)
if err == nil || !strings.Contains(err.Error(), "probing interval") {
t.Fatalf("0 mps improperly allowed.")
}
- _, err = SpecParametersFromArguments(1, 1, 1, 1, 1, 1, -1, 0)
+ _, err = SpecParametersFromArguments(1, 1, 1, 1, 1, 1, -1, 0, 0)
if err == nil || !strings.Contains(err.Error(), "probing interval") {
t.Fatalf("negative mps improperly allowed.")
}
}
func TestSpecParametersFromArgumentsBadPtc(t *testing.T) {
- _, err := SpecParametersFromArguments(1, 1, 1, 1, 1, 1, 1, 0)
+ _, err := SpecParametersFromArguments(1, 1, 1, 1, 1, 1, 1, 0, 0)
if err == nil || !strings.Contains(err.Error(), "capacity") {
t.Fatalf("0 ptc improperly allowed.")
}
- _, err = SpecParametersFromArguments(1, 1, 1, 1, 1, 1, 1, -1)
+ _, err = SpecParametersFromArguments(1, 1, 1, 1, 1, 1, 1, -1, 0)
if err == nil || !strings.Contains(err.Error(), "capacity") {
t.Fatalf("negative ptc improperly allowed.")
}
}
+
+func TestSpecParametersFromArgumentsBadP(t *testing.T) {
+ _, err := SpecParametersFromArguments(1, 1, 1, 1, 1, 1, 1, 1, -1)
+ if err == nil || !strings.Contains(err.Error(), "percentile") {
+ t.Fatalf("-1 percentile improperly allowed.")
+ }
+ _, err = SpecParametersFromArguments(1, 1, 1, 1, 1, 1, 1, 1, 0)
+ if err == nil || !strings.Contains(err.Error(), "percentile") {
+ t.Fatalf("0 percentile improperly allowed.")
+ }
+ _, err = SpecParametersFromArguments(1, 1, 1, 1, 1, 1, 1, 1, 101)
+ if err == nil || !strings.Contains(err.Error(), "percentile") {
+ t.Fatalf("percentile greater than 100 improperly allowed.")
+ }
+}
generated by cgit v1.2.3 (git 2.51.0) at 2025-12-15 12:22:35 +0000