Adds a couple more measures to the benchmarking app

apps/benchmark/measurements.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "apps/benchmark/measurements.h"
 
+#include <algorithm>
+
 namespace benchmark {
 namespace {
 
-bool Match(const Event& event, const EventSpec& spec) {
+static bool Match(const Event& event, const EventSpec& spec) {
   return event.name == spec.name && event.categories == spec.categories;
 }
 
 }  // namespace
 
 EventSpec::EventSpec() {}
 
 EventSpec::EventSpec(std::string name, std::string categories)
     : name(name), categories(categories) {}
 
@@ skipping 10 matching lines @@
     : type(type), target_event(target_event), second_event(second_event) {}
 
 Measurement::~Measurement() {}
 
 Measurements::Measurements(std::vector<Event> events,
                            base::TimeTicks time_origin)
     : events_(events), time_origin_(time_origin) {}
 
 Measurements::~Measurements() {}
 
-double Measurements::Measure(const Measurement& measurement) {
+double Measurements::Measure(const Measurement& measurement) const {
   switch (measurement.type) {
     case MeasurementType::TIME_UNTIL:
       return TimeUntil(measurement.target_event);
     case MeasurementType::TIME_BETWEEN:
       return TimeBetween(measurement.target_event, measurement.second_event);
     case MeasurementType::AVG_DURATION:
       return AvgDuration(measurement.target_event);
+    case MeasurementType::PERCENTILE_DURATION:
+      return Percentile(measurement.target_event, measurement.param);
     default:
       NOTREACHED();
       return double();
   }
 }
 
 bool Measurements::EarliestOccurence(const EventSpec& event_spec,
-                                     base::TimeTicks* earliest) {
+                                     base::TimeTicks* earliest) const {
   base::TimeTicks result;
   bool found = false;
   for (const Event& event : events_) {
     if (!Match(event, event_spec))
       continue;
 
     if (found) {
       result = std::min(result, event.timestamp);
     } else {
       result = event.timestamp;
       found = true;
     }
   }
   if (!found)
     return false;
   *earliest = result;
   return true;
 }
 
-double Measurements::TimeUntil(const EventSpec& event_spec) {
+double Measurements::TimeUntil(const EventSpec& event_spec) const {
   base::TimeTicks earliest;
   if (!EarliestOccurence(event_spec, &earliest))
     return -1.0;
   return (earliest - time_origin_).InMillisecondsF();
 }
 
 double Measurements::TimeBetween(const EventSpec& first_event_spec,
-                                 const EventSpec& second_event_spec) {
+                                 const EventSpec& second_event_spec) const {
   base::TimeTicks earliest_first_event;
   if (!EarliestOccurence(first_event_spec, &earliest_first_event))
     return -1.0;
   base::TimeTicks earliest_second_event;
   if (!EarliestOccurence(second_event_spec, &earliest_second_event))
     return -1.0;
   if (earliest_second_event < earliest_first_event)
     return -1.0;
   return (earliest_second_event - earliest_first_event).InMillisecondsF();
 }
 
-double Measurements::AvgDuration(const EventSpec& event_spec) {
+double Measurements::AvgDuration(const EventSpec& event_spec) const {
   double sum = 0.0;
   int count = 0;
   for (const Event& event : events_) {
     if (event.type != EventType::COMPLETE)
       continue;
 
     if (!Match(event, event_spec))
       continue;
 
     sum += event.duration.InMillisecondsF();
     count += 1;
   }
 
   if (!count)
     return -1.0;
   return sum / count;
 }
 
+double Measurements::Percentile(const EventSpec& event_spec,
+                                double percentile) const {
+  std::vector<double> durations;
+
+  if ((percentile < 0.0) || (percentile > 1.0)) {

[ppi, 2015/10/12 19:19:18]

Given that we already ensure that in run_args, I'd make this a DCHECK.

[zra, 2015/10/12 20:38:19]

Done.

+    LOG(ERROR) << "Requested percentile should be between 0 and 1 inclusive";
+  }
+
+  for (const Event& event : events_) {
+    if (event.type != EventType::COMPLETE)
+      continue;
+
+    if (!Match(event, event_spec))
+      continue;
+
+    durations.push_back(event.duration.InMillisecondsF());
+  }
+  if (durations.size() == 0) {
+    return -1.0;
+  }
+
+  size_t index =
+      static_cast<size_t>(static_cast<double>(durations.size()) * percentile);

[ppi, 2015/10/12 19:19:19]

I'd expect that we want index in the range [0, size - 1], not [0, size]. Or does
that API want [0, size]?

[zra, 2015/10/12 20:38:19]

You're right. Needed to be more careful here. Changed to ceil(size * percentile)
- 1.

[ppi, 2015/10/12 20:53:54]

Why not use the simple formula of percentile * (size-1) ? This would map full
range of indices [0, size-1]. In particular, this would handle 0.0 (which
Sheet's PERCENTILE is happy to accept).

[zra, 2015/10/12 22:59:33]

I think we should follow the "Nearest Rank Method" described here:

https://en.wikipedia.org/wiki/Percentile

The problem with the simple formula is that the double to int conversion
truncates. E.g.:

90th percentile of [1, 2, 3] should be 3, but:

.9 * (3 - 1) = 1.8, which is truncated to 1.

Value at index 1 is 2. We can't just add 1 to the result, because that will
screw up other examples, e.g. 0.5.

But handling 0.0 sounds better to me, so I just added a special case for it.

[ppi, 2015/10/12 23:15:20]

Ack. Thanks for the reference!

+  std::nth_element(durations.begin(), durations.begin() + index,
+                   durations.end());
+  return durations[index];
+}
+
 }  // namespace benchmark