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

storaged: replace LOG_TO() macros with LOG()

Browse source 
Storaged always writes to the SYSTEM log, so instead of using
LOG_TO(), it can use the normal LOG() macros as long as it calls
InitLogging() with a default to the SYSTEM log.

Test: storaged writes to the SYSTEM log still
Change-Id: I47e63bc92d55f9b1262a67e3508601ddbd9edc87
This commit is contained in:
Tom Cherry 2020-01-10 17:08:15 -08:00
parent 679185dc88
commit b8c1147c4a
5 changed files with 43 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
storaged/main.cpp
View file

@ -51,7 +51,7 @@ void* storaged_main(void* /* unused */) {
storaged_sp->init();
storaged_sp->report_storage_info();
LOG_TO(SYSTEM, INFO) << "storaged: Start";
LOG(INFO) << "storaged: Start";
for (;;) {
storaged_sp->event_checked();
@ -76,6 +76,8 @@ int main(int argc, char** argv) {
bool flag_dump_perf = false;
int opt;
android::base::InitLogging(argv, android::base::LogdLogger(android::base::SYSTEM));
for (;;) {
int opt_idx = 0;
static struct option long_options[] = {
@ -124,13 +126,13 @@ int main(int argc, char** argv) {
pthread_t storaged_main_thread;
errno = pthread_create(&storaged_main_thread, NULL, storaged_main, NULL);
if (errno != 0) {
PLOG_TO(SYSTEM, ERROR) << "Failed to create main thread";
PLOG(ERROR) << "Failed to create main thread";
return -1;
}
if (StoragedService::start() != android::OK ||
StoragedPrivateService::start() != android::OK) {
PLOG_TO(SYSTEM, ERROR) << "Failed to start storaged service";
PLOG(ERROR) << "Failed to start storaged service";
return -1;
}

34
storaged/storaged.cpp
View file

@ -97,25 +97,23 @@ void storaged_t::init_health_service() {
health = get_health_service();
if (health == NULL) {
LOG_TO(SYSTEM, WARNING) << "health: failed to find IHealth service";
LOG(WARNING) << "health: failed to find IHealth service";
return;
}
BatteryStatus status = BatteryStatus::UNKNOWN;
auto ret = health->getChargeStatus([&](Result r, BatteryStatus v) {
if (r != Result::SUCCESS) {
LOG_TO(SYSTEM, WARNING)
<< "health: cannot get battery status " << toString(r);
LOG(WARNING) << "health: cannot get battery status " << toString(r);
return;
}
if (v == BatteryStatus::UNKNOWN) {
LOG_TO(SYSTEM, WARNING) << "health: invalid battery status";
LOG(WARNING) << "health: invalid battery status";
}
status = v;
});
if (!ret.isOk()) {
LOG_TO(SYSTEM, WARNING) << "health: get charge status transaction error "
<< ret.description();
LOG(WARNING) << "health: get charge status transaction error " << ret.description();
}
mUidm.init(is_charger_on(status));
@ -126,11 +124,11 @@ void storaged_t::init_health_service() {
void storaged_t::serviceDied(uint64_t cookie, const wp<::android::hidl::base::V1_0::IBase>& who) {
if (health != NULL && interfacesEqual(health, who.promote())) {
LOG_TO(SYSTEM, ERROR) << "health service died, exiting";
LOG(ERROR) << "health service died, exiting";
android::hardware::IPCThreadState::self()->stopProcess();
exit(1);
} else {
LOG_TO(SYSTEM, ERROR) << "unknown service died";
LOG(ERROR) << "unknown service died";
}
}
@ -192,7 +190,7 @@ void storaged_t::load_proto(userid_t user_id) {
reinterpret_cast<const Bytef*>(uid_io_usage.SerializeAsString().c_str()),
uid_io_usage.ByteSize());
if (proto.crc() != computed_crc) {
LOG_TO(SYSTEM, WARNING) << "CRC mismatch in " << proto_file;
LOG(WARNING) << "CRC mismatch in " << proto_file;
return;
}
@ -228,8 +226,7 @@ char* storaged_t:: prepare_proto(userid_t user_id, StoragedProto* proto) {
char* data = nullptr;
if (posix_memalign(reinterpret_cast<void**>(&data),
pagesize, proto->ByteSize())) {
PLOG_TO(SYSTEM, ERROR) << "Faied to alloc aligned buffer (size: "
<< proto->ByteSize() << ")";
PLOG(ERROR) << "Faied to alloc aligned buffer (size: " << proto->ByteSize() << ")";
return data;
}
@ -246,7 +243,7 @@ void storaged_t::flush_proto_data(userid_t user_id,
(user_id == USER_SYSTEM ? O_DIRECT : 0),
S_IRUSR | S_IWUSR)));
if (fd == -1) {
PLOG_TO(SYSTEM, ERROR) << "Faied to open tmp file: " << tmp_file;
PLOG(ERROR) << "Faied to open tmp file: " << tmp_file;
return;
}
@ -261,7 +258,7 @@ void storaged_t::flush_proto_data(userid_t user_id,
start = steady_clock::now();
ret = write(fd, data, MIN(benchmark_unit_size, size));
if (ret <= 0) {
PLOG_TO(SYSTEM, ERROR) << "Faied to write tmp file: " << tmp_file;
PLOG(ERROR) << "Faied to write tmp file: " << tmp_file;
return;
}
end = steady_clock::now();
@ -284,7 +281,7 @@ void storaged_t::flush_proto_data(userid_t user_id,
}
} else {
if (!WriteFully(fd, data, size)) {
PLOG_TO(SYSTEM, ERROR) << "Faied to write tmp file: " << tmp_file;
PLOG(ERROR) << "Faied to write tmp file: " << tmp_file;
return;
}
}
@ -343,22 +340,21 @@ void storaged_t::event_checked(void) {
if (mConfig.event_time_check_usec &&
clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &start_ts) < 0) {
check_time = false;
PLOG_TO(SYSTEM, ERROR) << "clock_gettime() failed";
PLOG(ERROR) << "clock_gettime() failed";
}
event();
if (mConfig.event_time_check_usec && check_time) {
if (clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &end_ts) < 0) {
PLOG_TO(SYSTEM, ERROR) << "clock_gettime() failed";
PLOG(ERROR) << "clock_gettime() failed";
return;
}
int64_t cost = (end_ts.tv_sec - start_ts.tv_sec) * SEC_TO_USEC +
(end_ts.tv_nsec - start_ts.tv_nsec) / USEC_TO_NSEC;
if (cost > mConfig.event_time_check_usec) {
LOG_TO(SYSTEM, ERROR)
<< "event loop spent " << cost << " usec, threshold "
<< mConfig.event_time_check_usec << " usec";
LOG(ERROR) << "event loop spent " << cost << " usec, threshold "
<< mConfig.event_time_check_usec << " usec";
}
}
}

22
storaged/storaged_diskstats.cpp
View file

@ -41,8 +41,8 @@ void log_debug_disk_perf(struct disk_perf* perf, const char* type) {
// skip if the input structure are all zeros
if (perf == NULL || perf->is_zero()) return;
LOG_TO(SYSTEM, INFO) << "disk_perf " << type
<< " rd: " << perf->read_perf << " kbps, " << perf->read_ios << " iops"
LOG(INFO) << "disk_perf " << type << " rd: " << perf->read_perf << " kbps, " << perf->read_ios
<< " iops"
<< " wr: " << perf->write_perf << " kbps, " << perf->write_ios << " iops"
<< " q: " << perf->queue;
}
@ -71,7 +71,7 @@ bool get_time(struct timespec* ts) {
// when system is running.
int ret = clock_gettime(CLOCK_MONOTONIC, ts);
if (ret < 0) {
PLOG_TO(SYSTEM, ERROR) << "clock_gettime() failed";
PLOG(ERROR) << "clock_gettime() failed";
return false;
}
return true;
@ -93,7 +93,7 @@ bool parse_disk_stats(const char* disk_stats_path, struct disk_stats* stats) {
std::string buffer;
if (!android::base::ReadFileToString(disk_stats_path, &buffer)) {
PLOG_TO(SYSTEM, ERROR) << disk_stats_path << ": ReadFileToString failed.";
PLOG(ERROR) << disk_stats_path << ": ReadFileToString failed.";
return false;
}
@ -130,12 +130,12 @@ bool get_disk_stats_from_health_hal(const sp<IHealth>& service, struct disk_stat
bool success = false;
auto ret = service->getDiskStats([&success, stats](auto result, const auto& halStats) {
if (result == Result::NOT_SUPPORTED) {
LOG_TO(SYSTEM, DEBUG) << "getDiskStats is not supported on health HAL.";
LOG(DEBUG) << "getDiskStats is not supported on health HAL.";
return;
}
if (result != Result::SUCCESS || halStats.size() == 0) {
LOG_TO(SYSTEM, ERROR) << "getDiskStats failed with result " << toString(result)
<< " and size " << halStats.size();
LOG(ERROR) << "getDiskStats failed with result " << toString(result) << " and size "
<< halStats.size();
return;
}
@ -144,7 +144,7 @@ bool get_disk_stats_from_health_hal(const sp<IHealth>& service, struct disk_stat
});
if (!ret.isOk()) {
LOG_TO(SYSTEM, ERROR) << "getDiskStats failed with " << ret.description();
LOG(ERROR) << "getDiskStats failed with " << ret.description();
return false;
}
@ -199,9 +199,9 @@ void get_inc_disk_stats(const struct disk_stats* prev, const struct disk_stats*
void add_disk_stats(struct disk_stats* src, struct disk_stats* dst)
{
if (dst->end_time != 0 && dst->end_time != src->start_time) {
LOG_TO(SYSTEM, WARNING) << "Two dis-continuous periods of diskstats"
<< " are added. dst end with " << dst->end_time
<< ", src start with " << src->start_time;
LOG(WARNING) << "Two dis-continuous periods of diskstats"
<< " are added. dst end with " << dst->end_time << ", src start with "
<< src->start_time;
}
*dst += *src;

12
storaged/storaged_info.cpp
View file

@ -76,7 +76,7 @@ void storage_info_t::load_perf_history_proto(const IOPerfHistory& perf_history)
if (!perf_history.has_day_start_sec() ||
perf_history.daily_perf_size() > (int)daily_perf.size() ||
perf_history.weekly_perf_size() > (int)weekly_perf.size()) {
LOG_TO(SYSTEM, ERROR) << "Invalid IOPerfHistory proto";
LOG(ERROR) << "Invalid IOPerfHistory proto";
return;
}
@ -114,7 +114,7 @@ void storage_info_t::refresh(IOPerfHistory* perf_history)
{
struct statvfs buf;
if (statvfs(userdata_path.c_str(), &buf) != 0) {
PLOG_TO(SYSTEM, WARNING) << "Failed to get userdata info";
PLOG(WARNING) << "Failed to get userdata info";
return;
}
@ -328,12 +328,12 @@ void ufs_info_t::report()
void health_storage_info_t::report() {
auto ret = mHealth->getStorageInfo([this](auto result, const auto& halInfos) {
if (result == Result::NOT_SUPPORTED) {
LOG_TO(SYSTEM, DEBUG) << "getStorageInfo is not supported on health HAL.";
LOG(DEBUG) << "getStorageInfo is not supported on health HAL.";
return;
}
if (result != Result::SUCCESS || halInfos.size() == 0) {
LOG_TO(SYSTEM, ERROR) << "getStorageInfo failed with result " << toString(result)
<< " and size " << halInfos.size();
LOG(ERROR) << "getStorageInfo failed with result " << toString(result) << " and size "
<< halInfos.size();
return;
}
set_values_from_hal_storage_info(halInfos[0]);
@ -341,7 +341,7 @@ void health_storage_info_t::report() {
});
if (!ret.isOk()) {
LOG_TO(SYSTEM, ERROR) << "getStorageInfo failed with " << ret.description();
LOG(ERROR) << "getStorageInfo failed with " << ret.description();
}
}

15
storaged/storaged_uid_monitor.cpp
View file

@ -71,8 +71,7 @@ bool uid_info::parse_uid_io_stats(std::string&& s)
!ParseUint(fields[8], &io[BACKGROUND].write_bytes) ||
!ParseUint(fields[9], &io[FOREGROUND].fsync) ||
!ParseUint(fields[10], &io[BACKGROUND].fsync)) {
LOG_TO(SYSTEM, WARNING) << "Invalid uid I/O stats: \""
<< s << "\"";
LOG(WARNING) << "Invalid uid I/O stats: \"" << s << "\"";
return false;
}
return true;
@ -95,8 +94,7 @@ bool task_info::parse_task_io_stats(std::string&& s)
!ParseUint(fields[size - 3], &io[BACKGROUND].write_bytes) ||
!ParseUint(fields[size - 2], &io[FOREGROUND].fsync) ||
!ParseUint(fields[size - 1], &io[BACKGROUND].fsync)) {
LOG_TO(SYSTEM, WARNING) << "Invalid task I/O stats: \""
<< s << "\"";
LOG(WARNING) << "Invalid task I/O stats: \"" << s << "\"";
return false;
}
comm = Join(std::vector<std::string>(
@ -123,13 +121,13 @@ void get_uid_names(const vector<int>& uids, const vector<std::string*>& uid_name
{
sp<IServiceManager> sm = defaultServiceManager();
if (sm == NULL) {
LOG_TO(SYSTEM, ERROR) << "defaultServiceManager failed";
LOG(ERROR) << "defaultServiceManager failed";
return;
}
sp<IBinder> binder = sm->getService(String16("package_native"));
if (binder == NULL) {
LOG_TO(SYSTEM, ERROR) << "getService package_native failed";
LOG(ERROR) << "getService package_native failed";
return;
}
@ -137,8 +135,7 @@ void get_uid_names(const vector<int>& uids, const vector<std::string*>& uid_name
std::vector<std::string> names;
binder::Status status = package_mgr->getNamesForUids(uids, &names);
if (!status.isOk()) {
LOG_TO(SYSTEM, ERROR) << "package_native::getNamesForUids failed: "
<< status.exceptionMessage();
LOG(ERROR) << "package_native::getNamesForUids failed: " << status.exceptionMessage();
return;
}
@ -158,7 +155,7 @@ std::unordered_map<uint32_t, uid_info> uid_monitor::get_uid_io_stats_locked()
std::unordered_map<uint32_t, uid_info> uid_io_stats;
std::string buffer;
if (!ReadFileToString(UID_IO_STATS_PATH, &buffer)) {
PLOG_TO(SYSTEM, ERROR) << UID_IO_STATS_PATH << ": ReadFileToString failed";
PLOG(ERROR) << UID_IO_STATS_PATH << ": ReadFileToString failed";
return uid_io_stats;
}