Changeset 09ccaf5


Ignore:
Timestamp:
Jun 6, 2018, 5:45:04 PM (4 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, with_gc
Children:
ae3bb3d, b4e1876, e5d5272
Parents:
2ee0076 (diff), 214e8da (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 plg2:software/cfa/cfa-cc

Location:
src
Files:
1 added
3 edited
2 moved

Legend:

Unmodified
Added
Removed
  • src/benchmark/Makefile.am

    r2ee0076 r09ccaf5  
    9292
    9393## =========================================================================================================
     94loop$(EXEEXT):
     95        @@BACKEND_CC@ loop.c      -DBENCH_N=5000000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     96
     97function$(EXEEXT):
     98        @@BACKEND_CC@ function.c  -DBENCH_N=5000000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     99
     100fetch_add$(EXEEXT):
     101        @@BACKEND_CC@ fetch_add.c -DBENCH_N=500000000  -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     102
     103## =========================================================================================================
    94104ctxswitch$(EXEEXT): \
     105        loop.run                                \
     106        function.run                    \
     107        fetch_add.run                   \
    95108        ctxswitch-pthread.run           \
    96109        ctxswitch-cfa_coroutine.run     \
     
    139152## =========================================================================================================
    140153mutex$(EXEEXT) :\
    141         mutex-function.run      \
    142         mutex-fetch_add.run     \
     154        loop.run                        \
     155        function.run            \
     156        fetch_add.run           \
    143157        mutex-pthread_lock.run  \
    144158        mutex-upp.run           \
     
    147161        mutex-cfa4.run          \
    148162        mutex-java_thread.run
    149 
    150 mutex-function$(EXEEXT):
    151         @@BACKEND_CC@ mutex/function.c    -DBENCH_N=500000000   -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
    152 
    153 mutex-fetch_add$(EXEEXT):
    154         @@BACKEND_CC@ mutex/fetch_add.c   -DBENCH_N=500000000   -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
    155163
    156164mutex-pthread_lock$(EXEEXT):
  • src/benchmark/Makefile.in

    r2ee0076 r09ccaf5  
    505505        @echo "}"
    506506
     507loop$(EXEEXT):
     508        @@BACKEND_CC@ loop.c      -DBENCH_N=5000000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     509
     510function$(EXEEXT):
     511        @@BACKEND_CC@ function.c  -DBENCH_N=5000000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     512
     513fetch_add$(EXEEXT):
     514        @@BACKEND_CC@ fetch_add.c -DBENCH_N=500000000  -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     515
    507516ctxswitch$(EXEEXT): \
     517        loop.run                                \
     518        function.run                    \
     519        fetch_add.run                   \
    508520        ctxswitch-pthread.run           \
    509521        ctxswitch-cfa_coroutine.run     \
     
    551563
    552564mutex$(EXEEXT) :\
    553         mutex-function.run      \
    554         mutex-fetch_add.run     \
     565        loop.run                        \
     566        function.run            \
     567        fetch_add.run           \
    555568        mutex-pthread_lock.run  \
    556569        mutex-upp.run           \
     
    559572        mutex-cfa4.run          \
    560573        mutex-java_thread.run
    561 
    562 mutex-function$(EXEEXT):
    563         @@BACKEND_CC@ mutex/function.c    -DBENCH_N=500000000   -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
    564 
    565 mutex-fetch_add$(EXEEXT):
    566         @@BACKEND_CC@ mutex/fetch_add.c   -DBENCH_N=500000000   -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
    567574
    568575mutex-pthread_lock$(EXEEXT):
  • src/benchmark/function.c

    r2ee0076 r09ccaf5  
    44
    55void __attribute__((noinline)) do_call() {
    6         asm volatile ("");
     6        asm volatile("" ::: "memory");
    77}
    88
  • src/libcfa/concurrency/kernel.c

    r2ee0076 r09ccaf5  
    1616//C Includes
    1717#include <stddef.h>
     18#include <errno.h>
    1819extern "C" {
    1920#include <stdio.h>
     
    663664        __cfaabi_dbg_print_safe("Kernel : Processor %p ready to sleep\n", this);
    664665
    665         verify( ({int sval = 0; sem_getvalue(&this->idleLock, &sval); sval; }) < 65536);
    666         sem_wait(&idleLock);
     666        verify( ({int sval = 0; sem_getvalue(&this->idleLock, &sval); sval; }) < 200);
     667        int __attribute__((unused)) ret = sem_wait(&idleLock);
     668        verify(ret > 0 || errno == EINTR);
    667669
    668670        __cfaabi_dbg_print_safe("Kernel : Processor %p woke up and ready to run\n", this);
     
    678680void wake(processor * this) {
    679681        __cfaabi_dbg_print_safe("Kernel : Waking up processor %p\n", this);
    680         sem_post(&this->idleLock);
    681         verify( ({int sval = 0; sem_getvalue(&this->idleLock, &sval); sval; }) < 65536);
     682        int __attribute__((unused)) ret = sem_post(&this->idleLock);
     683        verify(ret > 0 || errno == EINTR);
     684        verify( ({int sval = 0; sem_getvalue(&this->idleLock, &sval); sval; }) < 200);
    682685}
    683686
Note: See TracChangeset for help on using the changeset viewer.