Changes in / [9b443c7f:5a3ac84]

Files:

• Jenkins/FullBuild (modified) (3 diffs)
• Jenkinsfile (modified) (6 diffs)
• doc/proposals/concurrency/thePlan.md (modified) (1 diff)
• src/CodeGen/CodeGenerator.cc (modified) (2 diffs)
• src/Common/utility.h (modified) (1 diff)
• src/Concurrency/Keywords.cc (modified) (1 diff)
• src/Concurrency/Keywords.h (modified) (1 diff)
• src/GenPoly/Box.cc (modified) (2 diffs)
• src/InitTweak/FixGlobalInit.cc (modified) (3 diffs)
• src/InitTweak/FixInit.cc (modified) (6 diffs)
• src/InitTweak/GenInit.cc (modified) (2 diffs)
• src/InitTweak/InitTweak.cc (modified) (1 diff)
• src/Parser/DeclarationNode.cc (modified) (18 diffs)
• src/Parser/ParseNode.h (modified) (5 diffs)
• src/Parser/TypeData.cc (modified) (5 diffs)
• src/Parser/TypeData.h (modified) (2 diffs)
• src/SymTab/Autogen.cc (modified) (3 diffs)
• src/SymTab/Autogen.h (modified) (1 diff)
• src/SymTab/Indexer.cc (modified) (2 diffs)
• src/SymTab/Validate.cc (modified) (1 diff)
• src/SynTree/Type.h (modified) (5 diffs)
• src/Tuples/TupleAssignment.cc (modified) (1 diff)
• src/Tuples/TupleExpansion.cc (modified) (1 diff)
• src/benchmark/CorCtxSwitch.c (modified) (2 diffs)
• src/benchmark/ThrdCtxSwitch.c (modified) (1 diff)
• src/benchmark/bench.c (modified) (5 diffs)
• src/benchmark/csv-data.c (modified) (2 diffs)
• src/examples/multicore.c (modified) (1 diff)
• src/libcfa/Makefile.am (modified) (1 diff)
• src/libcfa/Makefile.in (modified) (10 diffs)
• src/libcfa/concurrency/coroutine (deleted)
• src/libcfa/concurrency/coroutine.c (deleted)
• src/libcfa/concurrency/coroutines (added)
• src/libcfa/concurrency/coroutines.c (added)
• src/libcfa/concurrency/invoke.c (modified) (3 diffs)
• src/libcfa/concurrency/invoke.h (modified) (3 diffs)
• src/libcfa/concurrency/kernel (modified) (3 diffs)
• src/libcfa/concurrency/kernel.c (modified) (13 diffs)
• src/libcfa/concurrency/kernel_private.h (modified) (5 diffs)
• src/libcfa/concurrency/monitor (modified) (3 diffs)
• src/libcfa/concurrency/monitor.c (modified) (6 diffs)
• src/libcfa/concurrency/thread (deleted)
• src/libcfa/concurrency/thread.c (deleted)
• src/libcfa/concurrency/threads (added)
• src/libcfa/concurrency/threads.c (added)
• src/main.cc (modified) (2 diffs)
• src/tests/coroutine.c (modified) (3 diffs)
• src/tests/monitor.c (modified) (3 diffs)
• src/tests/multi-monitor.c (modified) (2 diffs)
• src/tests/test.py (modified) (1 diff)
• src/tests/thread.c (modified) (1 diff)

Jenkins/FullBuild

@@ -20 +20 @@
 
                                         parallel (
-                                                gcc_6_x64: { trigger_build( 'gcc-6',   'x64', true  ) },
-                                                gcc_6_x86: { trigger_build( 'gcc-6',   'x86', true  ) },
-                                                gcc_5_x64: { trigger_build( 'gcc-5',   'x64', false ) },
-                                                gcc_5_x86: { trigger_build( 'gcc-5',   'x86', false ) },
-                                                gcc_4_x64: { trigger_build( 'gcc-4.9', 'x64', false ) },
-                                                gcc_4_x86: { trigger_build( 'gcc-4.9', 'x86', false ) },
-                                                clang_x64: { trigger_build( 'clang',   'x64', false ) },
-                                                clang_x86: { trigger_build( 'clang',   'x86', false ) },
+                                                gcc_6_x64: { trigger_build( 'gcc-6',   'x64' ) },
+                                                gcc_6_x86: { trigger_build( 'gcc-6',   'x86' ) },
+                                                gcc_5_x64: { trigger_build( 'gcc-5',   'x64' ) },
+                                                gcc_5_x86: { trigger_build( 'gcc-5',   'x86' ) },
+                                                gcc_4_x64: { trigger_build( 'gcc-4.9', 'x64' ) },
+                                                gcc_4_x86: { trigger_build( 'gcc-4.9', 'x86' ) },
+                                                clang_x64: { trigger_build( 'clang',   'x64' ) },
+                                                clang_x86: { trigger_build( 'clang',   'x86' ) },
                                         )
 
@@ -62 +62 @@
 //===========================================================================================================
 
-def trigger_build(String cc, String arch, Boolean publish) {
+def trigger_build(String cc, String arch) {
         def result = build job: 'Cforall/master',               \
                 parameters: [                                           \
@@ -82 +82 @@
                         [$class: 'BooleanParameterValue',               \
                           name: 'pPublish',                             \
-                          value: publish],                                      \
+                          value: true],                                         \
                         [$class: 'BooleanParameterValue',               \
                           name: 'pSilent',                              \

Jenkinsfile

@@ -13 +13 @@
 
         compiler                = null
-        arch_name               = ''
         architecture    = ''
         
@@ -131 +130 @@
                                 [$class: 'BooleanParameterDefinition',                                                  \
                                         description: 'If true, jenkins also builds documentation',              \
-                                        name: 'pBuildDocumentation',                                                    \
+                                        name: 'pBuildDocumentation',                                                            \
                                         defaultValue: true,                                                             \
                                 ],                                                                                              \
@@ -137 +136 @@
                                         description: 'If true, jenkins also publishes results',                 \
                                         name: 'pPublish',                                                               \
-                                        defaultValue: false,                                                            \
+                                        defaultValue: true,                                                             \
                                 ],                                                                                              \
                                 [$class: 'BooleanParameterDefinition',                                                  \
                                         description: 'If true, jenkins will not send emails',           \
-                                        name: 'pSilent',                                                                        \
+                                        name: 'pSilent',                                                \
                                         defaultValue: false,                                                            \
                                 ],                                                                                              \
@@ -148 +147 @@
 
         compiler                = compiler_from_params( pCompiler )
-        arch_name               = pArchitecture
-        architecture    = architecture_from_params( arch_name )
+        architecture    = architecture_from_params( pArchitecture )
 
         do_alltests             = (pRunAllTests == 'true')
@@ -158 +156 @@
 
         echo """Compiler                : ${compiler.cc_name} (${compiler.cpp_cc}/${compiler.cfa_cc})
-Architecture            : ${arch_name}
-Arc Flags               : ${architecture}
+Architecture            : ${architecture}
 Run All Tests           : ${ pRunAllTests.toString() }
 Run Benchmark           : ${ pRunBenchmark.toString() }
@@ -290 +287 @@
 
                 //Write the commit id to Benchmark
-                writeFile  file: 'bench.csv', text:'data=' + gitRefNewValue + ',' + arch_name + ','
+                writeFile  file: 'bench.csv', text:'data=' + gitRefNewValue + ',' 
  
                 //Append bench results

doc/proposals/concurrency/thePlan.md

@@ -7 +7 @@
 
 _Phase 2_ : Minimum Viable Product
-done - Monitor type and enter/leave mutex member routines
+Monitor type and enter/leave mutex member routines
 Monitors as a language feature (not calling enter/leave by hand)
 Internal scheduling

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Mar 13 23:56:59 2017
-// Update Count     : 477
+// Last Modified On : Sun Mar  5 17:13:33 2017
+// Update Count     : 475
 //
 
@@ -895 +895 @@
 
         void CodeGenerator::handleStorageClass( DeclarationWithType * decl ) {
-                if ( decl->get_storageClasses().val != 0 ) {
+                if ( decl->get_storageClasses().any() ) {
                         DeclarationNode::print_StorageClass( output, decl->get_storageClasses() );
                 } // if

src/Common/utility.h

@@ -265 +265 @@
 reverse_iterate_t< T > reverseIterate( T & ref ) {
         return reverse_iterate_t< T >( ref );
-}
-
-template< typename OutType, typename Range, typename Functor >
-OutType map_range( const Range& range, Functor&& functor ) {
-        OutType out;
-
-        std::transform(
-                begin( range ),
-                end( range ),
-                std::back_inserter( out ),
-                std::forward< Functor >( functor )
-        );
-
-        return out;
 }
 

src/Concurrency/Keywords.cc

@@ -1 @@
-//                              -*- Mode: CPP -*-
-//
-// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// Keywords.cc --
-//
-// Author           : Thierry Delisle
-// Created On       : Mon Mar 13 12:41:22 2017
-// Last Modified By :
-// Last Modified On :
-// Update Count     : 0
-//
-
-#include "Concurrency/Keywords.h"
-
-#include "SynTree/Declaration.h"
-#include "SynTree/Expression.h"
-#include "SynTree/Initializer.h"
-#include "SynTree/Mutator.h"
-#include "SynTree/Statement.h"
-#include "SynTree/Type.h"
-#include "SynTree/Visitor.h"
-
-namespace Concurrency {
-
-        namespace {
-                const std::list<Label> noLabels;
-                DeclarationNode::StorageClasses noStorage;
-                Type::Qualifiers noQualifiers;
-        }
-
-        //=============================================================================================
-        // Visitors declaration
-        //=============================================================================================
-
-        //-----------------------------------------------------------------------------
-        //Handles thread type declarations :
-        // thread Mythread {                         struct MyThread {
-        //      int data;                                  int data;
-        //      a_struct_t more_data;                      a_struct_t more_data;
-        //                                =>             thread_desc __thrd_d;
-        // };                                        };
-        //                                           static inline thread_desc * get_thread( MyThread * this ) { return &this->__thrd_d; }
-        //                                           void main( MyThread * this );
-        //
-        class ThreadKeyword final : public Mutator {
-          public:
-
-                static void implement( std::list< Declaration * > & translationUnit ) {}
-        };
-
-        //-----------------------------------------------------------------------------
-        //Handles coroutine type declarations :
-        // coroutine MyCoroutine {                   struct MyCoroutine {
-        //      int data;                                  int data;
-        //      a_struct_t more_data;                      a_struct_t more_data;
-        //                                =>             coroutine_desc __cor_d;
-        // };                                        };
-        //                                           static inline coroutine_desc * get_coroutine( MyCoroutine * this ) { return &this->__cor_d; }
-        //                                           void main( MyCoroutine * this );
-        //
-        class CoroutineKeyword final : public Mutator {
-          public:
-
-                static void implement( std::list< Declaration * > & translationUnit ) {}
-        };
-
-        //-----------------------------------------------------------------------------
-        //Handles monitor type declarations :
-        // monitor MyMonitor {                       struct MyMonitor {
-        //      int data;                                  int data;
-        //      a_struct_t more_data;                      a_struct_t more_data;
-        //                                =>             monitor_desc __mon_d;
-        // };                                        };
-        //                                           static inline monitor_desc * get_coroutine( MyMonitor * this ) { return &this->__cor_d; }
-        //                                           void main( MyMonitor * this );
-        //
-        class MonitorKeyword final : public Mutator {
-          public:
-
-                static void implement( std::list< Declaration * > & translationUnit ) {}
-        };
-
-        //-----------------------------------------------------------------------------
-        //Handles mutex routines definitions :
-        // void foo( A * mutex a, B * mutex b,  int i ) {                  void foo( A * a, B * b,  int i ) {
-        //                                                                       monitor_desc * __monitors[] = { get_monitor(a), get_monitor(b) };
-        //                                                                       monitor_guard_t __guard = { __monitors, 2 };
-        //    /*Some code*/                                       =>           /*Some code*/
-        // }                                                               }
-        //
-        class MutexKeyword final : public Visitor {
-          public:
-
-                using Visitor::visit;
-                virtual void visit( FunctionDecl *functionDecl ) override final;
-                virtual void visit(   StructDecl *functionDecl ) override final;
-
-                std::list<DeclarationWithType*> findMutexArgs( FunctionDecl* );
-                void validate( DeclarationWithType * );
-                void addStatments( CompoundStmt *, const std::list<DeclarationWithType * > &);
-
-                static void implement( std::list< Declaration * > & translationUnit ) {
-                        MutexKeyword impl;
-                        acceptAll( translationUnit, impl );
-                }
-
-          private:
-                StructDecl* monitor_decl = nullptr;
-        };
-
-        //=============================================================================================
-        // General entry routine
-        //=============================================================================================
-        void applyKeywords( std::list< Declaration * > & translationUnit ) {
-                ThreadKeyword   ::implement( translationUnit );
-                CoroutineKeyword        ::implement( translationUnit );
-                MonitorKeyword  ::implement( translationUnit );
-                MutexKeyword    ::implement( translationUnit );
-        }
-
-        //=============================================================================================
-        // Mutex keyword implementation
-        //=============================================================================================
-        void MutexKeyword::visit(FunctionDecl* decl) {
-                std::list<DeclarationWithType*> mutexArgs = findMutexArgs( decl );
-                if( mutexArgs.empty() ) return;
-
-                for(auto arg : mutexArgs) {
-                        validate( arg );
-                }
-
-                CompoundStmt* body = decl->get_statements();
-                if( ! body ) return;
-
-                assert(monitor_decl);
-                addStatments( body, mutexArgs );
-        }
-
-        void MutexKeyword::visit(StructDecl* decl) {
-                if( decl->get_name() == "monitor_desc" ) {
-                        assert( !monitor_decl );
-                        monitor_decl = decl;
-                }
-        }
-
-        std::list<DeclarationWithType*> MutexKeyword::findMutexArgs( FunctionDecl* decl ) {
-                std::list<DeclarationWithType*> mutexArgs;
-
-                for( auto arg : decl->get_functionType()->get_parameters()) {
-                        //Find mutex arguments
-                        Type* ty = arg->get_type();
-                        if( ! ty->get_qualifiers().isMutex ) continue;
-
-                        //Append it to the list
-                        mutexArgs.push_back( arg );
-                }
-
-                return mutexArgs;
-        }
-
-        void MutexKeyword::validate( DeclarationWithType * arg ) {
-                Type* ty = arg->get_type();
-
-                //Makes sure it's not a copy
-                PointerType* pty = dynamic_cast< PointerType * >( ty );
-                if( ! pty ) throw SemanticError( "Mutex argument must be of pointer/reference type ", arg );
-
-                //Make sure the we are pointing directly to a type
-                Type* base = pty->get_base();
-                if(  dynamic_cast< PointerType * >( base ) ) throw SemanticError( "Mutex argument have exactly one level of indirection ", arg );
-
-                //Make sure that typed isn't mutex
-                if( ! base->get_qualifiers().isMutex ) throw SemanticError( "mutex keyword may only appear once per argument ", arg );
-        }
-
-        void MutexKeyword::addStatments( CompoundStmt * body, const std::list<DeclarationWithType * > & args ) {
-
-                ObjectDecl * monitors = new ObjectDecl(
-                        "__monitors",
-                        noStorage,
-                        LinkageSpec::Cforall,
-                        nullptr,
-                        new ArrayType(
-                                noQualifiers,
-                                new PointerType(
-                                        noQualifiers,
-                                        new StructInstType(
-                                                noQualifiers,
-                                                monitor_decl
-                                        )
-                                ),
-                                new ConstantExpr( Constant::from_ulong( args.size() ) ),
-                                false,
-                                false
-                        ),
-                        new ListInit(
-                                map_range < std::list<Initializer*> > ( args, [](DeclarationWithType * var ){
-                                        return new SingleInit( new UntypedExpr(
-                                                new NameExpr( "get_monitor" ),
-                                                {  new VariableExpr( var ) }
-                                        ) );
-                                })
-                        )
-                );
-
-                //in reverse order :
-                // monitor_guard_t __guard = { __monitors, # };
-                body->push_front(
-                        new DeclStmt( noLabels, new ObjectDecl(
-                                "__guard",
-                                noStorage,
-                                LinkageSpec::Cforall,
-                                nullptr,
-                                new StructInstType(
-                                        noQualifiers,
-                                        "monitor_guard_t"
-                                ),
-                                new ListInit(
-                                        {
-                                                new SingleInit( new VariableExpr( monitors ) ),
-                                                new SingleInit( new ConstantExpr( Constant::from_ulong( args.size() ) ) )
-                                        }
-                                )
-                        ))
-                );
-
-                //monitor_desc * __monitors[] = { a, b };
-                body->push_front( new DeclStmt( noLabels, monitors) );
-        }
-};

src/Concurrency/Keywords.h

@@ -1 @@
-//                              -*- Mode: CPP -*-
-//
-// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// Keywords.h --
-//
-// Author           : Thierry Delisle
-// Created On       : Fri Mar 10 15:16:42 2017
-// Last Modified By :
-// Last Modified On :
-// Update Count     : 0
-//
-
-#ifndef KEYWORDS_H
-#define KEYWORDS_H
-
-#include <list>
-
-#include "SynTree/Declaration.h"
-
-namespace Concurrency {
-        void applyKeywords( std::list< Declaration * > & translationUnit );
-};
-
-#endif //KEYWORDS_H

src/GenPoly/Box.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 14 07:45:29 2017
-// Update Count     : 334
+// Last Modified On : Mon Mar  6 23:45:59 2017
+// Update Count     : 330
 //
 
@@ -299 +299 @@
                 // because each unit generates copies of the default routines for each aggregate.
                 FunctionDecl *layoutDecl = new FunctionDecl( layoutofName( typeDecl ),
-                                                                                                         functionNesting > 0 ? DeclarationNode::StorageClasses() : DeclarationNode::StorageClasses( DeclarationNode::Static ),
+                                                                                                         functionNesting > 0 ? DeclarationNode::StorageClasses() : DeclarationNode::StorageClasses( DeclarationNode::StaticClass ),
                                                                                                          LinkageSpec::AutoGen, layoutFnType, new CompoundStmt( noLabels ),
-                                                                                                         std::list< Attribute * >(), DeclarationNode::FuncSpecifiers( DeclarationNode::Inline ) );
+                                                                                                         std::list< Attribute * >(), DeclarationNode::FuncSpecifiers( DeclarationNode::InlineSpec ) );
                 layoutDecl->fixUniqueId();
                 return layoutDecl;

src/InitTweak/FixGlobalInit.cc

@@ -10 +10 @@
 // Created On       : Mon May 04 15:14:56 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Mar 13 23:58:27 2017
-// Update Count     : 16
+// Last Modified On : Mon Mar  6 23:14:19 2017
+// Update Count     : 14
 //
 
@@ -87 +87 @@
                         dtorParameters.push_back( new ConstantExpr( Constant::from_int( 102 ) ) );
                 }
-                initFunction = new FunctionDecl( "_init_" + fixedName, DeclarationNode::StorageClasses( DeclarationNode::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ) );
+                initFunction = new FunctionDecl( "_init_" + fixedName, DeclarationNode::StorageClasses( DeclarationNode::StaticClass ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ) );
                 initFunction->get_attributes().push_back( new Attribute( "constructor", ctorParameters ) );
-                destroyFunction = new FunctionDecl( "_destroy_" + fixedName, DeclarationNode::StorageClasses( DeclarationNode::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ) );
+                destroyFunction = new FunctionDecl( "_destroy_" + fixedName, DeclarationNode::StorageClasses( DeclarationNode::StaticClass ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ) );
                 destroyFunction->get_attributes().push_back( new Attribute( "destructor", dtorParameters ) );
         }
@@ -143 +143 @@
 // compile-command: "make install" //
 // End: //
+

src/InitTweak/FixInit.cc

@@ -10 +10 @@
 // Created On       : Wed Jan 13 16:29:30 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 14 08:05:28 2017
-// Update Count     : 63
+// Last Modified On : Tue Mar  7 07:51:40 2017
+// Update Count     : 59
 //
 
@@ -678 +678 @@
                                 assert( ! ctorInit->get_ctor() || ! ctorInit->get_init() );
                                 if ( Statement * ctor = ctorInit->get_ctor() ) {
-                                        if ( objDecl->get_storageClasses().is_static ) {
+                                        if ( objDecl->get_storageClasses()[ DeclarationNode::Static ] ) {
                                                 // originally wanted to take advantage of gcc nested functions, but
                                                 // we get memory errors with this approach. To remedy this, the static
@@ -704 +704 @@
                                                 BasicType * boolType = new BasicType( Type::Qualifiers(), BasicType::Bool );
                                                 SingleInit * boolInitExpr = new SingleInit( new ConstantExpr( Constant( boolType->clone(), "1" ) ), noDesignators );
-                                                ObjectDecl * isUninitializedVar = new ObjectDecl( objDecl->get_mangleName() + "_uninitialized", DeclarationNode::StorageClasses( DeclarationNode::Static ), LinkageSpec::Cforall, 0, boolType, boolInitExpr );
+                                                ObjectDecl * isUninitializedVar = new ObjectDecl( objDecl->get_mangleName() + "_uninitialized", DeclarationNode::StorageClasses( DeclarationNode::StaticClass ), LinkageSpec::Cforall, 0, boolType, boolInitExpr );
                                                 isUninitializedVar->fixUniqueId();
 
@@ -731 +731 @@
 
                                                         // void __objName_dtor_atexitN(...) {...}
-                                                        FunctionDecl * dtorCaller = new FunctionDecl( objDecl->get_mangleName() + dtorCallerNamer.newName(), DeclarationNode::StorageClasses( DeclarationNode::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ) );
+                                                        FunctionDecl * dtorCaller = new FunctionDecl( objDecl->get_mangleName() + dtorCallerNamer.newName(), DeclarationNode::StorageClasses( DeclarationNode::StaticClass ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ) );
                                                         dtorCaller->fixUniqueId();
                                                         dtorCaller->get_statements()->push_back( dtorStmt );
@@ -764 +764 @@
                                                         // create a new object which is never used
                                                         static UniqueName dummyNamer( "_dummy" );
-                                                        ObjectDecl * dummy = new ObjectDecl( dummyNamer.newName(), DeclarationNode::StorageClasses( DeclarationNode::Static ), LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) ), 0, std::list< Attribute * >{ new Attribute("unused") } );
+                                                        ObjectDecl * dummy = new ObjectDecl( dummyNamer.newName(), DeclarationNode::StorageClasses( DeclarationNode::StaticClass ), LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) ), 0, std::list< Attribute * >{ new Attribute("unused") } );
                                                         return dummy;
                                                 }
@@ -821 +821 @@
                 void InsertDtors::visit( ObjectDecl * objDecl ) {
                         // remember non-static destructed objects so that their destructors can be inserted later
-                        if ( ! objDecl->get_storageClasses().is_static ) {
+                        if ( ! objDecl->get_storageClasses()[ DeclarationNode::Static ] ) {
                                 if ( ConstructorInit * ctorInit = dynamic_cast< ConstructorInit * >( objDecl->get_init() ) ) {
                                         // a decision should have been made by the resolver, so ctor and init are not both non-NULL

src/InitTweak/GenInit.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Mar 13 23:59:09 2017
-// Update Count     : 180
+// Last Modified On : Tue Mar  7 07:51:38 2017
+// Update Count     : 179
 //
 
@@ -186 +186 @@
                 // C doesn't allow variable sized arrays at global scope or for static variables, so don't hoist dimension.
                 if ( ! inFunction ) return;
-                if ( storageClasses.is_static ) return;
+                if ( storageClasses[ DeclarationNode::StaticClass] ) return;
 
                 if ( ArrayType * arrayType = dynamic_cast< ArrayType * >( type ) ) {

src/InitTweak/InitTweak.cc

@@ -260 +260 @@
                         (objDecl->get_init() == NULL ||
                                 ( objDecl->get_init() != NULL && objDecl->get_init()->get_maybeConstructed() ))
-                        && ! objDecl->get_storageClasses().is_extern;
+                        && ! objDecl->get_storageClasses()[ DeclarationNode::Extern ];
         }
 

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 14 14:45:52 2017
-// Update Count     : 973
+// Last Modified On : Tue Mar  7 17:28:56 2017
+// Update Count     : 937
 //
 
@@ -90 +90 @@
         newnode->type = maybeClone( type );
         newnode->storageClasses = storageClasses;
+        newnode->bitfieldWidth = maybeClone( bitfieldWidth );
         newnode->funcSpecs = funcSpecs;
-        newnode->bitfieldWidth = maybeClone( bitfieldWidth );
         newnode->enumeratorValue.reset( maybeClone( enumeratorValue.get() ) );
         newnode->hasEllipsis = hasEllipsis;
@@ -117 +117 @@
 
 void DeclarationNode::print_StorageClass( std::ostream & output, StorageClasses storageClasses ) {
-        if ( storageClasses.val != 0 ) {                                        // storage classes ?
+        if ( storageClasses.any() ) {                                                           // function specifiers?
                 for ( unsigned int i = 0; i < DeclarationNode::NoStorageClass; i += 1 ) {
                         if ( storageClasses[i] ) {
@@ -127 +127 @@
 
 void DeclarationNode::print_FuncSpec( std::ostream & output, DeclarationNode::FuncSpecifiers funcSpec ) {
-        if ( funcSpec.val != 0 ) {                                                      // function specifiers ?
+        if ( funcSpec.any() ) {                                                         // function specifiers?
                 for ( unsigned int i = 0; i < DeclarationNode::NoFuncSpecifier; i += 1 ) {
                         if ( funcSpec[i] ) {
@@ -202 +202 @@
 
 
-DeclarationNode * DeclarationNode::newStorageClass( StorageClasses sc ) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->storageClasses = sc;
+DeclarationNode * DeclarationNode::newStorageClass( DeclarationNode::StorageClass sc ) {
+        DeclarationNode * newnode = new DeclarationNode;
+        newnode->storageClasses[ sc ] = true;
         return newnode;
 } // DeclarationNode::newStorageClass
 
-DeclarationNode * DeclarationNode::newFuncSpecifier( FuncSpecifiers fs ) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->funcSpecs = fs;
+DeclarationNode * DeclarationNode::newFuncSpecifier( DeclarationNode::FuncSpecifier fs ) {
+        DeclarationNode * newnode = new DeclarationNode;
+        newnode->funcSpecs[ fs ] = true;
         return newnode;
 } // DeclarationNode::newFuncSpecifier
 
-DeclarationNode * DeclarationNode::newTypeQualifier( TypeQualifiers tq ) {
+DeclarationNode * DeclarationNode::newTypeQualifier( TypeQualifier tq ) {
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = new TypeData();
-        newnode->type->typeQualifiers = tq;
+        newnode->type->typeQualifiers[ tq ] = true;
         return newnode;
 } // DeclarationNode::newQualifier
@@ -457 +457 @@
 
 void DeclarationNode::checkQualifiers( const TypeData * src, const TypeData * dst ) {
-        const TypeQualifiers qsrc = src->typeQualifiers, qdst = dst->typeQualifiers; // optimization
-
-        if ( (qsrc.val & qdst.val) != 0 ) {                                     // duplicates ?
-                for ( unsigned int i = 0; i < NoTypeQualifier; i += 1 ) { // find duplicates
+        const TypeData::TypeQualifiers qsrc = src->typeQualifiers, qdst = dst->typeQualifiers; // optimization
+
+        if ( (qsrc & qdst).any() ) {                                            // common qualifier ?
+                for ( unsigned int i = 0; i < NoTypeQualifier; i += 1 ) { // find common qualifiers
                         if ( qsrc[i] && qdst[i] ) {
                                 appendError( error, string( "duplicate " ) + DeclarationNode::typeQualifierNames[i] );
@@ -469 +469 @@
 
 void DeclarationNode::checkSpecifiers( DeclarationNode * src ) {
-        if ( (funcSpecs.val & src->funcSpecs.val) != 0 ) {                // duplicates ?
-                for ( unsigned int i = 0; i < NoFuncSpecifier; i += 1 ) { // find duplicates
+        if ( (funcSpecs & src->funcSpecs).any() ) {                     // common specifier ?
+                for ( unsigned int i = 0; i < NoFuncSpecifier; i += 1 ) { // find common specifier
                         if ( funcSpecs[i] && src->funcSpecs[i] ) {
                                 appendError( error, string( "duplicate " ) + DeclarationNode::funcSpecifierNames[i] );
@@ -477 +477 @@
         } // if
 
-        if ( storageClasses.val != 0 && src->storageClasses.val != 0 ) { // any reason to check ?
-                if ( (storageClasses.val & src->storageClasses.val ) != 0 ) { // duplicates ?
+        if ( storageClasses != 0 && src->storageClasses != 0 ) { // any reason to check ?
+                if ( (storageClasses & src->storageClasses).any() ) { // duplicates ?
                         for ( unsigned int i = 0; i < NoStorageClass; i += 1 ) { // find duplicates
                                 if ( storageClasses[i] && src->storageClasses[i] ) {
@@ -485 +485 @@
                         } // for
                         // src is the new item being added and has a single bit
-                } else if ( ! src->storageClasses.is_threadlocal ) { // conflict ?
-                        appendError( error, string( "conflicting " ) + storageClassNames[ffs( storageClasses.val ) - 1] +
-                                                 " & " + storageClassNames[ffs( src->storageClasses.val ) - 1] );
-                        src->storageClasses.val = 0;                            // FIX to preserve invariant of one basic storage specifier
+                } else if ( ! src->storageClasses[ Threadlocal ] ) { // conflict ?
+                        appendError( error, string( "conflicting " ) + storageClassNames[ffs( storageClasses.to_ulong() ) - 1] +
+                                                 " & " + storageClassNames[ffs( src->storageClasses.to_ulong() ) - 1] );
+                        src->storageClasses.reset();                            // FIX to preserve invariant of one basic storage specifier
                 } // if
         } // if
@@ -496 +496 @@
 
 DeclarationNode * DeclarationNode::copySpecifiers( DeclarationNode * q ) {
-        funcSpecs.val = funcSpecs.val | q->funcSpecs.val;
-        storageClasses.val = storageClasses.val | q->storageClasses.val;
+        funcSpecs = funcSpecs | q->funcSpecs;
+        storageClasses = storageClasses | q->storageClasses;
 
         for ( Attribute *attr: reverseIterate( q->attributes ) ) {
@@ -520 +520 @@
                 src = nullptr;
         } else {
-                dst->typeQualifiers.val |= src->typeQualifiers.val;
+                dst->typeQualifiers |= src->typeQualifiers;
         } // if
 } // addQualifiersToType
@@ -578 +578 @@
                 switch ( dst->kind ) {
                   case TypeData::Unknown:
-                        src->typeQualifiers.val |= dst->typeQualifiers.val;
+                        src->typeQualifiers |= dst->typeQualifiers;
                         dst = src;
                         src = nullptr;
                         break;
                   case TypeData::Basic:
-                        dst->typeQualifiers.val |= src->typeQualifiers.val;
+                        dst->typeQualifiers |= src->typeQualifiers;
                         if ( src->kind != TypeData::Unknown ) {
                                 assert( src->kind == TypeData::Basic );
@@ -619 +619 @@
                                         dst->base->aggInst.params = maybeClone( src->aggregate.actuals );
                                 } // if
-                                dst->base->typeQualifiers.val |= src->typeQualifiers.val;
+                                dst->base->typeQualifiers |= src->typeQualifiers;
                                 src = nullptr;
                                 break;
@@ -651 +651 @@
                                                 type->aggInst.hoistType = o->type->enumeration.body;
                                         } // if
-                                        type->typeQualifiers.val |= o->type->typeQualifiers.val;
+                                        type->typeQualifiers |= o->type->typeQualifiers;
                                 } else {
                                         type = o->type;
@@ -807 +807 @@
                                         p->type->base->aggInst.params = maybeClone( type->aggregate.actuals );
                                 } // if
-                                p->type->base->typeQualifiers.val |= type->typeQualifiers.val;
+                                p->type->base->typeQualifiers |= type->typeQualifiers;
                                 break;
 
@@ -844 +844 @@
                                         lastArray->base->aggInst.params = maybeClone( type->aggregate.actuals );
                                 } // if
-                                lastArray->base->typeQualifiers.val |= type->typeQualifiers.val;
+                                lastArray->base->typeQualifiers |= type->typeQualifiers;
                                 break;
                           default:
@@ -1058 +1058 @@
                 //    inline _Noreturn int g( int i );  // allowed
                 //    inline _Noreturn int i;                   // disallowed
-                if ( type->kind != TypeData::Function && funcSpecs.val != 0 ) {
+                if ( type->kind != TypeData::Function && funcSpecs.any() ) {
                         throw SemanticError( "invalid function specifier for ", this );
                 } // if
@@ -1068 +1068 @@
         //    inlne _Noreturn struct S { ... };         // disallowed
         //    inlne _Noreturn enum   E { ... };         // disallowed
-        if ( funcSpecs.val != 0 ) {
+        if ( funcSpecs.any() ) {
                 throw SemanticError( "invalid function specifier for ", this );
         } // if

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 14 16:53:19 2017
-// Update Count     : 757
+// Last Modified On : Tue Mar  7 08:10:53 2017
+// Update Count     : 726
 //
 
@@ -19 +19 @@
 #include <string>
 #include <list>
+#include <bitset>
 #include <iterator>
 #include <memory>
@@ -203 +204 @@
         // These must remain in the same order as the corresponding DeclarationNode names.
 
-        enum { Extern = 1 << 0, Static = 1 << 1, Auto = 1 << 2, Register = 1 << 3, Threadlocal = 1 << 4, NoStorageClass = 5 };
-        union StorageClasses {
-                unsigned int val;
-                struct {
-                        bool is_extern : 1;
-                        bool is_static : 1;
-                        bool is_auto : 1;
-                        bool is_register : 1;
-                        bool is_threadlocal : 1;
-                };
-                StorageClasses() : val( 0 ) {}
-                StorageClasses( unsigned int val ) : val( val ) {}
-                bool operator[]( unsigned int i ) const { return val & (1 << i); }
-        }; // StorageClasses
-
-        enum { Inline = 1 << 0, Noreturn = 1 << 1, Fortran = 1 << 2, NoFuncSpecifier = 3 };
-        union FuncSpecifiers {
-                unsigned int val;
-                struct {
-                        bool is_inline : 1;
-                        bool is_noreturn : 1;
-                        bool is_fortran : 1;
-                };
-                FuncSpecifiers() : val( 0 ) {}
-                FuncSpecifiers( unsigned int val ) : val( val ) {}
-                bool operator[]( unsigned int i ) const { return val & (1 << i); }
-        }; // FuncSpecifiers
-
-        enum { Const = 1 << 0, Restrict = 1 << 1, Volatile = 1 << 2, Lvalue = 1 << 3, Mutex = 1 << 4, Atomic = 1 << 5, NoTypeQualifier = 6 };
-        union TypeQualifiers {
-                unsigned int val;
-                struct {
-                        bool is_const : 1;
-                        bool is_restrict : 1;
-                        bool is_volatile : 1;
-                        bool is_lvalue : 1;
-                        bool is_mutex : 1;
-                        bool is_atomic : 1;
-                };
-                TypeQualifiers() : val( 0 ) {}
-                TypeQualifiers( unsigned int val ) : val( val ) {}
-                bool operator[]( unsigned int i ) const { return val & (1 << i); }
-        }; // TypeQualifiers
-
+        enum StorageClass { Extern, Static, Auto, Register, Threadlocal, NoStorageClass,
+                                                ExternClass = 1 << Extern, StaticClass = 1 << Static, AutoClass = 1 << Auto, RegisterClass = 1 << Register, ThreadlocalClass = 1 << Threadlocal };
+        enum FuncSpecifier { Inline, Noreturn, Fortran, NoFuncSpecifier,
+                                                 InlineSpec = 1 << Inline, NoreturnSpec = 1 << Noreturn, FortranSpec = 1 << Fortran };
+        enum TypeQualifier { Const, Restrict, Volatile, Lvalue, Mutex, Atomic, NoTypeQualifier };
         enum BasicType { Void, Bool, Char, Int, Float, Double, LongDouble, NoBasicType };
         enum ComplexType { Complex, Imaginary, NoComplexType };
@@ -266 +228 @@
         static const char * builtinTypeNames[];
 
-        static DeclarationNode * newStorageClass( StorageClasses );
-        static DeclarationNode * newFuncSpecifier( FuncSpecifiers );
-        static DeclarationNode * newTypeQualifier( TypeQualifiers );
+        static DeclarationNode * newStorageClass( StorageClass );
+        static DeclarationNode * newFuncSpecifier( FuncSpecifier );
+        static DeclarationNode * newTypeQualifier( TypeQualifier );
         static DeclarationNode * newBasicType( BasicType );
         static DeclarationNode * newComplexType( ComplexType );
@@ -364 +326 @@
         TypeData * type;
 
+        typedef std::bitset< DeclarationNode::NoStorageClass > StorageClasses;
         StorageClasses storageClasses;
         static void print_StorageClass( std::ostream & output, StorageClasses storageClasses );
 
+        typedef std::bitset< DeclarationNode::NoFuncSpecifier > FuncSpecifiers;
         FuncSpecifiers funcSpecs;
         static void print_FuncSpec( std::ostream & output, FuncSpecifiers funcSpecs );

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 14 15:01:44 2017
-// Update Count     : 548
+// Last Modified On : Tue Mar  7 08:08:21 2017
+// Update Count     : 538
 //
 
@@ -26 +26 @@
 using namespace std;
 
-TypeData::TypeData( Kind k ) : kind( k ), base( nullptr ), forall( nullptr ) /*, PTR1( (void*)(0xdeadbeefdeadbeef)), PTR2( (void*)(0xdeadbeefdeadbeef) ) */ {
+TypeData::TypeData( Kind k ) : kind( k ), base( nullptr ), forall( nullptr ) {
         switch ( kind ) {
           case Unknown:
@@ -50 +50 @@
                 function.newStyle = false;
                 break;
-                // Enum is an Aggregate, so both structures are initialized together.
-          case Enum:
-                // enumeration = new Enumeration_t;
-                enumeration.name = nullptr;
-                enumeration.constants = nullptr;
-                enumeration.body = false;
           case Aggregate:
                 // aggregate = new Aggregate_t;
@@ -69 +63 @@
                 aggInst.params = nullptr;
                 aggInst.hoistType = false;;
+                break;
+          case Enum:
+                // enumeration = new Enumeration_t;
+                enumeration.name = nullptr;
+                enumeration.constants = nullptr;
+                enumeration.body = false;
                 break;
           case Symbolic:
@@ -494 +494 @@
 Type::Qualifiers buildQualifiers( const TypeData * td ) {
         Type::Qualifiers q;
-        q.isConst = td->typeQualifiers.is_const;
-        q.isVolatile = td->typeQualifiers.is_volatile;
-        q.isRestrict = td->typeQualifiers.is_restrict;
-        q.isLvalue = td->typeQualifiers.is_lvalue;
-        q.isAtomic = td->typeQualifiers.is_atomic;
+        q.isConst = td->typeQualifiers[ DeclarationNode::Const ];
+        q.isVolatile = td->typeQualifiers[ DeclarationNode::Volatile ];
+        q.isRestrict = td->typeQualifiers[ DeclarationNode::Restrict ];
+        q.isLvalue = td->typeQualifiers[ DeclarationNode::Lvalue ];
+        q.isAtomic = td->typeQualifiers[ DeclarationNode::Atomic ];;
         return q;
 } // buildQualifiers

src/Parser/TypeData.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 14 16:51:26 2017
-// Update Count     : 181
+// Last Modified On : Wed Mar  8 22:28:33 2017
+// Update Count     : 174
 //
 
 #ifndef TYPEDATA_H
 #define TYPEDATA_H
+
+#include <bitset>
 
 #include "ParseNode.h"
@@ -75 +77 @@
         DeclarationNode::BuiltinType builtintype = DeclarationNode::NoBuiltinType;
 
-        DeclarationNode::TypeQualifiers typeQualifiers;
+        typedef std::bitset< DeclarationNode::NoTypeQualifier > TypeQualifiers;
+        TypeQualifiers typeQualifiers;
         DeclarationNode * forall;
 

src/SymTab/Autogen.cc

@@ -10 +10 @@
 // Created On       : Thu Mar 03 15:45:56 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 14 07:45:00 2017
-// Update Count     : 54
+// Last Modified On : Tue Mar  7 07:42:44 2017
+// Update Count     : 51
 //
 
@@ -162 +162 @@
                 // because each unit generates copies of the default routines for each aggregate.
 //              DeclarationNode::StorageClass sc = functionNesting > 0 ? DeclarationNode::NoStorageClass : DeclarationNode::Static;
-                DeclarationNode::StorageClasses scs = functionNesting > 0 ? DeclarationNode::StorageClasses() : DeclarationNode::StorageClasses( DeclarationNode::Static );
+                DeclarationNode::StorageClasses scs = functionNesting > 0 ? DeclarationNode::StorageClasses() : DeclarationNode::StorageClasses( DeclarationNode::StaticClass );
                 LinkageSpec::Spec spec = isIntrinsic ? LinkageSpec::Intrinsic : LinkageSpec::AutoGen;
                 FunctionDecl * decl = new FunctionDecl( fname, scs, spec, ftype, new CompoundStmt( noLabels ),
-                                                                                                std::list< Attribute * >(), DeclarationNode::FuncSpecifiers( DeclarationNode::Inline ) );
+                                                                                                std::list< Attribute * >(), DeclarationNode::FuncSpecifiers( DeclarationNode::InlineSpec ) );
                 decl->fixUniqueId();
                 return decl;
@@ -720 +720 @@
                                         TypeInstType * inst = new TypeInstType( Type::Qualifiers(), newDecl->get_name(), newDecl );
                                         newDecl->get_assertions().push_back( new FunctionDecl( "?=?", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, genAssignType( inst ), nullptr,
-                                                                                                                                                   std::list< Attribute * >(), DeclarationNode::FuncSpecifiers( DeclarationNode::Inline ) ) );
+                                                                                                                                                   std::list< Attribute * >(), DeclarationNode::FuncSpecifiers( DeclarationNode::InlineSpec ) ) );
                                         newDecl->get_assertions().push_back( new FunctionDecl( "?{}", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, genDefaultType( inst ), nullptr,
-                                                                                                                                                   std::list< Attribute * >(), DeclarationNode::FuncSpecifiers( DeclarationNode::Inline ) ) );
+                                                                                                                                                   std::list< Attribute * >(), DeclarationNode::FuncSpecifiers( DeclarationNode::InlineSpec ) ) );
                                         newDecl->get_assertions().push_back( new FunctionDecl( "?{}", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, genCopyType( inst ), nullptr,
-                                                                                                                                                   std::list< Attribute * >(), DeclarationNode::FuncSpecifiers( DeclarationNode::Inline ) ) );
+                                                                                                                                                   std::list< Attribute * >(), DeclarationNode::FuncSpecifiers( DeclarationNode::InlineSpec ) ) );
                                         newDecl->get_assertions().push_back( new FunctionDecl( "^?{}", DeclarationNode::StorageClasses(), LinkageSpec::Cforall, genDefaultType( inst ), nullptr,
-                                                                                                                                                   std::list< Attribute * >(), DeclarationNode::FuncSpecifiers( DeclarationNode::Inline ) ) );
+                                                                                                                                                   std::list< Attribute * >(), DeclarationNode::FuncSpecifiers( DeclarationNode::InlineSpec ) ) );
                                         typeParams.push_back( newDecl );
                                         done.insert( ty->get_baseType() );

src/SymTab/Autogen.h

@@ -58 +58 @@
                         assert( type );
                         Type * castType = type->clone();
-                        castType->get_qualifiers() -= Type::Qualifiers(true, true, true, false, true, false);
+                        castType->get_qualifiers() -= Type::Qualifiers(true, true, true, false, true);
                         castType->set_isLvalue( true ); // xxx - might not need this
                         dstParam = new CastExpr( dstParam, new PointerType( Type::Qualifiers(), castType ) );

src/SymTab/Indexer.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:37:33 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 14 08:07:34 2017
-// Update Count     : 17
+// Last Modified On : Tue Mar  7 07:45:32 2017
+// Update Count     : 16
 //
 
@@ -738 +738 @@
                                 ObjectDecl *newobj = dynamic_cast< ObjectDecl* >( added );
                                 ObjectDecl *oldobj = dynamic_cast< ObjectDecl* >( existing );
-                                if ( ! newobj->get_storageClasses().is_extern && ! oldobj->get_storageClasses().is_extern ) {
+                                if ( ! newobj->get_storageClasses()[ DeclarationNode::Extern ] && ! oldobj->get_storageClasses()[ DeclarationNode::Extern ] ) {
                                         throw SemanticError( "duplicate object definition for ", added );
                                 } // if

src/SymTab/Validate.cc

@@ -323 +323 @@
                         ObjectDecl * obj = dynamic_cast< ObjectDecl * >( *i );
                         assert( obj );
-                        obj->set_type( new EnumInstType( Type::Qualifiers( true, false, false, false, false, false ), enumDecl->get_name() ) );
+                        obj->set_type( new EnumInstType( Type::Qualifiers( true, false, false, false, false ), enumDecl->get_name() ) );
                 } // for
                 Parent::visit( enumDecl );

src/SynTree/Type.h

@@ -25 +25 @@
   public:
         struct Qualifiers {
-                Qualifiers(): isConst( false ), isVolatile( false ), isRestrict( false ), isLvalue( false ), isAtomic( false ), isMutex( false ) {}
-                Qualifiers( bool isConst, bool isVolatile, bool isRestrict, bool isLvalue, bool isAtomic, bool isMutex ): isConst( isConst ), isVolatile( isVolatile ), isRestrict( isRestrict ), isLvalue( isLvalue ), isAtomic( isAtomic ), isMutex( isMutex ) {}
+                Qualifiers(): isConst( false ), isVolatile( false ), isRestrict( false ), isLvalue( false ), isAtomic( false ) {}
+                Qualifiers( bool isConst, bool isVolatile, bool isRestrict, bool isLvalue, bool isAtomic ): isConst( isConst ), isVolatile( isVolatile ), isRestrict( isRestrict ), isLvalue( isLvalue ), isAtomic( isAtomic ) {}
 
                 Qualifiers &operator&=( const Qualifiers &other );
@@ -45 +45 @@
                 bool isLvalue;
                 bool isAtomic;
-                bool isMutex;
         };
 
@@ -512 +511 @@
         isLvalue &= other.isLvalue;
         isAtomic &= other.isAtomic;
-        isMutex &= other.isMutex;
         return *this;
 }
@@ -522 +520 @@
         isLvalue |= other.isLvalue;
         isAtomic |= other.isAtomic;
-        isMutex |= other.isMutex;
         return *this;
 }
@@ -531 +528 @@
         if ( other.isRestrict ) isRestrict = 0;
         if ( other.isAtomic ) isAtomic = 0;
-        if ( other.isMutex ) isMutex = 0;
         return *this;
 }

src/Tuples/TupleAssignment.cc

@@ -199 +199 @@
                                 Type * type = InitTweak::getPointerBase( castType );
                                 assert( type );
-                                type->get_qualifiers() -= Type::Qualifiers(true, true, true, false, true, false);
+                                type->get_qualifiers() -= Type::Qualifiers(true, true, true, false, true);
                                 type->set_isLvalue( true ); // xxx - might not need this
                                 expr = new CastExpr( expr, castType );

src/Tuples/TupleExpansion.cc

@@ -305 +305 @@
         Type * makeTupleType( const std::list< Expression * > & exprs ) {
                 // produce the TupleType which aggregates the types of the exprs
-                TupleType *tupleType = new TupleType( Type::Qualifiers(true, true, true, true, true, true) );
+                TupleType *tupleType = new TupleType( Type::Qualifiers(true, true, true, true, true) );
                 Type::Qualifiers &qualifiers = tupleType->get_qualifiers();
                 for ( Expression * expr : exprs ) {

src/benchmark/CorCtxSwitch.c

@@ -1 +1 @@
 #include <fstream>
 #include <stdlib>
-#include <thread>
+#include <threads>
 
 #include <unistd.h>                                     // sysconf
@@ -24 +24 @@
 
 struct GreatSuspender {
-        coroutine_desc c;
+        coroutine c;
 };
 

src/benchmark/ThrdCtxSwitch.c

@@ -1 +1 @@
 #include <fstream>
 #include <stdlib>
-#include <thread>
+#include <threads>
 
 #include <unistd.h>                                     // sysconf

src/benchmark/bench.c

@@ -2 +2 @@
 #include <fstream>
 #include <stdlib>
-#include <thread>
+#include <threads>
 
 #include <unistd.h>                                     // sysconf
@@ -86 +86 @@
 //=======================================
 
-struct CoroutineDummy { coroutine_desc c; };
+struct CoroutineDummy { coroutine c; };
 DECL_COROUTINE(CoroutineDummy);
 void main(CoroutineDummy * this) {}
@@ -119 +119 @@
 struct CoroutineResume {
     int N;
-    coroutine_desc c;
+    coroutine c;
 };
 
@@ -150 +150 @@
 //=======================================
 
-struct ThreadDummy { thread_desc t; };
+struct ThreadDummy { thread t; };
 DECL_THREAD(ThreadDummy);
 void main(ThreadDummy * this) {}
@@ -180 +180 @@
     int N;
     long long result;
-    thread_desc t;
+    thread t;
 };
 

src/benchmark/csv-data.c

@@ -1 +1 @@
 #include <fstream>
 #include <stdlib>
-#include <thread>
+#include <threads>
 
 extern "C" {
@@ -26 +26 @@
 
 struct GreatSuspender {
-        coroutine_desc c;
+        coroutine c;
 };
 

src/examples/multicore.c

@@ -1 +1 @@
 #include <kernel>
-#include <thread>
+#include <threads>
 
-struct MyThread { thread_desc t; };
+struct MyThread { thread t; };
 
 DECL_THREAD(MyThread);

src/libcfa/Makefile.am

@@ -45 +45 @@
 # not all platforms support concurrency, add option do disable it
 if BUILD_CONCURRENCY
-headers += containers/vector concurrency/coroutine concurrency/thread concurrency/kernel concurrency/monitor
+headers += containers/vector concurrency/coroutines concurrency/threads concurrency/kernel concurrency/monitor
 endif
 

src/libcfa/Makefile.in

@@ -43 +43 @@
 
 # not all platforms support concurrency, add option do disable it
-@BUILD_CONCURRENCY_TRUE@am__append_3 = containers/vector concurrency/coroutine concurrency/thread concurrency/kernel concurrency/monitor
+@BUILD_CONCURRENCY_TRUE@am__append_3 = containers/vector concurrency/coroutines concurrency/threads concurrency/kernel concurrency/monitor
 
 # not all platforms support concurrency, add option do disable it
@@ -99 +99 @@
 am__libcfa_d_a_SOURCES_DIST = libcfa-prelude.c limits.c stdlib.c \
         math.c iostream.c fstream.c iterator.c rational.c assert.c \
-        containers/vector.c concurrency/coroutine.c \
-        concurrency/thread.c concurrency/kernel.c \
+        containers/vector.c concurrency/coroutines.c \
+        concurrency/threads.c concurrency/kernel.c \
         concurrency/monitor.c concurrency/CtxSwitch-@MACHINE_TYPE@.S \
         concurrency/invoke.c
 am__dirstamp = $(am__leading_dot)dirstamp
 @BUILD_CONCURRENCY_TRUE@am__objects_1 = containers/libcfa_d_a-vector.$(OBJEXT) \
-@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_d_a-coroutine.$(OBJEXT) \
-@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_d_a-thread.$(OBJEXT) \
+@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_d_a-coroutines.$(OBJEXT) \
+@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_d_a-threads.$(OBJEXT) \
 @BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_d_a-kernel.$(OBJEXT) \
 @BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_d_a-monitor.$(OBJEXT)
@@ -124 +124 @@
 am__libcfa_a_SOURCES_DIST = libcfa-prelude.c limits.c stdlib.c math.c \
         iostream.c fstream.c iterator.c rational.c assert.c \
-        containers/vector.c concurrency/coroutine.c \
-        concurrency/thread.c concurrency/kernel.c \
+        containers/vector.c concurrency/coroutines.c \
+        concurrency/threads.c concurrency/kernel.c \
         concurrency/monitor.c concurrency/CtxSwitch-@MACHINE_TYPE@.S \
         concurrency/invoke.c
 @BUILD_CONCURRENCY_TRUE@am__objects_5 =  \
 @BUILD_CONCURRENCY_TRUE@        containers/libcfa_a-vector.$(OBJEXT) \
-@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-coroutine.$(OBJEXT) \
-@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-thread.$(OBJEXT) \
+@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-coroutines.$(OBJEXT) \
+@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-threads.$(OBJEXT) \
 @BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-kernel.$(OBJEXT) \
 @BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-monitor.$(OBJEXT)
@@ -175 +175 @@
 am__nobase_cfa_include_HEADERS_DIST = limits stdlib math iostream \
         fstream iterator rational assert containers/vector \
-        concurrency/coroutine concurrency/thread concurrency/kernel \
+        concurrency/coroutines concurrency/threads concurrency/kernel \
         concurrency/monitor ${shell echo stdhdr/*} \
         concurrency/invoke.h
@@ -397 +397 @@
         @$(MKDIR_P) concurrency/$(DEPDIR)
         @: > concurrency/$(DEPDIR)/$(am__dirstamp)
-concurrency/libcfa_d_a-coroutine.$(OBJEXT):  \
+concurrency/libcfa_d_a-coroutines.$(OBJEXT):  \
         concurrency/$(am__dirstamp) \
         concurrency/$(DEPDIR)/$(am__dirstamp)
-concurrency/libcfa_d_a-thread.$(OBJEXT): concurrency/$(am__dirstamp) \
+concurrency/libcfa_d_a-threads.$(OBJEXT): concurrency/$(am__dirstamp) \
         concurrency/$(DEPDIR)/$(am__dirstamp)
 concurrency/libcfa_d_a-kernel.$(OBJEXT): concurrency/$(am__dirstamp) \
@@ -417 +417 @@
 containers/libcfa_a-vector.$(OBJEXT): containers/$(am__dirstamp) \
         containers/$(DEPDIR)/$(am__dirstamp)
-concurrency/libcfa_a-coroutine.$(OBJEXT): concurrency/$(am__dirstamp) \
+concurrency/libcfa_a-coroutines.$(OBJEXT):  \
+        concurrency/$(am__dirstamp) \
         concurrency/$(DEPDIR)/$(am__dirstamp)
-concurrency/libcfa_a-thread.$(OBJEXT): concurrency/$(am__dirstamp) \
+concurrency/libcfa_a-threads.$(OBJEXT): concurrency/$(am__dirstamp) \
         concurrency/$(DEPDIR)/$(am__dirstamp)
 concurrency/libcfa_a-kernel.$(OBJEXT): concurrency/$(am__dirstamp) \
@@ -435 +436 @@
         -rm -f *.$(OBJEXT)
         -rm -f concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT)
-        -rm -f concurrency/libcfa_a-coroutine.$(OBJEXT)
+        -rm -f concurrency/libcfa_a-coroutines.$(OBJEXT)
         -rm -f concurrency/libcfa_a-invoke.$(OBJEXT)
         -rm -f concurrency/libcfa_a-kernel.$(OBJEXT)
         -rm -f concurrency/libcfa_a-monitor.$(OBJEXT)
-        -rm -f concurrency/libcfa_a-thread.$(OBJEXT)
-        -rm -f concurrency/libcfa_d_a-coroutine.$(OBJEXT)
+        -rm -f concurrency/libcfa_a-threads.$(OBJEXT)
+        -rm -f concurrency/libcfa_d_a-coroutines.$(OBJEXT)
         -rm -f concurrency/libcfa_d_a-invoke.$(OBJEXT)
         -rm -f concurrency/libcfa_d_a-kernel.$(OBJEXT)
         -rm -f concurrency/libcfa_d_a-monitor.$(OBJEXT)
-        -rm -f concurrency/libcfa_d_a-thread.$(OBJEXT)
+        -rm -f concurrency/libcfa_d_a-threads.$(OBJEXT)
         -rm -f containers/libcfa_a-vector.$(OBJEXT)
         -rm -f containers/libcfa_d_a-vector.$(OBJEXT)
@@ -470 +471 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_d_a-stdlib.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/CtxSwitch-@MACHINE_TYPE@.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_a-coroutine.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_a-coroutines.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_a-invoke.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_a-kernel.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_a-monitor.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_a-thread.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_d_a-coroutine.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_a-threads.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_d_a-coroutines.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_d_a-invoke.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_d_a-kernel.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_d_a-monitor.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_d_a-thread.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_d_a-threads.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@containers/$(DEPDIR)/libcfa_a-vector.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@containers/$(DEPDIR)/libcfa_d_a-vector.Po@am__quote@
@@ -648 +649 @@
 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o containers/libcfa_d_a-vector.obj `if test -f 'containers/vector.c'; then $(CYGPATH_W) 'containers/vector.c'; else $(CYGPATH_W) '$(srcdir)/containers/vector.c'; fi`
 
-concurrency/libcfa_d_a-coroutine.o: concurrency/coroutine.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_d_a-coroutine.o -MD -MP -MF concurrency/$(DEPDIR)/libcfa_d_a-coroutine.Tpo -c -o concurrency/libcfa_d_a-coroutine.o `test -f 'concurrency/coroutine.c' || echo '$(srcdir)/'`concurrency/coroutine.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_d_a-coroutine.Tpo concurrency/$(DEPDIR)/libcfa_d_a-coroutine.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='concurrency/coroutine.c' object='concurrency/libcfa_d_a-coroutine.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_d_a-coroutine.o `test -f 'concurrency/coroutine.c' || echo '$(srcdir)/'`concurrency/coroutine.c
-
-concurrency/libcfa_d_a-coroutine.obj: concurrency/coroutine.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_d_a-coroutine.obj -MD -MP -MF concurrency/$(DEPDIR)/libcfa_d_a-coroutine.Tpo -c -o concurrency/libcfa_d_a-coroutine.obj `if test -f 'concurrency/coroutine.c'; then $(CYGPATH_W) 'concurrency/coroutine.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/coroutine.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_d_a-coroutine.Tpo concurrency/$(DEPDIR)/libcfa_d_a-coroutine.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='concurrency/coroutine.c' object='concurrency/libcfa_d_a-coroutine.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_d_a-coroutine.obj `if test -f 'concurrency/coroutine.c'; then $(CYGPATH_W) 'concurrency/coroutine.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/coroutine.c'; fi`
-
-concurrency/libcfa_d_a-thread.o: concurrency/thread.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_d_a-thread.o -MD -MP -MF concurrency/$(DEPDIR)/libcfa_d_a-thread.Tpo -c -o concurrency/libcfa_d_a-thread.o `test -f 'concurrency/thread.c' || echo '$(srcdir)/'`concurrency/thread.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_d_a-thread.Tpo concurrency/$(DEPDIR)/libcfa_d_a-thread.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='concurrency/thread.c' object='concurrency/libcfa_d_a-thread.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_d_a-thread.o `test -f 'concurrency/thread.c' || echo '$(srcdir)/'`concurrency/thread.c
-
-concurrency/libcfa_d_a-thread.obj: concurrency/thread.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_d_a-thread.obj -MD -MP -MF concurrency/$(DEPDIR)/libcfa_d_a-thread.Tpo -c -o concurrency/libcfa_d_a-thread.obj `if test -f 'concurrency/thread.c'; then $(CYGPATH_W) 'concurrency/thread.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/thread.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_d_a-thread.Tpo concurrency/$(DEPDIR)/libcfa_d_a-thread.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='concurrency/thread.c' object='concurrency/libcfa_d_a-thread.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_d_a-thread.obj `if test -f 'concurrency/thread.c'; then $(CYGPATH_W) 'concurrency/thread.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/thread.c'; fi`
+concurrency/libcfa_d_a-coroutines.o: concurrency/coroutines.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_d_a-coroutines.o -MD -MP -MF concurrency/$(DEPDIR)/libcfa_d_a-coroutines.Tpo -c -o concurrency/libcfa_d_a-coroutines.o `test -f 'concurrency/coroutines.c' || echo '$(srcdir)/'`concurrency/coroutines.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_d_a-coroutines.Tpo concurrency/$(DEPDIR)/libcfa_d_a-coroutines.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='concurrency/coroutines.c' object='concurrency/libcfa_d_a-coroutines.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_d_a-coroutines.o `test -f 'concurrency/coroutines.c' || echo '$(srcdir)/'`concurrency/coroutines.c
+
+concurrency/libcfa_d_a-coroutines.obj: concurrency/coroutines.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_d_a-coroutines.obj -MD -MP -MF concurrency/$(DEPDIR)/libcfa_d_a-coroutines.Tpo -c -o concurrency/libcfa_d_a-coroutines.obj `if test -f 'concurrency/coroutines.c'; then $(CYGPATH_W) 'concurrency/coroutines.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/coroutines.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_d_a-coroutines.Tpo concurrency/$(DEPDIR)/libcfa_d_a-coroutines.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='concurrency/coroutines.c' object='concurrency/libcfa_d_a-coroutines.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_d_a-coroutines.obj `if test -f 'concurrency/coroutines.c'; then $(CYGPATH_W) 'concurrency/coroutines.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/coroutines.c'; fi`
+
+concurrency/libcfa_d_a-threads.o: concurrency/threads.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_d_a-threads.o -MD -MP -MF concurrency/$(DEPDIR)/libcfa_d_a-threads.Tpo -c -o concurrency/libcfa_d_a-threads.o `test -f 'concurrency/threads.c' || echo '$(srcdir)/'`concurrency/threads.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_d_a-threads.Tpo concurrency/$(DEPDIR)/libcfa_d_a-threads.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='concurrency/threads.c' object='concurrency/libcfa_d_a-threads.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_d_a-threads.o `test -f 'concurrency/threads.c' || echo '$(srcdir)/'`concurrency/threads.c
+
+concurrency/libcfa_d_a-threads.obj: concurrency/threads.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_d_a-threads.obj -MD -MP -MF concurrency/$(DEPDIR)/libcfa_d_a-threads.Tpo -c -o concurrency/libcfa_d_a-threads.obj `if test -f 'concurrency/threads.c'; then $(CYGPATH_W) 'concurrency/threads.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/threads.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_d_a-threads.Tpo concurrency/$(DEPDIR)/libcfa_d_a-threads.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='concurrency/threads.c' object='concurrency/libcfa_d_a-threads.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_d_a-threads.obj `if test -f 'concurrency/threads.c'; then $(CYGPATH_W) 'concurrency/threads.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/threads.c'; fi`
 
 concurrency/libcfa_d_a-kernel.o: concurrency/kernel.c
@@ -844 +845 @@
 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o containers/libcfa_a-vector.obj `if test -f 'containers/vector.c'; then $(CYGPATH_W) 'containers/vector.c'; else $(CYGPATH_W) '$(srcdir)/containers/vector.c'; fi`
 
-concurrency/libcfa_a-coroutine.o: concurrency/coroutine.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_a-coroutine.o -MD -MP -MF concurrency/$(DEPDIR)/libcfa_a-coroutine.Tpo -c -o concurrency/libcfa_a-coroutine.o `test -f 'concurrency/coroutine.c' || echo '$(srcdir)/'`concurrency/coroutine.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_a-coroutine.Tpo concurrency/$(DEPDIR)/libcfa_a-coroutine.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='concurrency/coroutine.c' object='concurrency/libcfa_a-coroutine.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_a-coroutine.o `test -f 'concurrency/coroutine.c' || echo '$(srcdir)/'`concurrency/coroutine.c
-
-concurrency/libcfa_a-coroutine.obj: concurrency/coroutine.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_a-coroutine.obj -MD -MP -MF concurrency/$(DEPDIR)/libcfa_a-coroutine.Tpo -c -o concurrency/libcfa_a-coroutine.obj `if test -f 'concurrency/coroutine.c'; then $(CYGPATH_W) 'concurrency/coroutine.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/coroutine.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_a-coroutine.Tpo concurrency/$(DEPDIR)/libcfa_a-coroutine.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='concurrency/coroutine.c' object='concurrency/libcfa_a-coroutine.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_a-coroutine.obj `if test -f 'concurrency/coroutine.c'; then $(CYGPATH_W) 'concurrency/coroutine.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/coroutine.c'; fi`
-
-concurrency/libcfa_a-thread.o: concurrency/thread.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_a-thread.o -MD -MP -MF concurrency/$(DEPDIR)/libcfa_a-thread.Tpo -c -o concurrency/libcfa_a-thread.o `test -f 'concurrency/thread.c' || echo '$(srcdir)/'`concurrency/thread.c
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_a-thread.Tpo concurrency/$(DEPDIR)/libcfa_a-thread.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='concurrency/thread.c' object='concurrency/libcfa_a-thread.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_a-thread.o `test -f 'concurrency/thread.c' || echo '$(srcdir)/'`concurrency/thread.c
-
-concurrency/libcfa_a-thread.obj: concurrency/thread.c
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_a-thread.obj -MD -MP -MF concurrency/$(DEPDIR)/libcfa_a-thread.Tpo -c -o concurrency/libcfa_a-thread.obj `if test -f 'concurrency/thread.c'; then $(CYGPATH_W) 'concurrency/thread.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/thread.c'; fi`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_a-thread.Tpo concurrency/$(DEPDIR)/libcfa_a-thread.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='concurrency/thread.c' object='concurrency/libcfa_a-thread.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_a-thread.obj `if test -f 'concurrency/thread.c'; then $(CYGPATH_W) 'concurrency/thread.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/thread.c'; fi`
+concurrency/libcfa_a-coroutines.o: concurrency/coroutines.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_a-coroutines.o -MD -MP -MF concurrency/$(DEPDIR)/libcfa_a-coroutines.Tpo -c -o concurrency/libcfa_a-coroutines.o `test -f 'concurrency/coroutines.c' || echo '$(srcdir)/'`concurrency/coroutines.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_a-coroutines.Tpo concurrency/$(DEPDIR)/libcfa_a-coroutines.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='concurrency/coroutines.c' object='concurrency/libcfa_a-coroutines.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_a-coroutines.o `test -f 'concurrency/coroutines.c' || echo '$(srcdir)/'`concurrency/coroutines.c
+
+concurrency/libcfa_a-coroutines.obj: concurrency/coroutines.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_a-coroutines.obj -MD -MP -MF concurrency/$(DEPDIR)/libcfa_a-coroutines.Tpo -c -o concurrency/libcfa_a-coroutines.obj `if test -f 'concurrency/coroutines.c'; then $(CYGPATH_W) 'concurrency/coroutines.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/coroutines.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_a-coroutines.Tpo concurrency/$(DEPDIR)/libcfa_a-coroutines.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='concurrency/coroutines.c' object='concurrency/libcfa_a-coroutines.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_a-coroutines.obj `if test -f 'concurrency/coroutines.c'; then $(CYGPATH_W) 'concurrency/coroutines.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/coroutines.c'; fi`
+
+concurrency/libcfa_a-threads.o: concurrency/threads.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_a-threads.o -MD -MP -MF concurrency/$(DEPDIR)/libcfa_a-threads.Tpo -c -o concurrency/libcfa_a-threads.o `test -f 'concurrency/threads.c' || echo '$(srcdir)/'`concurrency/threads.c
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_a-threads.Tpo concurrency/$(DEPDIR)/libcfa_a-threads.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='concurrency/threads.c' object='concurrency/libcfa_a-threads.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_a-threads.o `test -f 'concurrency/threads.c' || echo '$(srcdir)/'`concurrency/threads.c
+
+concurrency/libcfa_a-threads.obj: concurrency/threads.c
+@am__fastdepCC_TRUE@    $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_a-threads.obj -MD -MP -MF concurrency/$(DEPDIR)/libcfa_a-threads.Tpo -c -o concurrency/libcfa_a-threads.obj `if test -f 'concurrency/threads.c'; then $(CYGPATH_W) 'concurrency/threads.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/threads.c'; fi`
+@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_a-threads.Tpo concurrency/$(DEPDIR)/libcfa_a-threads.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='concurrency/threads.c' object='concurrency/libcfa_a-threads.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_a-threads.obj `if test -f 'concurrency/threads.c'; then $(CYGPATH_W) 'concurrency/threads.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/threads.c'; fi`
 
 concurrency/libcfa_a-kernel.o: concurrency/kernel.c

src/libcfa/concurrency/invoke.c

@@ -29 +29 @@
 
 extern void __suspend_internal(void);
-extern void __thread_signal_termination(struct thread_desc*);
+extern void __thread_signal_termination(struct thread*);
 
 void CtxInvokeCoroutine(
       void (*main)(void *), 
-      struct coroutine_desc *(*get_coroutine)(void *), 
+      struct coroutine *(*get_coroutine)(void *), 
       void *this
 ) {
       // LIB_DEBUG_PRINTF("Invoke Coroutine : Received %p (main %p, get_c %p)\n", this, main, get_coroutine);
 
-      struct coroutine_desc* cor = get_coroutine( this );
+      struct coroutine* cor = get_coroutine( this );
 
       if(cor->state == Primed) {
@@ -57 +57 @@
 void CtxInvokeThread(
       void (*main)(void *), 
-      struct thread_desc *(*get_thread)(void *), 
+      struct thread *(*get_thread)(void *), 
       void *this
 ) {
       __suspend_internal();
 
-      struct thread_desc* thrd = get_thread( this );
-      struct coroutine_desc* cor = &thrd->c;
+      struct thread* thrd = get_thread( this );
+      struct coroutine* cor = &thrd->c;
       cor->state = Active;
 
@@ -79 +79 @@
 void CtxStart(
       void (*main)(void *), 
-      struct coroutine_desc *(*get_coroutine)(void *), 
+      struct coroutine *(*get_coroutine)(void *), 
       void *this, 
       void (*invoke)(void *)

src/libcfa/concurrency/invoke.h

@@ -35 +35 @@
 
       struct simple_thread_list {
-            struct thread_desc * head;
-            struct thread_desc ** tail;
+            struct thread * head;
+            struct thread ** tail;
       };
 
@@ -48 +48 @@
       extern "Cforall" {
             void ?{}( struct simple_thread_list * );
-            void append( struct simple_thread_list *, struct thread_desc * );
-            struct thread_desc * pop_head( struct simple_thread_list * );
+            void append( struct simple_thread_list *, struct thread * );
+            struct thread * pop_head( struct simple_thread_list * );
 
             void ?{}(spinlock * this);
@@ -71 +71 @@
       enum coroutine_state { Halted, Start, Inactive, Active, Primed };
 
-      struct coroutine_desc {
+      struct coroutine {
             struct coStack_t stack;
             const char *name;                         // textual name for coroutine/task, initialized by uC++ generated code
             int errno_;                               // copy of global UNIX variable errno
             enum coroutine_state state;       // current execution status for coroutine
-            struct coroutine_desc *starter;           // first coroutine to resume this one
-            struct coroutine_desc *last;                      // last coroutine to resume this one
+            struct coroutine *starter;        // first coroutine to resume this one
+            struct coroutine *last;                   // last coroutine to resume this one
       };
 
-      struct thread_desc {
-            struct coroutine_desc c;                 // coroutine body used to store context
+      struct thread {
+            struct coroutine c;                 // coroutine body used to store context
             struct signal_once terminated;      // indicate if execuation state is not halted
-            struct thread_desc * next;               // instrusive link field for threads
+            struct thread * next;               // instrusive link field for threads
       };
 

src/libcfa/concurrency/kernel

@@ -6 +6 @@
 // file "LICENCE" distributed with Cforall.
 //
-// kernel --
+// threads --
 //
 // Author           : Thierry Delisle
@@ -49 +49 @@
 struct FinishAction {
         FinishOpCode action_code;
-        thread_desc * thrd;
+        thread * thrd;
         spinlock * lock;
 };
@@ -62 +62 @@
         struct processorCtx_t * runner;
         cluster * cltr;
-        coroutine_desc * current_coroutine;
-        thread_desc * current_thread;
+        coroutine * current_coroutine;
+        thread * current_thread;
         pthread_t kernel_thread;
         

src/libcfa/concurrency/kernel.c

@@ -43 +43 @@
 KERNEL_STORAGE(cluster, systemCluster);
 KERNEL_STORAGE(processor, systemProcessor);
-KERNEL_STORAGE(thread_desc, mainThread);
+KERNEL_STORAGE(thread, mainThread);
 KERNEL_STORAGE(machine_context_t, mainThread_context);
 
 cluster * systemCluster;
 processor * systemProcessor;
-thread_desc * mainThread;
+thread * mainThread;
 
 //-----------------------------------------------------------------------------
@@ -55 +55 @@
 thread_local processor * this_processor;
 
-coroutine_desc * this_coroutine(void) {
+processor * get_this_processor() {
+        return this_processor;
+}
+
+coroutine * this_coroutine(void) {
         return this_processor->current_coroutine;
 }
 
-thread_desc * this_thread(void) {
+thread * this_thread(void) {
         return this_processor->current_thread;
 }
@@ -99 +103 @@
 }
 
-void ?{}( coroutine_desc * this, current_stack_info_t * info) {
+void ?{}( coroutine * this, current_stack_info_t * info) {
         (&this->stack){ info }; 
         this->name = "Main Thread";
@@ -106 +110 @@
 }
 
-void ?{}( thread_desc * this, current_stack_info_t * info) {
+void ?{}( thread * this, current_stack_info_t * info) {
         (&this->c){ info };
 }
@@ -175 +179 @@
         LIB_DEBUG_PRINTF("Kernel : core %p starting\n", this);
 
-        thread_desc * readyThread = NULL;
+        thread * readyThread = NULL;
         for( unsigned int spin_count = 0; ! this->is_terminated; spin_count++ ) 
         {
@@ -202 +206 @@
 // runThread runs a thread by context switching 
 // from the processor coroutine to the target thread 
-void runThread(processor * this, thread_desc * dst) {
-        coroutine_desc * proc_cor = get_coroutine(this->runner);
-        coroutine_desc * thrd_cor = get_coroutine(dst);
+void runThread(processor * this, thread * dst) {
+        coroutine * proc_cor = get_coroutine(this->runner);
+        coroutine * thrd_cor = get_coroutine(dst);
         
         //Reset the terminating actions here
@@ -293 +297 @@
 //-----------------------------------------------------------------------------
 // Scheduler routines
-void ScheduleThread( thread_desc * thrd ) {
+void ScheduleThread( thread * thrd ) {
         assertf( thrd->next == NULL, "Expected null got %p", thrd->next );
         
@@ -301 +305 @@
 }
 
-thread_desc * nextThread(cluster * this) {
+thread * nextThread(cluster * this) {
         lock( &this->lock );
-        thread_desc * head = pop_head( &this->ready_queue );
+        thread * head = pop_head( &this->ready_queue );
         unlock( &this->lock );
         return head;
@@ -313 +317 @@
 
 void ScheduleInternal( spinlock * lock ) {
-        this_processor->finish.action_code = Release;
-        this_processor->finish.lock = lock;
+        get_this_processor()->finish.action_code = Release;
+        get_this_processor()->finish.lock = lock;
         suspend();
 }
 
-void ScheduleInternal( thread_desc * thrd ) {
-        this_processor->finish.action_code = Schedule;
-        this_processor->finish.thrd = thrd;
+void ScheduleInternal( thread * thrd ) {
+        get_this_processor()->finish.action_code = Schedule;
+        get_this_processor()->finish.thrd = thrd;
         suspend();
 }
 
-void ScheduleInternal( spinlock * lock, thread_desc * thrd ) {
-        this_processor->finish.action_code = Release_Schedule;
-        this_processor->finish.lock = lock;
-        this_processor->finish.thrd = thrd;
+void ScheduleInternal( spinlock * lock, thread * thrd ) {
+        get_this_processor()->finish.action_code = Release_Schedule;
+        get_this_processor()->finish.lock = lock;
+        get_this_processor()->finish.thrd = thrd;
         suspend();
 }
@@ -339 +343 @@
         // SKULLDUGGERY: the mainThread steals the process main thread 
         // which will then be scheduled by the systemProcessor normally
-        mainThread = (thread_desc *)&mainThread_storage;
+        mainThread = (thread *)&mainThread_storage;
         current_stack_info_t info;
         mainThread{ &info };
@@ -436 +440 @@
                 this->condition = true;
 
-                thread_desc * it;
+                thread * it;
                 while( it = pop_head( &this->blocked) ) {
                         ScheduleThread( it );
@@ -451 +455 @@
 }
 
-void append( simple_thread_list * this, thread_desc * t ) {
+void append( simple_thread_list * this, thread * t ) {
         assert(this->tail != NULL);
         *this->tail = t;
@@ -457 +461 @@
 }
 
-thread_desc * pop_head( simple_thread_list * this ) {
-        thread_desc * head = this->head;
+thread * pop_head( simple_thread_list * this ) {
+        thread * head = this->head;
         if( head ) {
                 this->head = head->next;

src/libcfa/concurrency/kernel_private.h

@@ -6 +6 @@
 // file "LICENCE" distributed with Cforall.
 //
-// kernel_private.h --
+// threads --
 //
 // Author           : Thierry Delisle
@@ -19 +19 @@
 
 #include "kernel"
-#include "thread"
+#include "threads"
 
 //-----------------------------------------------------------------------------
 // Scheduler
-void ScheduleThread( thread_desc * );
-thread_desc * nextThread(cluster * this);
+void ScheduleThread( thread * );
+thread * nextThread(cluster * this);
 
 void ScheduleInternal();
 void ScheduleInternal(spinlock * lock);
-void ScheduleInternal(thread_desc * thrd);
-void ScheduleInternal(spinlock * lock, thread_desc * thrd);
+void ScheduleInternal(thread * thrd);
+void ScheduleInternal(spinlock * lock, thread * thrd);
 
 //-----------------------------------------------------------------------------
@@ -35 +35 @@
 struct processorCtx_t {
         processor * proc;
-        coroutine_desc c;
+        coroutine c;
 };
 
@@ -42 +42 @@
 void main(processorCtx_t *);
 void start(processor * this);
-void runThread(processor * this, thread_desc * dst);
+void runThread(processor * this, thread * dst);
 void finishRunning(processor * this);
 void spin(processor * this, unsigned int * spin_count);
@@ -53 +53 @@
 }
 
-extern void ThreadCtxSwitch(coroutine_desc * src, coroutine_desc * dst);
+extern void ThreadCtxSwitch(coroutine * src, coroutine * dst);
 
 #endif //KERNEL_PRIVATE_H

src/libcfa/concurrency/monitor

@@ -22 +22 @@
 #include "stdlib"
 
-struct monitor_desc {
+struct __monitor_t {
         spinlock lock;
-        thread_desc * owner;
+        thread * owner;
         simple_thread_list entry_queue;
         unsigned int recursion;
 };
 
-static inline void ?{}(monitor_desc * this) {
+static inline void ?{}(__monitor_t * this) {
         this->owner = 0;
         this->recursion = 0;
@@ -35 +35 @@
 
 //Basic entering routine
-void enter(monitor_desc *);
-void leave(monitor_desc *);
+void enter(__monitor_t *);
+void leave(__monitor_t *);
 
 //Array entering routine
-void enter(monitor_desc **, int count);
-void leave(monitor_desc **, int count);
+void enter(__monitor_t **, int count);
+void leave(__monitor_t **, int count);
 
 struct monitor_guard_t {
-        monitor_desc ** m;
+        __monitor_t ** m;
         int count;
 };
 
-static inline int ?<?(monitor_desc* lhs, monitor_desc* rhs) {
+static inline int ?<?(__monitor_t* lhs, __monitor_t* rhs) {
         return ((intptr_t)lhs) < ((intptr_t)rhs);
 }
 
-static inline void ?{}( monitor_guard_t * this, monitor_desc ** m ) {
+static inline void ?{}( monitor_guard_t * this, __monitor_t ** m ) {
         this->m = m;
         this->count = 1;
@@ -57 +57 @@
 }
 
-static inline void ?{}( monitor_guard_t * this, monitor_desc ** m, int count ) {
+static inline void ?{}( monitor_guard_t * this, __monitor_t ** m, int count ) {
         this->m = m;
         this->count = count;

src/libcfa/concurrency/monitor.c

@@ -6 +6 @@
 // file "LICENCE" distributed with Cforall.
 //
-// monitor_desc.c --
+// __monitor_t.c --
 //
 // Author           : Thierry Delisle
@@ -19 +19 @@
 #include "kernel_private.h"
 
-void enter(monitor_desc * this) {
+void enter(__monitor_t * this) {
         lock( &this->lock );
-        thread_desc * thrd = this_thread();
+        thread * thrd = this_thread();
 
         if( !this->owner ) {
@@ -45 +45 @@
 }
 
-void leave(monitor_desc * this) {
+void leave(__monitor_t * this) {
         lock( &this->lock );
 
-        thread_desc * thrd = this_thread();
+        thread * thrd = this_thread();
         assert( thrd == this->owner );
 
@@ -55 +55 @@
 
         //If we left the last level of recursion it means we are changing who owns the monitor
-        thread_desc * new_owner = 0;
+        thread * new_owner = 0;
         if( this->recursion == 0) {
                 //Get the next thread in the list
@@ -72 +72 @@
 }
 
-void enter(monitor_desc ** monitors, int count) {
+void enter(__monitor_t ** monitors, int count) {
         for(int i = 0; i < count; i++) {
                 // printf("%d\n", i);
@@ -79 +79 @@
 }
 
-void leave(monitor_desc ** monitors, int count) {
+void leave(__monitor_t ** monitors, int count) {
         for(int i = count - 1; i >= 0; i--) {
                 // printf("%d\n", i);

src/main.cc

@@ -32 +32 @@
 #include "GenPoly/CopyParams.h"
 #include "GenPoly/InstantiateGeneric.h"
-#include "Concurrency/Keywords.h"
 #include "CodeGen/Generate.h"
 #include "CodeGen/FixNames.h"
@@ -237 +236 @@
                 OPTPRINT( "mutate" )
                 ControlStruct::mutate( translationUnit );
-                OPTPRINT( "Concurrency" )
-                Concurrency::applyKeywords( translationUnit );
                 OPTPRINT( "fixNames" )
                 CodeGen::fixNames( translationUnit );

src/tests/coroutine.c

@@ -1 +1 @@
 #include <fstream>
-#include <coroutine>
+#include <coroutines>
 
 struct Fibonacci {
       int fn; // used for communication
-      coroutine_desc c;
+      coroutine c;
 };
 
@@ -11 +11 @@
 }
 
-coroutine_desc* get_coroutine(Fibonacci* this) {
+coroutine* get_coroutine(Fibonacci* this) {
       return &this->c;
 }
@@ -47 +47 @@
 #ifdef MORE_DEBUG      
       Fibonacci *pf1 = &f1, *pf2 = &f2;
-      coroutine_desc *cf1 = &f1.c, *cf2 = &f2.c;
+      coroutine *cf1 = &f1.c, *cf2 = &f2.c;
       covptr_t  *vf1 = vtable(pf1), *vf2 = vtable(pf2);
-      coroutine_desc *cv1 = get_coroutine(vf1), *cv2 = get_coroutine(vf2);
+      coroutine *cv1 = get_coroutine(vf1), *cv2 = get_coroutine(vf2);
       Fibonacci *ov1 = (Fibonacci *)get_object(vf1), *ov2 = (Fibonacci *)get_object(vf2);
 

src/tests/monitor.c

@@ -2 +2 @@
 #include <kernel>
 #include <monitor>
-#include <thread>
+#include <threads>
 
 struct global_t {
         int value;
-        monitor_desc m;
+        __monitor_t m;
 };
 
@@ -16 +16 @@
 
 void increment( /*mutex*/ global_t * this ) {
-        monitor_desc * mon = &this->m;
+        __monitor_t * mon = &this->m;
         monitor_guard_t g1 = { &mon };
         {
@@ -27 +27 @@
 }
 
-struct MyThread { thread_desc t; };
+struct MyThread { thread t; };
 
 DECL_THREAD(MyThread);

src/tests/multi-monitor.c

@@ -2 +2 @@
 #include <kernel>
 #include <monitor>
-#include <thread>
+#include <threads>
 
 static int global12, global23, global13;
 
-static monitor_desc m1, m2, m3;
+static __monitor_t m1, m2, m3;
 
-void increment( /*mutex*/ monitor_desc * p1, /*mutex*/ monitor_desc * p2, int * value ) {
-        monitor_desc * mons[] = { p1, p2 };
+void increment( /*mutex*/ __monitor_t * p1, /*mutex*/ __monitor_t * p2, int * value ) {
+        __monitor_t * mons[] = { p1, p2 };
         monitor_guard_t g = { mons, 2 };
         *value += 1;
@@ -15 +15 @@
 
 struct MyThread { 
-        thread_desc t; 
+        thread t; 
         int target;
 };

src/tests/test.py

@@ -250 +250 @@
 parser = argparse.ArgumentParser(description='Script which runs cforall tests')
 parser.add_argument('--debug', help='Run all tests in debug or release', type=yes_no, default='no')
-parser.add_argument('--concurrent', help='Run concurrent tests', type=yes_no, default='yes')
+parser.add_argument('--concurrent', help='Run concurrent tests', type=yes_no, default='no')
 parser.add_argument('--dry-run', help='Don\'t run the tests, only output the commands', action='store_true')
 parser.add_argument('--list', help='List all test available', action='store_true')

src/tests/thread.c

@@ -2 +2 @@
 #include <kernel>
 #include <stdlib>
-#include <thread>
+#include <threads>
 
-struct First { thread_desc t; signal_once* lock; };
-struct Second { thread_desc t; signal_once* lock; };
+struct First { thread t; signal_once* lock; };
+struct Second { thread t; signal_once* lock; };
 
 DECL_THREAD(First);