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

Merge "misctrl: use libbase combined logging" into main am: 564ad17564 am: b630ec9be6

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2969975

Change-Id: I67ad2c6d6cbe993334c0dc5bf8803fcae1c3e752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Steven Moreland 2024-02-22 22:29:58 +00:00 committed by Automerger Merge Worker
commit 63c87a21b2
1 changed files with 14 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
bootloader_message/misctrl_main.cpp
View file

@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
#include <android-base/logging.h>
#include <android-base/properties.h> #include <android-base/properties.h>
#include <bootloader_message/bootloader_message.h> #include <bootloader_message/bootloader_message.h>
#include <log/log.h> #include <log/log.h>
@ -21,32 +22,16 @@
#include <cstdio> #include <cstdio>
static void log(const char* fmt, ...) __attribute__((format(printf, 1, 2)));
static void log(const char* fmt, ...) {
va_list va;
va_start(va, fmt);
va_list vb;
va_copy(vb, va);
__android_log_vprint(ANDROID_LOG_ERROR, "misctrl", fmt, va);
va_end(va);
vfprintf(stderr, fmt, vb);
fprintf(stderr, "\n");
va_end(vb);
}
static int check_control_message() { static int check_control_message() {
misc_control_message m; misc_control_message m;
std::string err; std::string err;
if (!ReadMiscControlMessage(&m, &err)) { if (!ReadMiscControlMessage(&m, &err)) {
log("Could not read misctrl message: %s", err.c_str()); LOG(ERROR) << "Could not read misctrl message: " << err.c_str();
return 1; return 1;
} }
if (m.magic != MISC_CONTROL_MAGIC_HEADER || m.version != MISC_CONTROL_MESSAGE_VERSION) { if (m.magic != MISC_CONTROL_MAGIC_HEADER || m.version != MISC_CONTROL_MESSAGE_VERSION) {
log("misctrl message invalid, resetting it"); LOG(WARNING) << "misctrl message invalid, resetting it";
m = { .version = MISC_CONTROL_MESSAGE_VERSION, m = { .version = MISC_CONTROL_MESSAGE_VERSION,
.magic = MISC_CONTROL_MAGIC_HEADER, .magic = MISC_CONTROL_MAGIC_HEADER,
.misctrl_flags = 0 }; .misctrl_flags = 0 };
@ -57,7 +42,7 @@ static int check_control_message() {
const size_t ps = getpagesize(); const size_t ps = getpagesize();
if (ps != 4096 && ps != 16384) { if (ps != 4096 && ps != 16384) {
log("Unrecognized page size: %zu", ps); LOG(ERROR) << "Unrecognized page size: " << ps;
res = 1; res = 1;
} }
@ -69,7 +54,7 @@ static int check_control_message() {
res |= android::base::SetProperty("ro.misctrl.16kb_before", before_16kb ? "1" : "0"); res |= android::base::SetProperty("ro.misctrl.16kb_before", before_16kb ? "1" : "0");
if (!WriteMiscControlMessage(m, &err)) { if (!WriteMiscControlMessage(m, &err)) {
log("Could not write misctrl message: %s", err.c_str()); LOG(ERROR) << "Could not write misctrl message: " << err.c_str();
res |= 1; res |= 1;
} }
@ -81,22 +66,24 @@ static int check_reserved_space() {
std::string err; std::string err;
bool success = CheckReservedSystemSpaceEmpty(&empty, &err); bool success = CheckReservedSystemSpaceEmpty(&empty, &err);
if (!success) { if (!success) {
log("Could not read reserved space: %s", err.c_str()); LOG(ERROR) << "Could not read reserved space: " << err.c_str();
return 1; return 1;
} }
log("System reserved space empty? %d.", empty); LOG(INFO) << "System reserved space empty? " << empty;
if (!err.empty()) { if (!err.empty()) {
constexpr size_t kPrintChunkSize = 256; LOG(ERROR) << "Reserved misc space being used: " << err;
for (size_t i = 0; i < err.size(); i += kPrintChunkSize) {
log("DATA: %s", err.substr(i, kPrintChunkSize).c_str());
}
} }
return empty ? 0 : 1; return empty ? 0 : 1;
} }
int main() { int main(int argc, char** argv) {
{
using namespace android::base;
(void)argc;
InitLogging(argv, TeeLogger(LogdLogger(), &StderrLogger));
}
int err = 0; int err = 0;
err |= check_control_message(); err |= check_control_message();
err |= check_reserved_space(); err |= check_reserved_space();