#Rename shard_reader.* -> corpus_io.* (NFC) Pre-work before adding more corpus I/O APIs (in particular, moving the ones already implemented ad-hoc in other sources, such as distill.cc). PiperOrigin-RevId: 616874084
diff --git a/centipede/BUILD b/centipede/BUILD index 77f325f..443704c 100644 --- a/centipede/BUILD +++ b/centipede/BUILD
@@ -419,13 +419,13 @@ ":binary_info", ":control_flow", ":corpus", + ":corpus_io", ":coverage", ":defs", ":feature", ":logging", ":pc_info", ":remote_file", - ":shard_reader", ":workdir", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/log", @@ -750,10 +750,10 @@ ) cc_library( - name = "shard_reader", - srcs = ["shard_reader.cc"], - hdrs = ["shard_reader.h"], - # TODO(kcc): move shard_reader test from testing/centipede_test.cc into a dedicated test. + name = "corpus_io", + srcs = ["corpus_io.cc"], + hdrs = ["corpus_io.h"], + # TODO(kcc): move corpus_io test from testing/centipede_test.cc into a dedicated test. deps = [ ":blob_file", ":defs", @@ -811,6 +811,7 @@ ":command", ":control_flow", ":corpus", + ":corpus_io", ":coverage", ":defs", ":early_exit", @@ -824,7 +825,6 @@ ":runner_result", ":rusage_profiler", ":rusage_stats", - ":shard_reader", ":stats", ":symbol_table", ":util", @@ -913,6 +913,7 @@ hdrs = ["distill.h"], deps = [ ":blob_file", + ":corpus_io", ":defs", ":environment", ":feature", @@ -922,7 +923,6 @@ ":resource_pool", ":rusage_profiler", ":rusage_stats", - ":shard_reader", ":thread_pool", ":util", ":workdir", @@ -1121,13 +1121,13 @@ hdrs = ["seed_corpus_maker_lib.h"], deps = [ ":blob_file", + ":corpus_io", ":defs", ":feature", ":logging", ":remote_file", ":rusage_profiler", ":seed_corpus_config_cc_proto", - ":shard_reader", ":thread_pool", ":util", ":workdir", @@ -1349,13 +1349,13 @@ srcs = ["distill_test.cc"], deps = [ ":blob_file", + ":corpus_io", ":defs", ":distill", ":environment", ":feature", ":resource_pool", ":rusage_stats", - ":shard_reader", ":test_util", ":util", ":workdir", @@ -1724,13 +1724,13 @@ ":centipede_default_callbacks", ":centipede_interface", ":corpus", + ":corpus_io", ":defs", ":environment", ":feature", ":logging", ":mutation_input", ":runner_result", - ":shard_reader", ":test_util", ":util", ":workdir",
diff --git a/centipede/analyze_corpora.cc b/centipede/analyze_corpora.cc index 8c87142..8029f31 100644 --- a/centipede/analyze_corpora.cc +++ b/centipede/analyze_corpora.cc
@@ -28,13 +28,13 @@ #include "./centipede/binary_info.h" #include "./centipede/control_flow.h" #include "./centipede/corpus.h" +#include "./centipede/corpus_io.h" #include "./centipede/coverage.h" #include "./centipede/defs.h" #include "./centipede/feature.h" #include "./centipede/logging.h" #include "./centipede/pc_info.h" #include "./centipede/remote_file.h" -#include "./centipede/shard_reader.h" #include "./centipede/workdir.h" namespace centipede {
diff --git a/centipede/centipede.cc b/centipede/centipede.cc index ada8348..9c1808a 100644 --- a/centipede/centipede.cc +++ b/centipede/centipede.cc
@@ -79,6 +79,7 @@ #include "./centipede/centipede_callbacks.h" #include "./centipede/command.h" #include "./centipede/control_flow.h" +#include "./centipede/corpus_io.h" #include "./centipede/coverage.h" #include "./centipede/defs.h" #include "./centipede/early_exit.h" @@ -91,7 +92,6 @@ #include "./centipede/runner_result.h" #include "./centipede/rusage_profiler.h" #include "./centipede/rusage_stats.h" -#include "./centipede/shard_reader.h" #include "./centipede/stats.h" #include "./centipede/util.h" #include "./centipede/workdir.h"
diff --git a/centipede/centipede_test.cc b/centipede/centipede_test.cc index db528a4..a98ae74 100644 --- a/centipede/centipede_test.cc +++ b/centipede/centipede_test.cc
@@ -36,13 +36,13 @@ #include "./centipede/centipede_default_callbacks.h" #include "./centipede/centipede_interface.h" #include "./centipede/corpus.h" +#include "./centipede/corpus_io.h" #include "./centipede/defs.h" #include "./centipede/environment.h" #include "./centipede/feature.h" #include "./centipede/logging.h" #include "./centipede/mutation_input.h" #include "./centipede/runner_result.h" -#include "./centipede/shard_reader.h" #include "./centipede/test_util.h" #include "./centipede/util.h" #include "./centipede/workdir.h"
diff --git a/centipede/shard_reader.cc b/centipede/corpus_io.cc similarity index 98% rename from centipede/shard_reader.cc rename to centipede/corpus_io.cc index d8b860e..b526c98 100644 --- a/centipede/shard_reader.cc +++ b/centipede/corpus_io.cc
@@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include "./centipede/shard_reader.h" +#include "./centipede/corpus_io.h" #include <functional> #include <memory>
diff --git a/centipede/shard_reader.h b/centipede/corpus_io.h similarity index 100% rename from centipede/shard_reader.h rename to centipede/corpus_io.h
diff --git a/centipede/distill.cc b/centipede/distill.cc index 1b4b2c0..99493c6 100644 --- a/centipede/distill.cc +++ b/centipede/distill.cc
@@ -34,6 +34,7 @@ #include "absl/synchronization/mutex.h" #include "absl/time/time.h" #include "./centipede/blob_file.h" +#include "./centipede/corpus_io.h" #include "./centipede/defs.h" #include "./centipede/environment.h" #include "./centipede/feature.h" @@ -43,7 +44,6 @@ #include "./centipede/resource_pool.h" #include "./centipede/rusage_profiler.h" #include "./centipede/rusage_stats.h" -#include "./centipede/shard_reader.h" #include "./centipede/thread_pool.h" #include "./centipede/util.h" #include "./centipede/workdir.h"
diff --git a/centipede/distill_test.cc b/centipede/distill_test.cc index 4e0fd64..454e415 100644 --- a/centipede/distill_test.cc +++ b/centipede/distill_test.cc
@@ -27,12 +27,12 @@ #include "absl/flags/reflection.h" #include "absl/log/check.h" #include "./centipede/blob_file.h" +#include "./centipede/corpus_io.h" #include "./centipede/defs.h" #include "./centipede/environment.h" #include "./centipede/feature.h" #include "./centipede/resource_pool.h" #include "./centipede/rusage_stats.h" -#include "./centipede/shard_reader.h" #include "./centipede/test_util.h" #include "./centipede/util.h" #include "./centipede/workdir.h"
diff --git a/centipede/seed_corpus_maker_lib.cc b/centipede/seed_corpus_maker_lib.cc index 5e5fb66..9eb22ef 100644 --- a/centipede/seed_corpus_maker_lib.cc +++ b/centipede/seed_corpus_maker_lib.cc
@@ -44,13 +44,13 @@ #include "absl/strings/str_replace.h" #include "absl/time/time.h" #include "./centipede/blob_file.h" +#include "./centipede/corpus_io.h" #include "./centipede/defs.h" #include "./centipede/feature.h" #include "./centipede/logging.h" #include "./centipede/remote_file.h" #include "./centipede/rusage_profiler.h" #include "./centipede/seed_corpus_config.pb.h" -#include "./centipede/shard_reader.h" #include "./centipede/thread_pool.h" #include "./centipede/util.h" #include "./centipede/workdir.h"