Skip to content

Commit 028dbe2

Browse files
author
poolqa
committed
modify statistics range
1 parent e13aaa1 commit 028dbe2

File tree

2 files changed

+41
-73
lines changed

2 files changed

+41
-73
lines changed

flagArg/flag.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func InitFlag(f *FlagArg) {
2121
flag.StringVar(&f.Url, "u", "", "target `url`")
2222

2323
flag.BoolVar(&f.DebugLog, "d", false, "show debug log")
24-
flag.BoolVar(&f.ReportDetail, "r", false, "show those routine's requests detail at report log,\nbut it wall use more and more memory.")
24+
//flag.BoolVar(&f.ReportDetail, "r", false, "show those routine's requests detail at report log,\nbut it wall use more and more memory.")
2525
flag.BoolVar(&f.PreHeat, "w", false, "waiting all routines stand-by.")
2626
flag.Int64Var(&f.PrintInterval, "i", 1, "print interval for process request count time.")
2727
flag.BoolVar(&f.Help, "h", false, "this help")
@@ -44,8 +44,8 @@ type FlagArg struct {
4444
}
4545

4646
func (f *FlagArg) Usage() {
47-
_, _ = fmt.Fprintf(os.Stderr, `Transactions Request Pressure Test/ v0.0.1
48-
Usage: pressure -c concurrency -n requests -t timeLimit -m method -u url -[dh]
47+
_, _ = fmt.Fprintf(os.Stderr, `Transactions Request Pressure Test/ v1.0.0
48+
Usage: pressure -c concurrency -n requests -t timeLimit -m method -u url -[dwh]
4949
5050
Options:
5151
`)
@@ -89,5 +89,3 @@ func (f *FlagArg) CheckFlag() bool {
8989
}
9090
return true
9191
}
92-
93-

performance/performance.go

Lines changed: 38 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -12,61 +12,45 @@ import (
1212

1313
const (
1414
LE01MillSECOND = iota
15-
LE02MillSECOND
16-
LE03MillSECOND
17-
LE04MillSECOND
1815
LE05MillSECOND
1916
LE10MillSECOND
20-
LE20MillSECOND
21-
LE30MillSECOND
17+
LE100MillSECOND
18+
LE500MillSECOND
2219
LE01SECOND
23-
LE02SECOND
24-
LE03SECOND
25-
LE04SECOND
26-
LE05SECOND
2720
LE10SECOND
28-
LE20SECOND
2921
LE30SECOND
3022
LE01MINUTE
31-
GT01MINUTE
23+
LE05MINUTE
24+
LE10MINUTE
25+
GT10MINUTE
3226
)
3327

3428
var _RangeName = []string{
3529
"LE 1 ms",
36-
"LE 2 ms",
37-
"LE 3 ms",
38-
"LE 4 ms",
3930
"LE 5 ms",
4031
"LE 10 ms",
41-
"LE 20 ms",
42-
"LE 30 ms",
32+
"LE100 ms",
33+
"LE500 ms",
4334
"LE 1 Sec",
44-
"LE 2 Sec",
45-
"LE 3 Sec",
46-
"LE 4 Sec",
47-
"LE 5 Sec",
4835
"LE 10 Sec",
49-
"LE 20 Sec",
5036
"LE 30 Sec",
5137
"LE 1 Min",
52-
"GT 1 Min",
38+
"LE 5 Min",
39+
"LE 10 Min",
40+
"GT 10 Min",
5341
}
5442

5543
const (
56-
SECOND30 = 30 * time.Second
57-
SECOND20 = 20 * time.Second
58-
SECOND10 = 10 * time.Second
59-
SECOND05 = 5 * time.Second
60-
SECOND04 = 4 * time.Second
61-
SECOND03 = 3 * time.Second
62-
SECOND02 = 2 * time.Second
63-
MillSECOND30 = 30 * time.Millisecond
64-
MillSECOND20 = 20 * time.Millisecond
65-
MillSECOND10 = 10 * time.Millisecond
66-
MillSECOND05 = 5 * time.Millisecond
67-
MillSECOND04 = 4 * time.Millisecond
68-
MillSECOND03 = 3 * time.Millisecond
69-
MillSECOND02 = 2 * time.Millisecond
44+
MINUTE10 = 10 * time.Minute
45+
MINUTE05 = 5 * time.Minute
46+
MINUTE01 = time.Minute
47+
SECOND30 = 30 * time.Second
48+
SECOND01 = time.Second
49+
MillSECOND500 = 500 * time.Millisecond
50+
MillSECOND100 = 100 * time.Millisecond
51+
MillSECOND10 = 10 * time.Millisecond
52+
MillSECOND05 = 5 * time.Millisecond
53+
MillSECOND01 = time.Millisecond
7054
)
7155

7256
var lock atomic.Bool
@@ -88,7 +72,7 @@ type performance struct {
8872
}
8973

9074
func NewPerformance(routineCnt int64) {
91-
perfData := make([]Statistics, GT01MINUTE+1)
75+
perfData := make([]Statistics, GT10MINUTE+1)
9276
_perf = &performance{
9377
perfChan: make(chan perfI, routineCnt+1),
9478
perfData: perfData,
@@ -122,7 +106,7 @@ func Wait(sTime, eTime time.Time) {
122106
Transaction: StatisticsTime{
123107
MinTime: math.MaxInt64,
124108
},
125-
Response: StatisticsTime{
109+
Response: StatisticsTime{
126110
MinTime: math.MaxInt64,
127111
},
128112
BuildClient: StatisticsTime{
@@ -131,7 +115,7 @@ func Wait(sTime, eTime time.Time) {
131115
}
132116
outStat.WriteString(fmt.Sprintf("\nperformance statistics :\n"))
133117

134-
for idx := GT01MINUTE; idx >= 0; idx-- {
118+
for idx := GT10MINUTE; idx >= 0; idx-- {
135119
data := &_perf.perfData[idx]
136120
if data.Count <= 0 {
137121
continue
@@ -146,13 +130,13 @@ func Wait(sTime, eTime time.Time) {
146130

147131
cnt++
148132
}
149-
if st.Transaction.MinTime == math.MaxInt64 {
133+
if st.Transaction.MinTime == math.MaxInt64 {
150134
st.Transaction.MinTime = 0
151135
}
152-
if st.Response.MinTime == math.MaxInt64 {
136+
if st.Response.MinTime == math.MaxInt64 {
153137
st.Response.MinTime = 0
154138
}
155-
if st.BuildClient.MinTime == math.MaxInt64 {
139+
if st.BuildClient.MinTime == math.MaxInt64 {
156140
st.BuildClient.MinTime = 0
157141
}
158142
outTimes.WriteString(fmt.Sprintf("-----------------------\nTotal Count: %v\n\n", st.Count))
@@ -174,42 +158,28 @@ func (perf *performance) Run() {
174158
useTime, respTime, bTime := perfData.GetUseTime()
175159

176160
var timeRange int
177-
if respTime < time.Millisecond {
161+
if respTime < MillSECOND01 {
178162
timeRange = LE01MillSECOND
179-
} else if respTime < MillSECOND02 {
180-
timeRange = LE02MillSECOND
181-
} else if respTime < MillSECOND03 {
182-
timeRange = LE03MillSECOND
183-
} else if respTime < MillSECOND04 {
184-
timeRange = LE04MillSECOND
185163
} else if respTime < MillSECOND05 {
186164
timeRange = LE05MillSECOND
187165
} else if respTime < MillSECOND10 {
188166
timeRange = LE10MillSECOND
189-
} else if respTime < MillSECOND20 {
190-
timeRange = LE20MillSECOND
191-
} else if respTime < MillSECOND30 {
192-
timeRange = LE30MillSECOND
193-
} else if respTime < time.Second {
167+
} else if respTime < MillSECOND100 {
168+
timeRange = LE100MillSECOND
169+
} else if respTime < MillSECOND500 {
170+
timeRange = LE500MillSECOND
171+
} else if respTime < SECOND01 {
194172
timeRange = LE01SECOND
195-
} else if respTime < SECOND02 {
196-
timeRange = LE02SECOND
197-
} else if respTime < SECOND03 {
198-
timeRange = LE03SECOND
199-
} else if respTime < SECOND04 {
200-
timeRange = LE04SECOND
201-
} else if respTime < SECOND05 {
202-
timeRange = LE05SECOND
203-
} else if respTime < SECOND10 {
204-
timeRange = LE10SECOND
205-
} else if respTime < SECOND20 {
206-
timeRange = LE20SECOND
207173
} else if respTime < SECOND30 {
208174
timeRange = LE30SECOND
209-
} else if respTime < time.Minute {
175+
} else if respTime < MINUTE01 {
210176
timeRange = LE01MINUTE
177+
} else if respTime < MINUTE05 {
178+
timeRange = LE01MINUTE
179+
} else if respTime < MINUTE10 {
180+
timeRange = LE10MINUTE
211181
} else {
212-
timeRange = GT01MINUTE
182+
timeRange = GT10MINUTE
213183
}
214184

215185
dataStatus := perfData.GetStatus()

0 commit comments

Comments
 (0)