Skip to content

Commit

Permalink
Revert Measurement.cs
Browse files Browse the repository at this point in the history
  • Loading branch information
timcassell committed Dec 4, 2020
1 parent 4104143 commit 82ec67e
Showing 1 changed file with 1 addition and 34 deletions.
35 changes: 1 addition & 34 deletions src/BenchmarkDotNet/Reports/Measurement.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ public struct Measurement : IComparable<Measurement>

private const string NsSymbol = "ns";
private const string OpSymbol = "op";
private const string SBSymbol = "B";

private static Measurement Error() => new Measurement(-1, IterationMode.Unknown, IterationStage.Unknown, 0, 0, 0);

Expand All @@ -44,11 +43,6 @@ private static readonly int IterationInfoNameMaxWidth
/// </summary>
public double Nanoseconds { get; }

/// <summary>
/// Gets the total number of survived bytes from all operations.
/// </summary>
public long SurvivedBytes { get; }

/// <summary>
/// Creates an instance of <see cref="Measurement"/> struct.
/// </summary>
Expand All @@ -59,27 +53,13 @@ private static readonly int IterationInfoNameMaxWidth
/// <param name="operations">The number of operations performed.</param>
/// <param name="nanoseconds">The total number of nanoseconds it took to perform all operations.</param>
public Measurement(int launchIndex, IterationMode iterationMode, IterationStage iterationStage, int iterationIndex, long operations, double nanoseconds)
: this(launchIndex, iterationMode, iterationStage, iterationIndex, operations, nanoseconds, 0) { }

/// <summary>
/// Creates an instance of <see cref="Measurement"/> struct.
/// </summary>
/// <param name="launchIndex"></param>
/// <param name="iterationMode"></param>
/// <param name="iterationStage"></param>
/// <param name="iterationIndex"></param>
/// <param name="operations">The number of operations performed.</param>
/// <param name="nanoseconds">The total number of nanoseconds it took to perform all operations.</param>
/// <param name="survivedBytes">The total number of survived bytes from all operations.</param>
public Measurement(int launchIndex, IterationMode iterationMode, IterationStage iterationStage, int iterationIndex, long operations, double nanoseconds, long survivedBytes)
{
Operations = operations;
Nanoseconds = nanoseconds;
LaunchIndex = launchIndex;
IterationMode = iterationMode;
IterationStage = iterationStage;
IterationIndex = iterationIndex;
SurvivedBytes = survivedBytes;
}

private static IterationMode ParseIterationMode(string name) => Enum.TryParse(name, out IterationMode mode) ? mode : IterationMode.Unknown;
Expand Down Expand Up @@ -118,15 +98,6 @@ public override string ToString()
builder.Append(GetAverageTime().ToString(MainCultureInfo).ToAscii());
builder.Append("/op");

if (SurvivedBytes != 0)
{
builder.Append(", ");
builder.Append(SurvivedBytes.ToString(MainCultureInfo));
builder.Append(' ');
builder.Append(SBSymbol);
builder.Append(" Survived");
}

return builder.ToString();
}

Expand Down Expand Up @@ -175,7 +146,6 @@ public static Measurement Parse(ILogger logger, string line, int processIndex)
var measurementsInfoSplit = measurementsInfo.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
long op = 1L;
double ns = double.PositiveInfinity;
long survived = 0;
foreach (string item in measurementsInfoSplit)
{
var measurementSplit = item.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
Expand All @@ -189,12 +159,9 @@ public static Measurement Parse(ILogger logger, string line, int processIndex)
case OpSymbol:
op = long.Parse(value, MainCultureInfo);
break;
case SBSymbol:
survived = long.Parse(value, MainCultureInfo);
break;
}
}
return new Measurement(processIndex, iterationMode, iterationStage, iterationIndex, op, ns, survived);
return new Measurement(processIndex, iterationMode, iterationStage, iterationIndex, op, ns);
}
catch (Exception)
{
Expand Down

0 comments on commit 82ec67e

Please sign in to comment.