Add options to JvmObjectEvaluator for selectively disabling pretty-printers.

punzki · Xinghua Dou · commit 169efbd61993 · 2018-04-12T12:44:00.000-07:00
With v2 of the @dbg Java tracer, we should not pretty-print objects since we cannot map incremental changes to fields to changes in the pretty-printed values. See: http://go/@dbg-java-tracer-v2-design#heading=h.u8111soubm2f ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=192466452
diff --git a/build/jarjar.jar b/build/jarjar.jar
diff --git a/src/agent/jvm_object_evaluator.cc b/src/agent/jvm_object_evaluator.cc
@@ -61,7 +61,7 @@ JvmObjectEvaluator::~JvmObjectEvaluator() {
 }
 
 
-void JvmObjectEvaluator::Initialize() {
+void JvmObjectEvaluator::Initialize(const Options& options) {
   generic_.reset(new GenericTypeEvaluator);
 
   array_[static_cast<int>(JType::Boolean)].reset(
@@ -83,10 +83,18 @@ void JvmObjectEvaluator::Initialize() {
   array_[static_cast<int>(JType::Object)].reset(
       new ArrayTypeEvaluator<jobject>);
 
-  iterable_.reset(new IterableTypeEvaluator);
-  map_entry_.reset(new MapEntryTypeEvaluator);
-  map_.reset(new MapTypeEvaluator);
-  stringable_.reset(new StringableTypeEvaluator);
+  if (options.pretty_print_iterable) {
+    iterable_.reset(new IterableTypeEvaluator);
+  }
+  if (options.pretty_print_map_entry) {
+    map_entry_.reset(new MapEntryTypeEvaluator);
+  }
+  if (options.pretty_print_map) {
+    map_.reset(new MapTypeEvaluator);
+  }
+  if (options.pretty_print_stringable) {
+    stringable_.reset(new StringableTypeEvaluator);
+  }
 }
 
 
diff --git a/src/agent/jvm_object_evaluator.h b/src/agent/jvm_object_evaluator.h
@@ -34,12 +34,33 @@ namespace cdbg {
 
 class JvmObjectEvaluator : public ObjectEvaluator {
  public:
+  struct Options {
+    // Determines whether classes that implement the Iterable interface should
+    // be pretty printed.
+    bool pretty_print_iterable = true;
+
+    // Determines whether classes that implement the Map interface should be
+    // pretty printed.
+    bool pretty_print_map = true;
+
+    // Determines whether classes that implement the Map.Entry interface should
+    // be pretty printed.
+    bool pretty_print_map_entry = true;
+
+    // Determines whether supported classes should be pretty printed using
+    // "toString()". StringableTypeEvaluator::IsSupported() is used to determine
+    // if a class is supported for pretty printing using "toString()".
+    bool pretty_print_stringable = true;
+  };
+
   JvmObjectEvaluator(
       ClassMetadataReader* class_metadata_reader);
 
   ~JvmObjectEvaluator() override;
 
-  void Initialize();
+  void Initialize() { Initialize(Options()); }
+
+  void Initialize(const Options& options);
 
   void Evaluate(
       MethodCaller* method_caller,
@@ -73,4 +94,3 @@ class JvmObjectEvaluator : public ObjectEvaluator {
 }  // namespace devtools
 
 #endif  // DEVTOOLS_CDBG_DEBUGLETS_JAVA_JVM_OBJECT_EVALUATOR_H_
-
