commit 5c40a20f35a972109f9ad5a9c43b7f60dda9ef89
author Lalit Maganti <lalitm@google.com> Mon Dec 16 11:26:06 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 16 11:26:06 2019 +0000
tree 453a56b1e211bd73d9194237afae682a366eec09
parent c19c7972d571a3cc4896bb47ef0fedf81f041d2a
parent 957e099f31f99c131630b85eea1a9eef27bf9d4b

Merge "trace_processor: remove ref and ref_type from counters table"

src/trace_processor/tables/track_tables.h

diff --git a/src/trace_processor/tables/track_tables.h b/src/trace_processor/tables/track_tables.h
index 9147b0a..9048d66 100644
--- a/src/trace_processor/tables/track_tables.h
+++ b/src/trace_processor/tables/track_tables.h
@@ -58,8 +58,6 @@
 #define PERFETTO_TP_COUNTER_TRACK_DEF(NAME, PARENT, C) \
   NAME(CounterTrackTable, "counter_track")             \
   PARENT(PERFETTO_TP_TRACK_TABLE_DEF, C)               \
-  C(int64_t, ref)                                      \
-  C(StringPool::Id, ref_type)                          \
   C(StringPool::Id, unit)                              \
   C(StringPool::Id, description)
 

src/trace_processor/track_tracker.cc

diff --git a/src/trace_processor/track_tracker.cc b/src/trace_processor/track_tracker.cc
index 5cc9746..839155e 100644
--- a/src/trace_processor/track_tracker.cc
+++ b/src/trace_processor/track_tracker.cc
@@ -339,9 +339,6 @@
 
   tables::CpuCounterTrackTable::Row row(name);
   row.cpu = cpu;
-  row.ref = cpu;
-  row.ref_type = context_->storage->InternString(
-      GetRefTypeStringMap()[static_cast<size_t>(RefType::kRefCpuId)]);
 
   TrackId track =
       context_->storage->mutable_cpu_counter_track_table()->Insert(row);
@@ -357,9 +354,6 @@
 
   tables::ThreadCounterTrackTable::Row row(name);
   row.utid = utid;
-  row.ref = utid;
-  row.ref_type = context_->storage->InternString(
-      GetRefTypeStringMap()[static_cast<size_t>(RefType::kRefUtid)]);
 
   TrackId track =
       context_->storage->mutable_thread_counter_track_table()->Insert(row);
@@ -375,9 +369,6 @@
 
   tables::ProcessCounterTrackTable::Row row(name);
   row.upid = upid;
-  row.ref = upid;
-  row.ref_type = context_->storage->InternString(
-      GetRefTypeStringMap()[static_cast<size_t>(RefType::kRefUpid)]);
 
   TrackId track =
       context_->storage->mutable_process_counter_track_table()->Insert(row);
@@ -393,9 +384,6 @@
 
   tables::IrqCounterTrackTable::Row row(name);
   row.irq = irq;
-  row.ref = irq;
-  row.ref_type = context_->storage->InternString(
-      GetRefTypeStringMap()[static_cast<size_t>(RefType::kRefIrq)]);
 
   TrackId track =
       context_->storage->mutable_irq_counter_track_table()->Insert(row);
@@ -412,9 +400,6 @@
 
   tables::SoftirqCounterTrackTable::Row row(name);
   row.softirq = softirq;
-  row.ref = softirq;
-  row.ref_type = context_->storage->InternString(
-      GetRefTypeStringMap()[static_cast<size_t>(RefType::kRefSoftIrq)]);
 
   TrackId track =
       context_->storage->mutable_softirq_counter_track_table()->Insert(row);
@@ -440,9 +425,6 @@
   row.gpu_id = gpu_id;
   row.description = description;
   row.unit = unit;
-  row.ref = gpu_id;
-  row.ref_type = context_->storage->InternString(
-      GetRefTypeStringMap()[static_cast<size_t>(RefType::kRefGpuId)]);
 
   return context_->storage->mutable_gpu_counter_track_table()->Insert(row);
 }