Skip to content

Commit 9027f8f

Browse files
abondvt89abondvt89
authored
Merge pull request #805 from nico-robert/update-ticklecharts-package
Update ticklecharts package
2 parents eb4d16f + 33c2632 commit 9027f8f

File tree

3 files changed

+43
-39
lines changed

3 files changed

+43
-39
lines changed

‎Build/Bawt-2.1.0/Setup/HammerDB-Linux.bawt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ Setup db2tcl db2tcl-2.0.1.1.7z db2tcl.bawt
2020
Setup pgtcl pgtcl-2.1.1.1.7z pgtcl.bawt
2121
# Pure Tcl/Tk packages.
2222
Setup awthemes awthemes-10.4.0.7z awthemes.bawt
23-
Setup ticklecharts ticklecharts-3.1.7z ticklecharts.bawt
23+
Setup ticklecharts ticklecharts-3.2.8.7z ticklecharts.bawt

‎Build/Bawt-2.1.0/Setup/HammerDB-Windows.bawt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ Setup db2tcl db2tcl-2.0.1.1.7z db2tcl_NMake.bawt
2727
# Compiled Tcl packages.
2828
# Pure Tcl/Tk packages.
2929
Setup awthemes awthemes-10.4.0.7z awthemes.bawt
30-
Setup ticklecharts ticklecharts-3.1.7z ticklecharts.bawt
30+
Setup ticklecharts ticklecharts-3.2.8.7z ticklecharts.bawt

‎modules/jobs-1.0.tm‎

Lines changed: 41 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1845,10 +1845,10 @@ namespace eval jobs {
18451845
set ::ticklecharts::htmlstdout "True" ;
18461846
$bar SetOptions -title [ subst {text "$dbdescription TPROC-H Result $jobid $date"} ] -tooltip {show "True"} -legend {bottom "5%" left "45%"}
18471847
$bar Xaxis -data [list $xaxisvals] -axisLabel [list show "True"]
1848-
$bar Yaxis -name "Seconds" -position "left" -axisLabel {formatter "<0123>value<0125>"}
1849-
$bar AddBarSeries -name GEOMEAN -data [list "$geomeantime "] -itemStyle [ subst {color $color1 opacity 0.90} ]
1850-
$bar AddBarSeries -name "QUERY SET" -data [list "$qsettime "] -itemStyle [ subst {color $color2 opacity 0.90} ]
1851-
set html [ $bar RenderX -title "$jobid Result" ]
1848+
$bar Yaxis -name "Seconds" -position "left" -axisLabel {formatter {"{value}"}}
1849+
$bar Add "barSeries" -name GEOMEAN -data [list "$geomeantime "] -itemStyle [ subst {color $color1 opacity 0.90} ]
1850+
$bar Add "barSeries" -name "QUERY SET" -data [list "$qsettime "] -itemStyle [ subst {color $color2 opacity 0.90} ]
1851+
set html [ $bar toHTML -title "$jobid Result" ]
18521852
hdbjobs eval {INSERT INTO JOBCHART(jobid,chart,html) VALUES($jobid,'result',$html)}
18531853
return $html
18541854
} else {
@@ -1863,10 +1863,10 @@ namespace eval jobs {
18631863
set ::ticklecharts::htmlstdout "True" ;
18641864
$bar SetOptions -title [ subst {text "$dbdescription TPROC-C Result $jobid $date"} ] -tooltip {show "True"} -legend {bottom "5%" left "45%"}
18651865
$bar Xaxis -data [list [ subst {"$dbdescription $vus"}]] -axisLabel [list show "True"]
1866-
$bar Yaxis -name "Transactions" -position "left" -axisLabel {formatter "<0123>value<0125>"}
1867-
$bar AddBarSeries -name NOPM -data [list "$nopm "] -itemStyle [ subst {color $color1 opacity 0.90} ]
1868-
$bar AddBarSeries -name TPM -data [list "$tpm "] -itemStyle [ subst {color $color2 opacity 0.90} ]
1869-
set html [ $bar RenderX -title "$jobid Result" ]
1866+
$bar Yaxis -name "Transactions" -position "left" -axisLabel {formatter {"{value}"}}
1867+
$bar Add "barSeries" -name NOPM -data [list "$nopm "] -itemStyle [ subst {color $color1 opacity 0.90} ]
1868+
$bar Add "barSeries" -name TPM -data [list "$tpm "] -itemStyle [ subst {color $color2 opacity 0.90} ]
1869+
set html [ $bar toHTML -title "$jobid Result" ]
18701870
hdbjobs eval {INSERT INTO JOBCHART(jobid,chart,html) VALUES($jobid,'result',$html)}
18711871
return $html
18721872
}
@@ -1924,9 +1924,9 @@ namespace eval jobs {
19241924
set ::ticklecharts::htmlstdout "True" ;
19251925
$bar SetOptions -title [ subst {text "$dbdescription TPROC-H Power Query Times $jobid $date"} ] -tooltip {show "True"} -legend {bottom "5%" left "45%"}
19261926
$bar Xaxis -data [list $xaxisvals] -axisLabel [list show "True"]
1927-
$bar Yaxis -name "Seconds" -position "left" -axisLabel {formatter "<0123>value<0125>"}
1928-
$bar AddBarSeries -name "VU 1 Query Set" -data [list $barseries ] -itemStyle [ subst {color $color1 opacity 0.90} ]
1929-
set html [ $bar RenderX -title "$jobid Query Times" ]
1927+
$bar Yaxis -name "Seconds" -position "left" -axisLabel {formatter {"{value}"}}
1928+
$bar Add "barSeries" -name "VU 1 Query Set" -data [list $barseries ] -itemStyle [ subst {color $color1 opacity 0.90} ]
1929+
set html [ $bar toHTML -title "$jobid Query Times" ]
19301930
hdbjobs eval {INSERT INTO JOBCHART(jobid,chart,html) VALUES($jobid,'timing',$html)}
19311931
return $html
19321932
} else {
@@ -1947,12 +1947,12 @@ namespace eval jobs {
19471947
set ::ticklecharts::htmlstdout "True" ;
19481948
$bar SetOptions -title [ subst {text "$dbdescription TPROC-C Response Times $jobid $date"} ] -tooltip {show "True"} -legend {bottom "5%" left "30%"}
19491949
$bar Xaxis -data [list $xaxisvals] -axisLabel [list show "True"]
1950-
$bar Yaxis -name "Milliseconds" -position "left" -axisLabel {formatter "<0123>value<0125>"}
1951-
$bar AddBarSeries -name P50_MS -data [list "$P50_MS "]
1952-
$bar AddBarSeries -name P95_MS -data [list "$P95_MS "]
1953-
$bar AddBarSeries -name P99_MS -data [list "$P99_MS "]
1954-
$bar AddBarSeries -name AVG_MS -data [list "$AVG_MS "]
1955-
set html [ $bar RenderX -title "$jobid Response Times" ]
1950+
$bar Yaxis -name "Milliseconds" -position "left" -axisLabel {formatter {"{value}"}}
1951+
$bar Add "barSeries" -name P50_MS -data [list "$P50_MS "]
1952+
$bar Add "barSeries" -name P95_MS -data [list "$P95_MS "]
1953+
$bar Add "barSeries" -name P99_MS -data [list "$P99_MS "]
1954+
$bar Add "barSeries" -name AVG_MS -data [list "$AVG_MS "]
1955+
set html [ $bar toHTML -title "$jobid Response Times" ]
19561956
hdbjobs eval {INSERT INTO JOBCHART(jobid,chart,html) VALUES($jobid,'timing',$html)}
19571957
return $html
19581958
}
@@ -1999,9 +1999,9 @@ namespace eval jobs {
19991999
set ::ticklecharts::htmlstdout "True" ;
20002000
$line SetOptions -title [ subst {text "$dbdescription $workload Count $jobid $date"} ] -tooltip {show "True"} -legend {bottom "5%" left "40%"}
20012001
$line Xaxis -data [list $xaxisvals] -axisLabel [list show "True"]
2002-
$line Yaxis -name "$axisname" -position "left" -axisLabel {formatter "<0123>value<0125>"}
2003-
$line AddLineSeries -name [ join $header ] -data [ list $lineseries ] -itemStyle [ subst {color $color1 opacity 0.90} ]
2004-
set html [ $line RenderX -title "$jobid Transaction Count" ]
2002+
$line Yaxis -name "$axisname" -position "left" -axisLabel {formatter {"{value}"}}
2003+
$line Add "lineSeries" -name [ join $header ] -data [ list $lineseries ] -itemStyle [ subst {color $color1 opacity 0.90} ]
2004+
set html [ $line toHTML -title "$jobid Transaction Count" ]
20052005
#If we query the tcount chart while the job is running it will not be generated again
20062006
#meaning the output will be truncated
20072007
#only save the chart once the job is complete
@@ -2040,35 +2040,39 @@ namespace eval jobs {
20402040
dict with cpuvalues {
20412041
lappend usrseries ${usr%}
20422042
lappend sysseries ${sys%}
2043-
#to include interrupt requests uncomment below
2044-
#lappend irqseries ${irq%}
2043+
lappend irqseries ${irq%}
20452044
}}
20462045
#Delete the first and trailing values if usr utilisation is 0, so we start from the first measurement and only chart when running
20472046
if { [ lindex $usrseries 0 ] eq 0.0 } {
20482047
set usrseries [ lreplace $usrseries 0 0 ]
20492048
set sysseries [ lreplace $sysseries 0 0 ]
2050-
#to include interrupt requests uncomment below
2051-
#set irqseries [ lreplace $irqseries 0 0 ]
2049+
set irqseries [ lreplace $irqseries 0 0 ]
20522050
set xaxisvals [ lreplace $xaxisvals 0 0 ]
20532051
}
20542052
while { [ lindex $usrseries end ] eq 0.0 } {
20552053
set usrseries [ lreplace $usrseries end end ]
20562054
set sysseries [ lreplace $sysseries end end ]
2057-
#to include interrupt requests uncomment below
2058-
#set irqseries [ lreplace $irqseries end end ]
2055+
set irqseries [ lreplace $irqseries end end ]
20592056
set xaxisvals [ lreplace $xaxisvals end end ]
20602057
}
20612058
if { ![ info exists dbdescription ] } { set dbdescription "Generic CPU" }
20622059
set line [ticklecharts::chart new]
20632060
set ::ticklecharts::htmlstdout "True" ;
2064-
$line SetOptions -title [ subst {text "$dbdescription $jobid"} ] -tooltip {show "True"} -legend {bottom "5%" left "40%"}
2061+
set irqSeriesName "irq%"
2062+
# Set 'showIrqSeries' to True to show the IRQ series in the chart (default is 'False').
2063+
set showIrqSeries "False"
2064+
# Use 'irqJS' to toggle the visibility of the IRQ series in the chart.
2065+
set irqJS [ticklecharts::jsfunc new [subst {{'$irqSeriesName': [string tolower $showIrqSeries]}}]]
2066+
$line SetOptions -title [ subst {text "$dbdescription $jobid"} ] \
2067+
-tooltip {show "True"} \
2068+
-legend [list bottom "5%" left "40%" selected $irqJS]
20652069
$line Xaxis -data [list $xaxisvals] -axisLabel [list show "True"]
2066-
$line Yaxis -name "$axisname" -position "left" -axisLabel {formatter "<0123>value<0125>"}
2067-
$line AddLineSeries -name "usr%" -data [ list $usrseries ] -itemStyle [ subst {color green opacity 0.90} ]
2068-
$line AddLineSeries -name "sys%" -data [ list $sysseries ] -itemStyle [ subst {color red opacity 0.90} ]
2069-
#to include interrupt requests uncomment below
2070-
#$line AddLineSeries -name "irq%" -data [ list $irqseries ] -itemStyle [ subst {color blue opacity 0.90} ]
2071-
set html [ $line RenderX -title "$jobid " ]
2070+
$line Yaxis -name "$axisname" -position "left" -axisLabel {formatter {"{value}"}}
2071+
$line Add "lineSeries" -name "usr%" -data [ list $usrseries ] -itemStyle [ subst {color green opacity 0.90} ]
2072+
$line Add "lineSeries" -name "sys%" -data [ list $sysseries ] -itemStyle [ subst {color red opacity 0.90} ]
2073+
# 'irqseries' is included but hidden by default with 'showIrqSeries' variable set.
2074+
$line Add "lineSeries" -name $irqSeriesName -data [ list $irqseries ] -itemStyle [ subst {color blue opacity 0.90} ]
2075+
set html [ $line toHTML -title "$jobid " ]
20722076
#If we query the metrics chart while the job is running it will not be generated again
20732077
#meaning the output will be truncated
20742078
#only save the chart once the job is complete
@@ -2115,10 +2119,10 @@ namespace eval jobs {
21152119
foreach colour {color1 color2} {set $colour [ dict get $chartcolors $dbdescription $colour ]}
21162120
$line SetOptions -title [ subst {text "$dbdescription Performance Profile $profileid $timestamp"} ] -tooltip {show "True"} -legend {bottom "5%" left "40%"}
21172121
$line Xaxis -name "Active VU" -data [list $xaxisvals] -axisLabel [list show "True"]
2118-
$line Yaxis -name "Transactions" -position "left" -axisLabel {formatter "<0123>value<0125>"}
2119-
$line AddLineSeries -name "NOPM" -data [ list $lineseries1 ] -itemStyle [ subst {color $color1 opacity 0.90} ]
2120-
$line AddLineSeries -name "TPM" -data [ list $lineseries2 ] -itemStyle [ subst {color $color2 opacity 0.90} ]
2121-
set html [ $line RenderX -title "Performance Profile $profileid" ]
2122+
$line Yaxis -name "Transactions" -position "left" -axisLabel {formatter {"{value}"}}
2123+
$line Add "lineSeries" -name "NOPM" -data [ list $lineseries1 ] -itemStyle [ subst {color $color1 opacity 0.90} ]
2124+
$line Add "lineSeries" -name "TPM" -data [ list $lineseries2 ] -itemStyle [ subst {color $color2 opacity 0.90} ]
2125+
set html [ $line toHTML -title "Performance Profile $profileid" ]
21222126
#If we query the profile chart while the job is running it will not be generated again
21232127
#meaning the output will be truncated
21242128
#only save the chart once the last job is complete

0 commit comments

Comments
 (0)