aboutsummaryrefslogtreecommitdiffstats
path: root/src/libunixonacid/sassclient_cancel.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/libunixonacid/sassclient_cancel.c')
-rw-r--r--src/libunixonacid/sassclient_cancel.c16
1 files changed, 3 insertions, 13 deletions
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) ;