-
Notifications
You must be signed in to change notification settings - Fork 207
aosp: wrap alarm() and make it use a thread-directed timer #11340
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
rogerzanoni
wants to merge
1
commit into
youtube:main
Choose a base branch
from
rogerzanoni:aosp-alarm
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| // Copyright 2026 The Cobalt Authors. All Rights Reserved. | ||
| // | ||
| // 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. | ||
|
|
||
| #include <errno.h> | ||
| #include <signal.h> | ||
| #include <string.h> | ||
| #include <time.h> | ||
| #include <unistd.h> | ||
|
|
||
| #include "starboard/common/log.h" | ||
|
|
||
| namespace { | ||
|
|
||
| // A one-shot POSIX timer used to implement a thread-directed alarm() | ||
| struct ThreadAlarmTimer { | ||
| timer_t timer = nullptr; | ||
|
|
||
| ~ThreadAlarmTimer() { | ||
| if (timer) { | ||
| timer_delete(timer); | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| thread_local ThreadAlarmTimer g_thread_alarm_timer; | ||
|
|
||
| } // namespace | ||
|
|
||
| extern "C" { | ||
|
|
||
| unsigned int __real_alarm(unsigned int seconds); | ||
|
|
||
| // alarm() on Android/ART calls setitimer set with ITIMER_REAL, which raises a | ||
| // process-directed SIGALRM. signal() may deliver process-directed signals to | ||
| // any of the process threads that has SIGALRM unblocked, and the kernel decides | ||
| // which is going to be the receiving thread. So on Android, waiting for SIGALRM | ||
| // isn't reliable and to circunvent this issue a per-thread POSIX timer is set | ||
| // with SIGEV_THREAD_ID, which sets up the thread that started the timer as the | ||
| // receiver, not letting the signal go to unblocked receivers like the ART | ||
| // signal catcher. | ||
|
|
||
| unsigned int __wrap_alarm(unsigned int seconds) { | ||
| ThreadAlarmTimer& thread_timer = g_thread_alarm_timer; | ||
| if (thread_timer.timer == nullptr) { | ||
| if (seconds == 0) { | ||
| // No timer to create yet; just cancel any existing process-level alarm. | ||
| return __real_alarm(0); | ||
| } | ||
| struct sigevent sev = {}; | ||
| sev.sigev_notify = SIGEV_THREAD_ID; | ||
| sev.sigev_signo = SIGALRM; | ||
| sev.sigev_notify_thread_id = gettid(); | ||
| if (timer_create(CLOCK_REALTIME, &sev, &thread_timer.timer) != 0) { | ||
| SB_LOG(WARNING) << "alarm(): timer_create failed (" << strerror(errno) | ||
| << "), falling back to the process-level alarm"; | ||
| return __real_alarm(seconds); | ||
| } | ||
| } | ||
|
|
||
| struct itimerspec new_value = {}; | ||
| new_value.it_value.tv_sec = seconds; | ||
| struct itimerspec old_value = {}; | ||
| if (timer_settime(thread_timer.timer, 0, &new_value, &old_value) != 0) { | ||
| SB_LOG(WARNING) << "alarm(): timer_settime failed (" << strerror(errno) | ||
| << "), falling back to the process-level alarm"; | ||
| return __real_alarm(seconds); | ||
| } | ||
|
|
||
| // matches musl's implementation return logic, but using | ||
| // nsec instead of usec | ||
| return old_value.it_value.tv_sec + !!old_value.it_value.tv_nsec; | ||
| } | ||
|
|
||
| } // extern "C" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do we use nsec instead of usec?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IIUC
timer_settimetakesitimerspecargs and that struct uses nsec, vs musl's version usessetitimerwithitimervalwhich has usec.setitimerwas removed from posix so the change from musl to here is reasonable IMO.I'd say the comment referencing the nsec/usec difference from musl is burying the lede a bit. It can probably just explain that we match the behavior to round up any partial seconds that are left on the timer.