commit 4b6bd99fd77249235611bdf019131f3629d40801
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jun 13 13:39:51 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 13 13:39:51 2022 +0000
tree 10d7c7a68fe8427594911264282d2aa84a92934e
parent c8f24f53007380afbc90d6a644c530b647fc9a61
parent 78b5482d6e21efe0a56d846c35d9573f0fd09801

Merge "tp: add metatracing of individual queries"

src/trace_processor/tp_metatrace.h

diff --git a/src/trace_processor/tp_metatrace.h b/src/trace_processor/tp_metatrace.h
index 7ca1865..3b4f856 100644
--- a/src/trace_processor/tp_metatrace.h
+++ b/src/trace_processor/tp_metatrace.h
@@ -77,6 +77,10 @@
   void AddArg(base::StringView key, const std::string& value) {
     AddArg(key, base::StringView(value));
   }
+
+  void AddArg(base::StringView key, const char* value) {
+    AddArg(key, base::StringView(value));
+  }
 };
 
 // Implementation of fixed-size ring buffer. The implementation of this

src/trace_processor/trace_processor_impl.cc

diff --git a/src/trace_processor/trace_processor_impl.cc b/src/trace_processor/trace_processor_impl.cc
index afe5c5d..2ff8b5d 100644
--- a/src/trace_processor/trace_processor_impl.cc
+++ b/src/trace_processor/trace_processor_impl.cc
@@ -840,16 +840,28 @@
     // Before stepping into |cur_stmt|, we need to finish iterating through
     // the previous statement so we don't have two clashing statements (e.g.
     // SELECT * FROM v and DROP VIEW v) partially stepped into.
-    if (prev_stmt)
+    if (prev_stmt) {
+      PERFETTO_TP_TRACE(
+          "STMT_STEP_UNTIL_DONE", [&prev_stmt](metatrace::Record* record) {
+            record->AddArg("SQL", sqlite3_expanded_sql(*prev_stmt));
+          });
       RETURN_IF_ERROR(sqlite_utils::StepStmtUntilDone(prev_stmt.get()));
+    }
 
     PERFETTO_DLOG("Executing statement: %s", sqlite3_sql(*cur_stmt));
 
-    // Now step once into |cur_stmt| so that when we prepare the next statment
-    // we will have executed any dependent bytecode in this one.
-    int err = sqlite3_step(*cur_stmt);
-    if (err != SQLITE_ROW && err != SQLITE_DONE)
-      return base::ErrStatus("%s (errcode: %d)", sqlite3_errmsg(db), err);
+    {
+      PERFETTO_TP_TRACE(
+          "STMT_FIRST_STEP", [&cur_stmt](metatrace::Record* record) {
+            record->AddArg("SQL", sqlite3_expanded_sql(*cur_stmt));
+          });
+
+      // Now step once into |cur_stmt| so that when we prepare the next statment
+      // we will have executed any dependent bytecode in this one.
+      int err = sqlite3_step(*cur_stmt);
+      if (err != SQLITE_ROW && err != SQLITE_DONE)
+        return base::ErrStatus("%s (errcode: %d)", sqlite3_errmsg(db), err);
+    }
 
     // Increment the neecessary counts for the statement.
     IncrementCountForStmt(cur_stmt.get(), metadata);