Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "BatteryStats: update to use new notifyWakeup with wakeup reasons" am: 6f000144cd am: 42f35b5081 am: 3bf1e46421 am: 689b12f052

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1464467

Change-Id: Ia20748038c96a8062da43e3481214ab43615a0b7
This commit is contained in:
Michael Sun
2020-10-27 22:03:47 +00:00
committed by Automerger Merge Worker
parent 14036d6166 689b12f052
commit 6b8918abae
1 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
services/core/jni/com_android_server_am_BatteryStatsService.cpp
View File

@@ -17,7 +17,6 @@
#define LOG_TAG "BatteryStatsService"
//#define LOG_NDEBUG 0
#include <climits>
#include <errno.h>
#include <fcntl.h>
#include <inttypes.h>
@@ -28,6 +27,7 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#include <climits>
#include <unordered_map>
#include <utility>
@@ -66,10 +66,9 @@ using IPowerV1_0 = android::hardware::power::V1_0::IPower;
namespace android
{
#define LAST_RESUME_REASON "/sys/kernel/wakeup_reasons/last_resume_reason"
#define MAX_REASON_SIZE 512
static bool wakeup_init = false;
static std::mutex mReasonsMutex;
static std::vector<std::string> mWakeupReasons;
static sem_t wakeup_sem;
extern sp<ISuspendControlService> getSuspendControl();
@@ -115,9 +114,25 @@ struct PowerHalDeathRecipient : virtual public hardware::hidl_death_recipient {
sp<PowerHalDeathRecipient> gDeathRecipient = new PowerHalDeathRecipient();
class WakeupCallback : public BnSuspendCallback {
public:
binder::Status notifyWakeup(bool success) override {
public:
binder::Status notifyWakeup(bool success,
const std::vector<std::string>& wakeupReasons) override {
ALOGI("In wakeup_callback: %s", success ? "resumed from suspend" : "suspend aborted");
bool reasonsCaptured = false;
{
std::unique_lock<std::mutex> reasonsLock(mReasonsMutex, std::defer_lock);
if (reasonsLock.try_lock() && mWakeupReasons.empty()) {
mWakeupReasons = std::move(wakeupReasons);
reasonsCaptured = true;
}
}
if (!reasonsCaptured) {
ALOGE("Failed to write wakeup reasons. Reasons dropped:");
for (auto wakeupReason : wakeupReasons) {
ALOGE("\t%s", wakeupReason.c_str());
}
}
int ret = sem_post(&wakeup_sem);
if (ret < 0) {
char buf[80];
@@ -157,8 +172,6 @@ static jint nativeWaitWakeup(JNIEnv *env, jobject clazz, jobject outBuf)
// Wait for wakeup.
ALOGV("Waiting for wakeup...");
// TODO(b/116747600): device can suspend and wakeup after sem_wait() finishes and before wakeup
// reason is recorded, i.e. BatteryStats might occasionally miss wakeup events.
int ret = sem_wait(&wakeup_sem);
if (ret < 0) {
char buf[80];
@@ -168,20 +181,27 @@ static jint nativeWaitWakeup(JNIEnv *env, jobject clazz, jobject outBuf)
return 0;
}
FILE *fp = fopen(LAST_RESUME_REASON, "r");
if (fp == NULL) {
ALOGE("Failed to open %s", LAST_RESUME_REASON);
return -1;
}
char* mergedreason = (char*)env->GetDirectBufferAddress(outBuf);
int remainreasonlen = (int)env->GetDirectBufferCapacity(outBuf);
ALOGV("Reading wakeup reasons");
std::vector<std::string> wakeupReasons;
{
std::unique_lock<std::mutex> reasonsLock(mReasonsMutex, std::defer_lock);
if (reasonsLock.try_lock() && !mWakeupReasons.empty()) {
wakeupReasons = std::move(mWakeupReasons);
mWakeupReasons.clear();
}
}
if (wakeupReasons.empty()) {
return 0;
}
char* mergedreasonpos = mergedreason;
char reasonline[128];
int i = 0;
while (fgets(reasonline, sizeof(reasonline), fp) != NULL) {
for (auto wakeupReason : wakeupReasons) {
auto reasonline = const_cast<char*>(wakeupReason.c_str());
char* pos = reasonline;
char* endPos;
int len;
@@ -238,10 +258,6 @@ static jint nativeWaitWakeup(JNIEnv *env, jobject clazz, jobject outBuf)
*mergedreasonpos = 0;
}
if (fclose(fp) != 0) {
ALOGE("Failed to close %s", LAST_RESUME_REASON);
return -1;
}
return mergedreasonpos - mergedreason;
}