mailing list of musl libc
 help / color / mirror / code / Atom feed
From: Alexander Lobakin <alobakin@pm.me>
To: Rich Felker <dalias@aerifal.cx>, musl@lists.openwall.com
Cc: Alexander Lobakin <alobakin@pm.me>
Subject: [musl] [PATCH 18/18] sched_rr_get_interval: use time64 variant if available
Date: Sun, 27 Dec 2020 18:42:55 +0000	[thread overview]
Message-ID: <20201227184032.22413-18-alobakin@pm.me> (raw)
In-Reply-To: <20201227184032.22413-1-alobakin@pm.me>

Use the new time64 variant of sched_rr_get_interval as a default and
fallback to the old one only on -ENOSYS.

Signed-off-by: Alexander Lobakin <alobakin@pm.me>
---
 src/sched/sched_rr_get_interval.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/sched/sched_rr_get_interval.c b/src/sched/sched_rr_get_interval.c
index 33a3d1aeed43..bdcba9c57248 100644
--- a/src/sched/sched_rr_get_interval.c
+++ b/src/sched/sched_rr_get_interval.c
@@ -4,18 +4,17 @@
 int sched_rr_get_interval(pid_t pid, struct timespec *ts)
 {
 #ifdef SYS_sched_rr_get_interval_time64
-	/* On a 32-bit arch, use the old syscall if it exists. */
-	if (SYS_sched_rr_get_interval != SYS_sched_rr_get_interval_time64) {
-		long ts32[2];
-		int r = __syscall(SYS_sched_rr_get_interval, pid, ts32);
-		if (!r) {
-			ts->tv_sec = ts32[0];
-			ts->tv_nsec = ts32[1];
-		}
+	int r = __syscall(SYS_sched_rr_get_interval_time64, pid, ts);
+	if (SYS_sched_rr_get_interval == SYS_sched_rr_get_interval_time64 || r != -ENOSYS)
 		return __syscall_ret(r);
+	long ts32[2];
+	r = __syscall(SYS_sched_rr_get_interval, pid, ts32);
+	if (!r) {
+		ts->tv_sec = ts32[0];
+		ts->tv_nsec = ts32[1];
 	}
-#endif
-	/* If reaching this point, it's a 64-bit arch or time64-only
-	 * 32-bit arch and we can get result directly into timespec. */
+	return __syscall_ret(r);
+#else
 	return syscall(SYS_sched_rr_get_interval, pid, ts);
+#endif
 }
-- 
2.29.2



  parent reply	other threads:[~2020-12-27 18:57 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-27 18:39 [musl] [PATCH 00/18] time64: always prefer time64 syscalls Alexander Lobakin
2020-12-27 18:40 ` [musl] [PATCH 01/18] clock_gettime: prefer time64 variant if available Alexander Lobakin
2020-12-27 18:40   ` [musl] [PATCH 02/18] clock_settime: " Alexander Lobakin
2020-12-27 18:41   ` [musl] [PATCH 03/18] clock_adjtime: try adjtimex at last Alexander Lobakin
2020-12-27 21:57     ` Rich Felker
2020-12-27 18:41   ` [musl] [PATCH 04/18] clock_getres: use time64 variant by default Alexander Lobakin
2020-12-27 18:41   ` [musl] [PATCH 05/18] clock_nanosleep: prefer time64 variant if available Alexander Lobakin
2020-12-27 18:41   ` [musl] [PATCH 06/18] timer_gettime: " Alexander Lobakin
2020-12-27 18:41   ` [musl] [PATCH 07/18] timer_settime: " Alexander Lobakin
2020-12-27 18:41   ` [musl] [PATCH 08/18] timerfd_gettime: " Alexander Lobakin
2020-12-27 18:41   ` [musl] [PATCH 09/18] timerfd_settime: " Alexander Lobakin
2020-12-27 18:41   ` [musl] [PATCH 10/18] utimensat: " Alexander Lobakin
2020-12-27 18:42   ` [musl] [PATCH 11/18] pselect, select: prefer time64 variant of pselect6 " Alexander Lobakin
2020-12-27 18:42   ` [musl] [PATCH 12/18] poll, ppoll: prefer time64 variant of ppoll " Alexander Lobakin
2020-12-27 18:42   ` [musl] [PATCH 13/18] mq_timedsend: prefer time64 variant " Alexander Lobakin
2020-12-27 18:42   ` [musl] [PATCH 14/18] mq_timedreceive: " Alexander Lobakin
2020-12-27 18:42   ` [musl] [PATCH 15/18] semtimedop: prefer time64 variant of semtimedop " Alexander Lobakin
2020-12-27 18:42   ` [musl] [PATCH 16/18] [rt_]sigtimedwait: prefer time64 variant " Alexander Lobakin
2020-12-27 18:42   ` [musl] [PATCH 17/18] futex: " Alexander Lobakin
2020-12-27 22:18     ` Rich Felker
2020-12-27 18:42   ` Alexander Lobakin [this message]
2020-12-27 21:54   ` [musl] [PATCH 01/18] clock_gettime: " Rich Felker
2020-12-27 21:52 ` [musl] [PATCH 00/18] time64: always prefer time64 syscalls Rich Felker
2020-12-28 11:11 ` Alexander Lobakin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201227184032.22413-18-alobakin@pm.me \
    --to=alobakin@pm.me \
    --cc=dalias@aerifal.cx \
    --cc=musl@lists.openwall.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/musl/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).