Add phread_mutex_clocklock() sysdep, pthread_mutex_tailock() function

6 files changed, 53 insertions, 1 deletions

diff --git a/configure b/configure
index 453589f..7905631 100755
--- a/configure
+++ b/configure
@@ -722,6 +722,7 @@ choose cl prctl 'prctl()'
 choose cl procctl 'procctl()'
 choose cl kevent 'kevent()'
 choose cl kqueue1 'kqueue1()'
+choose cl pthreadmutexclocklock 'pthread_mutex_clocklock()'
 
 # Here are the evil irreducible run-time sysdeps.
 choose clr devurandom '/dev/urandom'
diff --git a/package/deps.mak b/package/deps.mak
index 82136d5..842979b 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -39,6 +39,7 @@ src/include/skalibs/playnice.h: src/include/skalibs/keventbridge.h
 src/include/skalibs/posixishard.h: src/include/skalibs/gccattributes.h src/include/skalibs/stat.h
 src/include/skalibs/posixplz.h: src/include/skalibs/functypes.h src/include/skalibs/gccattributes.h
 src/include/skalibs/prog.h: src/include/skalibs/types.h
+src/include/skalibs/pthread.h: src/include/skalibs/tai.h
 src/include/skalibs/random.h: src/include/skalibs/functypes.h src/include/skalibs/stralloc.h
 src/include/skalibs/sassclient.h: src/include/skalibs/genqdyn.h src/include/skalibs/gensetdyn.h src/include/skalibs/tai.h src/include/skalibs/textclient.h
 src/include/skalibs/sassserver.h: src/include/skalibs/avltree.h src/include/skalibs/functypes.h src/include/skalibs/gensetdyn.h src/include/skalibs/iopause.h src/include/skalibs/tai.h
@@ -52,7 +53,7 @@ src/include/skalibs/skamisc.h: src/include/skalibs/buffer.h src/include/skalibs/
 src/include/skalibs/socket.h: src/include/skalibs/fcntl.h src/include/skalibs/gccattributes.h src/include/skalibs/posixplz.h src/include/skalibs/tai.h
 src/include/skalibs/stat.h: src/include/skalibs/sysdeps.h
 src/include/skalibs/stdcrypto.h: src/include/skalibs/blake2s.h src/include/skalibs/crc32c.h src/include/skalibs/sha1.h src/include/skalibs/sha256.h src/include/skalibs/sha512.h
-src/include/skalibs/stddjb.h: src/include/skalibs/alarm.h src/include/skalibs/alloc.h src/include/skalibs/allreadwrite.h src/include/skalibs/bitarray.h src/include/skalibs/bufalloc.h src/include/skalibs/buffer.h src/include/skalibs/bytestr.h src/include/skalibs/cbuffer.h src/include/skalibs/cdb.h src/include/skalibs/cdbmake.h src/include/skalibs/cspawn.h src/include/skalibs/devino.h src/include/skalibs/direntry.h src/include/skalibs/disize.h src/include/skalibs/diuint.h src/include/skalibs/diuint32.h src/include/skalibs/djbtime.h src/include/skalibs/djbunix.h src/include/skalibs/envalloc.h src/include/skalibs/error.h src/include/skalibs/fmtscan.h src/include/skalibs/functypes.h src/include/skalibs/gccattributes.h src/include/skalibs/genalloc.h src/include/skalibs/genwrite.h src/include/skalibs/iopause.h src/include/skalibs/ip46.h src/include/skalibs/lolstdio.h src/include/skalibs/netstring.h src/include/skalibs/segfault.h src/include/skalibs/selfpipe.h src/include/skalibs/setgroups.h src/include/skalibs/sgetopt.h src/include/skalibs/sig.h src/include/skalibs/siovec.h src/include/skalibs/skamisc.h src/include/skalibs/socket.h src/include/skalibs/stralloc.h src/include/skalibs/tai.h src/include/skalibs/types.h src/include/skalibs/uint16.h src/include/skalibs/uint32.h src/include/skalibs/uint64.h
+src/include/skalibs/stddjb.h: src/include/skalibs/alarm.h src/include/skalibs/alloc.h src/include/skalibs/allreadwrite.h src/include/skalibs/bitarray.h src/include/skalibs/bufalloc.h src/include/skalibs/buffer.h src/include/skalibs/bytestr.h src/include/skalibs/cbuffer.h src/include/skalibs/cdb.h src/include/skalibs/cdbmake.h src/include/skalibs/cspawn.h src/include/skalibs/devino.h src/include/skalibs/direntry.h src/include/skalibs/disize.h src/include/skalibs/diuint.h src/include/skalibs/diuint32.h src/include/skalibs/djbtime.h src/include/skalibs/djbunix.h src/include/skalibs/envalloc.h src/include/skalibs/error.h src/include/skalibs/fmtscan.h src/include/skalibs/functypes.h src/include/skalibs/gccattributes.h src/include/skalibs/genalloc.h src/include/skalibs/genwrite.h src/include/skalibs/iopause.h src/include/skalibs/ip46.h src/include/skalibs/lolstdio.h src/include/skalibs/netstring.h src/include/skalibs/pthread.h src/include/skalibs/segfault.h src/include/skalibs/selfpipe.h src/include/skalibs/setgroups.h src/include/skalibs/sgetopt.h src/include/skalibs/sig.h src/include/skalibs/siovec.h src/include/skalibs/skamisc.h src/include/skalibs/socket.h src/include/skalibs/stralloc.h src/include/skalibs/tai.h src/include/skalibs/types.h src/include/skalibs/uint16.h src/include/skalibs/uint32.h src/include/skalibs/uint64.h
 src/include/skalibs/strerr.h: src/include/skalibs/gccattributes.h src/include/skalibs/prog.h
 src/include/skalibs/strerr2.h: src/include/skalibs/strerr.h
 src/include/skalibs/tai.h: src/include/skalibs/gccattributes.h src/include/skalibs/uint64.h
@@ -506,6 +507,7 @@ src/libstddjb/openwritevnclose_suffix6.o src/libstddjb/openwritevnclose_suffix6.
 src/libstddjb/openwritevnclose_unsafe5.o src/libstddjb/openwritevnclose_unsafe5.lo: src/libstddjb/openwritevnclose_unsafe5.c src/include/skalibs/djbunix.h src/include/skalibs/posixplz.h
 src/libstddjb/path_canonicalize.o src/libstddjb/path_canonicalize.lo: src/libstddjb/path_canonicalize.c src/include/skalibs/djbunix.h
 src/libstddjb/pipe_internal.o src/libstddjb/pipe_internal.lo: src/libstddjb/pipe_internal.c src/include/skalibs/djbunix.h src/include/skalibs/fcntl.h src/include/skalibs/nonposix.h src/include/skalibs/sysdeps.h
+src/libstddjb/pthread_mutex_tailock.o src/libstddjb/pthread_mutex_tailock.lo: src/libstddjb/pthread_mutex_tailock.c src/include/skalibs/pthread.h src/include/skalibs/sysdeps.h src/include/skalibs/tai.h
 src/libstddjb/readnclose.o src/libstddjb/readnclose.lo: src/libstddjb/readnclose.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h
 src/libstddjb/rm_rf.o src/libstddjb/rm_rf.lo: src/libstddjb/rm_rf.c src/include/skalibs/djbunix.h src/include/skalibs/skamisc.h
 src/libstddjb/rm_rf_in_tmp.o src/libstddjb/rm_rf_in_tmp.lo: src/libstddjb/rm_rf_in_tmp.c src/include/skalibs/djbunix.h src/include/skalibs/stralloc.h
diff --git a/src/include/skalibs/pthread.h b/src/include/skalibs/pthread.h
new file mode 100644
index 0000000..a368595
--- /dev/null
+++ b/src/include/skalibs/pthread.h
@@ -0,0 +1,13 @@
+/* ISC license. */
+
+#ifndef SKALIBS_PTHREAD_H
+#define SKALIBS_PTHREAD_H
+
+#include <pthread.h>
+
+#include <skalibs/tai.h>
+
+extern int pthread_mutex_tailock (pthread_mutex_t *, tain const *, tain *) ;
+#define pthread_mutex_tailock_g(mtx, deadline) pthread_mutex_tailock(mtx, (deadline), &STAMP)
+
+#endif
diff --git a/src/include/skalibs/stddjb.h b/src/include/skalibs/stddjb.h
index 2575b06..668e3af 100644
--- a/src/include/skalibs/stddjb.h
+++ b/src/include/skalibs/stddjb.h
@@ -47,5 +47,6 @@
 #include <skalibs/socket.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/tai.h>
+#include <skalibs/pthread.h>
 
 #endif
diff --git a/src/libstddjb/pthread_mutex_tailock.c b/src/libstddjb/pthread_mutex_tailock.c
new file mode 100644
index 0000000..affa8b3
--- /dev/null
+++ b/src/libstddjb/pthread_mutex_tailock.c
@@ -0,0 +1,24 @@
+/* ISC license. */
+
+#include <errno.h>
+#include <time.h>
+#include <pthread.h>
+
+#include <skalibs/sysdeps.h>
+#include <skalibs/tai.h>
+#include <skalibs/pthread.h>
+
+int pthread_mutex_tailock (pthread_mutex_t *mtx, tain const *deadline, tain *stamp)
+{
+  struct timespec ts ;
+  tain tto ;
+  tain_sub(&tto, deadline, stamp) ;
+  if (!timespec_from_tain_relative(&ts, &tto)) return errno ;
+#ifdef SKALIBS_HASPTHREADMUTEXCLOCKLOCK
+  if (&tain_now != &tain_wallclock_read)
+    return pthread_mutex_clocklock(mtx, CLOCK_MONOTONIC, &ts) ;
+  else
+#else
+  return pthread_mutex_timedlock(mtx, &ts) ;
+#endif
+}
diff --git a/src/sysdeps/trypthreadmutexclocklock.c b/src/sysdeps/trypthreadmutexclocklock.c
new file mode 100644
index 0000000..b102db2
--- /dev/null
+++ b/src/sysdeps/trypthreadmutexclocklock.c
@@ -0,0 +1,11 @@
+/* ISC license. */
+
+#include <time.h>
+#include <pthread.h>
+
+int main (void)
+{
+  pthread_mutex_t mtx = PTHREAD_MUTEX_INIT ;
+  strict timespec ts = { .tv_sec = 0, .tv_nsec = 1 } ;
+  return pthread_mutex_clocklock(&mtx, CLOCK_MONOTONIC, &ts) ;
+}