add measure types

alib2common/src/measurements/MeasurementTypes.cpp

@@ -26,9 +26,14 @@ std::string to_string ( Type t ) {
 	case Type::AUXILIARY:
 		return "AUXILIARY";
-	default:
-		throw::exception::CommonException ( "Missing case.");
+	case Type::PREPROCESS:
+		return "PREPROCESS";
+
+	case Type::ALGORITHM:
+		return "ALGORITHM";
 	}
+
+	throw::exception::CommonException ( "Missing case." );
 }
 Type measurementTypeFromString ( const std::string & ts ) {
@@ -44,6 +49,10 @@ Type measurementTypeFromString ( const std::string & ts ) {
 	if ( ts == "AUXILIARY" ) return Type::AUXILIARY;
+	if ( ts == "PREPROCESS" ) return Type::PREPROCESS;
+
+	if ( ts == "ALGORITHM" ) return Type::ALGORITHM;
+
 	throw::exception::CommonException ( "measurementTypeFromString failed, unknown measurement type: " + ts );
 }

alib2common/src/measurements/MeasurementTypes.hpp

@@ -14,7 +14,7 @@
 namespace measurements {
 enum class Type : unsigned {
-	ROOT = 1, OVERALL = 2, INIT = 4, FINALIZE = 8, MAIN = 16, AUXILIARY = 32
+	ROOT = 1, OVERALL = 2, INIT = 4, FINALIZE = 8, MAIN = 16, AUXILIARY = 32, PREPROCESS = 64, ALGORITHM = 128
 };
 std::string to_string ( Type );

alib2measurepp/src/processor/MeasurementProcessorOutput.cpp

@@ -186,10 +186,9 @@ std::string MeasurementProcessorOutput::getData ( const MeasurementFrame & frame
 	case OutputEngine::COUNTER:
 		return MeasurementProcessorViews::viewCounterDataFrame ( frame, mpo.outputEngineAttr );
-
-	default:
-		throw::exception::CommonException ( "Missing case.");
 	}
+
+	throw::exception::CommonException ( "Missing case." );
 }
 }

examples2/measurements/ameasure2.xml

+<?xml version="1.0"?>
+<MeasurementProvisioner>
+	<Environment>
+		<PipelineIterations>10</PipelineIterations>
+	</Environment>
+	<InputData>
+		<InputBatch>
+			<Generator id="1" alias="str 65536:2">./arand2 -t ST --length 16384 --terminals 2</Generator>
+			<Generator id="2" alias="pat 2">./arand2 -t SST --length 2 -i $1</Generator>
+			<Generator id="2" alias="pat 4">./arand2 -t SST --length 4 -i $1</Generator>
+			<Generator id="2" alias="pat 8">./arand2 -t SST --length 8 -i $1</Generator>
+			<Generator id="2" alias="pat 16">./arand2 -t SST --length 16 -i $1</Generator>
+			<Generator id="2" alias="pat 32">./arand2 -t SST --length 32 -i $1</Generator>
+			<Generator id="2" alias="pat 64">./arand2 -t SST --length 64 -i $1</Generator>
+			<Generator id="2" alias="pat 128">./arand2 -t SST --length 128 -i $1</Generator>
+			<Generator id="2" alias="pat 256">./arand2 -t SST --length 256 -i $1</Generator>
+			<Generator id="2" alias="pat 512">./arand2 -t SST --length 512 -i $1</Generator>
+			<Generator id="2" alias="pat 1024">./arand2 -t SST --length 1024 -i $1</Generator>
+			<Generator id="2" alias="pat 2048">./arand2 -t SST --length 2048 -i $1</Generator>
+		</InputBatch>
+	</InputData>
+	<Pipelines>
+		<Pipeline>
+			<Command alias="bmh">./astringology2 -a boyerMooreHorspool -s $1 -p $2</Command>
+		</Pipeline>
+	</Pipelines>
+</MeasurementProvisioner>