1 files changed, 8 insertions, 28 deletions
diff --git a/simpleperf/tracing.h b/simpleperf/tracing.h
index 101ac555..db3f04af 100644
--- a/simpleperf/tracing.h
+++ b/simpleperf/tracing.h
@@ -17,8 +17,6 @@
 #ifndef SIMPLE_PERF_TRACING_H_
 #define SIMPLE_PERF_TRACING_H_
 
-#include <optional>
-#include <set>
 #include <vector>
 
 #include <android-base/logging.h>
@@ -26,21 +24,12 @@
 #include "event_type.h"
 #include "utils.h"
 
-namespace simpleperf {
-
 struct TracingField {
   std::string name;
-  size_t offset = 0;
-  size_t elem_size = 0;
-  size_t elem_count = 1;
-  bool is_signed = false;
-  bool is_dynamic = false;
-
-  bool operator==(const TracingField& other) const {
-    return name == other.name && offset == other.offset && elem_size == other.elem_size &&
-           elem_count == other.elem_count && is_signed == other.is_signed &&
-           is_dynamic == other.is_dynamic;
-  }
+  size_t offset;
+  size_t elem_size;
+  size_t elem_count;
+  bool is_signed;
 };
 
 struct TracingFieldPlace {
@@ -89,7 +78,8 @@ struct TracingFormat {
         return field;
       }
     }
-    LOG(FATAL) << "Couldn't find field " << name << "in TracingFormat of " << this->name;
+    LOG(FATAL) << "Couldn't find field " << name << "in TracingFormat of "
+               << this->name;
     return fields[0];
   }
 };
@@ -111,17 +101,7 @@ class Tracing {
   std::vector<TracingFormat> tracing_formats_;
 };
 
-bool GetTracingData(const std::vector<const EventType*>& event_types, std::vector<char>* data);
-
-// use_quote: whether or not to use quotes in string operands
-// used_fields: field names used in the filter
-// Return adjusted filter on success, otherwise return std::nullopt.
-using FieldNameSet = std::set<std::string>;
-std::optional<std::string> AdjustTracepointFilter(const std::string& filter, bool use_quote,
-                                                  FieldNameSet* used_fields);
-std::optional<FieldNameSet> GetFieldNamesForTracepointEvent(const EventType& event);
-TracingFormat ParseTracingFormat(const std::string& data);
-
-}  // namespace simpleperf
+bool GetTracingData(const std::vector<const EventType*>& event_types,
+                    std::vector<char>* data);
 
 #endif  // SIMPLE_PERF_TRACING_H_