PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct caching behavior for should_inject_cache

Browse Source 
am: 88dd779

* commit '88dd7796a1fd4c64d57afb20021bf66cb26fa886':
  Correct caching behavior for should_inject_cache
This commit is contained in:
Jed Estep
2016-03-23 23:08:13 +00:00
committed by android-build-merger
parent e9699584b5 88dd7796a1
commit 7a9da521e1
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
otafault/Android.mk
+2 -1
View File
@@ -17,9 +17,10 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
otafault_static_libs := \ otafault_static_libs := \
libbase \
libminzip \ libminzip \
libz \ libz \
libselinux \ libselinux
LOCAL_SRC_FILES := config.cpp ota_io.cpp LOCAL_SRC_FILES := config.cpp ota_io.cpp
LOCAL_MODULE_TAGS := eng LOCAL_MODULE_TAGS := eng
otafault/config.cpp
+15 -16
View File
@@ -20,6 +20,8 @@
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include <android-base/stringprintf.h>
#include "minzip/Zip.h" #include "minzip/Zip.h"
#include "config.h" #include "config.h"
#include "ota_io.h" #include "ota_io.h"
@@ -27,12 +29,10 @@
#define OTAIO_MAX_FNAME_SIZE 128 #define OTAIO_MAX_FNAME_SIZE 128
static ZipArchive* archive; static ZipArchive* archive;
static std::map<const char*, bool> should_inject_cache; static std::map<std::string, bool> should_inject_cache;
static const char* get_type_path(const char* io_type) { static std::string get_type_path(const char* io_type) {
char* path = (char*)calloc(strlen(io_type) + strlen(OTAIO_BASE_DIR) + 2, sizeof(char)); return android::base::StringPrintf("%s/%s", OTAIO_BASE_DIR, io_type);
sprintf(path, "%s/%s", OTAIO_BASE_DIR, io_type);
return path;
} }
void ota_io_init(ZipArchive* za) { void ota_io_init(ZipArchive* za) {
@@ -46,13 +46,12 @@ bool should_fault_inject(const char* io_type) {
if (archive == NULL) { if (archive == NULL) {
return false; return false;
} }
if (should_inject_cache.find(io_type) != should_inject_cache.end()) { const std::string type_path = get_type_path(io_type);
return should_inject_cache[io_type]; if (should_inject_cache.find(type_path) != should_inject_cache.end()) {
return should_inject_cache[type_path];
} }
const char* type_path = get_type_path(io_type); const ZipEntry* entry = mzFindZipEntry(archive, type_path.c_str());
const ZipEntry* entry = mzFindZipEntry(archive, type_path);
should_inject_cache[type_path] = entry != nullptr; should_inject_cache[type_path] = entry != nullptr;
free((void*)type_path);
return entry != NULL; return entry != NULL;
} }
@@ -61,10 +60,10 @@ bool should_hit_cache() {
} }
std::string fault_fname(const char* io_type) { std::string fault_fname(const char* io_type) {
const char* type_path = get_type_path(io_type); std::string type_path = get_type_path(io_type);
char* fname = (char*) calloc(OTAIO_MAX_FNAME_SIZE, sizeof(char)); std::string fname;
const ZipEntry* entry = mzFindZipEntry(archive, type_path); fname.resize(OTAIO_MAX_FNAME_SIZE);
mzReadZipEntry(archive, entry, fname, OTAIO_MAX_FNAME_SIZE); const ZipEntry* entry = mzFindZipEntry(archive, type_path.c_str());
free((void*)type_path); mzReadZipEntry(archive, entry, &fname[0], OTAIO_MAX_FNAME_SIZE);
return std::string(fname); return fname;
} }