art: Refactor RuntimeOptions/ParsedOptions
Refactor the RuntimeOptions to be a
type-safe map (VariantMap, see runtime_options.h) and the ParsedOptions
to delegate the parsing to CmdlineParser (see cmdline/cmdline_parser.h).
This is the start of a command line parsing refactor, and may include
more in the future (dex2oat, patchoat, etc).
For more details of the command line parsing generator usage see cmdline/README.md
Change-Id: Ic67c6bca5e1f33bf2ec60e2e3ff8c366bab91563
diff --git a/runtime/trace.cc b/runtime/trace.cc
index 5066e03..0950abeb 100644
--- a/runtime/trace.cc
+++ b/runtime/trace.cc
@@ -153,30 +153,30 @@
#if defined(__linux__)
default_clock_source_ = clock_source;
#else
- if (clock_source != kTraceClockSourceWall) {
+ if (clock_source != TraceClockSource::kWall) {
LOG(WARNING) << "Ignoring tracing request to use CPU time.";
}
#endif
}
static uint16_t GetTraceVersion(TraceClockSource clock_source) {
- return (clock_source == kTraceClockSourceDual) ? kTraceVersionDualClock
+ return (clock_source == TraceClockSource::kDual) ? kTraceVersionDualClock
: kTraceVersionSingleClock;
}
static uint16_t GetRecordSize(TraceClockSource clock_source) {
- return (clock_source == kTraceClockSourceDual) ? kTraceRecordSizeDualClock
+ return (clock_source == TraceClockSource::kDual) ? kTraceRecordSizeDualClock
: kTraceRecordSizeSingleClock;
}
bool Trace::UseThreadCpuClock() {
- return (clock_source_ == kTraceClockSourceThreadCpu) ||
- (clock_source_ == kTraceClockSourceDual);
+ return (clock_source_ == TraceClockSource::kThreadCpu) ||
+ (clock_source_ == TraceClockSource::kDual);
}
bool Trace::UseWallClock() {
- return (clock_source_ == kTraceClockSourceWall) ||
- (clock_source_ == kTraceClockSourceDual);
+ return (clock_source_ == TraceClockSource::kWall) ||
+ (clock_source_ == TraceClockSource::kDual);
}
void Trace::MeasureClockOverhead() {