Skip to content
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.

Sign up for GitHub

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

lib: posix: make sleep() and usleep() standards-compliant #52519

Merged
merged 4 commits into from
Nov 25, 2022
Merged

lib: posix: make sleep() and usleep() standards-compliant #52519

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01ada37
tests: posix: clock: do not use usleep in a broken way
cfriedt Nov 24, 2022
0a055c5
lib: posix: sleep() should report unslept time in seconds
cfriedt Nov 24, 2022
7eb7292
lib: posix: update usleep() to follow the POSIX spec
cfriedt Nov 24, 2022
d58c4ef
tests: posix: add tests for sleep() and usleep()
cfriedt Nov 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions lib/posix/sleep.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/

#include <errno.h>

#include <zephyr/kernel.h>
#include <zephyr/posix/unistd.h>

Expand All @@ -28,10 +30,19 @@ unsigned sleep(unsigned int seconds)
*/
int usleep(useconds_t useconds)
{
if (useconds < USEC_PER_MSEC) {
k_busy_wait(useconds);
} else {
k_msleep(useconds / USEC_PER_MSEC);
int32_t rem;

if (useconds >= USEC_PER_SEC) {
Copy link
Collaborator

@yashi yashi Nov 24, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit
It says useconds >= USEC_PER_SEC but the commit message says:

if usecs > 1000000,

instead of >=.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the spec that's important.

errno = EINVAL;
return -1;
}

rem = k_usleep(useconds);
__ASSERT_NO_MSG(rem >= 0);
if (rem > 0) {
/* sleep was interrupted by a call to k_wakeup() */
errno = EINTR;
return -1;
}

return 0;
Expand Down