From: Jens Gustedt <Jens.Gustedt@inria.fr>
To: musl@lists.openwall.com
Subject: [PATCH 2/8] additions to src/time
Date: Sat, 30 Aug 2014 20:46:35 +0200 [thread overview]
Message-ID: <aaebc5b34089d367a4fa1a9e8f35712bcaf3c8e5.1409423162.git.Jens.Gustedt@inria.fr> (raw)
In-Reply-To: <cover.1409423162.git.Jens.Gustedt@inria.fr>
This adds two functions, thrd_sleep and timespec_get. Both have easy
functional equivalences in POSIX, but these have subtle differences in
the handling of errors.
thrd_sleep forces concrete numerical values as error return
timespec_get has a call interface that is incompatible with POSIX because
it has a bogus coding for its clock constants, and also this clock
constants must be returned in case of success. For the moment we only
implement one single clock, TIME_UTC, and map this to
CLOCK_REALTIME. This is the clock that we later need to measure time for
the timedlock and timedwait.
Also, other than for clock_gettime, C doesn't specify touching errno for
timespec_get. Because CLOCK_REALTIME can be obtained very efficiently
through VDSO and messing with errno is clearly the wrong step to go, we
try to avoid this.
---
src/time/thrd_sleep.c | 26 ++++++++++++++++++++++++++
src/time/timespec_get.c | 31 +++++++++++++++++++++++++++++++
2 files changed, 57 insertions(+)
create mode 100644 src/time/thrd_sleep.c
create mode 100644 src/time/timespec_get.c
diff --git a/src/time/thrd_sleep.c b/src/time/thrd_sleep.c
new file mode 100644
index 0000000..3dbfe47
--- /dev/null
+++ b/src/time/thrd_sleep.c
@@ -0,0 +1,26 @@
+#include <time.h>
+#include <errno.h>
+#include "syscall.h"
+#include "libc.h"
+#include "threads.h"
+
+/* Roughly __syscall already returns the right thing: 0 if all went
+ well or a negative error indication, otherwise. */
+int thrd_sleep(const struct timespec *req, struct timespec *rem)
+{
+ int ret = __syscall(SYS_nanosleep, req, rem);
+ switch (ret) {
+ case 0:
+ return 0;
+ /* error described by POSIX: */
+ /* EINTR The nanosleep() function was interrupted by a signal. */
+ /* The C11 wording is: */
+ /* -1 if it has been interrupted by a signal */
+ case -EINTR:
+ return -1;
+ /* EINVAL: described by POSIX */
+ /* EFAULT: described for linux */
+ default:
+ return -2;
+ }
+}
diff --git a/src/time/timespec_get.c b/src/time/timespec_get.c
new file mode 100644
index 0000000..20080a0
--- /dev/null
+++ b/src/time/timespec_get.c
@@ -0,0 +1,31 @@
+#include <time.h>
+#include "syscall.h"
+#include "atomic.h"
+
+static int syscall_clock_gettime(clockid_t clk, struct timespec *ts)
+{
+ return __syscall(SYS_clock_gettime, clk, ts);
+}
+
+void *__vdsosym(const char *, const char *);
+
+/* There is no other implemented value than TIME_UTC, all other values
+ are considered erroneous. */
+int timespec_get(struct timespec * ts, int base)
+{
+ if (base != TIME_UTC) return 0;
+ int ret;
+#ifdef VDSO_CGT_SYM
+ static int (*cgt)(clockid_t, struct timespec *);
+ if (!cgt) {
+ void *f = __vdsosym(VDSO_CGT_VER, VDSO_CGT_SYM);
+ if (!f) f = (void *)syscall_clock_gettime;
+ a_cas_p(&cgt, 0, f);
+ }
+ /* The vdso variants never fail, and thus never set errno. */
+ ret = cgt(CLOCK_REALTIME, ts);
+#else
+ ret = syscall_clock_gettime(CLOCK_REALTIME, ts);
+#endif
+ return ret < 0 ? 0 : base;
+}
--
1.7.10.4
next prev parent reply other threads:[~2014-08-30 18:46 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-30 18:46 [PATCH 0/8] C thread patch series, v. 8.3 and 9.4 Jens Gustedt
2014-08-30 18:46 ` [PATCH 1/8] interface additions for the C thread implementation Jens Gustedt
2014-08-30 18:46 ` Jens Gustedt [this message]
2014-08-31 0:13 ` [PATCH 2/8] additions to src/time Rich Felker
2014-08-31 7:15 ` Jens Gustedt
2014-08-31 12:45 ` Rich Felker
2014-08-30 18:46 ` [PATCH 3/8] use weak symbols for the POSIX functions that will be used by C threads Jens Gustedt
2014-08-31 0:17 ` Rich Felker
2014-08-31 7:18 ` Jens Gustedt
2014-08-30 18:47 ` [PATCH 4/8] add the functions for tss_t and once_flag Jens Gustedt
2014-08-30 18:47 ` [PATCH 5/8] add the functions for mtx_t Jens Gustedt
2014-08-30 18:47 ` [PATCH 6/8] add the functions for cnd_t Jens Gustedt
2014-08-31 0:35 ` Rich Felker
2014-08-31 7:26 ` Jens Gustedt
2014-08-30 18:47 ` [PATCH 7/8] add the thrd_xxxxxx functions Jens Gustedt
2014-08-31 0:46 ` Rich Felker
2014-08-31 7:57 ` Jens Gustedt
2014-08-31 9:51 ` Alexander Monakov
2014-08-31 10:50 ` Jens Gustedt
2014-08-31 11:06 ` Alexander Monakov
2014-08-31 11:31 ` Szabolcs Nagy
2014-08-31 12:57 ` Rich Felker
2014-08-31 13:19 ` Jens Gustedt
2014-08-31 14:05 ` Rich Felker
2014-08-31 15:07 ` Jens Gustedt
2014-08-31 16:06 ` Rich Felker
2014-08-31 16:36 ` Jens Gustedt
2014-08-31 17:02 ` Rich Felker
2014-08-31 19:10 ` Jens Gustedt
2014-09-01 0:04 ` Rich Felker
2014-08-30 18:47 ` [PATCH 8/8] Separate pthread_create and thrd_create Jens Gustedt
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=aaebc5b34089d367a4fa1a9e8f35712bcaf3c8e5.1409423162.git.Jens.Gustedt@inria.fr \
--to=jens.gustedt@inria.fr \
--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).