And use it in sassclient

4 files changed, 14 insertions, 27 deletions

diff --git a/package/deps.mak b/package/deps.mak
index 842979b..5d90012 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -816,12 +816,12 @@ src/libunixonacid/openslurpclose_at.o src/libunixonacid/openslurpclose_at.lo: sr
 src/libunixonacid/openwritenclose_at.o src/libunixonacid/openwritenclose_at.lo: src/libunixonacid/openwritenclose_at.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h src/include/skalibs/unix-transactional.h
 src/libunixonacid/openwritevnclose_at.o src/libunixonacid/openwritevnclose_at.lo: src/libunixonacid/openwritevnclose_at.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h src/include/skalibs/siovec.h src/include/skalibs/unix-transactional.h
 src/libunixonacid/sassclient_ack.o src/libunixonacid/sassclient_ack.lo: src/libunixonacid/sassclient_ack.c src/include/skalibs/genqdyn.h src/include/skalibs/sassclient.h src/include/skalibs/uint32.h
-src/libunixonacid/sassclient_cancel.o src/libunixonacid/sassclient_cancel.lo: src/libunixonacid/sassclient_cancel.c src/include/skalibs/gensetdyn.h src/libunixonacid/sassclient-internal.h src/include/skalibs/sassclient.h src/include/skalibs/tai.h src/include/skalibs/textclient.h src/include/skalibs/uint32.h
+src/libunixonacid/sassclient_cancel.o src/libunixonacid/sassclient_cancel.lo: src/libunixonacid/sassclient_cancel.c src/include/skalibs/gensetdyn.h src/include/skalibs/pthread.h src/libunixonacid/sassclient-internal.h src/include/skalibs/sassclient.h src/include/skalibs/textclient.h src/include/skalibs/uint32.h
 src/libunixonacid/sassclient_cancel_internal.o src/libunixonacid/sassclient_cancel_internal.lo: src/libunixonacid/sassclient_cancel_internal.c src/libunixonacid/sassclient-internal.h src/include/skalibs/textclient.h src/include/skalibs/uint32.h
 src/libunixonacid/sassclient_end.o src/libunixonacid/sassclient_end.lo: src/libunixonacid/sassclient_end.c src/include/skalibs/genqdyn.h src/include/skalibs/gensetdyn.h src/include/skalibs/sassclient.h src/include/skalibs/textclient.h
 src/libunixonacid/sassclient_release.o src/libunixonacid/sassclient_release.lo: src/libunixonacid/sassclient_release.c src/include/skalibs/sassclient.h
 src/libunixonacid/sassclient_send.o src/libunixonacid/sassclient_send.lo: src/libunixonacid/sassclient_send.c src/include/skalibs/sassclient.h
-src/libunixonacid/sassclient_sendv.o src/libunixonacid/sassclient_sendv.lo: src/libunixonacid/sassclient_sendv.c src/include/skalibs/gensetdyn.h src/libunixonacid/sassclient-internal.h src/include/skalibs/sassclient.h src/include/skalibs/siovec.h src/include/skalibs/tai.h src/include/skalibs/textclient.h src/include/skalibs/uint32.h
+src/libunixonacid/sassclient_sendv.o src/libunixonacid/sassclient_sendv.lo: src/libunixonacid/sassclient_sendv.c src/include/skalibs/gensetdyn.h src/include/skalibs/pthread.h src/libunixonacid/sassclient-internal.h src/include/skalibs/sassclient.h src/include/skalibs/siovec.h src/include/skalibs/tai.h src/include/skalibs/textclient.h src/include/skalibs/uint32.h
 src/libunixonacid/sassclient_start.o src/libunixonacid/sassclient_start.lo: src/libunixonacid/sassclient_start.c src/include/skalibs/genqdyn.h src/include/skalibs/gensetdyn.h src/include/skalibs/posixplz.h src/libunixonacid/sassclient-internal.h src/include/skalibs/sassclient.h src/include/skalibs/textclient.h
 src/libunixonacid/sassclient_update.o src/libunixonacid/sassclient_update.lo: src/libunixonacid/sassclient_update.c src/include/skalibs/genqdyn.h src/include/skalibs/gensetdyn.h src/include/skalibs/posixishard.h src/libunixonacid/sassclient-internal.h src/include/skalibs/sassclient.h src/include/skalibs/textclient.h src/include/skalibs/uint32.h
 src/libunixonacid/sassserver.o src/libunixonacid/sassserver.lo: src/libunixonacid/sassserver.c src/include/skalibs/alloc.h src/include/skalibs/avltree.h src/include/skalibs/error.h src/include/skalibs/functypes.h src/include/skalibs/gensetdyn.h src/include/skalibs/iopause.h src/include/skalibs/sass.h src/include/skalibs/sassserver.h src/include/skalibs/strerr.h src/include/skalibs/tai.h src/include/skalibs/textclient.h src/include/skalibs/textmessage.h src/include/skalibs/uint32.h
diff --git a/src/libstddjb/pthread_mutex_tailock.c b/src/libstddjb/pthread_mutex_tailock.c
index affa8b3..8f8fbf3 100644
--- a/src/libstddjb/pthread_mutex_tailock.c
+++ b/src/libstddjb/pthread_mutex_tailock.c
@@ -10,15 +10,19 @@
 
 int pthread_mutex_tailock (pthread_mutex_t *mtx, tain const *deadline, tain *stamp)
 {
+  int e ;
   struct timespec ts ;
   tain tto ;
+  if (!stamp) return pthread_mutex_lock(mtx) ;
   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) ;
+    e = pthread_mutex_clocklock(mtx, CLOCK_MONOTONIC, &ts) ;
   else
 #else
-  return pthread_mutex_timedlock(mtx, &ts) ;
+    e = pthread_mutex_timedlock(mtx, &ts) ;
 #endif
+  tain_now(stamp) ;
+  return e ;
 }
diff --git a/src/libunixonacid/sassclient_cancel.c b/src/libunixonacid/sassclient_cancel.c
index bc4273e..f56efd0 100644
--- a/src/libunixonacid/sassclient_cancel.c
+++ b/src/libunixonacid/sassclient_cancel.c
@@ -6,7 +6,7 @@
 #include <pthread.h>
 
 #include <skalibs/uint32.h>
-#include <skalibs/tai.h>
+#include <skalibs/pthread.h>
 #include <skalibs/textclient.h>
 #include <skalibs/gensetdyn.h>
 #include <skalibs/sassclient.h>
@@ -14,18 +14,8 @@
 
 int sassclient_cancel (sassclient *a, uint32_t id, tain const *deadline, tain *stamp)
 {
-  int e ;
-
-  {
-    struct timespec ts ;
-    tain diff ;
-    tain_sub(&diff, deadline, stamp) ;
-    if (!timespec_from_tain_relative(&ts, &diff)) return 0 ;
-    e = pthread_mutex_timedlock(&a->connection_mutex, &ts) ;
-//    e = pthread_mutex_clocklock(&a->connection_mutex, CLOCK_MONOTONIC, &ts) ;
-    if (e) return (errno = e, 0) ;
-  }
-
+  int e = pthread_mutex_tailock(&a->connection_mutex, deadline, stamp) ;
+  if (e) return (errno = e, 0) ;
   e = sassclient_cancel_internal(a, id, deadline, stamp) ;
   if (e) goto err ;
   gensetdyn_delete(&a->store, id) ;
diff --git a/src/libunixonacid/sassclient_sendv.c b/src/libunixonacid/sassclient_sendv.c
index 209462b..54d6a6e 100644
--- a/src/libunixonacid/sassclient_sendv.c
+++ b/src/libunixonacid/sassclient_sendv.c
@@ -10,6 +10,7 @@
 #include <skalibs/uint32.h>
 #include <skalibs/tai.h>
 #include <skalibs/siovec.h>
+#include <skalibs/pthread.h>
 #include <skalibs/gensetdyn.h>
 #include <skalibs/textclient.h>
 #include <skalibs/sassclient.h>
@@ -26,16 +27,8 @@ int sassclient_sendv (sassclient *a, uint32_t *cid, uint32_t flags, uint32_t tim
   struct iovec v[1 + n] ;
   if (len + 11 > UINT32_MAX) return (errno = ENAMETOOLONG, 0) ;
 
-  {
-    struct timespec ts ;
-    tain diff ;
-    tain_sub(&diff, deadline, stamp) ;
-    if (!timespec_from_tain_relative(&ts, &diff)) return 0 ;
-    e = pthread_mutex_timedlock(&a->connection_mutex, &ts) ;
-//    e = pthread_mutex_clocklock(&a->connection_mutex, CLOCK_MONOTONIC, &ts) ;
-    if (e) return (errno = e, 0) ;
-  }
-
+  e = pthread_mutex_tailock(&a->connection_mutex, deadline, stamp) ;
+  if (e) return (errno = e, 0) ;
   if (!gensetdyn_new(&a->store, &id)) goto err ;
   v[0].iov_base = pack ;
   v[0].iov_len = 17 ;