Rename TraceBuffez -> TraceBuffer
find src include test tools -name '*.cc' -o -name '*.h' | xargs sed -i 's/TraceBuffez/TraceBuffer/g'
Change-Id: I94c4ec489637b374b57b5b5f548bf3d8a209bdf2
diff --git a/src/tracing/core/service_impl.cc b/src/tracing/core/service_impl.cc
index 04612ee..552898e 100644
--- a/src/tracing/core/service_impl.cc
+++ b/src/tracing/core/service_impl.cc
@@ -278,9 +278,9 @@
const size_t buf_size_bytes = buffer_cfg.size_kb() * 1024u;
total_buf_size_kb += buffer_cfg.size_kb();
auto it_and_inserted =
- buffers_.emplace(global_id, TraceBuffez::Create(buf_size_bytes));
+ buffers_.emplace(global_id, TraceBuffer::Create(buf_size_bytes));
PERFETTO_DCHECK(it_and_inserted.second); // buffers_.count(global_id) == 0.
- std::unique_ptr<TraceBuffez>& trace_buffer = it_and_inserted.first->second;
+ std::unique_ptr<TraceBuffer>& trace_buffer = it_and_inserted.first->second;
if (!trace_buffer) {
did_allocate_all_buffers = false;
break;
@@ -451,7 +451,7 @@
PERFETTO_DCHECK(false);
continue;
}
- TraceBuffez& tbuf = *tbuf_iter->second;
+ TraceBuffer& tbuf = *tbuf_iter->second;
tbuf.BeginRead();
while (!did_hit_threshold) {
TracePacket packet;
@@ -765,7 +765,7 @@
const uint8_t* src,
size_t size) {
PERFETTO_DCHECK_THREAD(thread_checker_);
- TraceBuffez* buf = GetBufferByID(buffer_id);
+ TraceBuffer* buf = GetBufferByID(buffer_id);
if (!buf) {
PERFETTO_DLOG("Could not find target buffer %" PRIu16
" for producer %" PRIu16,
@@ -791,7 +791,7 @@
for (const auto& chunk : chunks_to_patch) {
const ChunkID chunk_id = static_cast<ChunkID>(chunk.chunk_id());
const WriterID writer_id = static_cast<WriterID>(chunk.writer_id());
- TraceBuffez* buf =
+ TraceBuffer* buf =
GetBufferByID(static_cast<BufferID>(chunk.target_buffer()));
static_assert(std::numeric_limits<ChunkID>::max() == kMaxChunkID,
"Add a '|| chunk_id > kMaxChunkID' below if this fails");
@@ -804,7 +804,7 @@
}
// Speculate on the fact that there are going to be a limited amount of
// patches per request, so we can allocate the |patches| array on the stack.
- std::array<TraceBuffez::Patch, 1024> patches; // Uninitialized.
+ std::array<TraceBuffer::Patch, 1024> patches; // Uninitialized.
if (chunk.patches().size() > patches.size()) {
PERFETTO_DLOG("Too many patches (%zu) batched in the same request",
patches.size());
@@ -849,7 +849,7 @@
return last_producer_id_;
}
-TraceBuffez* ServiceImpl::GetBufferByID(BufferID buffer_id) {
+TraceBuffer* ServiceImpl::GetBufferByID(BufferID buffer_id) {
auto buf_iter = buffers_.find(buffer_id);
if (buf_iter == buffers_.end())
return nullptr;
diff --git a/src/tracing/core/service_impl.h b/src/tracing/core/service_impl.h
index 4f7428c..899b6a6 100644
--- a/src/tracing/core/service_impl.h
+++ b/src/tracing/core/service_impl.h
@@ -46,7 +46,7 @@
class Producer;
class SharedMemory;
class SharedMemoryArbiterImpl;
-class TraceBuffez;
+class TraceBuffer;
class TraceConfig;
class TracePacket;
@@ -257,7 +257,7 @@
void MaybeSnapshotClocks(TracingSession*, std::vector<TracePacket>*);
void MaybeEmitTraceConfig(TracingSession*, std::vector<TracePacket>*);
- TraceBuffez* GetBufferByID(BufferID);
+ TraceBuffer* GetBufferByID(BufferID);
base::TaskRunner* const task_runner_;
std::unique_ptr<SharedMemory::Factory> shm_factory_;
@@ -278,7 +278,7 @@
std::set<ConsumerEndpointImpl*> consumers_;
std::map<TracingSessionID, TracingSession> tracing_sessions_;
- std::map<BufferID, std::unique_ptr<TraceBuffez>> buffers_;
+ std::map<BufferID, std::unique_ptr<TraceBuffer>> buffers_;
bool lockdown_mode_ = false;
diff --git a/src/tracing/core/trace_buffer.cc b/src/tracing/core/trace_buffer.cc
index 1a7a554..fb5b7b3 100644
--- a/src/tracing/core/trace_buffer.cc
+++ b/src/tracing/core/trace_buffer.cc
@@ -59,27 +59,27 @@
SharedMemoryABI::ChunkHeader::kChunkNeedsPatching;
} // namespace.
-constexpr size_t TraceBuffez::ChunkRecord::kMaxSize;
-constexpr size_t TraceBuffez::InlineChunkHeaderSize = sizeof(ChunkRecord);
+constexpr size_t TraceBuffer::ChunkRecord::kMaxSize;
+constexpr size_t TraceBuffer::InlineChunkHeaderSize = sizeof(ChunkRecord);
// static
-std::unique_ptr<TraceBuffez> TraceBuffez::Create(size_t size_in_bytes) {
- std::unique_ptr<TraceBuffez> trace_buffer(new TraceBuffez());
+std::unique_ptr<TraceBuffer> TraceBuffer::Create(size_t size_in_bytes) {
+ std::unique_ptr<TraceBuffer> trace_buffer(new TraceBuffer());
if (!trace_buffer->Initialize(size_in_bytes))
return nullptr;
return trace_buffer;
}
-TraceBuffez::TraceBuffez() {
+TraceBuffer::TraceBuffer() {
// See comments in ChunkRecord for the rationale of this.
static_assert(sizeof(ChunkRecord) == sizeof(SharedMemoryABI::PageHeader) +
sizeof(SharedMemoryABI::ChunkHeader),
"ChunkRecord out of sync with the layout of SharedMemoryABI");
}
-TraceBuffez::~TraceBuffez() = default;
+TraceBuffer::~TraceBuffer() = default;
-bool TraceBuffez::Initialize(size_t size) {
+bool TraceBuffer::Initialize(size_t size) {
static_assert(
base::kPageSize % sizeof(ChunkRecord) == 0,
"sizeof(ChunkRecord) must be an integer divider of a page size");
@@ -101,7 +101,7 @@
// Note: |src| points to a shmem region that is shared with the producer. Assume
// that the producer is malicious and will change the content of |src|
// while we execute here. Don't do any processing on it other than memcpy().
-void TraceBuffez::CopyChunkUntrusted(ProducerID producer_id_trusted,
+void TraceBuffer::CopyChunkUntrusted(ProducerID producer_id_trusted,
uid_t producer_uid_trusted,
WriterID writer_id,
ChunkID chunk_id,
@@ -195,7 +195,7 @@
AddPaddingRecord(padding_size);
}
-size_t TraceBuffez::DeleteNextChunksFor(size_t bytes_to_clear) {
+size_t TraceBuffer::DeleteNextChunksFor(size_t bytes_to_clear) {
// Find the position of the first chunk which begins at or after
// (|wptr_| + |bytes|). Note that such a chunk might not exist and we might
// either reach the end of the buffer or a zeroed region of the buffer.
@@ -247,7 +247,7 @@
return next_chunk_ptr - search_end;
}
-void TraceBuffez::AddPaddingRecord(size_t size) {
+void TraceBuffer::AddPaddingRecord(size_t size) {
PERFETTO_DCHECK(size >= sizeof(ChunkRecord) && size <= ChunkRecord::kMaxSize);
ChunkRecord record(size);
record.is_padding = 1;
@@ -257,7 +257,7 @@
// |wptr_| is deliberately not advanced when writing a padding record.
}
-bool TraceBuffez::TryPatchChunkContents(ProducerID producer_id,
+bool TraceBuffer::TryPatchChunkContents(ProducerID producer_id,
WriterID writer_id,
ChunkID chunk_id,
const Patch* patches,
@@ -320,14 +320,14 @@
return true;
}
-void TraceBuffez::BeginRead() {
+void TraceBuffer::BeginRead() {
read_iter_ = GetReadIterForSequence(index_.begin());
#if PERFETTO_DCHECK_IS_ON()
changed_since_last_read_ = false;
#endif
}
-TraceBuffez::SequenceIterator TraceBuffez::GetReadIterForSequence(
+TraceBuffer::SequenceIterator TraceBuffer::GetReadIterForSequence(
ChunkMap::iterator seq_begin) {
SequenceIterator iter;
iter.seq_begin = seq_begin;
@@ -369,7 +369,7 @@
return iter;
}
-void TraceBuffez::SequenceIterator::MoveNext() {
+void TraceBuffer::SequenceIterator::MoveNext() {
// Note: |seq_begin| might be == |seq_end|.
if (cur == seq_end || cur->first.chunk_id == wrapping_id) {
cur = seq_end;
@@ -379,7 +379,7 @@
cur = seq_begin;
}
-bool TraceBuffez::ReadNextTracePacket(TracePacket* packet,
+bool TraceBuffer::ReadNextTracePacket(TracePacket* packet,
uid_t* producer_uid) {
// Note: MoveNext() moves only within the next chunk within the same
// {ProducerID, WriterID} sequence. Here we want to:
@@ -523,7 +523,7 @@
} // for(;;MoveNext()) [iterate over chunks].
}
-TraceBuffez::ReadAheadResult TraceBuffez::ReadAhead(TracePacket* packet) {
+TraceBuffer::ReadAheadResult TraceBuffer::ReadAhead(TracePacket* packet) {
static_assert(static_cast<ChunkID>(kMaxChunkID + 1) == 0,
"relying on kMaxChunkID to wrap naturally");
TRACE_BUFFER_DLOG(" readahead start @ chunk %u", read_iter_.chunk_id());
@@ -600,7 +600,7 @@
return ReadAheadResult::kFailedMoveToNextSequence;
}
-bool TraceBuffez::ReadNextPacketInChunk(ChunkMeta* chunk_meta,
+bool TraceBuffer::ReadNextPacketInChunk(ChunkMeta* chunk_meta,
TracePacket* packet) {
PERFETTO_DCHECK(chunk_meta->num_fragments_read < chunk_meta->num_fragments);
PERFETTO_DCHECK(!(chunk_meta->flags & kChunkNeedsPatching));
diff --git a/src/tracing/core/trace_buffer.h b/src/tracing/core/trace_buffer.h
index 2aea918..a66a4db 100644
--- a/src/tracing/core/trace_buffer.h
+++ b/src/tracing/core/trace_buffer.h
@@ -123,10 +123,7 @@
// Reads guarantee that packets for the same sequence are read in FIFO order
// (according to their ChunkID), but don't give any guarantee about the read
// order of packets from different sequences (see ReadPacket() comments below).
-//
-// TODO(primiano): the name of this class is deliberately typo-ed as a temporary
-// situation until we replace TraceBuffer within service_impl.cc.
-class TraceBuffez {
+class TraceBuffer {
public:
static const size_t InlineChunkHeaderSize; // For test/fake_packet.{cc,h}.
@@ -151,9 +148,9 @@
};
// Can return nullptr if the memory allocation fails.
- static std::unique_ptr<TraceBuffez> Create(size_t size_in_bytes);
+ static std::unique_ptr<TraceBuffer> Create(size_t size_in_bytes);
- ~TraceBuffez();
+ ~TraceBuffer();
// Copies a Chunk from a producer Shared Memory Buffer into the trace buffer.
// |src| points to the first packet in the SharedMemoryABI's chunk shared
@@ -399,9 +396,9 @@
kFailedStayOnSameSequence,
};
- TraceBuffez();
- TraceBuffez(const TraceBuffez&) = delete;
- TraceBuffez& operator=(const TraceBuffez&) = delete;
+ TraceBuffer();
+ TraceBuffer(const TraceBuffer&) = delete;
+ TraceBuffer& operator=(const TraceBuffer&) = delete;
bool Initialize(size_t size);
diff --git a/src/tracing/core/trace_buffer_unittest.cc b/src/tracing/core/trace_buffer_unittest.cc
index c12c8e3..3031b3b 100644
--- a/src/tracing/core/trace_buffer_unittest.cc
+++ b/src/tracing/core/trace_buffer_unittest.cc
@@ -39,9 +39,9 @@
class TraceBufferTest : public testing::Test {
public:
- using SequenceIterator = TraceBuffez::SequenceIterator;
- using ChunkMetaKey = TraceBuffez::ChunkMeta::Key;
- using ChunkRecord = TraceBuffez::ChunkRecord;
+ using SequenceIterator = TraceBuffer::SequenceIterator;
+ using ChunkMetaKey = TraceBuffer::ChunkMeta::Key;
+ using ChunkRecord = TraceBuffer::ChunkRecord;
static constexpr uint8_t kContFromPrevChunk =
SharedMemoryABI::ChunkHeader::kFirstPacketContinuesFromPrevChunk;
@@ -55,14 +55,14 @@
}
void ResetBuffer(size_t size_) {
- trace_buffer_ = TraceBuffez::Create(size_);
+ trace_buffer_ = TraceBuffer::Create(size_);
ASSERT_TRUE(trace_buffer_);
}
bool TryPatchChunkContents(ProducerID p,
WriterID w,
ChunkID c,
- std::vector<TraceBuffez::Patch> patches,
+ std::vector<TraceBuffer::Patch> patches,
bool other_patches_pending = false) {
return trace_buffer_->TryPatchChunkContents(
p, w, c, patches.data(), patches.size(), other_patches_pending);
@@ -109,7 +109,7 @@
}
SequenceIterator GetReadIterForSequence(ProducerID p, WriterID w) {
- TraceBuffez::ChunkMeta::Key key(p, w, 0);
+ TraceBuffer::ChunkMeta::Key key(p, w, 0);
return trace_buffer_->GetReadIterForSequence(
trace_buffer_->index_.lower_bound(key));
}
@@ -126,11 +126,11 @@
return keys;
}
- TraceBuffez* trace_buffer() { return trace_buffer_.get(); }
+ TraceBuffer* trace_buffer() { return trace_buffer_.get(); }
size_t size_to_end() { return trace_buffer_->size_to_end(); }
private:
- std::unique_ptr<TraceBuffez> trace_buffer_;
+ std::unique_ptr<TraceBuffer> trace_buffer_;
};
// ----------------------
diff --git a/src/tracing/test/fake_packet.cc b/src/tracing/test/fake_packet.cc
index fd5ca05..2a254da 100644
--- a/src/tracing/test/fake_packet.cc
+++ b/src/tracing/test/fake_packet.cc
@@ -103,7 +103,7 @@
<< packet.payload() << "\"}";
}
-FakeChunk::FakeChunk(TraceBuffez* t, ProducerID p, WriterID w, ChunkID c)
+FakeChunk::FakeChunk(TraceBuffer* t, ProducerID p, WriterID w, ChunkID c)
: trace_buffer_{t}, producer_id{p}, writer_id{w}, chunk_id{c} {}
FakeChunk& FakeChunk::AddPacket(size_t size, char seed, uint8_t packet_flag) {
@@ -141,7 +141,7 @@
trace_buffer_->CopyChunkUntrusted(producer_id, uid, writer_id, chunk_id,
num_packets, flags, data.data(),
data.size());
- return data.size() + TraceBuffez::InlineChunkHeaderSize;
+ return data.size() + TraceBuffer::InlineChunkHeaderSize;
}
} // namespace perfetto
diff --git a/src/tracing/test/fake_packet.h b/src/tracing/test/fake_packet.h
index daab5e8..b3e56d8 100644
--- a/src/tracing/test/fake_packet.h
+++ b/src/tracing/test/fake_packet.h
@@ -28,7 +28,7 @@
namespace perfetto {
-class TraceBuffez;
+class TraceBuffer;
class FakePacketFragment {
public:
@@ -51,7 +51,7 @@
class FakeChunk {
public:
- FakeChunk(TraceBuffez* t, ProducerID p, WriterID w, ChunkID c);
+ FakeChunk(TraceBuffer* t, ProducerID p, WriterID w, ChunkID c);
// Appends a packet of exactly |size| bytes (including the varint header
// that states the size of the packet itself. The payload of the packet is
@@ -70,7 +70,7 @@
size_t CopyIntoTraceBuffer();
private:
- TraceBuffez* trace_buffer_;
+ TraceBuffer* trace_buffer_;
ProducerID producer_id;
WriterID writer_id;
ChunkID chunk_id;
