gugelfrei
/
android_system_vold
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Update vold to log only debug or higher level messages."

Browse Source
gugelfrei
Jeff Sharkey 6 years ago committed by Gerrit Code Review
parent 15b9656ae9 4b6ca4ea65
commit 9bd07d8760
9 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File

4
Benchmark.cpp
Unescape View File

@ -137,12 +137,12 @@ static status_t benchmarkInternal(const std::string& rootPath,
// Only drop when we haven't aborted
if (res == OK) {
android::base::Timer timer;
LOG(VERBOSE) << "Before drop_caches";
LOG(DEBUG) << "Before drop_caches";
if (!WriteStringToFile("3", "/proc/sys/vm/drop_caches")) {
PLOG(ERROR) << "Failed to drop_caches";
res = -1;
}
LOG(VERBOSE) << "After drop_caches";
LOG(DEBUG) << "After drop_caches";
sync();
if (res == OK) extras->putLong(String16("drop"), timer.duration().count());
}

2
Devmapper.cpp
Unescape View File

@ -252,7 +252,7 @@ int Devmapper::destroyAll() {
}
}
} else {
LOG(VERBOSE) << "Found unmanaged dm device named " << name;
LOG(DEBUG) << "Found unmanaged dm device named " << name;
}
nxt = n->next;
} while (nxt);

2
EncryptInplace.cpp
Unescape View File

@ -145,7 +145,7 @@ static int flush_outstanding_data(struct encryptGroupsData* data) {
return 0;
}
LOG(VERBOSE) << "Copying " << data->count << " blocks at offset " << data->offset;
LOG(DEBUG) << "Copying " << data->count << " blocks at offset " << data->offset;
if (pread64(data->realfd, data->buffer, info.block_size * data->count, data->offset) <= 0) {
LOG(ERROR) << "Error reading real_blkdev " << data->real_blkdev << " for inplace encrypt";

2
Loop.cpp
Unescape View File

@ -146,7 +146,7 @@ int Loop::destroyAll() {
PLOG(WARNING) << "Failed to LOOP_CLR_FD " << path;
}
} else {
LOG(VERBOSE) << "Found unmanaged loop device at " << path << " named " << id;
LOG(DEBUG) << "Found unmanaged loop device at " << path << " named " << id;
}
}

18
Utils.cpp
Unescape View File

@ -265,9 +265,9 @@ status_t ForkExecvp(const std::vector<std::string>& args, security_context_t con
for (size_t i = 0; i < argc; i++) {
argv[i] = (char*)args[i].c_str();
if (i == 0) {
LOG(VERBOSE) << args[i];
LOG(DEBUG) << args[i];
} else {
LOG(VERBOSE) << " " << args[i];
LOG(DEBUG) << " " << args[i];
}
}
@ -300,9 +300,9 @@ status_t ForkExecvp(const std::vector<std::string>& args, std::vector<std::strin
for (size_t i = 0; i < args.size(); i++) {
cmd += args[i] + " ";
if (i == 0) {
LOG(VERBOSE) << args[i];
LOG(DEBUG) << args[i];
} else {
LOG(VERBOSE) << " " << args[i];
LOG(DEBUG) << " " << args[i];
}
}
output.clear();
@ -327,7 +327,7 @@ status_t ForkExecvp(const std::vector<std::string>& args, std::vector<std::strin
}
char line[1024];
while (fgets(line, sizeof(line), fp) != nullptr) {
LOG(VERBOSE) << line;
LOG(DEBUG) << line;
output.push_back(std::string(line));
}
if (pclose(fp) != 0) {
@ -344,9 +344,9 @@ pid_t ForkExecvpAsync(const std::vector<std::string>& args) {
for (size_t i = 0; i < argc; i++) {
argv[i] = (char*)args[i].c_str();
if (i == 0) {
LOG(VERBOSE) << args[i];
LOG(DEBUG) << args[i];
} else {
LOG(VERBOSE) << " " << args[i];
LOG(DEBUG) << " " << args[i];
}
}
@ -686,7 +686,7 @@ dev_t GetDevice(const std::string& path) {
}
status_t RestoreconRecursive(const std::string& path) {
LOG(VERBOSE) << "Starting restorecon of " << path;
LOG(DEBUG) << "Starting restorecon of " << path;
static constexpr const char* kRestoreconString = "selinux.restorecon_recursive";
@ -695,7 +695,7 @@ status_t RestoreconRecursive(const std::string& path) {
android::base::WaitForProperty(kRestoreconString, path);
LOG(VERBOSE) << "Finished restorecon of " << path;
LOG(DEBUG) << "Finished restorecon of " << path;
return OK;
}

4
VolumeManager.cpp
Unescape View File

@ -176,8 +176,8 @@ void VolumeManager::handleBlockEvent(NetlinkEvent* evt) {
std::lock_guard<std::mutex> lock(mLock);
if (mDebug) {
LOG(VERBOSE) << "----------------";
LOG(VERBOSE) << "handleBlockEvent with action " << (int)evt->getAction();
LOG(DEBUG) << "----------------";
LOG(DEBUG) << "handleBlockEvent with action " << (int)evt->getAction();
evt->dump();
}

10
main.cpp
Unescape View File

@ -53,17 +53,17 @@ using android::base::StringPrintf;
int main(int argc, char** argv) {
atrace_set_tracing_enabled(false);
setenv("ANDROID_LOG_TAGS", "*:v", 1);
setenv("ANDROID_LOG_TAGS", "*:d", 1);
android::base::InitLogging(argv, android::base::LogdLogger(android::base::SYSTEM));
LOG(INFO) << "Vold 3.0 (the awakening) firing up";
ATRACE_BEGIN("main");
LOG(VERBOSE) << "Detected support for:"
<< (android::vold::IsFilesystemSupported("ext4") ? " ext4" : "")
<< (android::vold::IsFilesystemSupported("f2fs") ? " f2fs" : "")
<< (android::vold::IsFilesystemSupported("vfat") ? " vfat" : "");
LOG(DEBUG) << "Detected support for:"
<< (android::vold::IsFilesystemSupported("ext4") ? " ext4" : "")
<< (android::vold::IsFilesystemSupported("f2fs") ? " f2fs" : "")
<< (android::vold::IsFilesystemSupported("vfat") ? " vfat" : "");
VolumeManager* vm;
NetlinkManager* nm;

2
model/EmulatedVolume.cpp
Unescape View File

@ -105,7 +105,7 @@ status_t EmulatedVolume::doMount() {
nsecs_t start = systemTime(SYSTEM_TIME_BOOTTIME);
while (before == GetDevice(mFuseWrite)) {
LOG(VERBOSE) << "Waiting for FUSE to spin up...";
LOG(DEBUG) << "Waiting for FUSE to spin up...";
usleep(50000); // 50ms
nsecs_t now = systemTime(SYSTEM_TIME_BOOTTIME);

2
model/PublicVolume.cpp
Unescape View File

@ -202,7 +202,7 @@ status_t PublicVolume::doMount() {
nsecs_t start = systemTime(SYSTEM_TIME_BOOTTIME);
while (before == GetDevice(mFuseWrite)) {
LOG(VERBOSE) << "Waiting for FUSE to spin up...";
LOG(DEBUG) << "Waiting for FUSE to spin up...";
usleep(50000); // 50ms
nsecs_t now = systemTime(SYSTEM_TIME_BOOTTIME);

Write Preview
Loading…
Cancel
Save