StarMirror/sandboxed-api
1
0
Fork 0
mirror of https://github.com/google/sandboxed-api.git synced 2024-03-22 13:11:30 +08:00
Code Issues Projects Releases Wiki Activity

Really give priority to main_pid

Browse Source 
Do process all events as soon one for priority_pid arrives.

PiperOrigin-RevId: 553156575
Change-Id: I57a9b4ca54a0e0fe5f01245b130f53ef3f8678fc
This commit is contained in:
Wiktor Garbacz 2023-08-02 08:41:59 -07:00 committed by Copybara-Service
parent 3bbb98c494
commit 8fbe21ce0e
1 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
sandboxed_api/sandbox2/monitor_ptrace.cc
View File

@ -81,9 +81,7 @@ class PidWaiter {
// require attention at the moment, or -1 if there was an error, in which case // require attention at the moment, or -1 if there was an error, in which case
// the error value can be found in 'errno'. // the error value can be found in 'errno'.
int Wait(int* status) { int Wait(int* status) {
if (statuses_.empty() && last_errno_ == 0) { RefillStatuses();
RefillStatuses();
}
if (statuses_.empty()) { if (statuses_.empty()) {
if (last_errno_ == 0) return 0; if (last_errno_ == 0) return 0;
@ -100,25 +98,37 @@ class PidWaiter {
} }
private: private:
void RefillStatuses() { bool CheckStatus(pid_t pid) {
statuses_.clear();
last_errno_ = 0;
pid_t pid = priority_pid_;
int status; int status;
while (true) { // It should be a non-blocking operation (hence WNOHANG), so this function
// It should be a non-blocking operation (hence WNOHANG), so this function // returns quickly if there are no events to be processed.
// returns quickly if there are no events to be processed. pid_t ret =
pid_t ret = waitpid(pid, &status, __WNOTHREAD | __WALL | WUNTRACED | WNOHANG);
waitpid(pid, &status, __WNOTHREAD | __WALL | WUNTRACED | WNOHANG); if (ret < 0) {
if (ret > 0) { last_errno_ = errno;
statuses_.emplace_back(ret, status); return true;
} else if (ret < 0) { }
last_errno_ = errno; if (ret == 0) {
break; return false;
} else if (pid == -1) { }
statuses_.emplace_back(ret, status);
return true;
}
void RefillStatuses() {
constexpr int kMaxIterations = 1000;
constexpr int kPriorityCheckPeriod = 100;
if (!statuses_.empty()) {
return;
}
for (int i = 0; last_errno_ == 0 && i < kMaxIterations; ++i) {
bool should_check_priority = (i % kPriorityCheckPeriod) == 0;
if (should_check_priority && CheckStatus(priority_pid_)) {
return;
}
if (!CheckStatus(-1)) {
break; break;
} }
pid = -1;
} }
} }