trace_processor: remove ref and ref_type from slice table
Change-Id: I78129aac3c64258fd0dc8cad6fe455f37b06bdd4
diff --git a/src/trace_processor/export_json_unittest.cc b/src/trace_processor/export_json_unittest.cc
index ded2e75..02fe44d 100644
--- a/src/trace_processor/export_json_unittest.cc
+++ b/src/trace_processor/export_json_unittest.cc
@@ -119,11 +119,8 @@
context_.args_tracker->Flush(); // Flush track args.
StringId cat_id = context_.storage->InternString(base::StringView(kCategory));
StringId name_id = context_.storage->InternString(base::StringView(kName));
- StringId ref_type_id = context_.storage->InternString(
- GetRefTypeStringMap()[static_cast<uint32_t>(RefType::kRefUtid)]);
- context_.storage->mutable_slice_table()->Insert({kTimestamp, kDuration, track,
- utid, ref_type_id, cat_id,
- name_id, 0, 0, 0});
+ context_.storage->mutable_slice_table()->Insert(
+ {kTimestamp, kDuration, track, cat_id, name_id, 0, 0, 0});
context_.storage->mutable_thread_slices()->AddThreadSlice(
0, kThreadTimestamp, kThreadDuration, kThreadInstructionCount,
kThreadInstructionDelta);
@@ -169,11 +166,8 @@
context_.args_tracker->Flush(); // Flush track args.
StringId cat_id = context_.storage->InternString(base::StringView(kCategory));
StringId name_id = context_.storage->InternString(base::StringView(kName));
- StringId ref_type_id = context_.storage->InternString(
- GetRefTypeStringMap()[static_cast<uint32_t>(RefType::kRefUtid)]);
- context_.storage->mutable_slice_table()->Insert({kTimestamp, kDuration, track,
- utid, ref_type_id, cat_id,
- name_id, 0, 0, 0});
+ context_.storage->mutable_slice_table()->Insert(
+ {kTimestamp, kDuration, track, cat_id, name_id, 0, 0, 0});
context_.storage->mutable_thread_slices()->AddThreadSlice(
0, kThreadTimestamp, kThreadDuration, kThreadInstructionCount,
kThreadInstructionDelta);
@@ -234,10 +228,8 @@
StringId cat_id = context_.storage->InternString("cat");
StringId name_id = context_.storage->InternString("name");
- StringId ref_type_id = context_.storage->InternString(
- GetRefTypeStringMap()[static_cast<uint32_t>(RefType::kRefTrack)]);
context_.storage->mutable_slice_table()->Insert(
- {0, 0, track, track, ref_type_id, cat_id, name_id, 0, 0, 0});
+ {0, 0, track, cat_id, name_id, 0, 0, 0});
base::TempFile temp_file = base::TempFile::Create();
FILE* output = fopen(temp_file.path().c_str(), "w+");
@@ -408,10 +400,8 @@
context_.args_tracker->Flush(); // Flush track args.
StringId cat_id = context_.storage->InternString(base::StringView(kCategory));
StringId name_id = context_.storage->InternString(base::StringView(kName));
- StringId ref_type_id = context_.storage->InternString(
- GetRefTypeStringMap()[static_cast<uint32_t>(RefType::kRefUtid)]);
context_.storage->mutable_slice_table()->Insert(
- {0, 0, track, utid, ref_type_id, cat_id, name_id, 0, 0, 0});
+ {0, 0, track, cat_id, name_id, 0, 0, 0});
StringId arg_key_id = context_.storage->InternString(
base::StringView("task.posted_from.file_name"));
@@ -455,12 +445,9 @@
context_.args_tracker->Flush(); // Flush track args.
StringId cat_id = storage->InternString(base::StringView(kCategory));
StringId name_id = storage->InternString(base::StringView(kName));
- StringId ref_type_id = context_.storage->InternString(
- GetRefTypeStringMap()[static_cast<uint32_t>(RefType::kRefUtid)]);
RowId row_id = TraceStorage::CreateRowId(
- kNestableSlices,
- storage->mutable_slice_table()->Insert(
- {0, 0, track, utid, ref_type_id, cat_id, name_id, 0, 0, 0}));
+ kNestableSlices, storage->mutable_slice_table()->Insert(
+ {0, 0, track, cat_id, name_id, 0, 0, 0}));
auto add_arg = [&](const char* key, Variadic value) {
StringId key_id = storage->InternString(key);
@@ -507,10 +494,8 @@
context_.args_tracker->Flush(); // Flush track args.
StringId cat_id = context_.storage->InternString(base::StringView(kCategory));
StringId name_id = context_.storage->InternString(base::StringView(kName));
- StringId ref_type_id = context_.storage->InternString(
- GetRefTypeStringMap()[static_cast<uint32_t>(RefType::kRefUtid)]);
context_.storage->mutable_slice_table()->Insert(
- {0, 0, track, utid, ref_type_id, cat_id, name_id, 0, 0, 0});
+ {0, 0, track, cat_id, name_id, 0, 0, 0});
StringId arg_flat_key_id = context_.storage->InternString(
base::StringView("debug.draw_duration_ms"));
@@ -559,10 +544,8 @@
context_.args_tracker->Flush(); // Flush track args.
StringId cat_id = context_.storage->InternString(base::StringView(kCategory));
StringId name_id = context_.storage->InternString(base::StringView(kName));
- StringId ref_type_id = context_.storage->InternString(
- GetRefTypeStringMap()[static_cast<uint32_t>(RefType::kRefUtid)]);
context_.storage->mutable_slice_table()->Insert(
- {0, 0, track, utid, ref_type_id, cat_id, name_id, 0, 0, 0});
+ {0, 0, track, cat_id, name_id, 0, 0, 0});
StringId arg_key0_id =
context_.storage->InternString(base::StringView("arg0"));
@@ -607,10 +590,8 @@
context_.args_tracker->Flush(); // Flush track args.
StringId cat_id = context_.storage->InternString(base::StringView(kCategory));
StringId name_id = context_.storage->InternString(base::StringView(kName));
- StringId ref_type_id = context_.storage->InternString(
- GetRefTypeStringMap()[static_cast<uint32_t>(RefType::kRefUtid)]);
context_.storage->mutable_slice_table()->Insert(
- {0, 0, track, utid, ref_type_id, cat_id, name_id, 0, 0, 0});
+ {0, 0, track, cat_id, name_id, 0, 0, 0});
StringId arg_flat_key_id =
context_.storage->InternString(base::StringView("a.b"));
@@ -658,10 +639,8 @@
context_.args_tracker->Flush(); // Flush track args.
StringId cat_id = context_.storage->InternString(base::StringView(kCategory));
StringId name_id = context_.storage->InternString(base::StringView(kName));
- StringId ref_type_id = context_.storage->InternString(
- GetRefTypeStringMap()[static_cast<uint32_t>(RefType::kRefUtid)]);
context_.storage->mutable_slice_table()->Insert(
- {0, 0, track, utid, ref_type_id, cat_id, name_id, 0, 0, 0});
+ {0, 0, track, cat_id, name_id, 0, 0, 0});
StringId arg_flat_key_id =
context_.storage->InternString(base::StringView("a"));
@@ -709,10 +688,8 @@
context_.args_tracker->Flush(); // Flush track args.
StringId cat_id = context_.storage->InternString(base::StringView(kCategory));
StringId name_id = context_.storage->InternString(base::StringView(kName));
- StringId ref_type_id = context_.storage->InternString(
- GetRefTypeStringMap()[static_cast<uint32_t>(RefType::kRefUtid)]);
context_.storage->mutable_slice_table()->Insert(
- {0, 0, track, utid, ref_type_id, cat_id, name_id, 0, 0, 0});
+ {0, 0, track, cat_id, name_id, 0, 0, 0});
StringId arg_key_id = context_.storage->InternString(base::StringView("a"));
StringId arg_value_id =
@@ -749,9 +726,8 @@
context_.args_tracker->Flush(); // Flush track args.
StringId cat_id = context_.storage->InternString(base::StringView(kCategory));
StringId name_id = context_.storage->InternString(base::StringView(kName));
- StringId ref_type_id = context_.storage->InternString(base::StringView());
context_.storage->mutable_slice_table()->Insert(
- {kTimestamp, 0, track, 0, ref_type_id, cat_id, name_id, 0, 0, 0});
+ {kTimestamp, 0, track, cat_id, name_id, 0, 0, 0});
base::TempFile temp_file = base::TempFile::Create();
FILE* output = fopen(temp_file.path().c_str(), "w+");
@@ -782,10 +758,8 @@
context_.args_tracker->Flush(); // Flush track args.
StringId cat_id = context_.storage->InternString(base::StringView(kCategory));
StringId name_id = context_.storage->InternString(base::StringView(kName));
- StringId ref_type_id = context_.storage->InternString(
- GetRefTypeStringMap()[static_cast<uint32_t>(RefType::kRefUtid)]);
context_.storage->mutable_slice_table()->Insert(
- {kTimestamp, 0, track, utid, ref_type_id, cat_id, name_id, 0, 0, 0});
+ {kTimestamp, 0, track, cat_id, name_id, 0, 0, 0});
base::TempFile temp_file = base::TempFile::Create();
FILE* output = fopen(temp_file.path().c_str(), "w+");
@@ -817,8 +791,6 @@
UniquePid upid = context_.storage->AddEmptyProcess(kProcessID);
StringId cat_id = context_.storage->InternString(base::StringView(kCategory));
StringId name_id = context_.storage->InternString(base::StringView(kName));
- StringId ref_type_id = context_.storage->InternString(
- GetRefTypeStringMap()[static_cast<uint32_t>(RefType::kRefTrack)]);
constexpr int64_t kSourceId = 235;
TrackId track = context_.track_tracker->InternLegacyChromeAsyncTrack(
@@ -826,9 +798,8 @@
/*source_scope=*/0);
context_.args_tracker->Flush(); // Flush track args.
- context_.storage->mutable_slice_table()->Insert({kTimestamp, kDuration, track,
- track, ref_type_id, cat_id,
- name_id, 0, 0, 0});
+ context_.storage->mutable_slice_table()->Insert(
+ {kTimestamp, kDuration, track, cat_id, name_id, 0, 0, 0});
StringId arg_key_id =
context_.storage->InternString(base::StringView(kArgName));
TraceStorage::Args::Arg arg;
@@ -883,8 +854,6 @@
UniquePid upid = context_.storage->AddEmptyProcess(kProcessID);
StringId cat_id = context_.storage->InternString(base::StringView(kCategory));
StringId name_id = context_.storage->InternString(base::StringView(kName));
- StringId ref_type_id = context_.storage->InternString(
- GetRefTypeStringMap()[static_cast<uint32_t>(RefType::kRefTrack)]);
constexpr int64_t kSourceId = 235;
TrackId track = context_.track_tracker->InternLegacyChromeAsyncTrack(
@@ -893,8 +862,7 @@
context_.args_tracker->Flush(); // Flush track args.
auto slice_id = context_.storage->mutable_slice_table()->Insert(
- {kTimestamp, kDuration, track, track, ref_type_id, cat_id, name_id, 0, 0,
- 0});
+ {kTimestamp, kDuration, track, cat_id, name_id, 0, 0, 0});
context_.storage->mutable_virtual_track_slices()->AddVirtualTrackSlice(
slice_id, kThreadTimestamp, kThreadDuration, 0, 0);
@@ -941,8 +909,6 @@
UniquePid upid = context_.storage->AddEmptyProcess(kProcessID);
StringId cat_id = context_.storage->InternString(base::StringView(kCategory));
StringId name_id = context_.storage->InternString(base::StringView(kName));
- StringId ref_type_id = context_.storage->InternString(
- GetRefTypeStringMap()[static_cast<uint32_t>(RefType::kRefTrack)]);
constexpr int64_t kSourceId = 235;
TrackId track = context_.track_tracker->InternLegacyChromeAsyncTrack(
@@ -951,8 +917,7 @@
context_.args_tracker->Flush(); // Flush track args.
auto slice_id = context_.storage->mutable_slice_table()->Insert(
- {kTimestamp, kDuration, track, track, ref_type_id, cat_id, name_id, 0, 0,
- 0});
+ {kTimestamp, kDuration, track, cat_id, name_id, 0, 0, 0});
context_.storage->mutable_virtual_track_slices()->AddVirtualTrackSlice(
slice_id, kThreadTimestamp, kThreadDuration, 0, 0);
@@ -987,8 +952,6 @@
UniquePid upid = context_.storage->AddEmptyProcess(kProcessID);
StringId cat_id = context_.storage->InternString(base::StringView(kCategory));
StringId name_id = context_.storage->InternString(base::StringView(kName));
- StringId ref_type_id = context_.storage->InternString(
- GetRefTypeStringMap()[static_cast<uint32_t>(RefType::kRefTrack)]);
constexpr int64_t kSourceId = 235;
TrackId track = context_.track_tracker->InternLegacyChromeAsyncTrack(
@@ -997,7 +960,7 @@
context_.args_tracker->Flush(); // Flush track args.
context_.storage->mutable_slice_table()->Insert(
- {kTimestamp, 0, track, track, ref_type_id, cat_id, name_id, 0, 0, 0});
+ {kTimestamp, 0, track, cat_id, name_id, 0, 0, 0});
StringId arg_key_id =
context_.storage->InternString(base::StringView("arg_name"));
TraceStorage::Args::Arg arg;
@@ -1250,15 +1213,12 @@
StringId arg1_id = context_.storage->InternString(base::StringView("arg1"));
StringId arg2_id = context_.storage->InternString(base::StringView("arg2"));
StringId val_id = context_.storage->InternString(base::StringView("val"));
- StringId ref_type_id = context_.storage->InternString(
- GetRefTypeStringMap()[static_cast<uint32_t>(RefType::kRefUtid)]);
std::array<RowId, 3> slice_ids;
for (size_t i = 0; i < name_ids.size(); i++) {
slice_ids[i] = TraceStorage::CreateRowId(
- kNestableSlices,
- context_.storage->mutable_slice_table()->Insert(
- {0, 0, track, utid, ref_type_id, cat_id, name_ids[i], 0, 0, 0}));
+ kNestableSlices, context_.storage->mutable_slice_table()->Insert(
+ {0, 0, track, cat_id, name_ids[i], 0, 0, 0}));
}
for (RowId row : slice_ids) {
@@ -1358,15 +1318,11 @@
context_.args_tracker->Flush(); // Flush track args.
StringId cat_id = context_.storage->InternString(base::StringView(kCategory));
StringId name_id = context_.storage->InternString(base::StringView(kName));
- StringId ref_type_id = context_.storage->InternString(
- GetRefTypeStringMap()[static_cast<uint32_t>(RefType::kRefUtid)]);
- context_.storage->mutable_slice_table()->Insert({kTimestamp1, kDuration,
- track, utid, ref_type_id,
- cat_id, name_id, 0, 0, 0});
- context_.storage->mutable_slice_table()->Insert({kTimestamp2, kDuration,
- track, utid, ref_type_id,
- cat_id, name_id, 0, 0, 0});
+ context_.storage->mutable_slice_table()->Insert(
+ {kTimestamp1, kDuration, track, cat_id, name_id, 0, 0, 0});
+ context_.storage->mutable_slice_table()->Insert(
+ {kTimestamp2, kDuration, track, cat_id, name_id, 0, 0, 0});
auto label_filter = [](const char* label_name) {
return strcmp(label_name, "traceEvents") == 0;
