Changeset c457dc41 for libcfa/src/concurrency/clib

Timestamp:

May 14, 2021, 5:23:49 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

353aaba

Parents:

e2f601f

Message:

Fix sequential handling of timers

Location:

libcfa/src/concurrency/clib

Files:

• cfathread.cfa (modified) (2 diffs)
• cfathread.h (modified) (1 diff)

libcfa/src/concurrency/clib/cfathread.cfa

@@ -27 +27 @@
       extern void __cfactx_invoke_thread(void (*main)(void *), void * this);
 }
+
+extern Time __kernel_get_time();
 
 //================================================================================
@@ -265 +267 @@
         int cfathread_cond_timedwait(cfathread_cond_t *restrict cond, cfathread_mutex_t *restrict mut, const struct timespec *restrict abstime) __attribute__((nonnull (1,2,3))) {
                 Time t = { *abstime };
-                if( wait( (*cond)->impl, (*mut)->impl, t ) ) {
+                timespec curr;
+                clock_gettime( CLOCK_REALTIME, &curr );
+                Time c = { curr };
+                if( wait( (*cond)->impl, (*mut)->impl, t - c ) ) {
                         return 0;
                 }

libcfa/src/concurrency/clib/cfathread.h

@@ -80 +80 @@
 
         typedef struct cfathread_cond_attr {
+                // WARNING: adding support for pthread_condattr_setclock would require keeping track of the clock
+                // and reading it in cond_timedwait
         } cfathread_condattr_t;
         typedef struct cfathread_condition * cfathread_cond_t;