Extract: Convert TRANS_PER_* type to use explicit labels

Convert Extract and Monitor modules using DATA_TRANS_PER_* type to use appropriate explicit y-axis label. Signed-off-by: Jan Kara <jack@suse.cz>
gormanm · Nov 25, 2024 · 7ed206d · 7ed206d
1 parent 1e5be6e
commit 7ed206d
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 9 deletions.
diff --git a/bin/lib/MMTests/DataTypes.pm b/bin/lib/MMTests/DataTypes.pm
@@ -3,7 +3,7 @@ package DataTypes;
 use base qw(Exporter);
 
 our @EXPORT = qw(DATA_NONE DATA_TIME_SECONDS DATA_TIME_NSECONDS DATA_TIME_USECONDS DATA_TIME_MSECONDS DATA_TIME_CYCLES DATA_ACTIONS DATA_ACTIONS_PER_SECOND DATA_ACTIONS_PER_MINUTE DATA_BAD_ACTIONS DATA_OPS_PER_SECOND DATA_OPS_PER_MINUTE DATA_KBYTES_PER_SECOND DATA_MBYTES_PER_SECOND DATA_MBITS_PER_SECOND DATA_TRANS_PER_SECOND DATA_TRANS_PER_MINUTE DATA_SUCCESS_PERCENT
-	LABEL_TIME_NSECONDS LABEL_TIME_USECONDS LABEL_TIME_MSECONDS LABEL_TIME_SECONDS LABEL_KBYTES_PER_SECOND LABEL_KBYTES LABEL_OPS_PER_SECOND LABEL_OPS_PER_MINUTE);
+	LABEL_TIME_NSECONDS LABEL_TIME_USECONDS LABEL_TIME_MSECONDS LABEL_TIME_SECONDS LABEL_KBYTES_PER_SECOND LABEL_KBYTES LABEL_OPS_PER_SECOND LABEL_OPS_PER_MINUTE LABEL_TRANS_PER_SECOND);
 
 use constant DATA_NONE			=> 0;
 use constant DATA_TIME_SECONDS		=> 1;
@@ -48,5 +48,6 @@ use constant LABEL_KBYTES_PER_SECOND	=> "KBytes/sec";
 use constant LABEL_KBYTES		=> "KiB";
 use constant LABEL_OPS_PER_SECOND	=> "Ops/sec";
 use constant LABEL_OPS_PER_MINUTE	=> "Ops/min";
+use constant LABEL_TRANS_PER_SECOND	=> "Transactions/sec";
 
 1;
diff --git a/bin/lib/MMTests/ExtractFfsb.pm b/bin/lib/MMTests/ExtractFfsb.pm
@@ -7,7 +7,8 @@ use strict;
 sub initialise() {
 	my ($self, $subHeading) = @_;
 	$self->{_ModuleName} = "ExtractFfsb";
-	$self->{_DataType}   = DataTypes::DATA_TRANS_PER_SECOND;
+	$self->{_PlotYaxis}  = DataTypes::LABEL_TRANS_PER_SECOND;
+	$self->{_PreferredVal} = "Higher";
 	$self->{_PlotType}   = "histogram";
 	$self->{_Opname}     = "Trans/sec";
 

diff --git a/bin/lib/MMTests/ExtractJohnripper.pm b/bin/lib/MMTests/ExtractJohnripper.pm
@@ -8,7 +8,8 @@ use strict;
 sub initialise() {
 	my ($self, $subHeading) = @_;
 	$self->{_ModuleName} = "ExtractJohnripper";
-	$self->{_DataType}   = DataTypes::DATA_TRANS_PER_SECOND;
+	$self->{_PlotYaxis}  = DataTypes::LABEL_TRANS_PER_SECOND;
+	$self->{_PreferredVal} = "Higher";
 	$self->{_PlotType}   = "thread-errorlines";
 	$self->{_ClientSubheading} = 1;
 

diff --git a/bin/lib/MMTests/ExtractPgbench.pm b/bin/lib/MMTests/ExtractPgbench.pm
@@ -8,7 +8,8 @@ use strict;
 sub initialise() {
 	my ($self, $subHeading) = @_;
 	$self->{_ModuleName}		= "ExtractPgbench";
-	$self->{_DataType}		= DataTypes::DATA_TRANS_PER_SECOND;
+	$self->{_PlotYaxis}		= DataTypes::LABEL_TRANS_PER_SECOND;
+	$self->{_PreferredVal}		= "Higher";
 	$self->{_PlotType}		= "client-errorlines";
 	$self->{_SubheadingPlotType}	= "simple-clients";
 

diff --git a/bin/lib/MMTests/ExtractPostmark.pm b/bin/lib/MMTests/ExtractPostmark.pm
@@ -7,7 +7,8 @@ use strict;
 sub initialise() {
 	my ($self, $subHeading) = @_;
 	$self->{_ModuleName} = "ExtractPostmark";
-	$self->{_DataType}   = DataTypes::DATA_TRANS_PER_SECOND;
+	$self->{_PlotYaxis}  = DataTypes::LABEL_TRANS_PER_SECOND;
+	$self->{_PreferredVal} = "Higher";
 	$self->{_PlotType}   = "histogram";
 	$self->{_Opname}     = "Time";
 	$self->{_RatioOperations} = [ "Transactions", "DataRead/MB",

diff --git a/bin/lib/MMTests/ExtractRedis.pm b/bin/lib/MMTests/ExtractRedis.pm
@@ -8,7 +8,8 @@ use strict;
 sub initialise() {
 	my ($self, $subHeading) = @_;
 	$self->{_ModuleName} = "ExtractRedis";
-	$self->{_DataType}   = DataTypes::DATA_TRANS_PER_SECOND;
+	$self->{_PlotYaxis}  = DataTypes::LABEL_TRANS_PER_SECOND;
+	$self->{_PreferredVal} = "Higher";
 	$self->{_PlotType}   = "client-errorlines";
 	$self->{_ClientSubheading} = 1;
 	$self->SUPER::initialise($subHeading);

diff --git a/bin/lib/MMTests/ExtractSiege.pm b/bin/lib/MMTests/ExtractSiege.pm
@@ -8,7 +8,8 @@ use strict;
 sub initialise() {
 	my ($self, $subHeading) = @_;
 	$self->{_ModuleName} = "ExtractSiege";
-	$self->{_DataType}   = DataTypes::DATA_TRANS_PER_SECOND;
+	$self->{_PlotYaxis}  = DataTypes::LABEL_TRANS_PER_SECOND;
+	$self->{_PreferredVal} = "Higher";
 	$self->{_PlotType}   = "client-errorlines";
 	$self->SUPER::initialise($subHeading);
 }

diff --git a/bin/lib/MMTests/ExtractSqlite.pm b/bin/lib/MMTests/ExtractSqlite.pm
@@ -8,7 +8,8 @@ use strict;
 sub initialise() {
 	my ($self, $subHeading) = @_;
 	$self->{_ModuleName} = "ExtractSqlite";
-	$self->{_DataType} = DataTypes::DATA_TRANS_PER_SECOND,
+	$self->{_PlotYaxis} = DataTypes::LABEL_TRANS_PER_SECOND,
+	$self->{_PreferredVal} = "Higher",
 	$self->{_PlotType} = "simple";
 	$self->SUPER::initialise($subHeading);
 }

diff --git a/bin/lib/MMTests/ExtractSysbench.pm b/bin/lib/MMTests/ExtractSysbench.pm
@@ -8,7 +8,8 @@ use strict;
 sub initialise() {
 	my ($self, $subHeading) = @_;
 	$self->{_ModuleName} = "ExtractSysbench";
-	$self->{_DataType}   = DataTypes::DATA_TRANS_PER_SECOND;
+	$self->{_PlotYaxis}  = DataTypes::LABEL_TRANS_PER_SECOND;
+	$self->{_PreferredVal} = "Higher";
 	$self->{_PlotType}   = "client-errorlines";
 	$self->SUPER::initialise($subHeading);
 }