Skip to content

Commit 9c6097a

Browse files
committed
Reuse class-level buf in LogDelegateIntermediateOutput test instead of reallocating
1 parent 4174f48 commit 9c6097a

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

devtools/etdump/tests/etdump_test.cpp

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -512,10 +512,11 @@ static void et_expect_death_log_delegate(
512512
TEST_F(ProfilerETDumpTest, LogDelegateIntermediateOutput) {
513513
const size_t debug_buf_size = 2048;
514514
const size_t etdump_buf_size = 512 * 1024;
515+
ASSERT_NE(this->buf, nullptr);
516+
Span<uint8_t> span_buf = Span<uint8_t>(this->buf, etdump_buf_size);
515517

516518
for (size_t i = 0; i < 2; i++) {
517519
for (size_t j = 0; j < 3; j++) {
518-
uint8_t* buf = nullptr;
519520
void* ptr = malloc(debug_buf_size);
520521
Span<uint8_t> buffer((uint8_t*)ptr, debug_buf_size);
521522

@@ -526,21 +527,16 @@ TEST_F(ProfilerETDumpTest, LogDelegateIntermediateOutput) {
526527
TensorFactory<ScalarType::Float> tf;
527528

528529
if (j == 0) {
529-
// Use span to record debug data
530530
et_expect_death_log_delegate(etdump_gen[i], tf);
531+
532+
// Use span to record debug data
531533
etdump_gen[i]->set_debug_buffer(buffer);
532534
} else {
533-
buf = (uint8_t*)malloc(etdump_buf_size * sizeof(uint8_t));
534-
535-
// Wrap buffer in span for ETDumGen constructor
536-
Span<uint8_t> span_buf(buf, etdump_buf_size);
537-
538535
// Reset ETDumpGen to correctly trigger ET_EXPECT_DEATH
539536
delete etdump_gen[i];
540537

541538
// Recreate ETDumpGen; use span buffer only for etdump_gen[1]
542539
etdump_gen[i] = (i == 0) ? new ETDumpGen() : new ETDumpGen(span_buf);
543-
544540
etdump_gen[i]->create_event_block("test_block");
545541
et_expect_death_log_delegate(etdump_gen[i], tf);
546542

@@ -592,9 +588,6 @@ TEST_F(ProfilerETDumpTest, LogDelegateIntermediateOutput) {
592588
if (!etdump_gen[i]->is_static_etdump()) {
593589
free(result.buf);
594590
}
595-
if (buf) {
596-
free(buf);
597-
}
598591
}
599592
}
600593
}

0 commit comments

Comments
 (0)