ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "[zip] Stop calculating crc if it's not checked"

Browse source
This commit is contained in:
Yurii Zubrytskyi 2020-04-10 05:07:30 +00:00 • committed by Gerrit Code Review
commit 83c7ad22a1
2 changed files with 41 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libziparchive/zip_archive.cc
View file

@ -59,7 +59,7 @@
// Used to turn on crc checks - verify that the content CRC matches the values
// specified in the local file header and the central directory.
static const bool kCrcChecksEnabled = false;
static constexpr bool kCrcChecksEnabled = false;
// The maximum number of bytes to scan backwards for the EOCD start.
static const uint32_t kMaxEOCDSearch = kMaxCommentLen + sizeof(EocdRecord);
@ -1314,11 +1314,15 @@ static int32_t CopyEntryToWriter(MappedZipFile& mapped_zip, const ZipEntry64* en
if (!writer->Append(&buf[0], block_size)) {
return kIoError;
}
crc = crc32(crc, &buf[0], block_size);
if (crc_out) {
crc = crc32(crc, &buf[0], block_size);
}
count += block_size;
}
*crc_out = crc;
if (crc_out) {
*crc_out = crc;
}
return 0;
}
@ -1331,9 +1335,11 @@ int32_t ExtractToWriter(ZipArchiveHandle handle, const ZipEntry64* entry,
int32_t return_value = -1;
uint64_t crc = 0;
if (method == kCompressStored) {
return_value = CopyEntryToWriter(handle->mapped_zip, entry, writer, &crc);
return_value =
CopyEntryToWriter(handle->mapped_zip, entry, writer, kCrcChecksEnabled ? &crc : nullptr);
} else if (method == kCompressDeflated) {
return_value = InflateEntryToWriter(handle->mapped_zip, entry, writer, &crc);
return_value =
InflateEntryToWriter(handle->mapped_zip, entry, writer, kCrcChecksEnabled ? &crc : nullptr);
}
if (!return_value && entry->has_data_descriptor) {

35
libziparchive/zip_archive_benchmark.cpp
View file

@ -17,7 +17,6 @@
#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <iostream>
#include <string>
#include <tuple>
#include <vector>
@ -28,17 +27,20 @@
#include <ziparchive/zip_archive_stream_entry.h>
#include <ziparchive/zip_writer.h>
static TemporaryFile* CreateZip() {
TemporaryFile* result = new TemporaryFile;
static std::unique_ptr<TemporaryFile> CreateZip(int size = 4, int count = 1000) {
auto result = std::make_unique<TemporaryFile>();
FILE* fp = fdopen(result->fd, "w");
ZipWriter writer(fp);
std::string lastName = "file";
for (size_t i = 0; i < 1000; i++) {
for (size_t i = 0; i < count; i++) {
// Make file names longer and longer.
lastName = lastName + std::to_string(i);
writer.StartEntry(lastName.c_str(), ZipWriter::kCompress);
writer.WriteBytes("helo", 4);
while (size > 0) {
writer.WriteBytes("helo", 4);
size -= 4;
}
writer.FinishEntry();
}
writer.Finish();
@ -106,5 +108,28 @@ static void StartAlignedEntry(benchmark::State& state) {
}
BENCHMARK(StartAlignedEntry)->Arg(2)->Arg(16)->Arg(1024)->Arg(4096);
static void ExtractEntry(benchmark::State& state) {
std::unique_ptr<TemporaryFile> temp_file(CreateZip(1024 * 1024, 1));
ZipArchiveHandle handle;
ZipEntry data;
if (OpenArchive(temp_file->path, &handle)) {
state.SkipWithError("Failed to open archive");
}
if (FindEntry(handle, "file0", &data)) {
state.SkipWithError("Failed to find archive entry");
}
std::vector<uint8_t> buffer(1024 * 1024);
for (auto _ : state) {
if (ExtractToMemory(handle, &data, buffer.data(), uint32_t(buffer.size()))) {
state.SkipWithError("Failed to extract archive entry");
break;
}
}
CloseArchive(handle);
}
BENCHMARK(ExtractEntry)->Arg(2)->Arg(16)->Arg(1024);
BENCHMARK_MAIN();