From: Jens Gustedt <Jens.Gustedt@inria.fr>
To: musl@lists.openwall.com
Subject: [PATCH 5/8] add the functions for mtx_t
Date: Sat, 30 Aug 2014 20:47:12 +0200 [thread overview]
Message-ID: <1fd80c87fbb0d610730e9d0bf986a304427ba8ff.1409423162.git.Jens.Gustedt@inria.fr> (raw)
In-Reply-To: <cover.1409423162.git.Jens.Gustedt@inria.fr>
This is straightforward encapsulation of the corresponding
pthread_mutex_t functions.
---
src/thread/mtx_destroy.c | 5 +++++
src/thread/mtx_init.c | 10 ++++++++++
src/thread/mtx_lock.c | 13 +++++++++++++
src/thread/mtx_timedlock.c | 18 ++++++++++++++++++
src/thread/mtx_trylock.c | 21 +++++++++++++++++++++
src/thread/mtx_unlock.c | 9 +++++++++
6 files changed, 76 insertions(+)
create mode 100644 src/thread/mtx_destroy.c
create mode 100644 src/thread/mtx_init.c
create mode 100644 src/thread/mtx_lock.c
create mode 100644 src/thread/mtx_timedlock.c
create mode 100644 src/thread/mtx_trylock.c
create mode 100644 src/thread/mtx_unlock.c
diff --git a/src/thread/mtx_destroy.c b/src/thread/mtx_destroy.c
new file mode 100644
index 0000000..482b781
--- /dev/null
+++ b/src/thread/mtx_destroy.c
@@ -0,0 +1,5 @@
+#include <threads.h>
+
+void (mtx_destroy)(mtx_t *mtx) {
+ /* empty */
+}
diff --git a/src/thread/mtx_init.c b/src/thread/mtx_init.c
new file mode 100644
index 0000000..a197898
--- /dev/null
+++ b/src/thread/mtx_init.c
@@ -0,0 +1,10 @@
+#include "pthread_impl.h"
+#include <threads.h>
+
+int mtx_init(mtx_t * m, int type)
+{
+ *m = (mtx_t) {
+ ._m_type = ((type&mtx_recursive) ? PTHREAD_MUTEX_RECURSIVE : PTHREAD_MUTEX_NORMAL),
+ };
+ return thrd_success;
+}
diff --git a/src/thread/mtx_lock.c b/src/thread/mtx_lock.c
new file mode 100644
index 0000000..4d5d75e
--- /dev/null
+++ b/src/thread/mtx_lock.c
@@ -0,0 +1,13 @@
+#include "pthread_impl.h"
+#include <threads.h>
+
+int mtx_lock(mtx_t *m)
+{
+ if (m->_m_type == PTHREAD_MUTEX_NORMAL && !a_cas(&m->_m_lock, 0, EBUSY))
+ return thrd_success;
+ /* Calling mtx_timedlock with a null pointer is an
+ extension. Such a call is convenient, here, since it avoids
+ to repeat the case analysis that is already done for
+ mtx_timedlock. */
+ return mtx_timedlock(m, 0);
+}
diff --git a/src/thread/mtx_timedlock.c b/src/thread/mtx_timedlock.c
new file mode 100644
index 0000000..08359d8
--- /dev/null
+++ b/src/thread/mtx_timedlock.c
@@ -0,0 +1,18 @@
+#include <threads.h>
+#include <errno.h>
+
+int __pthread_mutex_timedlock(mtx_t *restrict m, const struct timespec *restrict ts);
+
+int mtx_timedlock(mtx_t *restrict mutex, const struct timespec *restrict ts) {
+ int ret = __pthread_mutex_timedlock(mutex, ts);
+ switch (ret) {
+ /* May also return EINVAL or EAGAIN. EAGAIN is
+ specially tricky since C11 doesn't define how many recursive
+ calls can be done. (this *isn't* the maximum amount of nested
+ calls!) This implementation here deals this with a counter and
+ detects overflow, so this is definitively UB. */
+ default: return thrd_error;
+ case 0: return thrd_success;
+ case ETIMEDOUT: return thrd_timedout;
+ }
+}
diff --git a/src/thread/mtx_trylock.c b/src/thread/mtx_trylock.c
new file mode 100644
index 0000000..4f55796
--- /dev/null
+++ b/src/thread/mtx_trylock.c
@@ -0,0 +1,21 @@
+#include "pthread_impl.h"
+#include <threads.h>
+
+int __pthread_mutex_trylock(pthread_mutex_t *restrict m);
+
+int mtx_trylock(mtx_t *restrict m) {
+ if (m->_m_type == PTHREAD_MUTEX_NORMAL)
+ return (a_cas(&m->_m_lock, 0, EBUSY) & EBUSY) ? thrd_busy : thrd_success;
+
+ int ret = __pthread_mutex_trylock(m);
+ switch (ret) {
+ /* In case of UB may also return EINVAL or EAGAIN. EAGAIN is
+ specially tricky since C11 doesn't define how many recursive
+ calls can be done. (this *isn't* the maximum amount of nested
+ calls!) This implementation here deals this with a counter and
+ detects overflow, so this is definitively UB. */
+ default: return thrd_error;
+ case 0: return thrd_success;
+ case EBUSY: return thrd_busy;
+ }
+}
diff --git a/src/thread/mtx_unlock.c b/src/thread/mtx_unlock.c
new file mode 100644
index 0000000..e673cd5
--- /dev/null
+++ b/src/thread/mtx_unlock.c
@@ -0,0 +1,9 @@
+#include <threads.h>
+
+int __pthread_mutex_unlock(mtx_t *);
+
+int (mtx_unlock)(mtx_t *mtx) {
+ int ret = __pthread_mutex_unlock(mtx);
+ /* In case of UB may also return EPERM. */
+ return ret ? thrd_error : thrd_success;
+}
--
1.7.10.4
next prev parent reply other threads:[~2014-08-30 18:47 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 ` [PATCH 2/8] additions to src/time Jens Gustedt
2014-08-31 0:13 ` 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 ` Jens Gustedt [this message]
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=1fd80c87fbb0d610730e9d0bf986a304427ba8ff.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).