Changeset 8d66610 for libcfa/src/concurrency/clib/cfathread.cfa

Timestamp:

May 21, 2021, 4:48:10 PM (5 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:

f1bce515

Parents:

5407cdc (diff), 7404cdc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/concurrency/clib/cfathread.cfa (modified) (2 diffs)

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;
                 }