Changeset 05d02c6


Ignore:
Timestamp:
Mar 15, 2021, 2:10:34 PM (6 months ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast-unique-expr
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:
5 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/concurrency/clib/cfathread.cfa

    rea837e94 r05d02c6  
    105105        //--------------------
    106106        // Thread
    107         int cfathread_create( cfathread_t * handle, cfathread_attr_t * attr, void *(*main)( void * ), void * arg ) __attribute__((nonnull (1))) {
     107        int cfathread_create( cfathread_t * handle, const cfathread_attr_t * attr, void *(*main)( void * ), void * arg ) __attribute__((nonnull (1))) {
    108108                cluster * cl = attr ? attr->cl : active_cluster();
    109109                cfathread_t thrd = alloc();
     
    120120                }
    121121                return 0;
     122        }
     123
     124        int cfathread_get_errno(void) {
     125                return errno;
    122126        }
    123127
  • libcfa/src/concurrency/clib/cfathread.h

    rea837e94 r05d02c6  
    3030        typedef struct cluster * cfathread_cluster_t;
    3131
    32         int cfathread_cluster_create(cfathread_cluster_t * cluster) __attribute__((nonnull(1)));
     32        int cfathread_cluster_create(cfathread_cluster_t * cluster);
    3333        cfathread_cluster_t cfathread_cluster_self(void);
    3434        int cfathread_cluster_add_worker(cfathread_cluster_t cluster, pthread_t* tid, void (*init_routine) (void *), void * arg);
     
    4343
    4444        int cfathread_attr_init(cfathread_attr_t * attr) __attribute__((nonnull (1)));
    45         static inline int cfathread_attr_destroy(cfathread_attr_t * attr) __attribute__((nonnull (1))) { return 0; }
    46         static inline int cfathread_attr_setbackground(cfathread_attr_t * attr, int background) __attribute__((nonnull (1))) { return 0; }
    47         static inline int cfathread_attr_setcluster(cfathread_attr_t * attr, cfathread_cluster_t cl) __attribute__((nonnull (1))) { attr->cl = cl; return 0; }
     45        static inline int cfathread_attr_destroy(cfathread_attr_t * attr) __attribute__((nonnull (1)));
     46        static inline int cfathread_attr_destroy(cfathread_attr_t * attr) { return 0; }
     47        static inline int cfathread_attr_setbackground(cfathread_attr_t * attr, int background) __attribute__((nonnull (1)));
     48        static inline int cfathread_attr_setbackground(cfathread_attr_t * attr, int background) { return 0; }
     49        static inline int cfathread_attr_setcluster(cfathread_attr_t * attr, cfathread_cluster_t cl) __attribute__((nonnull (1)));
     50        static inline int cfathread_attr_setcluster(cfathread_attr_t * attr, cfathread_cluster_t cl) { attr->cl = cl; return 0; }
    4851
    4952        //--------------------
     
    5255        typedef struct cfathread_object * cfathread_t;
    5356
    54         int cfathread_create( cfathread_t * h, cfathread_attr_t * a, void *(*main)( void * ), void * arg ) __attribute__((nonnull (1)));
     57        int cfathread_create( cfathread_t * h, const cfathread_attr_t * a, void *(*main)( void * ), void * arg ) __attribute__((nonnull (1)));
    5558        int cfathread_join( cfathread_t, void ** retval );
    5659
  • tests/Makefile.am

    rea837e94 r05d02c6  
    2626archiveerrors=
    2727
    28 DEBUG_FLAGS=-debug -O0
     28DEBUG_FLAGS=-debug -g -O0
    2929
    3030quick_test=avl_test operators numericConstants expression enum array typeof cast raii/dtor-early-exit raii/init_once attributes
     
    4444        -Wall \
    4545        -Wno-unused-function \
     46        -Wno-psabi \
    4647        -quiet @CFA_FLAGS@
    4748
  • tests/include/.expect/includes.nast.txt

    rea837e94 r05d02c6  
    1 /usr/include/x86_64-linux-gnu/bits/socket.h: In function '_X16_operator_assignFS7cmsghdr_S7cmsghdrS7cmsghdr_autogen___1':
    2 /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
    31include/includes.cfa: In function '_X4mainFi_iPPKc__1':
    4 include/includes.cfa:154:9: note: #pragma message: Compiled
     2include/includes.cfa:156:9: note: #pragma message: Compiled
  • tests/include/includes.cfa

    rea837e94 r05d02c6  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // includes.cfa -- 
     7// includes.cfa --
    88//
    99// Author           : Peter A. Buhr
     
    9090#include <poll.h>
    9191#include <printf.h>
    92 #include <proc_service.h>
    9392#include <pthread.h>
    9493#include <pty.h>
     
    122121#include <termio.h>
    123122#include <termios.h>
    124 #include <term_entry.h>
     123// #include <term_entry.h>                                                              // conflicts with search.h on some machines
    125124#include <tgmath.h>
    126125//#include <threads.h>                                                                  // does not exist
     
    137136#include <utmpx.h>
    138137#include <values.h>
     138#pragma GCC diagnostic push
     139#pragma GCC diagnostic ignored "-Wattributes"
    139140#include <wait.h>
     141#pragma GCC diagnostic pop
    140142#include <wchar.h>
    141143#include <wctype.h>
Note: See TracChangeset for help on using the changeset viewer.