#Centipede Refactor names
File names: execution_{request,result}{.h,.cc,_test.cc} -> runner_{request,result}{.h,.cc,_test.cc}
Namespaces names: execution_request -> runner_request
This is because the files/namespaces now cover not only the execution requests/results, but for all runner requests/results.
PiperOrigin-RevId: 561057272
diff --git a/centipede/BUILD b/centipede/BUILD
index c568abb..9d505be 100644
--- a/centipede/BUILD
+++ b/centipede/BUILD
@@ -356,9 +356,9 @@
)
cc_library(
- name = "execution_result",
- srcs = ["execution_result.cc"],
- hdrs = ["execution_result.h"],
+ name = "runner_result",
+ srcs = ["runner_result.cc"],
+ hdrs = ["runner_result.h"],
visibility = PUBLIC_API_VISIBILITY,
deps = [
# This target must have a minimal set of dependencies since it is
@@ -371,9 +371,9 @@
)
cc_library(
- name = "execution_request",
- srcs = ["execution_request.cc"],
- hdrs = ["execution_request.h"],
+ name = "runner_request",
+ srcs = ["runner_request.cc"],
+ hdrs = ["runner_request.h"],
deps = [
# This target must have a minimal set of dependencies since it is
# used in centipede_runner.
@@ -587,12 +587,12 @@
":control_flow",
":defs",
":environment",
- ":execution_request",
- ":execution_result",
":fuzztest_mutator",
":knobs",
":logging",
":mutation_input",
+ ":runner_request",
+ ":runner_result",
":shared_memory_blob_sequence",
":util",
"@com_google_absl//absl/strings",
@@ -631,11 +631,11 @@
":coverage",
":defs",
":environment",
- ":execution_result",
":feature",
":feature_set",
":logging",
":remote_file",
+ ":runner_result",
":rusage_profiler",
":rusage_stats",
":shard_reader",
@@ -733,8 +733,8 @@
":centipede_interface",
":defs",
":environment",
- ":execution_result",
":logging",
+ ":runner_result",
],
)
@@ -801,10 +801,10 @@
"defs.h",
"execution_metadata.cc",
"execution_metadata.h",
- "execution_request.cc",
- "execution_request.h",
- "execution_result.cc",
- "execution_result.h",
+ "runner_request.cc",
+ "runner_request.h",
+ "runner_result.cc",
+ "runner_result.h",
"feature.cc",
"feature.h",
"foreach_nonzero.h",
@@ -1143,11 +1143,11 @@
)
cc_test(
- name = "execution_result_test",
- srcs = ["execution_result_test.cc"],
+ name = "runner_result_test",
+ srcs = ["runner_result_test.cc"],
deps = [
- ":execution_result",
":feature",
+ ":runner_result",
":shared_memory_blob_sequence",
":test_util",
"@com_google_googletest//:gtest_main",
diff --git a/centipede/batch_fuzz_example/BUILD b/centipede/batch_fuzz_example/BUILD
index a28c229..4b19851 100644
--- a/centipede/batch_fuzz_example/BUILD
+++ b/centipede/batch_fuzz_example/BUILD
@@ -41,7 +41,7 @@
"@com_google_fuzztest//centipede:config_file",
"@com_google_fuzztest//centipede:defs",
"@com_google_fuzztest//centipede:environment",
- "@com_google_fuzztest//centipede:execution_result",
+ "@com_google_fuzztest//centipede:runner_result",
"@com_google_fuzztest//centipede:shared_memory_blob_sequence",
"@com_google_fuzztest//centipede:util",
],
diff --git a/centipede/batch_fuzz_example/customized_centipede.cc b/centipede/batch_fuzz_example/customized_centipede.cc
index 838d371..63fe799 100644
--- a/centipede/batch_fuzz_example/customized_centipede.cc
+++ b/centipede/batch_fuzz_example/customized_centipede.cc
@@ -28,7 +28,7 @@
#include "./centipede/config_file.h"
#include "./centipede/defs.h"
#include "./centipede/environment.h"
-#include "./centipede/execution_result.h"
+#include "./centipede/runner_result.h"
#include "./centipede/shared_memory_blob_sequence.h"
#include "./centipede/util.h"
diff --git a/centipede/centipede.cc b/centipede/centipede.cc
index 40d04fb..d46fada 100644
--- a/centipede/centipede.cc
+++ b/centipede/centipede.cc
@@ -68,11 +68,11 @@
#include "./centipede/coverage.h"
#include "./centipede/defs.h"
#include "./centipede/environment.h"
-#include "./centipede/execution_result.h"
#include "./centipede/feature.h"
#include "./centipede/feature_set.h"
#include "./centipede/logging.h"
#include "./centipede/remote_file.h"
+#include "./centipede/runner_result.h"
#include "./centipede/rusage_profiler.h"
#include "./centipede/rusage_stats.h"
#include "./centipede/shard_reader.h"
diff --git a/centipede/centipede.h b/centipede/centipede.h
index 6e27cd9..1657e16 100644
--- a/centipede/centipede.h
+++ b/centipede/centipede.h
@@ -28,7 +28,7 @@
#include "./centipede/coverage.h"
#include "./centipede/defs.h"
#include "./centipede/environment.h"
-#include "./centipede/execution_result.h"
+#include "./centipede/runner_result.h"
#include "./centipede/rusage_profiler.h"
#include "./centipede/stats.h"
#include "./centipede/symbol_table.h"
diff --git a/centipede/centipede_callbacks.cc b/centipede/centipede_callbacks.cc
index 10c835f..59314bb 100644
--- a/centipede/centipede_callbacks.cc
+++ b/centipede/centipede_callbacks.cc
@@ -28,9 +28,9 @@
#include "./centipede/command.h"
#include "./centipede/control_flow.h"
#include "./centipede/defs.h"
-#include "./centipede/execution_request.h"
-#include "./centipede/execution_result.h"
#include "./centipede/logging.h"
+#include "./centipede/runner_request.h"
+#include "./centipede/runner_result.h"
#include "./centipede/util.h"
namespace centipede {
@@ -153,7 +153,7 @@
} else {
// Feed the inputs to inputs_blobseq_.
num_inputs_written =
- execution_request::RequestExecution(inputs, inputs_blobseq_);
+ runner_request::RequestExecution(inputs, inputs_blobseq_);
}
if (num_inputs_written != inputs.size()) {
@@ -218,8 +218,8 @@
inputs_blobseq_.Reset();
outputs_blobseq_.Reset();
- size_t num_inputs_written = execution_request::RequestMutation(
- mutants.size(), inputs, inputs_blobseq_);
+ size_t num_inputs_written =
+ runner_request::RequestMutation(mutants.size(), inputs, inputs_blobseq_);
LOG_IF(INFO, num_inputs_written != inputs.size())
<< VV(num_inputs_written) << VV(inputs.size());
diff --git a/centipede/centipede_callbacks.h b/centipede/centipede_callbacks.h
index 4d65099..287893b 100644
--- a/centipede/centipede_callbacks.h
+++ b/centipede/centipede_callbacks.h
@@ -28,12 +28,12 @@
#include "./centipede/control_flow.h"
#include "./centipede/defs.h"
#include "./centipede/environment.h"
-#include "./centipede/execution_request.h"
-#include "./centipede/execution_result.h"
#include "./centipede/fuzztest_mutator.h"
#include "./centipede/knobs.h"
#include "./centipede/logging.h"
#include "./centipede/mutation_input.h"
+#include "./centipede/runner_request.h"
+#include "./centipede/runner_result.h"
#include "./centipede/shared_memory_blob_sequence.h"
#include "./centipede/symbol_table.h"
#include "./centipede/util.h"
diff --git a/centipede/centipede_default_callbacks.h b/centipede/centipede_default_callbacks.h
index a306b29..3e3e7db 100644
--- a/centipede/centipede_default_callbacks.h
+++ b/centipede/centipede_default_callbacks.h
@@ -26,7 +26,7 @@
#include <vector>
#include "./centipede/centipede_interface.h"
-#include "./centipede/execution_result.h"
+#include "./centipede/runner_result.h"
namespace centipede {
diff --git a/centipede/runner.cc b/centipede/runner.cc
index 5f08cf2..96ed7bc 100644
--- a/centipede/runner.cc
+++ b/centipede/runner.cc
@@ -43,13 +43,13 @@
#include "./centipede/byte_array_mutator.h"
#include "./centipede/defs.h"
-#include "./centipede/execution_request.h"
-#include "./centipede/execution_result.h"
#include "./centipede/feature.h"
#include "./centipede/foreach_nonzero.h"
#include "./centipede/pc_info.h"
#include "./centipede/runner_dl_info.h"
#include "./centipede/runner_interface.h"
+#include "./centipede/runner_request.h"
+#include "./centipede/runner_result.h"
#include "./centipede/runner_utils.h"
#include "./centipede/shared_memory_blob_sequence.h"
@@ -618,9 +618,9 @@
BlobSequence &outputs_blobseq,
RunnerCallbacks &callbacks) {
size_t num_inputs = 0;
- if (!execution_request::IsExecutionRequest(inputs_blobseq.Read()))
+ if (!runner_request::IsExecutionRequest(inputs_blobseq.Read()))
return EXIT_FAILURE;
- if (!execution_request::IsNumInputs(inputs_blobseq.Read(), num_inputs))
+ if (!runner_request::IsNumInputs(inputs_blobseq.Read(), num_inputs))
return EXIT_FAILURE;
PrepareCoverage(/*full_clear=*/true); // Clear the startup coverage.
@@ -629,7 +629,7 @@
auto blob = inputs_blobseq.Read();
// TODO(kcc): distinguish bad input from end of stream.
if (!blob.IsValid()) return EXIT_SUCCESS; // no more blobs to read.
- if (!execution_request::IsDataInput(blob)) return EXIT_FAILURE;
+ if (!runner_request::IsDataInput(blob)) return EXIT_FAILURE;
// TODO(kcc): [impl] handle sizes larger than kMaxDataSize.
size_t size = std::min(kMaxDataSize, blob.size);
@@ -710,11 +710,11 @@
// Read max_num_mutants.
size_t num_mutants = 0;
size_t num_inputs = 0;
- if (!execution_request::IsMutationRequest(inputs_blobseq.Read()))
+ if (!runner_request::IsMutationRequest(inputs_blobseq.Read()))
return EXIT_FAILURE;
- if (!execution_request::IsNumMutants(inputs_blobseq.Read(), num_mutants))
+ if (!runner_request::IsNumMutants(inputs_blobseq.Read(), num_mutants))
return EXIT_FAILURE;
- if (!execution_request::IsNumInputs(inputs_blobseq.Read(), num_inputs))
+ if (!runner_request::IsNumInputs(inputs_blobseq.Read(), num_inputs))
return EXIT_FAILURE;
// Mutation input with ownership.
@@ -734,12 +734,11 @@
// If inputs_blobseq have overflown in the engine, we still want to
// handle the first few inputs.
ExecutionMetadata metadata;
- if (!execution_request::IsExecutionMetadata(inputs_blobseq.Read(),
- metadata)) {
+ if (!runner_request::IsExecutionMetadata(inputs_blobseq.Read(), metadata)) {
break;
}
auto blob = inputs_blobseq.Read();
- if (!execution_request::IsDataInput(blob)) break;
+ if (!runner_request::IsDataInput(blob)) break;
inputs.push_back({.data = {blob.data, blob.data + blob.size},
.metadata = std::move(metadata)});
input_refs.push_back(
@@ -938,7 +937,7 @@
SharedMemoryBlobSequence outputs_blobseq(state.arg2);
// Read the first blob. It indicates what further actions to take.
auto request_type_blob = inputs_blobseq.Read();
- if (execution_request::IsMutationRequest(request_type_blob)) {
+ if (runner_request::IsMutationRequest(request_type_blob)) {
// Since we are mutating, no need to spend time collecting the coverage.
// We still pay for executing the coverage callbacks, but those will
// return immediately.
@@ -953,7 +952,7 @@
new ByteArrayMutator(state.knobs, GetRandomSeed());
return MutateInputsFromShmem(inputs_blobseq, outputs_blobseq, callbacks);
}
- if (execution_request::IsExecutionRequest(request_type_blob)) {
+ if (runner_request::IsExecutionRequest(request_type_blob)) {
// Execution request.
inputs_blobseq.Reset();
return ExecuteInputsFromShmem(inputs_blobseq, outputs_blobseq, callbacks);
diff --git a/centipede/runner.h b/centipede/runner.h
index be64ce3..c40ef17 100644
--- a/centipede/runner.h
+++ b/centipede/runner.h
@@ -30,7 +30,6 @@
#include "./centipede/callstack.h"
#include "./centipede/concurrent_bitset.h"
#include "./centipede/concurrent_byteset.h"
-#include "./centipede/execution_result.h"
#include "./centipede/feature.h"
#include "./centipede/hashed_ring_buffer.h"
#include "./centipede/knobs.h"
@@ -38,6 +37,7 @@
#include "./centipede/reverse_pc_table.h"
#include "./centipede/runner_cmp_trace.h"
#include "./centipede/runner_dl_info.h"
+#include "./centipede/runner_result.h"
#include "./centipede/runner_sancov_object.h"
namespace centipede {
diff --git a/centipede/execution_request.cc b/centipede/runner_request.cc
similarity index 96%
rename from centipede/execution_request.cc
rename to centipede/runner_request.cc
index cdb4508..26761d6 100644
--- a/centipede/execution_request.cc
+++ b/centipede/runner_request.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "./centipede/execution_request.h"
+#include "./centipede/runner_request.h"
#include <cstring>
#include <vector>
@@ -72,7 +72,7 @@
} // namespace
-namespace execution_request {
+namespace runner_request {
size_t RequestExecution(const std::vector<ByteArray> &inputs,
BlobSequence &blobseq) {
@@ -114,6 +114,6 @@
bool IsDataInput(Blob blob) { return blob.tag == kTagDataInput; }
-} // namespace execution_request
+} // namespace runner_request
} // namespace centipede
diff --git a/centipede/execution_request.h b/centipede/runner_request.h
similarity index 96%
rename from centipede/execution_request.h
rename to centipede/runner_request.h
index 26cac17..3d7d83c 100644
--- a/centipede/execution_request.h
+++ b/centipede/runner_request.h
@@ -25,7 +25,7 @@
#include "./centipede/mutation_input.h"
#include "./centipede/shared_memory_blob_sequence.h"
-namespace centipede::execution_request {
+namespace centipede::runner_request {
// Sends a request (via `blobseq`) to execute `inputs`.
// Returns the number of sent inputs, which would normally be inputs.size().
@@ -59,6 +59,6 @@
// Returns true iff `blob` indicates a data input.
bool IsDataInput(Blob blob);
-} // namespace centipede::execution_request
+} // namespace centipede::runner_request
#endif // THIRD_PARTY_CENTIPEDE_EXECUTION_REQUEST_H_
diff --git a/centipede/execution_result.cc b/centipede/runner_result.cc
similarity index 98%
rename from centipede/execution_result.cc
rename to centipede/runner_result.cc
index e6a1b7d..ef1ab6b 100644
--- a/centipede/execution_result.cc
+++ b/centipede/runner_result.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "./centipede/execution_result.h"
+#include "./centipede/runner_result.h"
#include <cstdint>
#include <cstring>
diff --git a/centipede/execution_result.h b/centipede/runner_result.h
similarity index 100%
rename from centipede/execution_result.h
rename to centipede/runner_result.h
diff --git a/centipede/execution_result_test.cc b/centipede/runner_result_test.cc
similarity index 99%
rename from centipede/execution_result_test.cc
rename to centipede/runner_result_test.cc
index 7ccf5a2..19cb660 100644
--- a/centipede/execution_result_test.cc
+++ b/centipede/runner_result_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "./centipede/execution_result.h"
+#include "./centipede/runner_result.h"
#include <cstdint>
#include <fstream>
diff --git a/centipede/testing/BUILD b/centipede/testing/BUILD
index 7040d3c..9f6a2a1 100644
--- a/centipede/testing/BUILD
+++ b/centipede/testing/BUILD
@@ -167,10 +167,10 @@
"@com_google_fuzztest//centipede:coverage",
"@com_google_fuzztest//centipede:defs",
"@com_google_fuzztest//centipede:environment",
- "@com_google_fuzztest//centipede:execution_result",
"@com_google_fuzztest//centipede:feature",
"@com_google_fuzztest//centipede:logging",
"@com_google_fuzztest//centipede:pc_info",
+ "@com_google_fuzztest//centipede:runner_result",
"@com_google_fuzztest//centipede:test_util",
"@com_google_fuzztest//centipede:util",
"@com_google_googletest//:gtest_main",
@@ -195,9 +195,9 @@
"@com_google_fuzztest//centipede:corpus",
"@com_google_fuzztest//centipede:defs",
"@com_google_fuzztest//centipede:environment",
- "@com_google_fuzztest//centipede:execution_result",
"@com_google_fuzztest//centipede:feature",
"@com_google_fuzztest//centipede:logging",
+ "@com_google_fuzztest//centipede:runner_result",
"@com_google_fuzztest//centipede:shard_reader",
"@com_google_fuzztest//centipede:test_util",
"@com_google_fuzztest//centipede:util",
diff --git a/centipede/testing/centipede_test.cc b/centipede/testing/centipede_test.cc
index 5c710cb..378cafc 100644
--- a/centipede/testing/centipede_test.cc
+++ b/centipede/testing/centipede_test.cc
@@ -31,9 +31,9 @@
#include "./centipede/corpus.h"
#include "./centipede/defs.h"
#include "./centipede/environment.h"
-#include "./centipede/execution_result.h"
#include "./centipede/feature.h"
#include "./centipede/logging.h"
+#include "./centipede/runner_result.h"
#include "./centipede/shard_reader.h"
#include "./centipede/test_util.h"
#include "./centipede/util.h"
diff --git a/centipede/testing/coverage_test.cc b/centipede/testing/coverage_test.cc
index 3801033..adc7ada 100644
--- a/centipede/testing/coverage_test.cc
+++ b/centipede/testing/coverage_test.cc
@@ -37,10 +37,10 @@
#include "./centipede/control_flow.h"
#include "./centipede/defs.h"
#include "./centipede/environment.h"
-#include "./centipede/execution_result.h"
#include "./centipede/feature.h"
#include "./centipede/logging.h"
#include "./centipede/pc_info.h"
+#include "./centipede/runner_result.h"
#include "./centipede/symbol_table.h"
#include "./centipede/test_util.h"
#include "./centipede/util.h"
