Merge "codec2 hal: AIDL type conversion, step 2" into main
diff --git a/camera/ndk/Android.bp b/camera/ndk/Android.bp
index fef873b..e7d4680 100644
--- a/camera/ndk/Android.bp
+++ b/camera/ndk/Android.bp
@@ -166,11 +166,6 @@
include_dirs: [
"system/media/private/camera/include",
],
- product_variables: {
- pdk: {
- enabled: false,
- },
- },
}
cc_test {
diff --git a/media/codec2/vndk/platform/C2SurfaceSyncObj.cpp b/media/codec2/vndk/platform/C2SurfaceSyncObj.cpp
index bf4ca32..01fd30b 100644
--- a/media/codec2/vndk/platform/C2SurfaceSyncObj.cpp
+++ b/media/codec2/vndk/platform/C2SurfaceSyncObj.cpp
@@ -114,8 +114,8 @@
}
namespace {
- constexpr int kSpinNumForLock = 100;
- constexpr int kSpinNumForUnlock = 200;
+ constexpr int kSpinNumForLock = 0;
+ constexpr int kSpinNumForUnlock = 0;
enum : uint32_t {
FUTEX_UNLOCKED = 0,
@@ -125,32 +125,65 @@
}
int C2SyncVariables::lock() {
- uint32_t old;
+ uint32_t old = FUTEX_UNLOCKED;
+
+ // see if we can lock uncontended immediately (if previously unlocked)
+ if (mLock.compare_exchange_strong(old, FUTEX_LOCKED_UNCONTENDED)) {
+ return 0;
+ }
+
+ // spin to see if we can get it with a short wait without involving kernel
for (int i = 0; i < kSpinNumForLock; i++) {
- old = 0;
+ sched_yield();
+
+ old = FUTEX_UNLOCKED;
if (mLock.compare_exchange_strong(old, FUTEX_LOCKED_UNCONTENDED)) {
return 0;
}
- sched_yield();
}
- if (old == FUTEX_LOCKED_UNCONTENDED)
+ // still locked, if other side thinks it was uncontended, now it is contended, so let them
+ // know that they need to wake us up.
+ if (old == FUTEX_LOCKED_UNCONTENDED) {
old = mLock.exchange(FUTEX_LOCKED_CONTENDED);
+ // It is possible that the other holder released the lock at this very moment (and old
+ // becomes UNLOCKED), If so, we will not involve the kernel to wait for the lock to be
+ // released, but are still marking our lock contended (even though we are the only
+ // holders.)
+ }
- while (old) {
- (void) syscall(__NR_futex, &mLock, FUTEX_WAIT, FUTEX_LOCKED_CONTENDED, NULL, NULL, 0);
+ // while the futex is still locked by someone else
+ while (old != FUTEX_UNLOCKED) {
+ // wait until other side releases the lock (and still contented)
+ (void)syscall(__NR_futex, &mLock, FUTEX_WAIT, FUTEX_LOCKED_CONTENDED, NULL, NULL, 0);
+ // try to relock
old = mLock.exchange(FUTEX_LOCKED_CONTENDED);
}
return 0;
}
int C2SyncVariables::unlock() {
- if (mLock.exchange(FUTEX_UNLOCKED) == FUTEX_LOCKED_UNCONTENDED) return 0;
+ // TRICKY: here we assume that we are holding this lock
+ // unlock the lock immediately (since we were holding it)
+ // If it is (still) locked uncontested, we are done (no need to involve the kernel)
+ if (mLock.exchange(FUTEX_UNLOCKED) == FUTEX_LOCKED_UNCONTENDED) {
+ return 0;
+ }
+
+ // We don't need to spin for unlock as here we know already we have a waiter who we need to
+ // wake up. This code was here in case someone just happened to lock this lock (uncontested)
+ // before we would wake up other waiters to avoid a syscall. It is unsure if this ever gets
+ // exercised or if this is the behavior we want. (Note that if this code is removed, the same
+ // situation is still handled in lock() by the woken up waiter that realizes that the lock is
+ // now taken.)
for (int i = 0; i < kSpinNumForUnlock; i++) {
- if (mLock.load()) {
+ // here we seem to check if someone relocked this lock, and if they relocked uncontested,
+ // we up it to contested (since there are other waiters.)
+ if (mLock.load() != FUTEX_UNLOCKED) {
uint32_t old = FUTEX_LOCKED_UNCONTENDED;
mLock.compare_exchange_strong(old, FUTEX_LOCKED_CONTENDED);
+ // this is always true here so we return immediately
if (old) {
return 0;
}
@@ -158,7 +191,8 @@
sched_yield();
}
- (void) syscall(__NR_futex, &mLock, FUTEX_WAKE, 1, NULL, NULL, 0);
+ // wake up one waiter
+ (void)syscall(__NR_futex, &mLock, FUTEX_WAKE, 1, NULL, NULL, 0);
return 0;
}
diff --git a/media/libaudiohal/impl/EffectHalAidl.cpp b/media/libaudiohal/impl/EffectHalAidl.cpp
index ae4a530..b8e62ae 100644
--- a/media/libaudiohal/impl/EffectHalAidl.cpp
+++ b/media/libaudiohal/impl/EffectHalAidl.cpp
@@ -56,6 +56,7 @@
using ::aidl::android::hardware::audio::effect::Descriptor;
using ::aidl::android::hardware::audio::effect::IEffect;
using ::aidl::android::hardware::audio::effect::IFactory;
+using ::aidl::android::hardware::audio::effect::State;
namespace android {
namespace effect {
@@ -165,13 +166,20 @@
// write to input FMQ here, wait for statusMQ STATUS_OK, and read from output FMQ
status_t EffectHalAidl::process() {
+ State state = State::INIT;
+ if (mConversion->isBypassing() || !mEffect->getState(&state).isOk() ||
+ state != State::PROCESSING) {
+ ALOGI("%s skipping %s process because it's %s", __func__, mDesc.common.name.c_str(),
+ mConversion->isBypassing()
+ ? "bypassing"
+ : aidl::android::hardware::audio::effect::toString(state).c_str());
+ return OK;
+ }
+
auto statusQ = mConversion->getStatusMQ();
auto inputQ = mConversion->getInputMQ();
auto outputQ = mConversion->getOutputMQ();
auto efGroup = mConversion->getEventFlagGroup();
- if (mConversion->isBypassing()) {
- return OK;
- }
if (!statusQ || !statusQ->isValid() || !inputQ || !inputQ->isValid() || !outputQ ||
!outputQ->isValid() || !efGroup) {
ALOGE("%s invalid FMQ [Status %d I %d O %d] efGroup %p", __func__,
diff --git a/media/libstagefright/http/Android.bp b/media/libstagefright/http/Android.bp
index f25318d..4383d6f 100644
--- a/media/libstagefright/http/Android.bp
+++ b/media/libstagefright/http/Android.bp
@@ -37,10 +37,4 @@
],
cfi: true,
},
-
- product_variables: {
- pdk: {
- enabled: false,
- },
- },
}
diff --git a/media/ndk/Android.bp b/media/ndk/Android.bp
index fded4f5..8b9dde3 100644
--- a/media/ndk/Android.bp
+++ b/media/ndk/Android.bp
@@ -161,11 +161,6 @@
"libgui",
],
- product_variables: {
- pdk: {
- enabled: false,
- },
- },
version_script: "libmediandk.map.txt",
stubs: {
symbol_file: "libmediandk.map.txt",
diff --git a/services/camera/libcameraservice/api2/HeicCompositeStream.cpp b/services/camera/libcameraservice/api2/HeicCompositeStream.cpp
index 2cc8e33..0feded2 100644
--- a/services/camera/libcameraservice/api2/HeicCompositeStream.cpp
+++ b/services/camera/libcameraservice/api2/HeicCompositeStream.cpp
@@ -437,15 +437,27 @@
newFormat->setString(KEY_MIME, mimeHeic);
newFormat->setInt32(KEY_WIDTH, mOutputWidth);
newFormat->setInt32(KEY_HEIGHT, mOutputHeight);
- if (mUseGrid) {
+ }
+
+ if (mUseGrid || mUseHeic) {
+ int32_t gridRows, gridCols, tileWidth, tileHeight;
+ if (newFormat->findInt32(KEY_GRID_ROWS, &gridRows) &&
+ newFormat->findInt32(KEY_GRID_COLUMNS, &gridCols) &&
+ newFormat->findInt32(KEY_TILE_WIDTH, &tileWidth) &&
+ newFormat->findInt32(KEY_TILE_HEIGHT, &tileHeight)) {
+ mGridWidth = tileWidth;
+ mGridHeight = tileHeight;
+ mGridRows = gridRows;
+ mGridCols = gridCols;
+ } else {
newFormat->setInt32(KEY_TILE_WIDTH, mGridWidth);
newFormat->setInt32(KEY_TILE_HEIGHT, mGridHeight);
newFormat->setInt32(KEY_GRID_ROWS, mGridRows);
newFormat->setInt32(KEY_GRID_COLUMNS, mGridCols);
- int32_t left, top, right, bottom;
- if (newFormat->findRect("crop", &left, &top, &right, &bottom)) {
- newFormat->setRect("crop", 0, 0, mOutputWidth - 1, mOutputHeight - 1);
- }
+ }
+ int32_t left, top, right, bottom;
+ if (newFormat->findRect("crop", &left, &top, &right, &bottom)) {
+ newFormat->setRect("crop", 0, 0, mOutputWidth - 1, mOutputHeight - 1);
}
}
newFormat->setInt32(KEY_IS_DEFAULT, 1 /*isPrimary*/);
diff --git a/services/mediaresourcemanager/ResourceManagerMetrics.cpp b/services/mediaresourcemanager/ResourceManagerMetrics.cpp
index f8cdb80..e26fd28 100644
--- a/services/mediaresourcemanager/ResourceManagerMetrics.cpp
+++ b/services/mediaresourcemanager/ResourceManagerMetrics.cpp
@@ -434,7 +434,7 @@
void ResourceManagerMetrics::pushReclaimAtom(const ClientInfoParcel& clientInfo,
const std::vector<int>& priorities,
- const Vector<std::shared_ptr<IResourceManagerClient>>& clients,
+ const std::vector<std::shared_ptr<IResourceManagerClient>>& clients,
const PidUidVector& idList, bool reclaimed) {
// Construct the metrics for codec reclaim as a pushed atom.
// 1. Information about the requester.
diff --git a/services/mediaresourcemanager/ResourceManagerMetrics.h b/services/mediaresourcemanager/ResourceManagerMetrics.h
index 3124aa2..d99c5b1 100644
--- a/services/mediaresourcemanager/ResourceManagerMetrics.h
+++ b/services/mediaresourcemanager/ResourceManagerMetrics.h
@@ -135,7 +135,7 @@
// To be called when after a reclaim event.
void pushReclaimAtom(const ClientInfoParcel& clientInfo,
const std::vector<int>& priorities,
- const Vector<std::shared_ptr<IResourceManagerClient>>& clients,
+ const std::vector<std::shared_ptr<IResourceManagerClient>>& clients,
const PidUidVector& idList, bool reclaimed);
// Add this pid/uid set to monitor for the process termination state.
diff --git a/services/mediaresourcemanager/ResourceManagerService.cpp b/services/mediaresourcemanager/ResourceManagerService.cpp
index 28a17b8..b2971c4 100644
--- a/services/mediaresourcemanager/ResourceManagerService.cpp
+++ b/services/mediaresourcemanager/ResourceManagerService.cpp
@@ -124,7 +124,7 @@
}
template <typename T>
-static String8 getString(const std::vector<T> &items) {
+static String8 getString(const std::vector<T>& items) {
String8 itemsStr;
for (size_t i = 0; i < items.size(); ++i) {
itemsStr.appendFormat("%s ", toString(items[i]).string());
@@ -165,8 +165,8 @@
static bool hasResourceType(MediaResource::Type type, MediaResource::SubType subType,
const ResourceInfos& infos) {
- for (size_t i = 0; i < infos.size(); ++i) {
- if (hasResourceType(type, subType, infos[i].resources)) {
+ for (const auto& [id, info] : infos) {
+ if (hasResourceType(type, subType, info.resources)) {
return true;
}
}
@@ -174,41 +174,37 @@
}
static ResourceInfos& getResourceInfosForEdit(int pid, PidResourceInfosMap& map) {
- ssize_t index = map.indexOfKey(pid);
- if (index < 0) {
+ PidResourceInfosMap::iterator found = map.find(pid);
+ if (found == map.end()) {
// new pid
ResourceInfos infosForPid;
- map.add(pid, infosForPid);
+ auto [it, inserted] = map.emplace(pid, infosForPid);
+ found = it;
}
- return map.editValueFor(pid);
+ return found->second;
}
static ResourceInfo& getResourceInfoForEdit(uid_t uid, int64_t clientId,
const std::string& name,
const std::shared_ptr<IResourceManagerClient>& client, ResourceInfos& infos) {
- ssize_t index = infos.indexOfKey(clientId);
+ ResourceInfos::iterator found = infos.find(clientId);
- if (index < 0) {
- ResourceInfo info;
- info.uid = uid;
- info.clientId = clientId;
- if (name.empty()) {
- info.name = "<unknown client>";
- } else {
- info.name = name;
- }
- info.client = client;
- info.cookie = 0;
- info.pendingRemoval = false;
-
- index = infos.add(clientId, info);
+ if (found == infos.end()) {
+ ResourceInfo info{.uid = uid,
+ .clientId = clientId,
+ .name = name.empty()? "<unknown client>" : name,
+ .client = client,
+ .cookie = 0,
+ .pendingRemoval = false};
+ auto [it, inserted] = infos.emplace(clientId, info);
+ found = it;
}
- return infos.editValueAt(index);
+ return found->second;
}
-static void notifyResourceGranted(int pid, const std::vector<MediaResourceParcel> &resources) {
+static void notifyResourceGranted(int pid, const std::vector<MediaResourceParcel>& resources) {
static const char* const kServiceName = "media_resource_monitor";
sp<IBinder> binder = defaultServiceManager()->checkService(String16(kServiceName));
if (binder != NULL) {
@@ -249,7 +245,7 @@
std::map<int, int> overridePidMapCopy;
String8 serviceLog;
{
- Mutex::Autolock lock(mLock);
+ std::scoped_lock lock{mLock};
mapCopy = mMap; // Shadow copy, real copy will happen on write.
supportsMultipleSecureCodecs = mSupportsMultipleSecureCodecs;
supportsSecureWithNonSecureCodec = mSupportsSecureWithNonSecureCodec;
@@ -269,8 +265,7 @@
result.append(buffer);
result.append(" Processes:\n");
- for (size_t i = 0; i < mapCopy.size(); ++i) {
- int pid = mapCopy.keyAt(i);
+ for (const auto& [pid, infos] : mapCopy) {
snprintf(buffer, SIZE, " Pid: %d\n", pid);
result.append(buffer);
int priority = 0;
@@ -281,17 +276,16 @@
}
result.append(buffer);
- const ResourceInfos &infos = mapCopy.valueAt(i);
- for (size_t j = 0; j < infos.size(); ++j) {
+ for (const auto& [infoKey, info] : infos) {
result.append(" Client:\n");
- snprintf(buffer, SIZE, " Id: %lld\n", (long long)infos[j].clientId);
+ snprintf(buffer, SIZE, " Id: %lld\n", (long long)info.clientId);
result.append(buffer);
- std::string clientName = infos[j].name;
+ std::string clientName = info.name;
snprintf(buffer, SIZE, " Name: %s\n", clientName.c_str());
result.append(buffer);
- const ResourceList &resources = infos[j].resources;
+ const ResourceList& resources = info.resources;
result.append(" Resources:\n");
for (auto it = resources.begin(); it != resources.end(); it++) {
snprintf(buffer, SIZE, " %s\n", toString(it->second).string());
@@ -388,7 +382,7 @@
String8 log = String8::format("config(%s)", getString(policies).string());
mServiceLog->add(log);
- Mutex::Autolock lock(mLock);
+ std::scoped_lock lock{mLock};
for (size_t i = 0; i < policies.size(); ++i) {
const std::string &type = policies[i].type;
const std::string &value = policies[i].value;
@@ -461,7 +455,7 @@
pid, uid, (long long) clientId, getString(resources).string());
mServiceLog->add(log);
- Mutex::Autolock lock(mLock);
+ std::scoped_lock lock{mLock};
if (!mProcessInfo->isPidUidTrusted(pid, uid)) {
pid_t callingPid = IPCThreadState::self()->getCallingPid();
uid_t callingUid = IPCThreadState::self()->getCallingUid();
@@ -523,27 +517,27 @@
pid, uid, (long long) clientId, getString(resources).string());
mServiceLog->add(log);
- Mutex::Autolock lock(mLock);
+ std::scoped_lock lock{mLock};
if (!mProcessInfo->isPidTrusted(pid)) {
pid_t callingPid = IPCThreadState::self()->getCallingPid();
ALOGW("%s called with untrusted pid %d, using calling pid %d", __FUNCTION__,
pid, callingPid);
pid = callingPid;
}
- ssize_t index = mMap.indexOfKey(pid);
- if (index < 0) {
+ PidResourceInfosMap::iterator found = mMap.find(pid);
+ if (found == mMap.end()) {
ALOGV("removeResource: didn't find pid %d for clientId %lld", pid, (long long) clientId);
return Status::ok();
}
- ResourceInfos &infos = mMap.editValueAt(index);
+ ResourceInfos& infos = found->second;
- index = infos.indexOfKey(clientId);
- if (index < 0) {
+ ResourceInfos::iterator foundClient = infos.find(clientId);
+ if (foundClient == infos.end()) {
ALOGV("removeResource: didn't find clientId %lld", (long long) clientId);
return Status::ok();
}
- ResourceInfo &info = infos.editValueAt(index);
+ ResourceInfo& info = foundClient->second;
ResourceList resourceRemoved;
for (size_t i = 0; i < resources.size(); ++i) {
const auto &res = resources[i];
@@ -593,27 +587,27 @@
pid, uid, (long long) clientId);
mServiceLog->add(log);
- Mutex::Autolock lock(mLock);
+ std::scoped_lock lock{mLock};
if (checkValid && !mProcessInfo->isPidTrusted(pid)) {
pid_t callingPid = IPCThreadState::self()->getCallingPid();
ALOGW("%s called with untrusted pid %d, using calling pid %d", __FUNCTION__,
pid, callingPid);
pid = callingPid;
}
- ssize_t index = mMap.indexOfKey(pid);
- if (index < 0) {
+ PidResourceInfosMap::iterator found = mMap.find(pid);
+ if (found == mMap.end()) {
ALOGV("removeResource: didn't find pid %d for clientId %lld", pid, (long long) clientId);
return Status::ok();
}
- ResourceInfos &infos = mMap.editValueAt(index);
+ ResourceInfos& infos = found->second;
- index = infos.indexOfKey(clientId);
- if (index < 0) {
+ ResourceInfos::iterator foundClient = infos.find(clientId);
+ if (foundClient == infos.end()) {
ALOGV("removeResource: didn't find clientId %lld", (long long) clientId);
return Status::ok();
}
- const ResourceInfo &info = infos[index];
+ const ResourceInfo& info = foundClient->second;
for (auto it = info.resources.begin(); it != info.resources.end(); it++) {
onLastRemoved(it->second, info);
}
@@ -627,14 +621,14 @@
mObserverService->onResourceRemoved(info.uid, pid, info.resources);
}
- infos.removeItemsAt(index);
+ infos.erase(foundClient);
return Status::ok();
}
void ResourceManagerService::getClientForResource_l(int callingPid,
const MediaResourceParcel *res,
PidUidVector* idVector,
- Vector<std::shared_ptr<IResourceManagerClient>> *clients) {
+ std::vector<std::shared_ptr<IResourceManagerClient>>* clients) {
if (res == NULL) {
return;
}
@@ -653,10 +647,10 @@
mServiceLog->add(log);
*_aidl_return = false;
- Vector<std::shared_ptr<IResourceManagerClient>> clients;
+ std::vector<std::shared_ptr<IResourceManagerClient>> clients;
PidUidVector idVector;
{
- Mutex::Autolock lock(mLock);
+ std::scoped_lock lock{mLock};
if (!mProcessInfo->isPidTrusted(callingPid)) {
pid_t actualCallingPid = IPCThreadState::self()->getCallingPid();
ALOGW("%s called with untrusted pid %d, using actual calling pid %d", __FUNCTION__,
@@ -749,7 +743,7 @@
}
void ResourceManagerService::pushReclaimAtom(const ClientInfoParcel& clientInfo,
- const Vector<std::shared_ptr<IResourceManagerClient>>& clients,
+ const std::vector<std::shared_ptr<IResourceManagerClient>>& clients,
const PidUidVector& idVector, bool reclaimed) {
int32_t callingPid = clientInfo.pid;
int requesterPriority = -1;
@@ -767,7 +761,7 @@
}
bool ResourceManagerService::reclaimUnconditionallyFrom(
- const Vector<std::shared_ptr<IResourceManagerClient>> &clients) {
+ const std::vector<std::shared_ptr<IResourceManagerClient>>& clients) {
if (clients.size() == 0) {
return false;
}
@@ -790,20 +784,18 @@
int failedClientPid = -1;
{
- Mutex::Autolock lock(mLock);
+ std::scoped_lock lock{mLock};
bool found = false;
- for (size_t i = 0; i < mMap.size(); ++i) {
- ResourceInfos &infos = mMap.editValueAt(i);
- for (size_t j = 0; j < infos.size();) {
- if (infos[j].client == failedClient) {
- j = infos.removeItemsAt(j);
+ for (auto& [pid, infos] : mMap) {
+ for (const auto& [id, info] : infos) {
+ if (info.client == failedClient) {
+ infos.erase(id);
found = true;
- } else {
- ++j;
+ break;
}
}
if (found) {
- failedClientPid = mMap.keyAt(i);
+ failedClientPid = pid;
break;
}
}
@@ -835,7 +827,7 @@
}
{
- Mutex::Autolock lock(mLock);
+ std::scoped_lock lock{mLock};
mOverridePidMap.erase(originalPid);
if (newPid != -1) {
mOverridePidMap.emplace(originalPid, newPid);
@@ -865,7 +857,7 @@
return Status::fromServiceSpecificError(BAD_VALUE);
}
- Mutex::Autolock lock(mLock);
+ std::scoped_lock lock{mLock};
removeProcessInfoOverride_l(pid);
if (!mProcessInfo->overrideProcessInfo(pid, procState, oomScore)) {
@@ -912,7 +904,7 @@
}
void ResourceManagerService::removeProcessInfoOverride(int pid) {
- Mutex::Autolock lock(mLock);
+ std::scoped_lock lock{mLock};
removeProcessInfoOverride_l(pid);
}
@@ -938,28 +930,28 @@
pid, (long long) clientId);
mServiceLog->add(log);
- Mutex::Autolock lock(mLock);
+ std::scoped_lock lock{mLock};
if (!mProcessInfo->isPidTrusted(pid)) {
pid_t callingPid = IPCThreadState::self()->getCallingPid();
ALOGW("%s called with untrusted pid %d, using calling pid %d", __FUNCTION__,
pid, callingPid);
pid = callingPid;
}
- ssize_t index = mMap.indexOfKey(pid);
- if (index < 0) {
+ PidResourceInfosMap::iterator found = mMap.find(pid);
+ if (found == mMap.end()) {
ALOGV("markClientForPendingRemoval: didn't find pid %d for clientId %lld",
pid, (long long)clientId);
return Status::ok();
}
- ResourceInfos &infos = mMap.editValueAt(index);
+ ResourceInfos& infos = found->second;
- index = infos.indexOfKey(clientId);
- if (index < 0) {
+ ResourceInfos::iterator foundClient = infos.find(clientId);
+ if (foundClient == infos.end()) {
ALOGV("markClientForPendingRemoval: didn't find clientId %lld", (long long) clientId);
return Status::ok();
}
- ResourceInfo &info = infos.editValueAt(index);
+ ResourceInfo& info = foundClient->second;
info.pendingRemoval = true;
return Status::ok();
}
@@ -968,9 +960,9 @@
String8 log = String8::format("reclaimResourcesFromClientsPendingRemoval(pid %d)", pid);
mServiceLog->add(log);
- Vector<std::shared_ptr<IResourceManagerClient>> clients;
+ std::vector<std::shared_ptr<IResourceManagerClient>> clients;
{
- Mutex::Autolock lock(mLock);
+ std::scoped_lock lock{mLock};
if (!mProcessInfo->isPidTrusted(pid)) {
pid_t callingPid = IPCThreadState::self()->getCallingPid();
ALOGW("%s called with untrusted pid %d, using calling pid %d", __FUNCTION__,
@@ -992,7 +984,7 @@
std::shared_ptr<IResourceManagerClient> client;
uid_t uid = 0;
if (getBiggestClientPendingRemoval_l(pid, type, subType, uid, &client)) {
- clients.add(client);
+ clients.push_back(client);
continue;
}
}
@@ -1003,7 +995,7 @@
uid_t uid = 0;
if (getBiggestClientPendingRemoval_l(pid, type,
MediaResource::SubType::kUnspecifiedSubType, uid, &client)) {
- clients.add(client);
+ clients.push_back(client);
}
break;
}
@@ -1031,23 +1023,22 @@
bool ResourceManagerService::getAllClients_l(int callingPid, MediaResource::Type type,
MediaResource::SubType subType,
PidUidVector* idVector,
- Vector<std::shared_ptr<IResourceManagerClient>> *clients) {
- Vector<std::shared_ptr<IResourceManagerClient>> temp;
+ std::vector<std::shared_ptr<IResourceManagerClient>>* clients) {
+ std::vector<std::shared_ptr<IResourceManagerClient>> temp;
PidUidVector tempIdList;
- for (size_t i = 0; i < mMap.size(); ++i) {
- ResourceInfos &infos = mMap.editValueAt(i);
- for (size_t j = 0; j < infos.size(); ++j) {
- if (hasResourceType(type, subType, infos[j].resources)) {
- if (!isCallingPriorityHigher_l(callingPid, mMap.keyAt(i))) {
+ for (auto& [pid, infos] : mMap) {
+ for (const auto& [id, info] : infos) {
+ if (hasResourceType(type, subType, info.resources)) {
+ if (!isCallingPriorityHigher_l(callingPid, pid)) {
// some higher/equal priority process owns the resource,
// this request can't be fulfilled.
ALOGE("getAllClients_l: can't reclaim resource %s from pid %d",
- asString(type), mMap.keyAt(i));
+ asString(type), pid);
return false;
}
- temp.push_back(infos[j].client);
- tempIdList.emplace_back(mMap.keyAt(i), infos[j].uid);
+ temp.push_back(info.client);
+ tempIdList.emplace_back(pid, info.uid);
}
}
}
@@ -1055,7 +1046,8 @@
ALOGV("getAllClients_l: didn't find any resource %s", asString(type));
return true;
}
- clients->appendVector(temp);
+
+ clients->insert(std::end(*clients), std::begin(temp), std::end(temp));
idVector->insert(std::end(*idVector), std::begin(tempIdList), std::end(tempIdList));
return true;
}
@@ -1102,17 +1094,16 @@
MediaResource::SubType subType, int *lowestPriorityPid, int *lowestPriority) {
int pid = -1;
int priority = -1;
- for (size_t i = 0; i < mMap.size(); ++i) {
- if (mMap.valueAt(i).size() == 0) {
+ for (auto& [tempPid, infos] : mMap) {
+ if (infos.size() == 0) {
// no client on this process.
continue;
}
- if (!hasResourceType(type, subType, mMap.valueAt(i))) {
+ if (!hasResourceType(type, subType, infos)) {
// doesn't have the requested resource type
continue;
}
- int tempPid = mMap.keyAt(i);
- int tempPriority;
+ int tempPriority = -1;
if (!getPriority_l(tempPid, &tempPriority)) {
ALOGV("getLowestPriorityPid_l: can't get priority of pid %d, skipped", tempPid);
// TODO: remove this pid from mMap?
@@ -1155,8 +1146,8 @@
MediaResource::SubType subType, uid_t& uid,
std::shared_ptr<IResourceManagerClient> *client,
bool pendingRemovalOnly) {
- ssize_t index = mMap.indexOfKey(pid);
- if (index < 0) {
+ PidResourceInfosMap::iterator found = mMap.find(pid);
+ if (found == mMap.end()) {
ALOGE_IF(!pendingRemovalOnly,
"getBiggestClient_l: can't find resource info for pid %d", pid);
return false;
@@ -1164,10 +1155,10 @@
std::shared_ptr<IResourceManagerClient> clientTemp;
uint64_t largestValue = 0;
- const ResourceInfos &infos = mMap.valueAt(index);
- for (size_t i = 0; i < infos.size(); ++i) {
- const ResourceList &resources = infos[i].resources;
- if (pendingRemovalOnly && !infos[i].pendingRemoval) {
+ const ResourceInfos& infos = found->second;
+ for (const auto& [id, info] : infos) {
+ const ResourceList& resources = info.resources;
+ if (pendingRemovalOnly && !info.pendingRemoval) {
continue;
}
for (auto it = resources.begin(); it != resources.end(); it++) {
@@ -1175,8 +1166,8 @@
if (hasResourceType(type, subType, resource)) {
if (resource.value > largestValue) {
largestValue = resource.value;
- clientTemp = infos[i].client;
- uid = infos[i].uid;
+ clientTemp = info.client;
+ uid = info.uid;
}
}
}
diff --git a/services/mediaresourcemanager/ResourceManagerService.h b/services/mediaresourcemanager/ResourceManagerService.h
index 1519e0e..a05a346 100644
--- a/services/mediaresourcemanager/ResourceManagerService.h
+++ b/services/mediaresourcemanager/ResourceManagerService.h
@@ -22,15 +22,13 @@
#include <set>
#include <mutex>
#include <string>
+#include <vector>
#include <aidl/android/media/BnResourceManagerService.h>
-#include <arpa/inet.h>
#include <media/MediaResource.h>
#include <utils/Errors.h>
-#include <utils/KeyedVector.h>
#include <utils/String8.h>
#include <utils/threads.h>
-#include <utils/Vector.h>
namespace android {
@@ -66,9 +64,8 @@
// vector of <PID, UID>
typedef std::vector<std::pair<int32_t, uid_t>> PidUidVector;
-// TODO: convert these to std::map
-typedef KeyedVector<int64_t, ResourceInfo> ResourceInfos;
-typedef KeyedVector<int, ResourceInfos> PidResourceInfosMap;
+typedef std::map<int64_t, ResourceInfo> ResourceInfos;
+typedef std::map<int, ResourceInfos> PidResourceInfosMap;
class ResourceManagerService : public BnResourceManagerService {
public:
@@ -136,14 +133,15 @@
// Reclaims resources from |clients|. Returns true if reclaim succeeded
// for all clients.
- bool reclaimUnconditionallyFrom(const Vector<std::shared_ptr<IResourceManagerClient>> &clients);
+ bool reclaimUnconditionallyFrom(
+ const std::vector<std::shared_ptr<IResourceManagerClient>>& clients);
// Gets the list of all the clients who own the specified resource type.
// Returns false if any client belongs to a process with higher priority than the
// calling process. The clients will remain unchanged if returns false.
bool getAllClients_l(int callingPid, MediaResource::Type type, MediaResource::SubType subType,
PidUidVector* idList,
- Vector<std::shared_ptr<IResourceManagerClient>> *clients);
+ std::vector<std::shared_ptr<IResourceManagerClient>>* clients);
// Gets the client who owns specified resource type from lowest possible priority process.
// Returns false if the calling process priority is not higher than the lowest process
@@ -174,7 +172,7 @@
// the result client to the given Vector.
void getClientForResource_l(int callingPid, const MediaResourceParcel *res,
PidUidVector* idList,
- Vector<std::shared_ptr<IResourceManagerClient>> *clients);
+ std::vector<std::shared_ptr<IResourceManagerClient>>* clients);
void onFirstAdded(const MediaResourceParcel& res, const ResourceInfo& clientInfo);
void onLastRemoved(const MediaResourceParcel& res, const ResourceInfo& clientInfo);
@@ -194,7 +192,7 @@
uintptr_t cookie);
void pushReclaimAtom(const ClientInfoParcel& clientInfo,
- const Vector<std::shared_ptr<IResourceManagerClient>>& clients,
+ const std::vector<std::shared_ptr<IResourceManagerClient>>& clients,
const PidUidVector& idList, bool reclaimed);
// Get the peak concurrent pixel count (associated with the video codecs) for the process.
@@ -202,7 +200,7 @@
// Get the current concurrent pixel count (associated with the video codecs) for the process.
long getCurrentConcurrentPixelCount(int pid) const;
- mutable Mutex mLock;
+ mutable std::mutex mLock;
sp<ProcessInfoInterface> mProcessInfo;
sp<SystemCallbackInterface> mSystemCB;
sp<ServiceLog> mServiceLog;
diff --git a/services/mediaresourcemanager/test/ResourceManagerService_test.cpp b/services/mediaresourcemanager/test/ResourceManagerService_test.cpp
index 4e575f0..ae3faea 100644
--- a/services/mediaresourcemanager/test/ResourceManagerService_test.cpp
+++ b/services/mediaresourcemanager/test/ResourceManagerService_test.cpp
@@ -131,18 +131,18 @@
const PidResourceInfosMap &map = mService->mMap;
EXPECT_EQ(2u, map.size());
- ssize_t index1 = map.indexOfKey(kTestPid1);
- ASSERT_GE(index1, 0);
- const ResourceInfos &infos1 = map[index1];
+ const auto& mapIndex1 = map.find(kTestPid1);
+ EXPECT_TRUE(mapIndex1 != map.end());
+ const ResourceInfos &infos1 = mapIndex1->second;
EXPECT_EQ(1u, infos1.size());
- expectEqResourceInfo(infos1.valueFor(getId(mTestClient1)), kTestUid1, mTestClient1, resources1);
+ expectEqResourceInfo(infos1.at(getId(mTestClient1)), kTestUid1, mTestClient1, resources1);
- ssize_t index2 = map.indexOfKey(kTestPid2);
- ASSERT_GE(index2, 0);
- const ResourceInfos &infos2 = map[index2];
+ const auto& mapIndex2 = map.find(kTestPid2);
+ EXPECT_TRUE(mapIndex2 != map.end());
+ const ResourceInfos &infos2 = mapIndex2->second;
EXPECT_EQ(2u, infos2.size());
- expectEqResourceInfo(infos2.valueFor(getId(mTestClient2)), kTestUid2, mTestClient2, resources2);
- expectEqResourceInfo(infos2.valueFor(getId(mTestClient3)), kTestUid2, mTestClient3, resources3);
+ expectEqResourceInfo(infos2.at(getId(mTestClient2)), kTestUid2, mTestClient2, resources2);
+ expectEqResourceInfo(infos2.at(getId(mTestClient3)), kTestUid2, mTestClient3, resources3);
}
void testCombineResourceWithNegativeValues() {
@@ -161,12 +161,12 @@
// 2) both resource entries should have been rejected, resource list should be empty.
const PidResourceInfosMap &map = mService->mMap;
EXPECT_EQ(1u, map.size());
- ssize_t index1 = map.indexOfKey(kTestPid1);
- ASSERT_GE(index1, 0);
- const ResourceInfos &infos1 = map[index1];
+ const auto& mapIndex1 = map.find(kTestPid1);
+ EXPECT_TRUE(mapIndex1 != map.end());
+ const ResourceInfos &infos1 = mapIndex1->second;
EXPECT_EQ(1u, infos1.size());
std::vector<MediaResourceParcel> expected;
- expectEqResourceInfo(infos1.valueFor(getId(mTestClient1)), kTestUid1, mTestClient1, expected);
+ expectEqResourceInfo(infos1.at(getId(mTestClient1)), kTestUid1, mTestClient1, expected);
resources1.clear();
resources1.push_back(MediaResource(MediaResource::Type::kDrmSession, INT64_MAX));
@@ -181,7 +181,7 @@
// Both values should saturate to INT64_MAX
expected.push_back(MediaResource(MediaResource::Type::kDrmSession, INT64_MAX));
expected.push_back(MediaResource(MediaResource::Type::kNonSecureCodec, INT64_MAX));
- expectEqResourceInfo(infos1.valueFor(getId(mTestClient1)), kTestUid1, mTestClient1, expected);
+ expectEqResourceInfo(infos1.at(getId(mTestClient1)), kTestUid1, mTestClient1, expected);
resources1.clear();
resources1.push_back(MediaResource(MediaResource::Type::kDrmSession, -10));
@@ -193,7 +193,7 @@
// 2) Non-drm session resource should ignore negative value addition.
expected.push_back(MediaResource(MediaResource::Type::kDrmSession, INT64_MAX - 10));
expected.push_back(MediaResource(MediaResource::Type::kNonSecureCodec, INT64_MAX));
- expectEqResourceInfo(infos1.valueFor(getId(mTestClient1)), kTestUid1, mTestClient1, expected);
+ expectEqResourceInfo(infos1.at(getId(mTestClient1)), kTestUid1, mTestClient1, expected);
resources1.clear();
resources1.push_back(MediaResource(MediaResource::Type::kDrmSession, INT64_MIN));
@@ -206,7 +206,7 @@
expected.clear();
expected.push_back(MediaResource(MediaResource::Type::kDrmSession, 0));
expected.push_back(MediaResource(MediaResource::Type::kNonSecureCodec, INT64_MAX));
- expectEqResourceInfo(infos1.valueFor(getId(mTestClient1)), kTestUid1, mTestClient1, expected);
+ expectEqResourceInfo(infos1.at(getId(mTestClient1)), kTestUid1, mTestClient1, expected);
}
void testConfig() {
@@ -256,9 +256,9 @@
const PidResourceInfosMap &map = mService->mMap;
EXPECT_EQ(1u, map.size());
- ssize_t index1 = map.indexOfKey(kTestPid1);
- ASSERT_GE(index1, 0);
- const ResourceInfos &infos1 = map[index1];
+ const auto& mapIndex1 = map.find(kTestPid1);
+ EXPECT_TRUE(mapIndex1 != map.end());
+ const ResourceInfos &infos1 = mapIndex1->second;
EXPECT_EQ(1u, infos1.size());
// test adding existing types to combine values
@@ -268,7 +268,7 @@
std::vector<MediaResourceParcel> expected;
expected.push_back(MediaResource(MediaResource::Type::kSecureCodec, 2));
expected.push_back(MediaResource(MediaResource::Type::kGraphicMemory, 300));
- expectEqResourceInfo(infos1.valueFor(getId(mTestClient1)), kTestUid1, mTestClient1, expected);
+ expectEqResourceInfo(infos1.at(getId(mTestClient1)), kTestUid1, mTestClient1, expected);
// test adding new types (including types that differs only in subType)
resources11.push_back(MediaResource(MediaResource::Type::kNonSecureCodec, 1));
@@ -280,7 +280,7 @@
expected.push_back(MediaResource(MediaResource::Type::kNonSecureCodec, 1));
expected.push_back(MediaResource(MediaResource::Type::kSecureCodec, MediaResource::SubType::kVideoCodec, 1));
expected.push_back(MediaResource(MediaResource::Type::kGraphicMemory, 500));
- expectEqResourceInfo(infos1.valueFor(getId(mTestClient1)), kTestUid1, mTestClient1, expected);
+ expectEqResourceInfo(infos1.at(getId(mTestClient1)), kTestUid1, mTestClient1, expected);
}
void testRemoveResource() {
@@ -299,9 +299,9 @@
const PidResourceInfosMap &map = mService->mMap;
EXPECT_EQ(1u, map.size());
- ssize_t index1 = map.indexOfKey(kTestPid1);
- ASSERT_GE(index1, 0);
- const ResourceInfos &infos1 = map[index1];
+ const auto& mapIndex1 = map.find(kTestPid1);
+ EXPECT_TRUE(mapIndex1 != map.end());
+ const ResourceInfos &infos1 = mapIndex1->second;
EXPECT_EQ(1u, infos1.size());
// test partial removal
@@ -311,13 +311,13 @@
std::vector<MediaResourceParcel> expected;
expected.push_back(MediaResource(MediaResource::Type::kSecureCodec, 1));
expected.push_back(MediaResource(MediaResource::Type::kGraphicMemory, 100));
- expectEqResourceInfo(infos1.valueFor(getId(mTestClient1)), kTestUid1, mTestClient1, expected);
+ expectEqResourceInfo(infos1.at(getId(mTestClient1)), kTestUid1, mTestClient1, expected);
// test removal request with negative value, should be ignored
resources11[0].value = -10000;
mService->removeResource(client1Info, resources11);
- expectEqResourceInfo(infos1.valueFor(getId(mTestClient1)), kTestUid1, mTestClient1, expected);
+ expectEqResourceInfo(infos1.at(getId(mTestClient1)), kTestUid1, mTestClient1, expected);
// test complete removal with overshoot value
resources11[0].value = 1000;
@@ -325,7 +325,7 @@
expected.clear();
expected.push_back(MediaResource(MediaResource::Type::kSecureCodec, 1));
- expectEqResourceInfo(infos1.valueFor(getId(mTestClient1)), kTestUid1, mTestClient1, expected);
+ expectEqResourceInfo(infos1.at(getId(mTestClient1)), kTestUid1, mTestClient1, expected);
}
void testOverridePid() {
@@ -466,13 +466,12 @@
const PidResourceInfosMap &map = mService->mMap;
EXPECT_EQ(2u, map.size());
- const ResourceInfos &infos1 = map.valueFor(kTestPid1);
- const ResourceInfos &infos2 = map.valueFor(kTestPid2);
+ const ResourceInfos &infos1 = map.at(kTestPid1);
+ const ResourceInfos &infos2 = map.at(kTestPid2);
EXPECT_EQ(1u, infos1.size());
EXPECT_EQ(1u, infos2.size());
// mTestClient2 has been removed.
- // (OK to use infos2[0] as there is only 1 entry)
- EXPECT_EQ(mTestClient3, infos2[0].client);
+ EXPECT_EQ(mTestClient3, infos2.at(getId(mTestClient3)).client);
}
void testGetAllClients() {
@@ -480,7 +479,7 @@
MediaResource::Type type = MediaResource::Type::kSecureCodec;
MediaResource::SubType subType = MediaResource::SubType::kUnspecifiedSubType;
- Vector<std::shared_ptr<IResourceManagerClient> > clients;
+ std::vector<std::shared_ptr<IResourceManagerClient> > clients;
PidUidVector idList;
EXPECT_FALSE(mService->getAllClients_l(kLowPriorityPid, type, subType, &idList, &clients));
// some higher priority process (e.g. kTestPid2) owns the resource, so getAllClients_l