Changeset ab388c5

Timestamp:

May 26, 2021, 10:15:14 PM (3 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:

03c0e44, 7bd23ce

Parents:

8c28967

Message:

alarm.hfa is now a public header
Fixed include of timeout_lock.cfa.

Files:

• libcfa/src/Makefile.am (modified) (2 diffs)
• tests/unified_locking/timeout_lock.cfa (modified) (3 diffs)

libcfa/src/Makefile.am

@@ -106 +106 @@
 
 inst_thread_headers_src = \
+        concurrency/alarm.hfa \
         concurrency/coroutine.hfa \
         concurrency/exception.hfa \
@@ -116 +117 @@
 thread_libsrc = ${inst_thread_headers_src} ${inst_thread_headers_src:.hfa=.cfa} \
         bits/signal.hfa \
-        concurrency/alarm.cfa \
-        concurrency/alarm.hfa \
         concurrency/clib/cfathread.cfa \
         concurrency/CtxSwitch-@ARCHITECTURE@.S \

tests/unified_locking/timeout_lock.cfa

@@ -1 +1 @@
 #include <stdio.h>
-#include "locks.hfa"
-#include "alarm.hfa"
+#include <locks.hfa>
+#include <alarm.hfa>
 #include <stdlib.hfa>
 #include <thread.hfa>
-#include "kernel.cfa"
+#include <kernel.hfa>
 
 multiple_acquisition_lock m, n;
@@ -33 +33 @@
 
         for ( unsigned int i = 0; i < NoOfTimes + 3; i += 1 ) {
-            if ( wait( c_m, m, 1000000`ns ) ) { 
+            if ( wait( c_m, m, 1000000`ns ) ) {
                         // printf("Thread: %p signalled\n", active_thread()); // removed since can't expect non deterministic output
             } else {
@@ -73 +73 @@
         processor p[2];
         printf("Start Test 1: surface testing condition variable timeout routines\n");
-        wait( c_m, 1`ns );                                                                                                              // bool wait( condition_variable(L) & this, Duration duration );        
+        wait( c_m, 1`ns );                                                                                                              // bool wait( condition_variable(L) & this, Duration duration );
         wait( c_m, 10, 1`ns );                                                                                                  // bool wait( condition_variable(L) & this, uintptr_t info, Duration duration );
         lock(m); wait( c_m, m, 1`ns ); unlock(m);                                                               // bool wait( condition_variable(L) & this, L & l, Duration duration );