Changeset 05d02c6

Timestamp:

Mar 15, 2021, 2:10:34 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

e5e5af9

Parents:

ea837e94 (diff), 36fbaeca (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

Files:

• libcfa/src/concurrency/clib/cfathread.cfa (modified) (2 diffs)
• libcfa/src/concurrency/clib/cfathread.h (modified) (3 diffs)
• tests/Makefile.am (modified) (2 diffs)
• tests/include/.expect/includes.nast.txt (modified) (1 diff)
• tests/include/includes.cfa (modified) (4 diffs)

libcfa/src/concurrency/clib/cfathread.cfa

@@ -105 +105 @@
         //--------------------
         // Thread
-        int cfathread_create( cfathread_t * handle, cfathread_attr_t * attr, void *(*main)( void * ), void * arg ) __attribute__((nonnull (1))) {
+        int cfathread_create( cfathread_t * handle, const cfathread_attr_t * attr, void *(*main)( void * ), void * arg ) __attribute__((nonnull (1))) {
                 cluster * cl = attr ? attr->cl : active_cluster();
                 cfathread_t thrd = alloc();
@@ -120 +120 @@
                 }
                 return 0;
+        }
+
+        int cfathread_get_errno(void) {
+                return errno;
         }
 

libcfa/src/concurrency/clib/cfathread.h

@@ -30 +30 @@
         typedef struct cluster * cfathread_cluster_t;
 
-        int cfathread_cluster_create(cfathread_cluster_t * cluster) __attribute__((nonnull(1)));
+        int cfathread_cluster_create(cfathread_cluster_t * cluster);
         cfathread_cluster_t cfathread_cluster_self(void);
         int cfathread_cluster_add_worker(cfathread_cluster_t cluster, pthread_t* tid, void (*init_routine) (void *), void * arg);
@@ -43 +43 @@
 
         int cfathread_attr_init(cfathread_attr_t * attr) __attribute__((nonnull (1)));
-        static inline int cfathread_attr_destroy(cfathread_attr_t * attr) __attribute__((nonnull (1))) { return 0; }
-        static inline int cfathread_attr_setbackground(cfathread_attr_t * attr, int background) __attribute__((nonnull (1))) { return 0; }
-        static inline int cfathread_attr_setcluster(cfathread_attr_t * attr, cfathread_cluster_t cl) __attribute__((nonnull (1))) { attr->cl = cl; return 0; }
+        static inline int cfathread_attr_destroy(cfathread_attr_t * attr) __attribute__((nonnull (1)));
+        static inline int cfathread_attr_destroy(cfathread_attr_t * attr) { return 0; }
+        static inline int cfathread_attr_setbackground(cfathread_attr_t * attr, int background) __attribute__((nonnull (1)));
+        static inline int cfathread_attr_setbackground(cfathread_attr_t * attr, int background) { return 0; }
+        static inline int cfathread_attr_setcluster(cfathread_attr_t * attr, cfathread_cluster_t cl) __attribute__((nonnull (1)));
+        static inline int cfathread_attr_setcluster(cfathread_attr_t * attr, cfathread_cluster_t cl) { attr->cl = cl; return 0; }
 
         //--------------------
@@ -52 +55 @@
         typedef struct cfathread_object * cfathread_t;
 
-        int cfathread_create( cfathread_t * h, cfathread_attr_t * a, void *(*main)( void * ), void * arg ) __attribute__((nonnull (1)));
+        int cfathread_create( cfathread_t * h, const cfathread_attr_t * a, void *(*main)( void * ), void * arg ) __attribute__((nonnull (1)));
         int cfathread_join( cfathread_t, void ** retval );
 

tests/Makefile.am

@@ -26 +26 @@
 archiveerrors=
 
-DEBUG_FLAGS=-debug -O0
+DEBUG_FLAGS=-debug -g -O0
 
 quick_test=avl_test operators numericConstants expression enum array typeof cast raii/dtor-early-exit raii/init_once attributes
@@ -44 +44 @@
         -Wall \
         -Wno-unused-function \
+        -Wno-psabi \
         -quiet @CFA_FLAGS@
 

tests/include/.expect/includes.nast.txt

@@ -1 @@
-/usr/include/x86_64-linux-gnu/bits/socket.h: In function '_X16_operator_assignFS7cmsghdr_S7cmsghdrS7cmsghdr_autogen___1':
-/usr/include/x86_64-linux-gnu/bits/socket.h:285:44: note: the ABI of passing struct with a flexible array member has changed in GCC 4.4
 include/includes.cfa: In function '_X4mainFi_iPPKc__1':
-include/includes.cfa:154:9: note: #pragma message: Compiled
+include/includes.cfa:156:9: note: #pragma message: Compiled

tests/include/includes.cfa

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// includes.cfa -- 
+// includes.cfa --
 //
 // Author           : Peter A. Buhr
@@ -90 +90 @@
 #include <poll.h>
 #include <printf.h>
-#include <proc_service.h>
 #include <pthread.h>
 #include <pty.h>
@@ -122 +121 @@
 #include <termio.h>
 #include <termios.h>
-#include <term_entry.h>
+// #include <term_entry.h>                                                              // conflicts with search.h on some machines
 #include <tgmath.h>
 //#include <threads.h>                                                                  // does not exist
@@ -137 +136 @@
 #include <utmpx.h>
 #include <values.h>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wattributes"
 #include <wait.h>
+#pragma GCC diagnostic pop
 #include <wchar.h>
 #include <wctype.h>