tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "imgdiff: cache bsdiff suffix array in zip mode." am: 37bda6a004 am: 9bb0819ef6

Browse source 
am: f859652e5f

Change-Id: I67af664a5da8d4ceea827542d5b82e30e08c4984
This commit is contained in:
Sen Jiang 2017-01-19 20:55:43 +00:00 committed by android-build-merger
commit a727d151d4
2 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
applypatch/Android.mk
View file

@ -124,6 +124,8 @@ libimgdiff_cflags := \
libimgdiff_static_libraries := \
libbsdiff \
libdivsufsort \
libdivsufsort64 \
libbase \
libz
@ -166,7 +168,5 @@ LOCAL_CFLAGS := -Werror
LOCAL_STATIC_LIBRARIES := \
libimgdiff \
$(libimgdiff_static_libraries) \
libbz \
libdivsufsort \
libdivsufsort64
libbz
include $(BUILD_HOST_EXECUTABLE)

30
applypatch/imgdiff.cpp
View file

@ -615,12 +615,12 @@ int ReconstructDeflateChunk(ImageChunk* chunk) {
}
/*
* Given source and target chunks, compute a bsdiff patch between them
* by running bsdiff in a subprocess. Return the patch data, placing
* its length in *size. Return NULL on failure. We expect the bsdiff
* program to be in the path.
* Given source and target chunks, compute a bsdiff patch between them.
* Return the patch data, placing its length in *size. Return NULL on failure.
* |bsdiff_cache| can be used to cache the suffix array if the same |src| chunk
* is used repeatedly, pass nullptr if not needed.
*/
unsigned char* MakePatch(ImageChunk* src, ImageChunk* tgt, size_t* size) {
unsigned char* MakePatch(ImageChunk* src, ImageChunk* tgt, size_t* size, saidx_t** bsdiff_cache) {
if (tgt->type == CHUNK_NORMAL) {
if (tgt->len <= 160) {
tgt->type = CHUNK_RAW;
@ -644,7 +644,7 @@ unsigned char* MakePatch(ImageChunk* src, ImageChunk* tgt, size_t* size) {
close(fd); // temporary file is created and we don't need its file
// descriptor
int r = bsdiff::bsdiff(src->data, src->len, tgt->data, tgt->len, ptemp);
int r = bsdiff::bsdiff(src->data, src->len, tgt->data, tgt->len, ptemp, bsdiff_cache);
if (r != 0) {
printf("bsdiff() failed: %d\n", r);
return NULL;
@ -970,28 +970,31 @@ int imgdiff(int argc, const char** argv) {
unsigned char** patch_data = static_cast<unsigned char**>(malloc(
num_tgt_chunks * sizeof(unsigned char*)));
size_t* patch_size = static_cast<size_t*>(malloc(num_tgt_chunks * sizeof(size_t)));
saidx_t* bsdiff_cache = nullptr;
for (i = 0; i < num_tgt_chunks; ++i) {
if (zip_mode) {
ImageChunk* src;
if (tgt_chunks[i].type == CHUNK_DEFLATE &&
(src = FindChunkByName(tgt_chunks[i].filename, src_chunks, num_src_chunks))) {
patch_data[i] = MakePatch(src, tgt_chunks+i, patch_size+i);
patch_data[i] = MakePatch(src, tgt_chunks + i, patch_size + i, nullptr);
} else {
patch_data[i] = MakePatch(src_chunks, tgt_chunks+i, patch_size+i);
patch_data[i] = MakePatch(src_chunks, tgt_chunks + i, patch_size + i, &bsdiff_cache);
}
} else {
if (i == 1 && bonus_data) {
printf(" using %zu bytes of bonus data for chunk %d\n", bonus_size, i);
src_chunks[i].data = static_cast<unsigned char*>(realloc(src_chunks[i].data,
src_chunks[i].len + bonus_size));
memcpy(src_chunks[i].data+src_chunks[i].len, bonus_data, bonus_size);
src_chunks[i].data =
static_cast<unsigned char*>(realloc(src_chunks[i].data, src_chunks[i].len + bonus_size));
memcpy(src_chunks[i].data + src_chunks[i].len, bonus_data, bonus_size);
src_chunks[i].len += bonus_size;
}
}
patch_data[i] = MakePatch(src_chunks+i, tgt_chunks+i, patch_size+i);
patch_data[i] = MakePatch(src_chunks + i, tgt_chunks + i, patch_size + i, nullptr);
}
printf("patch %3d is %zu bytes (of %zu)\n", i, patch_size[i], tgt_chunks[i].source_len);
}
free(bsdiff_cache);
free(src_chunks);
// Figure out how big the imgdiff file header is going to be, so
// that we can correctly compute the offset of each bsdiff patch
@ -1068,6 +1071,7 @@ int imgdiff(int argc, const char** argv) {
}
}
free(tgt_chunks);
free(patch_data);
free(patch_size);