Add API for retrieving oom scores from ActivityManagerService
bug: 25853091
Change-Id: I3848ee96dc845eb654b5177edc5a6b472024a852
diff --git a/include/binder/IProcessInfoService.h b/include/binder/IProcessInfoService.h
index dc62f45..34ce0f0 100644
--- a/include/binder/IProcessInfoService.h
+++ b/include/binder/IProcessInfoService.h
@@ -31,8 +31,14 @@
/*in*/ int32_t* pids,
/*out*/ int32_t* states) = 0;
+ virtual status_t getProcessStatesAndOomScoresFromPids( size_t length,
+ /*in*/ int32_t* pids,
+ /*out*/ int32_t* states,
+ /*out*/ int32_t* scores) = 0;
+
enum {
GET_PROCESS_STATES_FROM_PIDS = IBinder::FIRST_CALL_TRANSACTION,
+ GET_PROCESS_STATES_AND_OOM_SCORES_FROM_PIDS,
};
};
diff --git a/libs/binder/IProcessInfoService.cpp b/libs/binder/IProcessInfoService.cpp
index d86eb27..c37920d 100644
--- a/libs/binder/IProcessInfoService.cpp
+++ b/libs/binder/IProcessInfoService.cpp
@@ -49,6 +49,39 @@
return reply.readInt32();
}
+ virtual status_t getProcessStatesAndOomScoresFromPids(size_t length,
+ /*in*/ int32_t* pids, /*out*/ int32_t* states, /*out*/ int32_t* scores)
+ {
+ Parcel data, reply;
+ data.writeInterfaceToken(IProcessInfoService::getInterfaceDescriptor());
+ data.writeInt32Array(length, pids);
+ // write length of output arrays, used by java AIDL stubs
+ data.writeInt32(length);
+ data.writeInt32(length);
+ status_t err = remote()->transact(
+ GET_PROCESS_STATES_AND_OOM_SCORES_FROM_PIDS, data, &reply);
+ if (err != NO_ERROR
+ || ((err = reply.readExceptionCode()) != NO_ERROR)) {
+ return err;
+ }
+ int32_t replyLen = reply.readInt32();
+ if (static_cast<size_t>(replyLen) != length) {
+ return NOT_ENOUGH_DATA;
+ }
+ if (replyLen > 0 && (err = reply.read(
+ states, length * sizeof(*states))) != NO_ERROR) {
+ return err;
+ }
+ replyLen = reply.readInt32();
+ if (static_cast<size_t>(replyLen) != length) {
+ return NOT_ENOUGH_DATA;
+ }
+ if (replyLen > 0 && (err = reply.read(
+ scores, length * sizeof(*scores))) != NO_ERROR) {
+ return err;
+ }
+ return reply.readInt32();
+ }
};
IMPLEMENT_META_INTERFACE(ProcessInfoService, "android.os.IProcessInfoService");
@@ -84,6 +117,38 @@
reply->writeInt32(res);
return NO_ERROR;
} break;
+ case GET_PROCESS_STATES_AND_OOM_SCORES_FROM_PIDS: {
+ CHECK_INTERFACE(IProcessInfoService, data, reply);
+ int32_t arrayLen = data.readInt32();
+ if (arrayLen <= 0) {
+ reply->writeNoException();
+ reply->writeInt32(0);
+ reply->writeInt32(NOT_ENOUGH_DATA);
+ return NO_ERROR;
+ }
+
+ size_t len = static_cast<size_t>(arrayLen);
+ int32_t pids[len];
+ status_t res = data.read(pids, len * sizeof(*pids));
+
+ // Ignore output array length returned in the parcel here, as the
+ // states array must always be the same length as the input PIDs array.
+ int32_t states[len];
+ int32_t scores[len];
+ for (size_t i = 0; i < len; i++) {
+ states[i] = -1;
+ scores[i] = -10000;
+ }
+ if (res == NO_ERROR) {
+ res = getProcessStatesAndOomScoresFromPids(
+ len, /*in*/ pids, /*out*/ states, /*out*/ scores);
+ }
+ reply->writeNoException();
+ reply->writeInt32Array(len, states);
+ reply->writeInt32Array(len, scores);
+ reply->writeInt32(res);
+ return NO_ERROR;
+ } break;
default:
return BBinder::onTransact(code, data, reply, flags);
}