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

Merge changes I7681e9a4,If84ff730 am: 63190d2e3a am: 7c5e1562e3

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2260463

Change-Id: Iad2b707311e51a5aa08568c5069323ab746dff20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Akilesh Kailash 2022-10-18 22:55:39 +00:00 • committed by Automerger Merge Worker
commit 6b93d71541
9 changed files with 105 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
fs_mgr/libsnapshot/Android.bp
View file

@ -173,10 +173,11 @@ cc_library_static {
"libsnapshot_cow_defaults",
],
srcs: [
"cow_decompress.cpp",
"cow_reader.cpp",
"cow_writer.cpp",
"cow_format.cpp",
"libsnapshot_cow/cow_decompress.cpp",
"libsnapshot_cow/cow_reader.cpp",
"libsnapshot_cow/cow_writer.cpp",
"libsnapshot_cow/cow_format.cpp",
"libsnapshot_cow/cow_compress.cpp",
],
host_supported: true,
recovery_available: true,
@ -424,7 +425,7 @@ cc_test {
"libsnapshot_cow_defaults",
],
srcs: [
"cow_api_test.cpp",
"libsnapshot_cow/cow_api_test.cpp",
],
cflags: [
"-D_FILE_OFFSET_BITS=64",
@ -546,7 +547,7 @@ cc_binary {
shared_libs: [
],
srcs: [
"inspect_cow.cpp",
"libsnapshot_cow/inspect_cow.cpp",
],
}

0
fs_mgr/libsnapshot/cow_api_test.cpp → fs_mgr/libsnapshot/libsnapshot_cow/cow_api_test.cpp
View file

98
fs_mgr/libsnapshot/libsnapshot_cow/cow_compress.cpp Normal file
View file

@ -0,0 +1,98 @@
//
// Copyright (C) 2020 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 <sys/types.h>
#include <unistd.h>
#include <limits>
#include <queue>
#include <android-base/file.h>
#include <android-base/logging.h>
#include <android-base/unique_fd.h>
#include <brotli/encode.h>
#include <libsnapshot/cow_format.h>
#include <libsnapshot/cow_reader.h>
#include <libsnapshot/cow_writer.h>
#include <lz4.h>
#include <zlib.h>
namespace android {
namespace snapshot {
std::basic_string<uint8_t> CowWriter::Compress(const void* data, size_t length) {
switch (compression_) {
case kCowCompressGz: {
const auto bound = compressBound(length);
std::basic_string<uint8_t> buffer(bound, '\0');
uLongf dest_len = bound;
auto rv = compress2(buffer.data(), &dest_len, reinterpret_cast<const Bytef*>(data),
length, Z_BEST_COMPRESSION);
if (rv != Z_OK) {
LOG(ERROR) << "compress2 returned: " << rv;
return {};
}
buffer.resize(dest_len);
return buffer;
}
case kCowCompressBrotli: {
const auto bound = BrotliEncoderMaxCompressedSize(length);
if (!bound) {
LOG(ERROR) << "BrotliEncoderMaxCompressedSize returned 0";
return {};
}
std::basic_string<uint8_t> buffer(bound, '\0');
size_t encoded_size = bound;
auto rv = BrotliEncoderCompress(
BROTLI_DEFAULT_QUALITY, BROTLI_DEFAULT_WINDOW, BROTLI_DEFAULT_MODE, length,
reinterpret_cast<const uint8_t*>(data), &encoded_size, buffer.data());
if (!rv) {
LOG(ERROR) << "BrotliEncoderCompress failed";
return {};
}
buffer.resize(encoded_size);
return buffer;
}
case kCowCompressLz4: {
const auto bound = LZ4_compressBound(length);
if (!bound) {
LOG(ERROR) << "LZ4_compressBound returned 0";
return {};
}
std::basic_string<uint8_t> buffer(bound, '\0');
const auto compressed_size = LZ4_compress_default(
static_cast<const char*>(data), reinterpret_cast<char*>(buffer.data()), length,
buffer.size());
if (compressed_size <= 0) {
LOG(ERROR) << "LZ4_compress_default failed, input size: " << length
<< ", compression bound: " << bound << ", ret: " << compressed_size;
return {};
}
buffer.resize(compressed_size);
return buffer;
}
default:
LOG(ERROR) << "unhandled compression type: " << compression_;
break;
}
return {};
}
} // namespace snapshot
} // namespace android

0
fs_mgr/libsnapshot/cow_decompress.cpp → fs_mgr/libsnapshot/libsnapshot_cow/cow_decompress.cpp
View file

0
fs_mgr/libsnapshot/cow_decompress.h → fs_mgr/libsnapshot/libsnapshot_cow/cow_decompress.h
View file

0
fs_mgr/libsnapshot/cow_format.cpp → fs_mgr/libsnapshot/libsnapshot_cow/cow_format.cpp
View file

0
fs_mgr/libsnapshot/cow_reader.cpp → fs_mgr/libsnapshot/libsnapshot_cow/cow_reader.cpp
View file

61
fs_mgr/libsnapshot/cow_writer.cpp → fs_mgr/libsnapshot/libsnapshot_cow/cow_writer.cpp
View file

@ -404,67 +404,6 @@ bool CowWriter::EmitClusterIfNeeded() {
return true;
}
std::basic_string<uint8_t> CowWriter::Compress(const void* data, size_t length) {
switch (compression_) {
case kCowCompressGz: {
const auto bound = compressBound(length);
std::basic_string<uint8_t> buffer(bound, '\0');
uLongf dest_len = bound;
auto rv = compress2(buffer.data(), &dest_len, reinterpret_cast<const Bytef*>(data),
length, Z_BEST_COMPRESSION);
if (rv != Z_OK) {
LOG(ERROR) << "compress2 returned: " << rv;
return {};
}
buffer.resize(dest_len);
return buffer;
}
case kCowCompressBrotli: {
const auto bound = BrotliEncoderMaxCompressedSize(length);
if (!bound) {
LOG(ERROR) << "BrotliEncoderMaxCompressedSize returned 0";
return {};
}
std::basic_string<uint8_t> buffer(bound, '\0');
size_t encoded_size = bound;
auto rv = BrotliEncoderCompress(
BROTLI_DEFAULT_QUALITY, BROTLI_DEFAULT_WINDOW, BROTLI_DEFAULT_MODE, length,
reinterpret_cast<const uint8_t*>(data), &encoded_size, buffer.data());
if (!rv) {
LOG(ERROR) << "BrotliEncoderCompress failed";
return {};
}
buffer.resize(encoded_size);
return buffer;
}
case kCowCompressLz4: {
const auto bound = LZ4_compressBound(length);
if (!bound) {
LOG(ERROR) << "LZ4_compressBound returned 0";
return {};
}
std::basic_string<uint8_t> buffer(bound, '\0');
const auto compressed_size = LZ4_compress_default(
static_cast<const char*>(data), reinterpret_cast<char*>(buffer.data()), length,
buffer.size());
if (compressed_size <= 0) {
LOG(ERROR) << "LZ4_compress_default failed, input size: " << length
<< ", compression bound: " << bound << ", ret: " << compressed_size;
return {};
}
buffer.resize(compressed_size);
return buffer;
}
default:
LOG(ERROR) << "unhandled compression type: " << compression_;
break;
}
return {};
}
// TODO: Fix compilation issues when linking libcrypto library
// when snapuserd is compiled as part of ramdisk.
static void SHA256(const void*, size_t, uint8_t[]) {

0
fs_mgr/libsnapshot/inspect_cow.cpp → fs_mgr/libsnapshot/libsnapshot_cow/inspect_cow.cpp
View file