diff --git a/centipede/analyze_corpora.cc b/centipede/analyze_corpora.cc index 3f6a3f24..42654ab7 100644 --- a/centipede/analyze_corpora.cc +++ b/centipede/analyze_corpora.cc @@ -131,14 +131,13 @@ AnalyzeCorporaResults AnalyzeCorpora(const BinaryInfo &binary_info, << VV(b_shared_indices.size()) << VV(b_unique_indices.size()); // Sort PCs to put them in the canonical order, as in pc_table. - AnalyzeCorporaResults ret = { - .a_pcs = std::vector{a_pcs.begin(), a_pcs.end()}, - .b_pcs = std::vector{b_pcs.begin(), b_pcs.end()}, - .a_only_pcs = std::vector{a_only_pcs.begin(), a_only_pcs.end()}, - .b_only_pcs = std::vector{b_only_pcs.begin(), b_only_pcs.end()}, - .a_pc_to_corpus_record = std::move(a_pc_to_corpus), - .b_pc_to_corpus_record = std::move(b_pc_to_corpus), - }; + AnalyzeCorporaResults ret; + ret.a_pcs = std::vector{a_pcs.begin(), a_pcs.end()}; + ret.b_pcs = std::vector{b_pcs.begin(), b_pcs.end()}; + ret.a_only_pcs = std::vector{a_only_pcs.begin(), a_only_pcs.end()}; + ret.b_only_pcs = std::vector{b_only_pcs.begin(), b_only_pcs.end()}; + ret.a_pc_to_corpus_record = std::move(a_pc_to_corpus); + ret.b_pc_to_corpus_record = std::move(b_pc_to_corpus); std::sort(ret.a_pcs.begin(), ret.a_pcs.end()); std::sort(ret.b_pcs.begin(), ret.b_pcs.end()); std::sort(ret.a_only_pcs.begin(), ret.a_only_pcs.end()); @@ -160,8 +159,8 @@ CoverageResults GetCoverage(const std::vector &corpus_records, } } CoverageResults ret = { - .pcs = {pcs.begin(), pcs.end()}, - .binary_info = std::move(binary_info), + /*pcs=*/{pcs.begin(), pcs.end()}, + /*binary_info=*/std::move(binary_info), }; // Sort PCs to put them in the canonical order, as in pc_table. std::sort(ret.pcs.begin(), ret.pcs.end()); diff --git a/centipede/batch_fuzz_example/customized_centipede_test.cc b/centipede/batch_fuzz_example/customized_centipede_test.cc index 5adf9640..bdbcec9e 100644 --- a/centipede/batch_fuzz_example/customized_centipede_test.cc +++ b/centipede/batch_fuzz_example/customized_centipede_test.cc @@ -57,7 +57,8 @@ std::string GetTargetPath() { TEST(BatchFuzzWithExecutionResults, SucceedsToCollectCoverageForTwoInputs) { const std::string target_path = GetTargetPath(); - Environment env = {.binary = target_path}; + Environment env; + env.binary = target_path; CustomizedCallbacks callbacks(env, /*feature_only_feedback=*/false); BatchResult batch_result; @@ -70,7 +71,8 @@ TEST(BatchFuzzWithExecutionResults, SucceedsToCollectCoverageForTwoInputs) { TEST(BatchFuzzWithExecutionResults, CollectsTheSameCoverageForSameInputs) { const std::string target_path = GetTargetPath(); - const Environment env = {.binary = GetTargetPath()}; + Environment env; + env.binary = target_path; CustomizedCallbacks callbacks(env, /*feature_only_feedback=*/false); BatchResult batch_result; @@ -95,7 +97,8 @@ MATCHER_P(HasFeaturesOnly, features_matcher, "") { TEST(BatchFuzzWithCoverageData, SucceedsToCollectCoverageForTwoInputs) { const std::string target_path = GetTargetPath(); - const Environment env = {.binary = GetTargetPath()}; + Environment env; + env.binary = target_path; CustomizedCallbacks callbacks(env, /*feature_only_feedback=*/true); BatchResult batch_result; @@ -107,7 +110,8 @@ TEST(BatchFuzzWithCoverageData, SucceedsToCollectCoverageForTwoInputs) { TEST(BatchFuzzWithCoverageData, CollectsTheSameCoverageForSameInputs) { const std::string target_path = GetTargetPath(); - const Environment env = {.binary = target_path}; + Environment env; + env.binary = target_path; CustomizedCallbacks callbacks(env, /*feature_only_feedback=*/true); BatchResult batch_result; diff --git a/centipede/binary_info_test.cc b/centipede/binary_info_test.cc index 256a1ea9..171f06d4 100644 --- a/centipede/binary_info_test.cc +++ b/centipede/binary_info_test.cc @@ -30,7 +30,7 @@ namespace { TEST(BinaryInfoTest, SerializesAndDeserializesBinaryInfoSuccessfully) { const std::string temp_dir = GetTestTempDir(test_info_->name()); - const PCTable input_pcs = {{.pc = 0, .flags = 1}, {.pc = 2, .flags = 3}}; + const PCTable input_pcs = {{/*pc=*/0, /*flags=*/1}, {/*pc=*/2, /*flags=*/3}}; std::string input_symbols = R"(FunctionOne source/location/one.cc:1:0 @@ -43,9 +43,10 @@ TEST(BinaryInfoTest, SerializesAndDeserializesBinaryInfoSuccessfully) { std::istringstream input_stream(input_symbols); SymbolTable symbol_table; symbol_table.ReadFromLLVMSymbolizer(input_stream); - BinaryInfo input = {.pc_table = input_pcs, - .symbols = std::move(symbol_table), - .cf_table = cf_table}; + BinaryInfo input; + input.pc_table = input_pcs; + input.symbols = std::move(symbol_table); + input.cf_table = cf_table; input.Write(temp_dir); BinaryInfo output; output.Read(temp_dir); @@ -64,9 +65,10 @@ TEST(BinaryInfoTest, SerializesAndDeserializesEmptyBinaryInfoSuccessfully) { std::istringstream input_stream(input_symbols); SymbolTable symbol_table; symbol_table.ReadFromLLVMSymbolizer(input_stream); - BinaryInfo input = {.pc_table = input_pcs, - .symbols = std::move(symbol_table), - .cf_table = cf_table}; + BinaryInfo input; + input.pc_table = input_pcs; + input.symbols = std::move(symbol_table); + input.cf_table = cf_table; input.Write(temp_dir); BinaryInfo output; output.Read(temp_dir); diff --git a/centipede/byte_array_mutator_test.cc b/centipede/byte_array_mutator_test.cc index 997fb8bf..aacecf3a 100644 --- a/centipede/byte_array_mutator_test.cc +++ b/centipede/byte_array_mutator_test.cc @@ -106,23 +106,23 @@ TEST(DictEntry, DictEntry) { TEST(CmpDictionary, CmpDictionary) { CmpDictionary dict; - ExecutionMetadata metadata{.cmp_data = { - 2, // size - 1, 2, // a - 3, 4, // b - 3, // size - 5, 6, 7, // a - 8, 9, 10, // b - 4, // size - 11, 12, 13, 14, // a - 15, 16, 17, 18, // b - 3, // size - 20, 21, 22, // a - 15, 16, 17, // b - 3, // size - 15, 16, 20, // a - 30, 40, 50, // b - }}; + ExecutionMetadata metadata{/*cmp_data=*/{ + 2, // size + 1, 2, // a + 3, 4, // b + 3, // size + 5, 6, 7, // a + 8, 9, 10, // b + 4, // size + 11, 12, 13, 14, // a + 15, 16, 17, 18, // b + 3, // size + 20, 21, 22, // a + 15, 16, 17, // b + 3, // size + 15, 16, 20, // a + 30, 40, 50, // b + }}; EXPECT_TRUE(dict.SetFromMetadata(metadata)); using S = ByteSpan; @@ -206,7 +206,7 @@ void TestMutatorFn(ByteArrayMutator::Fn fn, const ByteArray &seed, EXPECT_TRUE(mutator.set_size_alignment(size_alignment)); EXPECT_TRUE(mutator.set_max_len(max_len)); mutator.AddToDictionary(dictionary); - mutator.SetMetadata({.cmp_data = {cmp_data.begin(), cmp_data.end()}}); + mutator.SetMetadata({/*cmp_data=*/{cmp_data.begin(), cmp_data.end()}}); absl::flat_hash_set expected(expected_mutants.begin(), expected_mutants.end()); absl::flat_hash_set unexpected(unexpected_mutants.begin(), diff --git a/centipede/centipede.cc b/centipede/centipede.cc index a5b1834a..126b4c04 100644 --- a/centipede/centipede.cc +++ b/centipede/centipede.cc @@ -221,57 +221,58 @@ void Centipede::UpdateAndMaybeLogStats(std::string_view log_type, stats_.store(Stats{ StatsMeta{ - .timestamp_unix_micros = - static_cast(absl::ToUnixMicros(absl::Now())), + /*timestamp_unix_micros=*/ + static_cast(absl::ToUnixMicros(absl::Now())), }, ExecStats{ - .fuzz_time_sec = static_cast(std::ceil(fuzz_time_secs)), - .num_executions = num_runs_, - .num_target_crashes = static_cast(num_crashes_), + /*fuzz_time_sec=*/static_cast(std::ceil(fuzz_time_secs)), + /*num_executions*/ num_runs_, + /*num_target_crashes*/ static_cast(num_crashes_), }, CovStats{ - .num_covered_pcs = fs_.CountFeatures(fd::kPCs), - .num_8bit_counter_features = fs_.CountFeatures(fd::k8bitCounters), - .num_data_flow_features = fs_.CountFeatures(fd::kDataFlow), - .num_cmp_features = fs_.CountFeatures(fd::kCMPDomains), - .num_call_stack_features = fs_.CountFeatures(fd::kCallStack), - .num_bounded_path_features = fs_.CountFeatures(fd::kBoundedPath), - .num_pc_pair_features = fs_.CountFeatures(fd::kPCPair), - .num_user_features = fs_.CountFeatures(fd::kUserDomains), - .num_user0_features = fs_.CountFeatures(fd::kUserDomains[0]), - .num_user1_features = fs_.CountFeatures(fd::kUserDomains[1]), - .num_user2_features = fs_.CountFeatures(fd::kUserDomains[2]), - .num_user3_features = fs_.CountFeatures(fd::kUserDomains[3]), - .num_user4_features = fs_.CountFeatures(fd::kUserDomains[4]), - .num_user5_features = fs_.CountFeatures(fd::kUserDomains[5]), - .num_user6_features = fs_.CountFeatures(fd::kUserDomains[6]), - .num_user7_features = fs_.CountFeatures(fd::kUserDomains[7]), - .num_user8_features = fs_.CountFeatures(fd::kUserDomains[8]), - .num_user9_features = fs_.CountFeatures(fd::kUserDomains[9]), - .num_user10_features = fs_.CountFeatures(fd::kUserDomains[10]), - .num_user11_features = fs_.CountFeatures(fd::kUserDomains[11]), - .num_user12_features = fs_.CountFeatures(fd::kUserDomains[12]), - .num_user13_features = fs_.CountFeatures(fd::kUserDomains[13]), - .num_user14_features = fs_.CountFeatures(fd::kUserDomains[14]), - .num_user15_features = fs_.CountFeatures(fd::kUserDomains[15]), - .num_unknown_features = fs_.CountFeatures(fd::kUnknown), - .num_funcs_in_frontier = coverage_frontier_.NumFunctionsInFrontier(), + /*num_covered_pcs=*/fs_.CountFeatures(fd::kPCs), + /*num_8bit_counter_features=*/fs_.CountFeatures(fd::k8bitCounters), + /*num_data_flow_features=*/fs_.CountFeatures(fd::kDataFlow), + /*num_cmp_features=*/fs_.CountFeatures(fd::kCMPDomains), + /*num_call_stack_features=*/fs_.CountFeatures(fd::kCallStack), + /*num_bounded_path_features=*/fs_.CountFeatures(fd::kBoundedPath), + /*num_pc_pair_features=*/fs_.CountFeatures(fd::kPCPair), + /*num_user_features=*/fs_.CountFeatures(fd::kUserDomains), + /*num_user0_features=*/fs_.CountFeatures(fd::kUserDomains[0]), + /*num_user1_features=*/fs_.CountFeatures(fd::kUserDomains[1]), + /*num_user2_features=*/fs_.CountFeatures(fd::kUserDomains[2]), + /*num_user3_features=*/fs_.CountFeatures(fd::kUserDomains[3]), + /*num_user4_features=*/fs_.CountFeatures(fd::kUserDomains[4]), + /*num_user5_features=*/fs_.CountFeatures(fd::kUserDomains[5]), + /*num_user6_features=*/fs_.CountFeatures(fd::kUserDomains[6]), + /*num_user7_features=*/fs_.CountFeatures(fd::kUserDomains[7]), + /*num_user8_features=*/fs_.CountFeatures(fd::kUserDomains[8]), + /*num_user9_features=*/fs_.CountFeatures(fd::kUserDomains[9]), + /*num_user10_features=*/fs_.CountFeatures(fd::kUserDomains[10]), + /*num_user11_features=*/fs_.CountFeatures(fd::kUserDomains[11]), + /*num_user12_features=*/fs_.CountFeatures(fd::kUserDomains[12]), + /*num_user13_features=*/fs_.CountFeatures(fd::kUserDomains[13]), + /*num_user14_features=*/fs_.CountFeatures(fd::kUserDomains[14]), + /*num_user15_features=*/fs_.CountFeatures(fd::kUserDomains[15]), + /*num_unknown_features=*/fs_.CountFeatures(fd::kUnknown), + /*num_funcs_in_frontier=*/coverage_frontier_.NumFunctionsInFrontier(), }, CorpusStats{ - .active_corpus_size = corpus_.NumActive(), - .total_corpus_size = corpus_.NumTotal(), - .max_corpus_element_size = max_corpus_size, - .avg_corpus_element_size = avg_corpus_size, + /*active_corpus_size=*/corpus_.NumActive(), + /*total_corpus_size=*/corpus_.NumTotal(), + /*max_corpus_element_size=*/max_corpus_size, + /*avg_corpus_element_size=*/avg_corpus_size, }, RusageStats{ - .engine_rusage_avg_millicores = static_cast( + /*engine_rusage_avg_millicores=*/static_cast( std::lround(rusage_timing.cpu_hyper_cores * 1000)), - .engine_rusage_cpu_percent = static_cast( + /*engine_rusage_cpu_percent=*/ + static_cast( std::lround(rusage_timing.cpu_utilization * 100)), - .engine_rusage_rss_mb = - static_cast(rusage_memory.mem_rss >> 20), - .engine_rusage_vsize_mb = - static_cast(rusage_memory.mem_vsize >> 20), + /*engine_rusage_rss_mb=*/ + static_cast(rusage_memory.mem_rss >> 20), + /*engine_rusage_vsize_mb=*/ + static_cast(rusage_memory.mem_vsize >> 20), }, }); diff --git a/centipede/centipede_interface.cc b/centipede/centipede_interface.cc index 0e16d1e4..c096263e 100644 --- a/centipede/centipede_interface.cc +++ b/centipede/centipede_interface.cc @@ -209,10 +209,10 @@ int Fuzz(const Environment &env, const BinaryInfo &binary_info, csv_appender.ReportCurrStats(); }, PeriodicAction::Options{ - .sleep_before_each = - [](size_t iteration) { - return absl::Minutes(std::clamp(iteration, 0UL, 10UL)); - }, + /*sleep_before_each=*/ + [](size_t iteration) { + return absl::Minutes(std::clamp(iteration, 0UL, 10UL)); + }, }); if (!envs.front().experiment.empty() || ABSL_VLOG_IS_ON(1)) { stats_reporters.emplace_back( @@ -220,10 +220,10 @@ int Fuzz(const Environment &env, const BinaryInfo &binary_info, logger.ReportCurrStats(); }, PeriodicAction::Options{ - .sleep_before_each = - [](size_t iteration) { - return absl::Seconds(std::clamp(iteration, 5UL, 600UL)); - }, + /*sleep_before_each=*/ + [](size_t iteration) { + return absl::Seconds(std::clamp(iteration, 5UL, 600UL)); + }, }); }