transcoding: use uid instead of pid for scheduling
This change replaces pid usage with uid, there is no functional
change other than that.
bug: 154734285
bug: 145233472
test: unit tests
Change-Id: I2000a84486a561a393211cb0b098e456c2173227
diff --git a/media/libmediatranscoding/TranscodingClientManager.cpp b/media/libmediatranscoding/TranscodingClientManager.cpp
index b05e3a6..71ffcba 100644
--- a/media/libmediatranscoding/TranscodingClientManager.cpp
+++ b/media/libmediatranscoding/TranscodingClientManager.cpp
@@ -59,8 +59,8 @@
// Pointer to the client manager for this client
TranscodingClientManager* mOwner;
- ClientImpl(const std::shared_ptr<ITranscodingClientCallback>& callback, pid_t pid,
- uid_t uid, const std::string& clientName, const std::string& opPackageName,
+ ClientImpl(const std::shared_ptr<ITranscodingClientCallback>& callback, pid_t pid, uid_t uid,
+ const std::string& clientName, const std::string& opPackageName,
TranscodingClientManager* owner);
Status submitRequest(const TranscodingRequestParcel& /*in_request*/,
@@ -99,7 +99,7 @@
int32_t jobId = mNextJobId.fetch_add(1);
*_aidl_return =
- mOwner->mJobScheduler->submit(mClientId, jobId, mClientPid, in_request,
+ mOwner->mJobScheduler->submit(mClientId, jobId, mClientUid, in_request,
ITranscodingClientCallback::fromBinder(mClientCallback));
if (*_aidl_return) {
diff --git a/media/libmediatranscoding/TranscodingJobScheduler.cpp b/media/libmediatranscoding/TranscodingJobScheduler.cpp
index 9dd070c..6e235c6 100644
--- a/media/libmediatranscoding/TranscodingJobScheduler.cpp
+++ b/media/libmediatranscoding/TranscodingJobScheduler.cpp
@@ -27,7 +27,7 @@
namespace android {
-constexpr static pid_t OFFLINE_PID = -1;
+constexpr static uid_t OFFLINE_UID = -1;
//static
String8 TranscodingJobScheduler::jobToString(const JobKeyType& jobKey) {
@@ -36,12 +36,12 @@
TranscodingJobScheduler::TranscodingJobScheduler(
const std::shared_ptr<TranscoderInterface>& transcoder,
- const std::shared_ptr<ProcessInfoInterface>& procInfo)
- : mTranscoder(transcoder), mProcInfo(procInfo), mCurrentJob(nullptr), mResourceLost(false) {
+ const std::shared_ptr<UidPolicyInterface>& uidPolicy)
+ : mTranscoder(transcoder), mUidPolicy(uidPolicy), mCurrentJob(nullptr), mResourceLost(false) {
// Only push empty offline queue initially. Realtime queues are added when requests come in.
- mPidSortedList.push_back(OFFLINE_PID);
- mOfflinePidIterator = mPidSortedList.begin();
- mJobQueues.emplace(OFFLINE_PID, JobQueueType());
+ mUidSortedList.push_back(OFFLINE_UID);
+ mOfflineUidIterator = mUidSortedList.begin();
+ mJobQueues.emplace(OFFLINE_UID, JobQueueType());
}
TranscodingJobScheduler::~TranscodingJobScheduler() {}
@@ -50,8 +50,8 @@
if (mJobMap.empty()) {
return nullptr;
}
- pid_t topPid = *mPidSortedList.begin();
- JobKeyType topJobKey = *mJobQueues[topPid].begin();
+ uid_t topUid = *mUidSortedList.begin();
+ JobKeyType topJobKey = *mJobQueues[topUid].begin();
return &mJobMap[topJobKey];
}
@@ -92,20 +92,20 @@
return;
}
- // Remove job from pid's queue.
- const pid_t pid = mJobMap[jobKey].pid;
- JobQueueType& jobQueue = mJobQueues[pid];
+ // Remove job from uid's queue.
+ const uid_t uid = mJobMap[jobKey].uid;
+ JobQueueType& jobQueue = mJobQueues[uid];
auto it = std::find(jobQueue.begin(), jobQueue.end(), jobKey);
if (it == jobQueue.end()) {
- ALOGE("couldn't find job %s in queue for pid %d", jobToString(jobKey).c_str(), pid);
+ ALOGE("couldn't find job %s in queue for uid %d", jobToString(jobKey).c_str(), uid);
return;
}
jobQueue.erase(it);
- // If this is the last job in a real-time queue, remove this pid's queue.
- if (pid != OFFLINE_PID && jobQueue.empty()) {
- mPidSortedList.remove(pid);
- mJobQueues.erase(pid);
+ // If this is the last job in a real-time queue, remove this uid's queue.
+ if (uid != OFFLINE_UID && jobQueue.empty()) {
+ mUidSortedList.remove(uid);
+ mJobQueues.erase(uid);
}
// Clear current job.
@@ -117,12 +117,12 @@
mJobMap.erase(jobKey);
}
-bool TranscodingJobScheduler::submit(ClientIdType clientId, int32_t jobId, pid_t pid,
+bool TranscodingJobScheduler::submit(ClientIdType clientId, int32_t jobId, uid_t uid,
const TranscodingRequestParcel& request,
const std::weak_ptr<ITranscodingClientCallback>& callback) {
JobKeyType jobKey = std::make_pair(clientId, jobId);
- ALOGV("%s: job %s, pid %d, prioirty %d", __FUNCTION__, jobToString(jobKey).c_str(), pid,
+ ALOGV("%s: job %s, uid %d, prioirty %d", __FUNCTION__, jobToString(jobKey).c_str(), uid,
(int32_t)request.priority);
std::scoped_lock lock{mLock};
@@ -135,37 +135,37 @@
// TODO(chz): only support offline vs real-time for now. All kUnspecified jobs
// go to offline queue.
if (request.priority == TranscodingJobPriority::kUnspecified) {
- pid = OFFLINE_PID;
+ uid = OFFLINE_UID;
}
// Add job to job map.
mJobMap[jobKey].key = jobKey;
- mJobMap[jobKey].pid = pid;
+ mJobMap[jobKey].uid = uid;
mJobMap[jobKey].state = Job::NOT_STARTED;
mJobMap[jobKey].request = request;
mJobMap[jobKey].callback = callback;
// If it's an offline job, the queue was already added in constructor.
- // If it's a real-time jobs, check if a queue is already present for the pid,
+ // If it's a real-time jobs, check if a queue is already present for the uid,
// and add a new queue if needed.
- if (pid != OFFLINE_PID) {
- if (mJobQueues.count(pid) == 0) {
- if (mProcInfo->isProcessOnTop(pid)) {
- mPidSortedList.push_front(pid);
+ if (uid != OFFLINE_UID) {
+ if (mJobQueues.count(uid) == 0) {
+ if (mUidPolicy->isUidOnTop(uid)) {
+ mUidSortedList.push_front(uid);
} else {
// Shouldn't be submitting real-time requests from non-top app,
// put it in front of the offline queue.
- mPidSortedList.insert(mOfflinePidIterator, pid);
+ mUidSortedList.insert(mOfflineUidIterator, uid);
}
- } else if (pid != *mPidSortedList.begin()) {
- if (mProcInfo->isProcessOnTop(pid)) {
- mPidSortedList.remove(pid);
- mPidSortedList.push_front(pid);
+ } else if (uid != *mUidSortedList.begin()) {
+ if (mUidPolicy->isUidOnTop(uid)) {
+ mUidSortedList.remove(uid);
+ mUidSortedList.push_front(uid);
}
}
}
- // Append this job to the pid's queue.
- mJobQueues[pid].push_back(jobKey);
+ // Append this job to the uid's queue.
+ mJobQueues[uid].push_back(jobKey);
updateCurrentJob_l();
@@ -302,28 +302,28 @@
validateState_l();
}
-void TranscodingJobScheduler::onTopProcessChanged(pid_t pid) {
- ALOGV("%s: pid %d", __FUNCTION__, pid);
+void TranscodingJobScheduler::onTopUidChanged(uid_t uid) {
+ ALOGV("%s: uid %d", __FUNCTION__, uid);
std::scoped_lock lock{mLock};
- if (pid < 0) {
- ALOGW("bringProcessToTop: ignoring invalid pid %d", pid);
+ if (uid == OFFLINE_UID) {
+ ALOGW("%s: ignoring invalid uid %d", __FUNCTION__, uid);
return;
}
- // If this pid doesn't have any jobs, we don't care about it.
- if (mJobQueues.count(pid) == 0) {
- ALOGW("bringProcessToTop: ignoring pid %d without any jobs", pid);
+ // If this uid doesn't have any jobs, we don't care about it.
+ if (mJobQueues.count(uid) == 0) {
+ ALOGW("%s: ignoring uid %d without any jobs", __FUNCTION__, uid);
return;
}
- // If this pid is already top, don't do anything.
- if (pid == *mPidSortedList.begin()) {
- ALOGW("pid %d is already top", pid);
+ // If this uid is already top, don't do anything.
+ if (uid == *mUidSortedList.begin()) {
+ ALOGW("%s: uid %d is already top", __FUNCTION__, uid);
return;
}
- mPidSortedList.remove(pid);
- mPidSortedList.push_front(pid);
+ mUidSortedList.remove(uid);
+ mUidSortedList.push_front(uid);
updateCurrentJob_l();
@@ -343,26 +343,26 @@
void TranscodingJobScheduler::validateState_l() {
#ifdef VALIDATE_STATE
- LOG_ALWAYS_FATAL_IF(mJobQueues.count(OFFLINE_PID) != 1,
+ LOG_ALWAYS_FATAL_IF(mJobQueues.count(OFFLINE_UID) != 1,
"mJobQueues offline queue number is not 1");
- LOG_ALWAYS_FATAL_IF(*mOfflinePidIterator != OFFLINE_PID,
- "mOfflinePidIterator not pointing to offline pid");
- LOG_ALWAYS_FATAL_IF(mPidSortedList.size() != mJobQueues.size(),
- "mPidList and mJobQueues size mismatch");
+ LOG_ALWAYS_FATAL_IF(*mOfflineUidIterator != OFFLINE_UID,
+ "mOfflineUidIterator not pointing to offline uid");
+ LOG_ALWAYS_FATAL_IF(mUidSortedList.size() != mJobQueues.size(),
+ "mUidList and mJobQueues size mismatch");
int32_t totalJobs = 0;
- for (auto pidIt = mPidSortedList.begin(); pidIt != mPidSortedList.end(); pidIt++) {
- LOG_ALWAYS_FATAL_IF(mJobQueues.count(*pidIt) != 1, "mJobQueues count for pid %d is not 1",
- *pidIt);
- for (auto jobIt = mJobQueues[*pidIt].begin(); jobIt != mJobQueues[*pidIt].end(); jobIt++) {
+ for (auto uidIt = mUidSortedList.begin(); uidIt != mUidSortedList.end(); uidIt++) {
+ LOG_ALWAYS_FATAL_IF(mJobQueues.count(*uidIt) != 1, "mJobQueues count for uid %d is not 1",
+ *uidIt);
+ for (auto jobIt = mJobQueues[*uidIt].begin(); jobIt != mJobQueues[*uidIt].end(); jobIt++) {
LOG_ALWAYS_FATAL_IF(mJobMap.count(*jobIt) != 1, "mJobs count for job %s is not 1",
jobToString(*jobIt).c_str());
}
- totalJobs += mJobQueues[*pidIt].size();
+ totalJobs += mJobQueues[*uidIt].size();
}
LOG_ALWAYS_FATAL_IF(mJobMap.size() != totalJobs,
- "mJobs size doesn't match total jobs counted from pid queues");
+ "mJobs size doesn't match total jobs counted from uid queues");
#endif // VALIDATE_STATE
}
diff --git a/media/libmediatranscoding/include/media/ProcessInfoInterface.h b/media/libmediatranscoding/include/media/ProcessInfoInterface.h
deleted file mode 100644
index ef79266..0000000
--- a/media/libmediatranscoding/include/media/ProcessInfoInterface.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_MEDIA_PROCESS_INFO_INTERFACE_H
-#define ANDROID_MEDIA_PROCESS_INFO_INTERFACE_H
-
-namespace android {
-
-// Interface for the scheduler to query a process's info.
-class ProcessInfoInterface {
-public:
- // Determines if a process is currently running as top process.
- // TODO(chz): this should probably be replaced by a query that determines
- // which pid has the highest priority among a given set of pids. For now,
- // we assume that there is a way to determine based on a pid number whether
- // that pid is on "top", but this may not be possible in some cases, for
- // example, the client process with highest priority is actually a foreground
- // service (serving the top-app), but technically is not "top".
- virtual bool isProcessOnTop(pid_t pid) = 0;
-
-protected:
- virtual ~ProcessInfoInterface() = default;
-};
-
-// Interface for notifying the scheduler of a change in a process's state or
-// transcoding resource availability.
-class ProcessInfoCallbackInterface {
-public:
- // Called when a process with pid is brought to top.
- // TODO(chz): this should probably be replace by a callback when the pid
- // that was previously identified being the highest priority as in
- // ProcessInfoInterface::isProcessOnTop() has changed in priority.
- virtual void onTopProcessChanged(pid_t pid) = 0;
-
- // Called when resources become available for transcoding use. The scheduler
- // may use this as a signal to attempt restart transcoding activity that
- // were previously paused due to temporary resource loss.
- virtual void onResourceAvailable() = 0;
-
-protected:
- virtual ~ProcessInfoCallbackInterface() = default;
-};
-
-} // namespace android
-#endif // ANDROID_MEDIA_PROCESS_INFO_INTERFACE_H
diff --git a/media/libmediatranscoding/include/media/SchedulerClientInterface.h b/media/libmediatranscoding/include/media/SchedulerClientInterface.h
index b4cf463..6ccf117 100644
--- a/media/libmediatranscoding/include/media/SchedulerClientInterface.h
+++ b/media/libmediatranscoding/include/media/SchedulerClientInterface.h
@@ -31,7 +31,7 @@
// the status of a job.
class SchedulerClientInterface {
public:
- virtual bool submit(ClientIdType clientId, int32_t jobId, pid_t pid,
+ virtual bool submit(ClientIdType clientId, int32_t jobId, uid_t uid,
const TranscodingRequestParcel& request,
const std::weak_ptr<ITranscodingClientCallback>& clientCallback) = 0;
diff --git a/media/libmediatranscoding/include/media/TranscodingJobScheduler.h b/media/libmediatranscoding/include/media/TranscodingJobScheduler.h
index f4d98ba..77f6404 100644
--- a/media/libmediatranscoding/include/media/TranscodingJobScheduler.h
+++ b/media/libmediatranscoding/include/media/TranscodingJobScheduler.h
@@ -18,10 +18,10 @@
#define ANDROID_MEDIA_TRANSCODING_JOB_SCHEDULER_H
#include <aidl/android/media/TranscodingJobPriority.h>
-#include <media/ProcessInfoInterface.h>
#include <media/SchedulerClientInterface.h>
#include <media/TranscoderInterface.h>
#include <media/TranscodingRequest.h>
+#include <media/UidPolicyInterface.h>
#include <utils/String8.h>
#include <list>
@@ -32,14 +32,14 @@
using ::aidl::android::media::TranscodingJobPriority;
using ::aidl::android::media::TranscodingResultParcel;
-class TranscodingJobScheduler : public ProcessInfoCallbackInterface,
+class TranscodingJobScheduler : public UidPolicyCallbackInterface,
public SchedulerClientInterface,
public TranscoderCallbackInterface {
public:
virtual ~TranscodingJobScheduler();
// SchedulerClientInterface
- bool submit(ClientIdType clientId, int32_t jobId, pid_t pid,
+ bool submit(ClientIdType clientId, int32_t jobId, uid_t uid,
const TranscodingRequestParcel& request,
const std::weak_ptr<ITranscodingClientCallback>& clientCallback) override;
bool cancel(ClientIdType clientId, int32_t jobId) override;
@@ -52,10 +52,10 @@
void onResourceLost() override;
// ~TranscoderCallbackInterface
- // ProcessInfoCallbackInterface
- void onTopProcessChanged(int32_t pid) override;
+ // UidPolicyCallbackInterface
+ void onTopUidChanged(uid_t uid) override;
void onResourceAvailable() override;
- // ~ProcessInfoCallbackInterface
+ // ~UidPolicyCallbackInterface
private:
friend class MediaTranscodingService;
@@ -66,7 +66,7 @@
struct Job {
JobKeyType key;
- pid_t pid;
+ uid_t uid;
enum JobState {
NOT_STARTED,
RUNNING,
@@ -82,23 +82,23 @@
std::map<JobKeyType, Job> mJobMap;
- // Pid->JobQueue map (pid == -1: offline queue)
- std::map<pid_t, JobQueueType> mJobQueues;
+ // uid->JobQueue map (uid == -1: offline queue)
+ std::map<uid_t, JobQueueType> mJobQueues;
- // Pids, with the head being the most-recently-top app, 2nd item is the
+ // uids, with the head being the most-recently-top app, 2nd item is the
// previous top app, etc.
- std::list<pid_t> mPidSortedList;
- std::list<pid_t>::iterator mOfflinePidIterator;
+ std::list<uid_t> mUidSortedList;
+ std::list<uid_t>::iterator mOfflineUidIterator;
std::shared_ptr<TranscoderInterface> mTranscoder;
- std::shared_ptr<ProcessInfoInterface> mProcInfo;
+ std::shared_ptr<UidPolicyInterface> mUidPolicy;
Job* mCurrentJob;
bool mResourceLost;
// Only allow MediaTranscodingService and unit tests to instantiate.
TranscodingJobScheduler(const std::shared_ptr<TranscoderInterface>& transcoder,
- const std::shared_ptr<ProcessInfoInterface>& procInfo);
+ const std::shared_ptr<UidPolicyInterface>& uidPolicy);
Job* getTopJob_l();
void updateCurrentJob_l();
diff --git a/media/libmediatranscoding/include/media/UidPolicyInterface.h b/media/libmediatranscoding/include/media/UidPolicyInterface.h
new file mode 100644
index 0000000..e9a9da4
--- /dev/null
+++ b/media/libmediatranscoding/include/media/UidPolicyInterface.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ANDROID_MEDIA_UID_POLICY_INTERFACE_H
+#define ANDROID_MEDIA_UID_POLICY_INTERFACE_H
+
+namespace android {
+
+// Interface for the scheduler to query a uid's info.
+class UidPolicyInterface {
+public:
+ // Determines if a uid is currently running as top.
+ // TODO(chz): this should probably be replaced by a query that determines
+ // which uid has the highest priority among a given set of uids.
+ virtual bool isUidOnTop(uid_t uid) = 0;
+
+protected:
+ virtual ~UidPolicyInterface() = default;
+};
+
+// Interface for notifying the scheduler of a change in a uid's state or
+// transcoding resource availability.
+class UidPolicyCallbackInterface {
+public:
+ // Called when a uid is brought to top.
+ // TODO(chz): this should probably be replace by a callback when the uid
+ // that was previously identified being the highest priority as in
+ // UidPolicyInterface::isUidOnTop() has changed in priority.
+ virtual void onTopUidChanged(uid_t uid) = 0;
+
+ // Called when resources become available for transcoding use. The scheduler
+ // may use this as a signal to attempt restart transcoding activity that
+ // were previously paused due to temporary resource loss.
+ virtual void onResourceAvailable() = 0;
+
+protected:
+ virtual ~UidPolicyCallbackInterface() = default;
+};
+
+} // namespace android
+#endif // ANDROID_MEDIA_UID_POLICY_INTERFACE_H
diff --git a/media/libmediatranscoding/tests/TranscodingClientManager_tests.cpp b/media/libmediatranscoding/tests/TranscodingClientManager_tests.cpp
index b58c827..7e5ae61 100644
--- a/media/libmediatranscoding/tests/TranscodingClientManager_tests.cpp
+++ b/media/libmediatranscoding/tests/TranscodingClientManager_tests.cpp
@@ -120,7 +120,7 @@
virtual ~TestScheduler() { ALOGI("TestScheduler Destroyed"); }
- bool submit(int64_t clientId, int32_t jobId, pid_t /*pid*/,
+ bool submit(int64_t clientId, int32_t jobId, uid_t /*uid*/,
const TranscodingRequestParcel& request,
const std::weak_ptr<ITranscodingClientCallback>& clientCallback) override {
JobKeyType jobKey = std::make_pair(clientId, jobId);
@@ -184,8 +184,8 @@
{
auto clientCallback = it->second.callback.lock();
if (clientCallback != nullptr) {
- clientCallback->onTranscodingFailed(
- mLastJob.second, TranscodingErrorCode::kUnknown);
+ clientCallback->onTranscodingFailed(mLastJob.second,
+ TranscodingErrorCode::kUnknown);
}
}
mJobs.erase(it);
diff --git a/media/libmediatranscoding/tests/TranscodingJobScheduler_tests.cpp b/media/libmediatranscoding/tests/TranscodingJobScheduler_tests.cpp
index d062d93..6bc9e20 100644
--- a/media/libmediatranscoding/tests/TranscodingJobScheduler_tests.cpp
+++ b/media/libmediatranscoding/tests/TranscodingJobScheduler_tests.cpp
@@ -40,16 +40,16 @@
constexpr int64_t kClientId = 1000;
constexpr int32_t kClientJobId = 0;
-constexpr pid_t kClientPid = 5000;
-constexpr pid_t kInvalidPid = -1;
+constexpr uid_t kClientUid = 5000;
+constexpr uid_t kInvalidUid = (uid_t)-1;
#define CLIENT(n) (kClientId + (n))
#define JOB(n) (kClientJobId + (n))
-#define PID(n) (kClientPid + (n))
+#define UID(n) (kClientUid + (n))
-class TestCallback : public TranscoderInterface, public ProcessInfoInterface {
+class TestCallback : public TranscoderInterface, public UidPolicyInterface {
public:
- TestCallback() : mTopPid(-1), mLastError(TranscodingErrorCode::kUnknown) {}
+ TestCallback() : mTopUid(kInvalidUid), mLastError(TranscodingErrorCode::kUnknown) {}
virtual ~TestCallback() {}
// TranscoderInterface
@@ -63,8 +63,8 @@
mEventQueue.push_back(Resume(clientId, jobId));
}
- // ProcessInfoInterface
- bool isProcessOnTop(pid_t pid) override { return pid == mTopPid; }
+ // UidPolicyInterface
+ bool isUidOnTop(uid_t uid) override { return uid == mTopUid; }
void onFinished(int64_t clientId, int32_t jobId) {
mEventQueue.push_back(Finished(clientId, jobId));
@@ -75,7 +75,7 @@
mEventQueue.push_back(Failed(clientId, jobId));
}
- void setTop(pid_t pid) { mTopPid = pid; }
+ void setTop(uid_t uid) { mTopUid = uid; }
TranscodingErrorCode getLastError() {
TranscodingErrorCode result = mLastError;
@@ -115,7 +115,7 @@
private:
Event mPoppedEvent;
std::list<Event> mEventQueue;
- pid_t mTopPid;
+ uid_t mTopUid;
TranscodingErrorCode mLastError;
};
@@ -197,43 +197,43 @@
TEST_F(TranscodingJobSchedulerTest, TestSubmitJob) {
ALOGD("TestSubmitJob");
- // Start with PID(1) on top.
- mCallback->setTop(PID(1));
+ // Start with UID(1) on top.
+ mCallback->setTop(UID(1));
- // Submit offline job to CLIENT(0) in PID(0).
+ // Submit offline job to CLIENT(0) in UID(0).
// Should start immediately (because this is the only job).
- mScheduler->submit(CLIENT(0), JOB(0), PID(0), mOfflineRequest, mClientCallback0);
+ mScheduler->submit(CLIENT(0), JOB(0), UID(0), mOfflineRequest, mClientCallback0);
EXPECT_EQ(mCallback->popEvent(), TestCallback::Start(CLIENT(0), 0));
// Submit real-time job to CLIENT(0).
- // Should pause offline job and start new job, even if PID(0) is not on top.
- mScheduler->submit(CLIENT(0), JOB(1), PID(0), mRealtimeRequest, mClientCallback0);
+ // Should pause offline job and start new job, even if UID(0) is not on top.
+ mScheduler->submit(CLIENT(0), JOB(1), UID(0), mRealtimeRequest, mClientCallback0);
EXPECT_EQ(mCallback->popEvent(), TestCallback::Pause(CLIENT(0), JOB(0)));
EXPECT_EQ(mCallback->popEvent(), TestCallback::Start(CLIENT(0), JOB(1)));
// Submit real-time job to CLIENT(0), should be queued after the previous job.
- mScheduler->submit(CLIENT(0), JOB(2), PID(0), mRealtimeRequest, mClientCallback0);
+ mScheduler->submit(CLIENT(0), JOB(2), UID(0), mRealtimeRequest, mClientCallback0);
EXPECT_EQ(mCallback->popEvent(), TestCallback::NoEvent);
- // Submit real-time job to CLIENT(1) in same pid, should be queued after the previous job.
- mScheduler->submit(CLIENT(1), JOB(0), PID(0), mRealtimeRequest, mClientCallback1);
+ // Submit real-time job to CLIENT(1) in same uid, should be queued after the previous job.
+ mScheduler->submit(CLIENT(1), JOB(0), UID(0), mRealtimeRequest, mClientCallback1);
EXPECT_EQ(mCallback->popEvent(), TestCallback::NoEvent);
- // Submit real-time job to CLIENT(2) in PID(1).
- // Should pause previous job and start new job, because PID(1) is top.
- mCallback->setTop(PID(1));
- mScheduler->submit(CLIENT(2), JOB(0), PID(1), mRealtimeRequest, mClientCallback2);
+ // Submit real-time job to CLIENT(2) in UID(1).
+ // Should pause previous job and start new job, because UID(1) is top.
+ mCallback->setTop(UID(1));
+ mScheduler->submit(CLIENT(2), JOB(0), UID(1), mRealtimeRequest, mClientCallback2);
EXPECT_EQ(mCallback->popEvent(), TestCallback::Pause(CLIENT(0), JOB(1)));
EXPECT_EQ(mCallback->popEvent(), TestCallback::Start(CLIENT(2), JOB(0)));
// Submit offline job, shouldn't generate any event.
- mScheduler->submit(CLIENT(2), JOB(1), PID(1), mOfflineRequest, mClientCallback2);
+ mScheduler->submit(CLIENT(2), JOB(1), UID(1), mOfflineRequest, mClientCallback2);
EXPECT_EQ(mCallback->popEvent(), TestCallback::NoEvent);
- mCallback->setTop(PID(0));
- // Submit real-time job to CLIENT(1) in PID(0).
- // Should pause current job, and resume last job in PID(0).
- mScheduler->submit(CLIENT(1), JOB(1), PID(0), mRealtimeRequest, mClientCallback1);
+ mCallback->setTop(UID(0));
+ // Submit real-time job to CLIENT(1) in UID(0).
+ // Should pause current job, and resume last job in UID(0).
+ mScheduler->submit(CLIENT(1), JOB(1), UID(0), mRealtimeRequest, mClientCallback1);
EXPECT_EQ(mCallback->popEvent(), TestCallback::Pause(CLIENT(2), JOB(0)));
EXPECT_EQ(mCallback->popEvent(), TestCallback::Resume(CLIENT(0), JOB(1)));
}
@@ -242,15 +242,15 @@
ALOGD("TestCancelJob");
// Submit real-time job JOB(0), should start immediately.
- mScheduler->submit(CLIENT(0), JOB(0), PID(0), mRealtimeRequest, mClientCallback0);
+ mScheduler->submit(CLIENT(0), JOB(0), UID(0), mRealtimeRequest, mClientCallback0);
EXPECT_EQ(mCallback->popEvent(), TestCallback::Start(CLIENT(0), JOB(0)));
// Submit real-time job JOB(1), should not start.
- mScheduler->submit(CLIENT(0), JOB(1), PID(0), mRealtimeRequest, mClientCallback0);
+ mScheduler->submit(CLIENT(0), JOB(1), UID(0), mRealtimeRequest, mClientCallback0);
EXPECT_EQ(mCallback->popEvent(), TestCallback::NoEvent);
// Submit offline job JOB(2), should not start.
- mScheduler->submit(CLIENT(0), JOB(2), PID(0), mOfflineRequest, mClientCallback0);
+ mScheduler->submit(CLIENT(0), JOB(2), UID(0), mOfflineRequest, mClientCallback0);
EXPECT_EQ(mCallback->popEvent(), TestCallback::NoEvent);
// Cancel queued real-time job.
@@ -262,7 +262,7 @@
EXPECT_TRUE(mScheduler->cancel(CLIENT(0), JOB(2)));
// Submit offline job JOB(3), shouldn't cause any event.
- mScheduler->submit(CLIENT(0), JOB(3), PID(0), mOfflineRequest, mClientCallback0);
+ mScheduler->submit(CLIENT(0), JOB(3), UID(0), mOfflineRequest, mClientCallback0);
EXPECT_EQ(mCallback->popEvent(), TestCallback::NoEvent);
// Cancel running real-time job JOB(0).
@@ -281,26 +281,26 @@
EXPECT_EQ(mCallback->popEvent(), TestCallback::NoEvent);
// Submit offline job JOB(0), should start immediately.
- mScheduler->submit(CLIENT(0), JOB(0), PID(0), mOfflineRequest, mClientCallback0);
+ mScheduler->submit(CLIENT(0), JOB(0), UID(0), mOfflineRequest, mClientCallback0);
EXPECT_EQ(mCallback->popEvent(), TestCallback::Start(CLIENT(0), JOB(0)));
// Submit real-time job JOB(1), should pause offline job and start immediately.
- mScheduler->submit(CLIENT(0), JOB(1), PID(0), mRealtimeRequest, mClientCallback0);
+ mScheduler->submit(CLIENT(0), JOB(1), UID(0), mRealtimeRequest, mClientCallback0);
EXPECT_EQ(mCallback->popEvent(), TestCallback::Pause(CLIENT(0), JOB(0)));
EXPECT_EQ(mCallback->popEvent(), TestCallback::Start(CLIENT(0), JOB(1)));
// Submit real-time job JOB(2), should not start.
- mScheduler->submit(CLIENT(0), JOB(2), PID(0), mRealtimeRequest, mClientCallback0);
+ mScheduler->submit(CLIENT(0), JOB(2), UID(0), mRealtimeRequest, mClientCallback0);
EXPECT_EQ(mCallback->popEvent(), TestCallback::NoEvent);
// Fail when the job never started, should be ignored.
mScheduler->onFinish(CLIENT(0), JOB(2));
EXPECT_EQ(mCallback->popEvent(), TestCallback::NoEvent);
- // PID(1) moves to top.
- mCallback->setTop(PID(1));
- // Submit real-time job to CLIENT(1) in PID(1), should pause previous job and start new job.
- mScheduler->submit(CLIENT(1), JOB(0), PID(1), mRealtimeRequest, mClientCallback1);
+ // UID(1) moves to top.
+ mCallback->setTop(UID(1));
+ // Submit real-time job to CLIENT(1) in UID(1), should pause previous job and start new job.
+ mScheduler->submit(CLIENT(1), JOB(0), UID(1), mRealtimeRequest, mClientCallback1);
EXPECT_EQ(mCallback->popEvent(), TestCallback::Pause(CLIENT(0), JOB(1)));
EXPECT_EQ(mCallback->popEvent(), TestCallback::Start(CLIENT(1), JOB(0)));
@@ -336,26 +336,26 @@
EXPECT_EQ(mCallback->popEvent(), TestCallback::NoEvent);
// Submit offline job JOB(0), should start immediately.
- mScheduler->submit(CLIENT(0), JOB(0), PID(0), mOfflineRequest, mClientCallback0);
+ mScheduler->submit(CLIENT(0), JOB(0), UID(0), mOfflineRequest, mClientCallback0);
EXPECT_EQ(mCallback->popEvent(), TestCallback::Start(CLIENT(0), JOB(0)));
// Submit real-time job JOB(1), should pause offline job and start immediately.
- mScheduler->submit(CLIENT(0), JOB(1), PID(0), mRealtimeRequest, mClientCallback0);
+ mScheduler->submit(CLIENT(0), JOB(1), UID(0), mRealtimeRequest, mClientCallback0);
EXPECT_EQ(mCallback->popEvent(), TestCallback::Pause(CLIENT(0), JOB(0)));
EXPECT_EQ(mCallback->popEvent(), TestCallback::Start(CLIENT(0), JOB(1)));
// Submit real-time job JOB(2), should not start.
- mScheduler->submit(CLIENT(0), JOB(2), PID(0), mRealtimeRequest, mClientCallback0);
+ mScheduler->submit(CLIENT(0), JOB(2), UID(0), mRealtimeRequest, mClientCallback0);
EXPECT_EQ(mCallback->popEvent(), TestCallback::NoEvent);
// Fail when the job never started, should be ignored.
mScheduler->onError(CLIENT(0), JOB(2), TranscodingErrorCode::kUnknown);
EXPECT_EQ(mCallback->popEvent(), TestCallback::NoEvent);
- // PID(1) moves to top.
- mCallback->setTop(PID(1));
- // Submit real-time job to CLIENT(1) in PID(1), should pause previous job and start new job.
- mScheduler->submit(CLIENT(1), JOB(0), PID(1), mRealtimeRequest, mClientCallback1);
+ // UID(1) moves to top.
+ mCallback->setTop(UID(1));
+ // Submit real-time job to CLIENT(1) in UID(1), should pause previous job and start new job.
+ mScheduler->submit(CLIENT(1), JOB(0), UID(1), mRealtimeRequest, mClientCallback1);
EXPECT_EQ(mCallback->popEvent(), TestCallback::Pause(CLIENT(0), JOB(1)));
EXPECT_EQ(mCallback->popEvent(), TestCallback::Start(CLIENT(1), JOB(0)));
@@ -384,33 +384,33 @@
EXPECT_EQ(mCallback->popEvent(), TestCallback::NoEvent);
}
-TEST_F(TranscodingJobSchedulerTest, TestTopProcessChanged) {
- ALOGD("TestTopProcessChanged");
+TEST_F(TranscodingJobSchedulerTest, TestTopUidChanged) {
+ ALOGD("TestTopUidChanged");
// Submit real-time job to CLIENT(0), job should start immediately.
- mScheduler->submit(CLIENT(0), JOB(0), PID(0), mRealtimeRequest, mClientCallback0);
+ mScheduler->submit(CLIENT(0), JOB(0), UID(0), mRealtimeRequest, mClientCallback0);
EXPECT_EQ(mCallback->popEvent(), TestCallback::Start(CLIENT(0), JOB(0)));
// Submit offline job to CLIENT(0), should not start.
- mScheduler->submit(CLIENT(1), JOB(0), PID(0), mOfflineRequest, mClientCallback1);
+ mScheduler->submit(CLIENT(1), JOB(0), UID(0), mOfflineRequest, mClientCallback1);
EXPECT_EQ(mCallback->popEvent(), TestCallback::NoEvent);
- // Move PID(1) to top.
- mCallback->setTop(PID(1));
- // Submit real-time job to CLIENT(2) in different pid PID(1).
+ // Move UID(1) to top.
+ mCallback->setTop(UID(1));
+ // Submit real-time job to CLIENT(2) in different uid UID(1).
// Should pause previous job and start new job.
- mScheduler->submit(CLIENT(2), JOB(0), PID(1), mRealtimeRequest, mClientCallback2);
+ mScheduler->submit(CLIENT(2), JOB(0), UID(1), mRealtimeRequest, mClientCallback2);
EXPECT_EQ(mCallback->popEvent(), TestCallback::Pause(CLIENT(0), JOB(0)));
EXPECT_EQ(mCallback->popEvent(), TestCallback::Start(CLIENT(2), JOB(0)));
- // Bring PID(0) back to top.
- mCallback->setTop(PID(0));
- mScheduler->onTopProcessChanged(PID(0));
+ // Bring UID(0) back to top.
+ mCallback->setTop(UID(0));
+ mScheduler->onTopUidChanged(UID(0));
EXPECT_EQ(mCallback->popEvent(), TestCallback::Pause(CLIENT(2), JOB(0)));
EXPECT_EQ(mCallback->popEvent(), TestCallback::Resume(CLIENT(0), JOB(0)));
- // Bring invalid process to top.
- mScheduler->onTopProcessChanged(kInvalidPid);
+ // Bring invalid uid to top.
+ mScheduler->onTopUidChanged(kInvalidUid);
EXPECT_EQ(mCallback->popEvent(), TestCallback::NoEvent);
// Finish job, next real-time job should resume.
@@ -428,19 +428,19 @@
ALOGD("TestResourceLost");
// Submit real-time job to CLIENT(0), job should start immediately.
- mScheduler->submit(CLIENT(0), JOB(0), PID(0), mRealtimeRequest, mClientCallback0);
+ mScheduler->submit(CLIENT(0), JOB(0), UID(0), mRealtimeRequest, mClientCallback0);
EXPECT_EQ(mCallback->popEvent(), TestCallback::Start(CLIENT(0), JOB(0)));
// Submit offline job to CLIENT(0), should not start.
- mScheduler->submit(CLIENT(1), JOB(0), PID(0), mOfflineRequest, mClientCallback1);
+ mScheduler->submit(CLIENT(1), JOB(0), UID(0), mOfflineRequest, mClientCallback1);
EXPECT_EQ(mCallback->popEvent(), TestCallback::NoEvent);
- // Move PID(1) to top.
- mCallback->setTop(PID(1));
+ // Move UID(1) to top.
+ mCallback->setTop(UID(1));
- // Submit real-time job to CLIENT(2) in different pid PID(1).
+ // Submit real-time job to CLIENT(2) in different uid UID(1).
// Should pause previous job and start new job.
- mScheduler->submit(CLIENT(2), JOB(0), PID(1), mRealtimeRequest, mClientCallback2);
+ mScheduler->submit(CLIENT(2), JOB(0), UID(1), mRealtimeRequest, mClientCallback2);
EXPECT_EQ(mCallback->popEvent(), TestCallback::Pause(CLIENT(0), JOB(0)));
EXPECT_EQ(mCallback->popEvent(), TestCallback::Start(CLIENT(2), JOB(0)));
@@ -458,8 +458,8 @@
mScheduler->onResourceLost();
EXPECT_EQ(mCallback->popEvent(), TestCallback::NoEvent);
- // Move PID(0) back to top, should have no resume due to no resource.
- mScheduler->onTopProcessChanged(PID(0));
+ // Move UID(0) back to top, should have no resume due to no resource.
+ mScheduler->onTopUidChanged(UID(0));
EXPECT_EQ(mCallback->popEvent(), TestCallback::NoEvent);
// Signal resource available, CLIENT(0) should resume.
@@ -471,11 +471,11 @@
mScheduler->onResourceLost();
EXPECT_EQ(mCallback->popEvent(), TestCallback::NoEvent);
- // Move PID(2) to top.
- mCallback->setTop(PID(2));
+ // Move UID(2) to top.
+ mCallback->setTop(UID(2));
- // Submit real-time job to CLIENT(3) in PID(2), job shouldn't start due to no resource.
- mScheduler->submit(CLIENT(3), JOB(0), PID(2), mRealtimeRequest, mClientCallback3);
+ // Submit real-time job to CLIENT(3) in UID(2), job shouldn't start due to no resource.
+ mScheduler->submit(CLIENT(3), JOB(0), UID(2), mRealtimeRequest, mClientCallback3);
EXPECT_EQ(mCallback->popEvent(), TestCallback::NoEvent);
// Signal resource available, CLIENT(3)'s job should start.
diff --git a/services/mediatranscoding/MediaTranscodingService.cpp b/services/mediatranscoding/MediaTranscodingService.cpp
index 0289613..a13bec0 100644
--- a/services/mediatranscoding/MediaTranscodingService.cpp
+++ b/services/mediatranscoding/MediaTranscodingService.cpp
@@ -48,7 +48,7 @@
}
}
-// DummyTranscoder and DummyProcessInfo are currently used to instantiate
+// DummyTranscoder and DummyUidPolicy are currently used to instantiate
// MediaTranscodingService on service side for testing, so that we could
// actually test the IPC calls of MediaTranscodingService to expose some
// issues that's observable only over IPC.
@@ -67,21 +67,21 @@
}
};
-class DummyProcessInfo : public ProcessInfoInterface {
- bool isProcessOnTop(int32_t pid) override {
- (void)pid;
+class DummyUidPolicy : public UidPolicyInterface {
+ bool isUidOnTop(uid_t uid) override {
+ (void)uid;
return true;
}
};
MediaTranscodingService::MediaTranscodingService()
: MediaTranscodingService(std::make_shared<DummyTranscoder>(),
- std::make_shared<DummyProcessInfo>()) {}
+ std::make_shared<DummyUidPolicy>()) {}
MediaTranscodingService::MediaTranscodingService(
const std::shared_ptr<TranscoderInterface>& transcoder,
- const std::shared_ptr<ProcessInfoInterface>& procInfo)
- : mJobScheduler(new TranscodingJobScheduler(transcoder, procInfo)),
+ const std::shared_ptr<UidPolicyInterface>& uidPolicy)
+ : mJobScheduler(new TranscodingJobScheduler(transcoder, uidPolicy)),
mClientManager(new TranscodingClientManager(mJobScheduler)) {
ALOGV("MediaTranscodingService is created");
}
diff --git a/services/mediatranscoding/MediaTranscodingService.h b/services/mediatranscoding/MediaTranscodingService.h
index 36db9b3..f7ac336 100644
--- a/services/mediatranscoding/MediaTranscodingService.h
+++ b/services/mediatranscoding/MediaTranscodingService.h
@@ -31,7 +31,7 @@
class TranscodingClientManager;
class TranscodingJobScheduler;
class TranscoderInterface;
-class ProcessInfoInterface;
+class UidPolicyInterface;
class MediaTranscodingService : public BnMediaTranscodingService {
public:
@@ -40,7 +40,7 @@
MediaTranscodingService();
MediaTranscodingService(const std::shared_ptr<TranscoderInterface>& transcoder,
- const std::shared_ptr<ProcessInfoInterface>& procInfo);
+ const std::shared_ptr<UidPolicyInterface>& uidPolicy);
virtual ~MediaTranscodingService();
static void instantiate();