From 0a94c56463da41dd08b5d80a7437d7d27ba61e2c Mon Sep 17 00:00:00 2001 From: Sebastian Pop Date: Tue, 30 May 2017 09:14:20 -0500 Subject: [PATCH] add a performance benchmark for libziparchive This patch adds two benchmarks that measure the performance of some operations of libziparchive. Both benchmarks are creating a temporary zip file containing file names of uniformly distributed lengths. The creation of the zip file is not timed in the benchmarks. - FindEntry_no_match tries to find an inexisting entry in the files of the zip archive, in order to force the code to examine all the files in the archive. - Iterate_all_files uses the iterate function to list all the files in the archive. Bug: N/A Test: adb shell /data/ziparchive-benchmarks Change-Id: Ibdb524ba1c5ae55caddf0416ebbc09f8b6df0021 --- libziparchive/.clang-format | 1 + libziparchive/Android.bp | 26 ++++++++ libziparchive/zip_archive_benchmark.cpp | 87 +++++++++++++++++++++++++ 3 files changed, 114 insertions(+) create mode 120000 libziparchive/.clang-format create mode 100644 libziparchive/zip_archive_benchmark.cpp diff --git a/libziparchive/.clang-format b/libziparchive/.clang-format new file mode 120000 index 000000000..fd0645fdf --- /dev/null +++ b/libziparchive/.clang-format @@ -0,0 +1 @@ +../.clang-format-2 \ No newline at end of file diff --git a/libziparchive/Android.bp b/libziparchive/Android.bp index 44daf3610..9f531981e 100644 --- a/libziparchive/Android.bp +++ b/libziparchive/Android.bp @@ -122,3 +122,29 @@ cc_test { }, }, } + +// Performance benchmarks. +cc_benchmark { + name: "ziparchive-benchmarks", + defaults: ["libziparchive_flags"], + + srcs: [ + "zip_archive_benchmark.cpp", + ], + shared_libs: [ + "libbase", + "liblog", + ], + + static_libs: [ + "libziparchive", + "libz", + "libutils", + ], + + target: { + host: { + cppflags: ["-Wno-unnamed-type-template-args"], + }, + }, +} diff --git a/libziparchive/zip_archive_benchmark.cpp b/libziparchive/zip_archive_benchmark.cpp new file mode 100644 index 000000000..cd3e16489 --- /dev/null +++ b/libziparchive/zip_archive_benchmark.cpp @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * 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 +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +static TemporaryFile* CreateZip() { + TemporaryFile* result = new TemporaryFile; + FILE* fp = fdopen(result->fd, "w"); + + ZipWriter writer(fp); + std::string lastName = "file"; + for (size_t i = 0; i < 1000; i++) { + // Make file names longer and longer. + lastName = lastName + std::to_string(i); + writer.StartEntry(lastName.c_str(), ZipWriter::kCompress); + writer.WriteBytes("helo", 4); + writer.FinishEntry(); + } + writer.Finish(); + fclose(fp); + + return result; +} + +static void FindEntry_no_match(benchmark::State& state) { + // Create a temporary zip archive. + std::unique_ptr temp_file(CreateZip()); + ZipArchiveHandle handle; + ZipEntry data; + + // In order to walk through all file names in the archive, look for a name + // that does not exist in the archive. + ZipString name("thisFileNameDoesNotExist"); + + // Start the benchmark. + while (state.KeepRunning()) { + OpenArchive(temp_file->path, &handle); + FindEntry(handle, name, &data); + CloseArchive(handle); + } +} +BENCHMARK(FindEntry_no_match); + +static void Iterate_all_files(benchmark::State& state) { + std::unique_ptr temp_file(CreateZip()); + ZipArchiveHandle handle; + void* iteration_cookie; + ZipEntry data; + ZipString name; + + while (state.KeepRunning()) { + OpenArchive(temp_file->path, &handle); + StartIteration(handle, &iteration_cookie, nullptr, nullptr); + while (Next(iteration_cookie, &data, &name) == 0) { + } + EndIteration(iteration_cookie); + CloseArchive(handle); + } +} +BENCHMARK(Iterate_all_files); + +BENCHMARK_MAIN()