Changes in libcfa/src/concurrency/clib/cfathread.cfa [5c04e82:c457dc41]

File:

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

libcfa/src/concurrency/clib/cfathread.cfa

@@ -27 +27 @@
       extern void __cfactx_invoke_thread(void (*main)(void *), void * this);
 }
+
+extern Time __kernel_get_time();
 
 //================================================================================
@@ -117 +119 @@
 
         this_thrd->state = Ready;
-        enable_interrupts( __cfaabi_dbg_ctx );
+        enable_interrupts();
 }
 
@@ -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;
                 }