Index: configure =================================================================== --- configure (revision 994d0802fc3bf8c42de451a2518cc2840b2fb0a6) +++ configure (revision bac5158d93abd08333697faf7db304f472d970c1) @@ -3471,20 +3471,20 @@ case $host_cpu in i386) - CFLAGS+="-m32" - CXXFLAGS+="-m32" - CFAFLAGS+="-m32" - LDFLAGS+="-m32" + CFLAGS+=" -m32 " + CXXFLAGS+=" -m32 " + CFAFLAGS+=" -m32 " + LDFLAGS+=" -m32 " ;; i686) - CFLAGS+="-m32" - CXXFLAGS+="-m32" - CFAFLAGS+="-m32" - LDFLAGS+="-m32" + CFLAGS+=" -m32 " + CXXFLAGS+=" -m32 " + CFAFLAGS+=" -m32 " + LDFLAGS+=" -m32 " ;; x86_64) - CFLAGS+="-m64" - CXXFLAGS+="-m64" - CFAFLAGS+="-m64" - LDFLAGS+="-m64" + CFLAGS+=" -m64 " + CXXFLAGS+=" -m64 " + CFAFLAGS+=" -m64 " + LDFLAGS+=" -m64 " ;; esac Index: configure.ac =================================================================== --- configure.ac (revision 994d0802fc3bf8c42de451a2518cc2840b2fb0a6) +++ configure.ac (revision bac5158d93abd08333697faf7db304f472d970c1) @@ -167,23 +167,23 @@ AC_SUBST([MACHINE_TYPE],[$host_cpu]) -if ! test "$host_cpu" = "$build_cpu"; then +if ! test "$host_cpu" = "$build_cpu"; then case $host_cpu in i386) - CFLAGS+="-m32" - CXXFLAGS+="-m32" - CFAFLAGS+="-m32" - LDFLAGS+="-m32" + CFLAGS+=" -m32 " + CXXFLAGS+=" -m32 " + CFAFLAGS+=" -m32 " + LDFLAGS+=" -m32 " ;; i686) - CFLAGS+="-m32" - CXXFLAGS+="-m32" - CFAFLAGS+="-m32" - LDFLAGS+="-m32" + CFLAGS+=" -m32 " + CXXFLAGS+=" -m32 " + CFAFLAGS+=" -m32 " + LDFLAGS+=" -m32 " ;; x86_64) - CFLAGS+="-m64" - CXXFLAGS+="-m64" - CFAFLAGS+="-m64" - LDFLAGS+="-m64" + CFLAGS+=" -m64 " + CXXFLAGS+=" -m64 " + CFAFLAGS+=" -m64 " + LDFLAGS+=" -m64 " ;; esac Index: src/Parser/DeclarationNode.cc =================================================================== --- src/Parser/DeclarationNode.cc (revision 994d0802fc3bf8c42de451a2518cc2840b2fb0a6) +++ src/Parser/DeclarationNode.cc (revision bac5158d93abd08333697faf7db304f472d970c1) @@ -10,6 +10,6 @@ // Created On : Sat May 16 12:34:05 2015 // Last Modified By : Andrew Beach -// Last Modified On : Wed Jun 28 15:27:00 2017 -// Update Count : 1019 +// Last Modified On : Fri Jul 14 16:55:00 2017 +// Update Count : 1020 // @@ -253,4 +253,6 @@ newnode->type->aggregate.fields = fields; newnode->type->aggregate.body = body; + newnode->type->aggregate.tagged = false; + newnode->type->aggregate.parent = nullptr; return newnode; } // DeclarationNode::newAggregate @@ -273,4 +275,18 @@ return newnode; } // DeclarationNode::newEnumConstant + +DeclarationNode * DeclarationNode::newTreeStruct( Aggregate kind, const string * name, const string * parent, ExpressionNode * actuals, DeclarationNode * fields, bool body ) { + assert( name ); + DeclarationNode * newnode = new DeclarationNode; + newnode->type = new TypeData( TypeData::Aggregate ); + newnode->type->aggregate.kind = kind; + newnode->type->aggregate.name = name; + newnode->type->aggregate.actuals = actuals; + newnode->type->aggregate.fields = fields; + newnode->type->aggregate.body = body; + newnode->type->aggregate.tagged = true; + newnode->type->aggregate.parent = parent; + return newnode; +} // DeclarationNode::newTreeStruct DeclarationNode * DeclarationNode::newName( string * name ) { Index: src/Parser/ParseNode.h =================================================================== --- src/Parser/ParseNode.h (revision 994d0802fc3bf8c42de451a2518cc2840b2fb0a6) +++ src/Parser/ParseNode.h (revision bac5158d93abd08333697faf7db304f472d970c1) @@ -10,6 +10,6 @@ // Created On : Sat May 16 13:28:16 2015 // Last Modified By : Andrew Beach -// Last Modified On : Mon Jun 12 13:00:00 2017 -// Update Count : 779 +// Last Modified On : Fri Jul 14 16:56:00 2017 +// Update Count : 780 // @@ -248,4 +248,7 @@ static DeclarationNode * newAsmStmt( StatementNode * stmt ); // gcc external asm statement + // Perhaps this would best fold into newAggragate. + static DeclarationNode * newTreeStruct( Aggregate kind, const std::string * name, const std::string * parent, ExpressionNode * actuals, DeclarationNode * fields, bool body ); + DeclarationNode(); ~DeclarationNode(); @@ -332,4 +335,7 @@ static UniqueName anonymous; + + // Temp to test TreeStruct + const std::string * parent_name; }; // DeclarationNode Index: src/Parser/TypeData.cc =================================================================== --- src/Parser/TypeData.cc (revision 994d0802fc3bf8c42de451a2518cc2840b2fb0a6) +++ src/Parser/TypeData.cc (revision bac5158d93abd08333697faf7db304f472d970c1) @@ -10,6 +10,6 @@ // Created On : Sat May 16 15:12:51 2015 // Last Modified By : Andrew Beach -// Last Modified On : Wed Jun 28 15:28:00 2017 -// Update Count : 564 +// Last Modified On : Fri Jul 14 16:58:00 2017 +// Update Count : 565 // @@ -63,4 +63,6 @@ aggregate.fields = nullptr; aggregate.body = false; + aggregate.tagged = false; + aggregate.parent = nullptr; break; case AggregateInst: @@ -121,4 +123,5 @@ delete aggregate.actuals; delete aggregate.fields; + delete aggregate.parent; // delete aggregate; break; @@ -192,4 +195,6 @@ newtype->aggregate.kind = aggregate.kind; newtype->aggregate.body = aggregate.body; + newtype->aggregate.tagged = aggregate.tagged; + newtype->aggregate.parent = aggregate.parent ? new string( *aggregate.parent ) : nullptr; break; case AggregateInst: @@ -619,4 +624,9 @@ switch ( td->aggregate.kind ) { case DeclarationNode::Struct: + if ( td->aggregate.tagged ) { + at = new StructDecl( *td->aggregate.name, td->aggregate.parent, attributes, linkage ); + buildForall( td->aggregate.params, at->get_parameters() ); + break; + } case DeclarationNode::Coroutine: case DeclarationNode::Monitor: Index: src/Parser/TypeData.h =================================================================== --- src/Parser/TypeData.h (revision 994d0802fc3bf8c42de451a2518cc2840b2fb0a6) +++ src/Parser/TypeData.h (revision bac5158d93abd08333697faf7db304f472d970c1) @@ -10,6 +10,6 @@ // Created On : Sat May 16 15:18:36 2015 // Last Modified By : Andrew Beach -// Last Modified On : Wed Jun 28 15:29:00 2017 -// Update Count : 186 +// Last Modified On : Fri Jul 14 16:57:00 2017 +// Update Count : 187 // @@ -31,4 +31,7 @@ DeclarationNode * fields; bool body; + + bool tagged; + const std::string * parent; }; Index: src/Parser/parser.yy =================================================================== --- src/Parser/parser.yy (revision 994d0802fc3bf8c42de451a2518cc2840b2fb0a6) +++ src/Parser/parser.yy (revision bac5158d93abd08333697faf7db304f472d970c1) @@ -10,6 +10,6 @@ // Created On : Sat Sep 1 20:22:55 2001 // Last Modified By : Peter A. Buhr -// Last Modified On : Sat Jul 15 08:17:48 2017 -// Update Count : 2450 +// Last Modified On : Sat Jul 15 09:46:26 2017 +// Update Count : 2451 // @@ -1679,4 +1679,28 @@ | aggregate_key attribute_list_opt typegen_name // CFA { $$ = $3->addQualifiers( $2 ); } + +// Temp, testing TreeStruct + | STRUCT TRY attribute_list_opt no_attr_identifier_or_type_name + { + typedefTable.makeTypedef( *$4 ); // create typedef + if ( forall ) typedefTable.changeKind( *$4, TypedefTable::TG ); // $ + forall = false; // reset + } + '{' field_declaration_list '}' + { + $$ = DeclarationNode::newTreeStruct( DeclarationNode::Struct, + $4, nullptr, nullptr, $7, true )->addQualifiers( $3 ); + } + | STRUCT TRY attribute_list_opt no_attr_identifier_or_type_name TYPEDEFname + { + typedefTable.makeTypedef( *$4 ); // create typedef + if ( forall ) typedefTable.changeKind( *$4, TypedefTable::TG ); // $ + forall = false; // reset + } + '{' field_declaration_list '}' + { + $$ = DeclarationNode::newTreeStruct( DeclarationNode::Struct, + $4, $5, nullptr, $8, true )->addQualifiers( $3 ); + } ; Index: src/SymTab/Autogen.cc =================================================================== --- src/SymTab/Autogen.cc (revision 994d0802fc3bf8c42de451a2518cc2840b2fb0a6) +++ src/SymTab/Autogen.cc (revision bac5158d93abd08333697faf7db304f472d970c1) @@ -10,6 +10,6 @@ // Created On : Thu Mar 03 15:45:56 2016 // Last Modified By : Andrew Beach -// Last Modified On : Wed Jun 28 15:30:00 2017 -// Update Count : 61 +// Last Modified On : Fri Jul 14 16:41:00 2017 +// Update Count : 62 // @@ -401,5 +401,5 @@ void makeStructFunctions( StructDecl *aggregateDecl, StructInstType *refType, unsigned int functionNesting, std::list< Declaration * > & declsToAdd, const std::vector< FuncData > & data ) { // Builtins do not use autogeneration. - if ( aggregateDecl->get_linkage() == LinkageSpec::Builtin || + if ( aggregateDecl->get_linkage() == LinkageSpec::BuiltinCFA || aggregateDecl->get_linkage() == LinkageSpec::BuiltinC ) { return; Index: src/SymTab/TreeStruct.cc =================================================================== --- src/SymTab/TreeStruct.cc (revision bac5158d93abd08333697faf7db304f472d970c1) +++ src/SymTab/TreeStruct.cc (revision bac5158d93abd08333697faf7db304f472d970c1) @@ -0,0 +1,228 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// TreeStruct.cc -- +// +// Author : Andrew Beach +// Created On : Wed Jul 12 14:48:00 2017 +// Last Modified By : Andrew Beach +// Last Modified On : Fri Jul 14 15:49:00 2017 +// Update Count : 0 +// + +#include "Common/PassVisitor.h" +#include "InitTweak/InitTweak.h" +#include "SynTree/Attribute.h" +#include "SynTree/Declaration.h" +#include "SynTree/Expression.h" +#include "SynTree/Statement.h" +#include "SynTree/Type.h" +#include "SynTree/Mutator.h" + +__attribute__((noinline)) +Declaration* searchDeclList( + const std::list< Declaration* > & lst, + const Declaration * val ) { + auto tmp = std::find( lst.begin(), lst.end(), val ); + return (tmp == lst.end()) ? nullptr : *tmp; +} + + +class TreeStructExpanderCore : public WithDeclsToAdd { + typedef std::pair map_pair; + typedef std::map map; + typedef std::pair insert_result; + // std::pair >, + // bool> + + // key_name first first + std::string key_name( std::pair & result ) + { return result.first->first; } + // struct_decl first second first + StructDecl *& struct_decl( std::pair & result ) + { return result.first->second.first; } + // type_object first second second + ObjectDecl *& type_object( std::pair & result ) + { return result.first->second.second; } + // key_name first + std::string key_name( map::iterator & it ) { return it->first; } + // struct_decl second first + StructDecl *& struct_decl( map::iterator & it ) + { return it->second.first; } + // type_object second second + ObjectDecl *& type_object( map::iterator & it ) + { return it->second.second; } + + StructDecl * type_object_type; + + map known_structs; + +public: + + TreeStructExpanderCore() : type_object_type( nullptr ) {} + + std::string base_type_object_name( std::string struct_name ) { + return std::string("type_object_for_") + struct_name; + } + + // Throws SemanticError if error is found. + Declaration * postmutate( StructDecl * node ) { + // Skip all untagged nodes. + if ( ! node->get_tagged() ) { + // Although we do grap the type object first. + if ( "__cfa__type_object" == node->get_name() ) { + assert( !type_object_type && "repeated type_object definition" ); + type_object_type = node; + } + return node; + } else { + assert( type_object_type && "missing type_object definition" ); + } + + // Track all of the tagged nodes. + std::pair target = known_structs.insert( + std::make_pair( node->get_name(), map_pair( node, nullptr) ) ); + + // Validate no conflict (is that does elsewhere?) + // New declaration, no conflicting definition possible. + if ( target.second ) { + ; + // Conflict if they have different parents. + } else if ( node->get_parentName() != + struct_decl( target )->get_parentName() ) { + throw SemanticError("TreeStructs do not share parents."); + // Conflict if they both have a body. + } else if ( node->has_body() && struct_decl( target )->has_body() ) { + throw SemanticError("TreeStructs with repeated bodies."); + // Update to the one with a body. + } else if ( node->has_body() ) { + struct_decl( target ) = node; + } + + // if ( node->get_name() == node->get_parent_name() ) + // We might actually use this for a while to say no parent. + + // Validate Parent exists: + map::iterator target_parent = + known_structs.find( node->get_parentName() ); + if ( known_structs.end() == target_parent && node->has_parent() ) { + throw SemanticError( std::string( "No named " ) + + node->get_parentName() + " defined." ); + } + + static Attribute linkonce( "section", std::list{ + new NameExpr( "\".gnu.linkonce.exception\"" ) } ); + + Expression * parent_address = node->has_parent() + ? (Expression *)new AddressExpr( + new VariableExpr( target_parent->second.second ) ) + : (Expression *)new ConstantExpr( Constant::null( + new PointerType( Type::Qualifiers(), + new StructInstType( Type::Qualifiers(), + type_object_type ) ) ) ); + + // Insert the declaration of the type object. + ObjectDecl * type_object_inst = new ObjectDecl( + base_type_object_name( node->get_name() ), + Type::StorageClasses() /* I think this is none. */, + node->get_linkage(), + nullptr, + new StructInstType( + Type::Qualifiers(), + type_object_type + ), + new ListInit({ new SingleInit( parent_address ) }), + std::list{ linkonce.clone() } + ); + + declsToAddAfter.push_back( type_object_inst ); + + type_object( target ) = type_object_inst; + + // Insert a field into the structure. + node->get_members().push_front( new ObjectDecl( + "tag", + Type::StorageClasses(), + node->get_linkage(), + nullptr, + new PointerType( + Type::Qualifiers( Type::Const ), + new StructInstType( + Type::Qualifiers( Type::Const ), + type_object_type + ) + ), + nullptr /*new SingleInit( new AddressExpr( + new VariableExpr( type_object_inst ) ) )*/ + ) ); + + return node; + } + + DeclarationWithType * postmutate( FunctionDecl * funcDecl ) { + if ( ! InitTweak::isConstructor( funcDecl->get_name() ) ) { + return funcDecl; + } + + if ( nullptr == funcDecl->get_statements() ) { + return funcDecl; + } + + DeclarationWithType * param_one = + funcDecl->get_functionType()->get_parameters().front(); + Type * param_one_t = + InitTweak::getPointerBase( param_one->get_type() ); + StructInstType * struct_one_t = + dynamic_cast( param_one_t ); + + if ( struct_one_t && struct_one_t->get_baseStruct()->get_tagged() ) { + map::iterator target = + known_structs.find( struct_one_t->get_name() ); + assertf( known_structs.end() != target, + "Missing definition of structure." ); + + DeclarationWithType * ptto_field = + dynamic_cast( + struct_decl( target )->get_members().front() ); + assertf( ptto_field, "Pointer to type object not found." ); + + Type * mutptr = ptto_field->get_type()->clone(); + mutptr->set_const( false ); + mutptr = new PointerType(Type::Qualifiers(), mutptr); + + funcDecl->get_statements()->push_front( new ExprStmt( noLabels, + new UntypedExpr( new NameExpr( "?{}" ), + std::list{ + new CastExpr( + new AddressExpr( + new MemberExpr( + ptto_field, + UntypedExpr::createDeref( + new VariableExpr( param_one ) + ) + ) + ), + mutptr + ), + new AddressExpr( + new VariableExpr( type_object( target ) ) + ) + } + ) + ) ); + } + return funcDecl; + } +}; + +// ?{}((type_object const**)&this->tag, & ) + +void expand_tree_structs( std::list & translationUnit ) { + PassVisitor translator; + mutateAll( translationUnit, translator ); +} Index: src/SymTab/TreeStruct.h =================================================================== --- src/SymTab/TreeStruct.h (revision bac5158d93abd08333697faf7db304f472d970c1) +++ src/SymTab/TreeStruct.h (revision bac5158d93abd08333697faf7db304f472d970c1) @@ -0,0 +1,24 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// TreeStruct.h -- +// +// Author : Andrew Beach +// Created On : Wed Jul 12 14:58:00 2017 +// Last Modified By : Andrew Beach +// Last Modified On : Fri Jul 14 11:15:00 2017 +// Update Count : 0 +// + +// Various additions to make the translator for tree structures (hierarchy). +// NOTE: Probably shouldn't be in SymTab. +// NOTE: The name tree struct is temperay, we need the actual name. + +#include + +class Declaration; + +void expand_tree_structs( std::list & translationUnit ); Index: src/SymTab/module.mk =================================================================== --- src/SymTab/module.mk (revision 994d0802fc3bf8c42de451a2518cc2840b2fb0a6) +++ src/SymTab/module.mk (revision bac5158d93abd08333697faf7db304f472d970c1) @@ -10,7 +10,7 @@ ## Author : Richard C. Bilson ## Created On : Mon Jun 1 17:49:17 2015 -## Last Modified By : Rob Schluntz -## Last Modified On : Tue Jul 07 16:22:23 2015 -## Update Count : 2 +## Last Modified By : Andrew Beach +## Last Modified On : Wed Jul 12 13:06:00 2017 +## Update Count : 3 ############################################################################### @@ -21,3 +21,4 @@ SymTab/ImplementationType.cc \ SymTab/TypeEquality.cc \ - SymTab/Autogen.cc + SymTab/Autogen.cc \ + SymTab/TreeStruct.cc Index: src/SynTree/Constant.cc =================================================================== --- src/SynTree/Constant.cc (revision 994d0802fc3bf8c42de451a2518cc2840b2fb0a6) +++ src/SynTree/Constant.cc (revision bac5158d93abd08333697faf7db304f472d970c1) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Andrew Beach -// Last Modified On : Thr Jun 22 10:11:00 2017 -// Update Count : 28 +// Last Modified On : Fri Jul 14 14:50:00 2017 +// Update Count : 29 // @@ -46,4 +46,15 @@ } +Constant Constant::null( Type * ptrtype ) { + if ( nullptr == ptrtype ) { + ptrtype = new PointerType( + Type::Qualifiers(), + new VoidType( Type::Qualifiers() ) + ); + } + + return Constant( ptrtype, "0", (unsigned long long int)0 ); +} + unsigned long long Constant::get_ival() const { assertf( safe_dynamic_cast(type)->isInteger(), "Attempt to retrieve ival from non-integer constant." ); Index: src/SynTree/Constant.h =================================================================== --- src/SynTree/Constant.h (revision 994d0802fc3bf8c42de451a2518cc2840b2fb0a6) +++ src/SynTree/Constant.h (revision bac5158d93abd08333697faf7db304f472d970c1) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Andrew Beach -// Last Modified On : Thr Jun 22 10:13:00 2017 -// Update Count : 15 +// Last Modified On : Fri Jul 14 13:33:00 2017 +// Update Count : 16 // @@ -44,4 +44,7 @@ static Constant from_double( double d ); + /// generates a null pointer value for the given type. void * if omitted. + static Constant null( Type * ptrtype = nullptr ); + virtual void accept( Visitor & v ) { v.visit( this ); } virtual Constant * acceptMutator( Mutator & m ) { return m.mutate( this ); } Index: src/SynTree/Declaration.h =================================================================== --- src/SynTree/Declaration.h (revision 994d0802fc3bf8c42de451a2518cc2840b2fb0a6) +++ src/SynTree/Declaration.h (revision bac5158d93abd08333697faf7db304f472d970c1) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Andrew Beach -// Last Modified On : Tus Jun 27 15:31:00 2017 -// Update Count : 122 +// Last Modified On : Fri Jul 14 16:59:00 2017 +// Update Count : 123 // @@ -266,5 +266,6 @@ typedef AggregateDecl Parent; public: - StructDecl( const std::string &name, DeclarationNode::Aggregate kind = DeclarationNode::Struct, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall ) : Parent( name, attributes, linkage ), kind( kind ) {} + StructDecl( const std::string &name, DeclarationNode::Aggregate kind = DeclarationNode::Struct, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall ) : Parent( name, attributes, linkage ), kind( kind ), tagged( false ), parent_name( "" ) {} + StructDecl( const std::string &name, const std::string *parent, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall ) : Parent( name, attributes, linkage ), kind( DeclarationNode::Struct ), tagged( true ), parent_name( parent ? *parent : "" ) {} StructDecl( const StructDecl &other ) : Parent( other ) {} @@ -273,4 +274,10 @@ bool is_thread() { return kind == DeclarationNode::Thread; } + // Tagged/Tree Structure Excetion + bool get_tagged() { return tagged; } + void set_tagged( bool newValue ) { tagged = newValue; } + bool has_parent() { return parent_name != ""; } + std::string get_parentName() { return parent_name; } + virtual StructDecl *clone() const { return new StructDecl( *this ); } virtual void accept( Visitor &v ) { v.visit( this ); } @@ -279,4 +286,7 @@ DeclarationNode::Aggregate kind; virtual std::string typeString() const; + + bool tagged; + std::string parent_name; }; Index: src/benchmark/create_pthrd.c =================================================================== --- src/benchmark/create_pthrd.c (revision 994d0802fc3bf8c42de451a2518cc2840b2fb0a6) +++ src/benchmark/create_pthrd.c (revision bac5158d93abd08333697faf7db304f472d970c1) @@ -14,17 +14,18 @@ n = atoi(argv[1]); } - printf("%lu\n", n); + printf("create %lu pthreads ... ", n); for (size_t i = 0; i < n; i++) { pthread_t thread; if (pthread_create(&thread, NULL, foo, NULL) < 0) { + perror( "failure" ); return 1; } if (pthread_join( thread, NULL) < 0) { + perror( "failure" ); return 1; } } - pthread_exit(NULL); - return 0; + printf("finish\n"); } Index: src/libcfa/Makefile.am =================================================================== --- src/libcfa/Makefile.am (revision 994d0802fc3bf8c42de451a2518cc2840b2fb0a6) +++ src/libcfa/Makefile.am (revision bac5158d93abd08333697faf7db304f472d970c1) @@ -11,6 +11,6 @@ ## Created On : Sun May 31 08:54:01 2015 ## Last Modified By : Andrew Beach -## Last Modified On : Wed Jun 28 15:36:00 2017 -## Update Count : 215 +## Last Modified On : Fri Jun 14 17:00:00 2017 +## Update Count : 216 ############################################################################### @@ -51,5 +51,6 @@ libobjs = ${headers:=.o} -libsrc = libcfa-prelude.c interpose.c libhdr/libdebug.c ${headers:=.c} exception.c +libsrc = libcfa-prelude.c interpose.c libhdr/libdebug.c ${headers:=.c} \ + exception.c typeobject.c # not all platforms support concurrency, add option do disable it @@ -68,8 +69,14 @@ ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -O2 ${EXTRA_FLAGS} -c -o $@ $< +libcfa_a-typeobject.o : typeobject.c + ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -O2 ${EXTRA_FLAGS} -c -o $@ $< + concurrency/libcfa_d_a-invoke.o : concurrency/invoke.c ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $< libcfa_d_a-exception.o : exception.c + ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $< + +libcfa_d_a-typeobject.o : typeobject.c ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $< Index: src/libcfa/concurrency/alarm.c =================================================================== --- src/libcfa/concurrency/alarm.c (revision 994d0802fc3bf8c42de451a2518cc2840b2fb0a6) +++ src/libcfa/concurrency/alarm.c (revision bac5158d93abd08333697faf7db304f472d970c1) @@ -43,8 +43,8 @@ void __kernel_set_timer( __cfa_time_t alarm ) { - LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Kernel : set timer to %lu\n", (__cfa_time_t)alarm ); + LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Kernel : set timer to %llu\n", (__cfa_time_t)alarm ); itimerval val; val.it_value.tv_sec = alarm / TIMEGRAN; // seconds - val.it_value.tv_usec = (alarm % TIMEGRAN) / ( TIMEGRAN / 1_000_000L ); // microseconds + val.it_value.tv_usec = max( (alarm % TIMEGRAN) / ( TIMEGRAN / 1_000_000L ), 1000 ); // microseconds val.it_interval.tv_sec = 0; val.it_interval.tv_usec = 0; Index: src/libcfa/concurrency/alarm.h =================================================================== --- src/libcfa/concurrency/alarm.h (revision 994d0802fc3bf8c42de451a2518cc2840b2fb0a6) +++ src/libcfa/concurrency/alarm.h (revision bac5158d93abd08333697faf7db304f472d970c1) @@ -19,8 +19,9 @@ #include +#include #include "assert" -typedef unsigned long int __cfa_time_t; +typedef uint64_t __cfa_time_t; struct thread_desc; Index: src/libcfa/concurrency/preemption.c =================================================================== --- src/libcfa/concurrency/preemption.c (revision 994d0802fc3bf8c42de451a2518cc2840b2fb0a6) +++ src/libcfa/concurrency/preemption.c (revision bac5158d93abd08333697faf7db304f472d970c1) @@ -66,8 +66,8 @@ void tick_preemption() { - // LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Ticking preemption\n" ); - alarm_list_t * alarms = &systemProcessor->alarms; __cfa_time_t currtime = __kernel_get_time(); + + // LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Ticking preemption @ %llu\n", currtime ); while( alarms->head && alarms->head->alarm < currtime ) { alarm_node_t * node = pop(alarms); @@ -83,6 +83,8 @@ verify( validate( alarms ) ); - if( node->period > 0 ) { - node->alarm = currtime + node->period; + __cfa_time_t period = node->period; + if( period > 0 ) { + node->alarm = currtime + period; + // LIB_DEBUG_PRINT_BUFFER_LOCAL( STDERR_FILENO, "Reinsert %p @ %llu (%llu + %llu)\n", node, node->alarm, currtime, period ); insert( alarms, node ); } @@ -101,5 +103,5 @@ void update_preemption( processor * this, __cfa_time_t duration ) { - LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Processor : %p updating preemption to %lu\n", this, duration ); + LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Processor : %p updating preemption to %llu\n", this, duration ); alarm_node_t * alarm = this->preemption_alarm; @@ -273,28 +275,22 @@ siginfo_t info; int sig = sigwaitinfo( &mask, &info ); - if( sig < 0 ) { - abortf( "internal error, sigwait" ); - } - else if( sig == SIGALRM ) + assertf(sig == SIGALRM, "Kernel Internal Error, sigwait: Unexpected signal %d (%d : %d)\n", sig, info.si_code, info.si_value.sival_int); + + LIB_DEBUG_PRINT_SAFE("Kernel : Caught alarm from %d with %d\n", info.si_code, info.si_value.sival_int ); + switch( info.si_code ) { - LIB_DEBUG_PRINT_SAFE("Kernel : Caught signal %d (%d)\n", sig, info.si_value.sival_int ); - if( info.si_value.sival_int == 0 ) - { - LIB_DEBUG_PRINT_SAFE("Kernel : Preemption thread tick\n"); - lock( &systemProcessor->alarm_lock DEBUG_CTX2 ); - tick_preemption(); - unlock( &systemProcessor->alarm_lock ); - } - else if( info.si_value.sival_int == 1 ) - { - break; - } - } - else - { - LIB_DEBUG_PRINT_SAFE("Kernel : Unexpected signal %d (%d)\n", sig, info.si_value.sival_int); - } - } - + case SI_TIMER: + case SI_KERNEL: + LIB_DEBUG_PRINT_SAFE("Kernel : Preemption thread tick\n"); + lock( &systemProcessor->alarm_lock DEBUG_CTX2 ); + tick_preemption(); + unlock( &systemProcessor->alarm_lock ); + break; + case SI_QUEUE: + goto EXIT; + } + } + +EXIT: LIB_DEBUG_PRINT_SAFE("Kernel : Preemption thread stopping\n"); return NULL; Index: src/libcfa/typeobject.c =================================================================== --- src/libcfa/typeobject.c (revision bac5158d93abd08333697faf7db304f472d970c1) +++ src/libcfa/typeobject.c (revision bac5158d93abd08333697faf7db304f472d970c1) @@ -0,0 +1,27 @@ +// +// 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. +// +// typeobject.c -- +// +// Author : Andrew Beach +// Created On : Tus Jul 11 15:10:00 2017 +// Last Modified By : Andrew Beach +// Last Modified On : Tus Jul 12 16:04:00 2017 +// Update Count : 0 +// + +#include "typeobject.h" + +// Takes in two non-null pointers to type_objects. +int is_parent( struct __cfa__type_object const * parent, + struct __cfa__type_object const * child ) { + do { + if ( parent == child ) + return 1; + child = child->parent; + } while ( child ); + return 0; +} Index: src/libcfa/typeobject.h =================================================================== --- src/libcfa/typeobject.h (revision bac5158d93abd08333697faf7db304f472d970c1) +++ src/libcfa/typeobject.h (revision bac5158d93abd08333697faf7db304f472d970c1) @@ -0,0 +1,28 @@ +// +// 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. +// +// typeobject.h -- Builtins for hierarchy objects. +// +// Author : Andrew Beach +// Created On : Tus Jul 11 15:08:00 2017 +// Last Modified By : Andrew Beach +// Last Modified On : Tus Jul 11 16:18:00 2017 +// Update Count : 0 +// + +#pragma once +#ifndef TYPEOBJECT_H +#define TYPEOBJECT_H + +struct __cfa__type_object { + struct __cfa__type_object const * const parent; +}; + +// Takes in two non-null pointers to type_objects. +int is_parent( struct __cfa__type_object const * parent, + struct __cfa__type_object const * child ); + +#endif // TYPEOBJECT_H Index: src/tests/preempt_longrun/Makefile.am =================================================================== --- src/tests/preempt_longrun/Makefile.am (revision 994d0802fc3bf8c42de451a2518cc2840b2fb0a6) +++ src/tests/preempt_longrun/Makefile.am (revision bac5158d93abd08333697faf7db304f472d970c1) @@ -31,4 +31,7 @@ all-local: ${TESTS:=.run} +clean-local: + rm -f ${TESTS} + % : %.c ${CC} ${AM_V_GEN}${CC} ${CFLAGS} ${<} -o ${@} Index: src/tests/preempt_longrun/Makefile.in =================================================================== --- src/tests/preempt_longrun/Makefile.in (revision 994d0802fc3bf8c42de451a2518cc2840b2fb0a6) +++ src/tests/preempt_longrun/Makefile.in (revision bac5158d93abd08333697faf7db304f472d970c1) @@ -790,5 +790,5 @@ clean: clean-am -clean-am: clean-generic mostlyclean-am +clean-am: clean-generic clean-local mostlyclean-am distclean: distclean-am @@ -857,5 +857,5 @@ .PHONY: all all-am all-local check check-TESTS check-am clean \ - clean-generic cscopelist-am ctags-am distclean \ + clean-generic clean-local cscopelist-am ctags-am distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ @@ -875,4 +875,7 @@ all-local: ${TESTS:=.run} +clean-local: + rm -f ${TESTS} + % : %.c ${CC} ${AM_V_GEN}${CC} ${CFLAGS} ${<} -o ${@} Index: src/tests/sched-int-barge.c =================================================================== --- src/tests/sched-int-barge.c (revision 994d0802fc3bf8c42de451a2518cc2840b2fb0a6) +++ src/tests/sched-int-barge.c (revision bac5158d93abd08333697faf7db304f472d970c1) @@ -4,4 +4,8 @@ #include #include + +#ifndef N +#define N 100_000 +#endif enum state_t { WAIT, SIGNAL, BARGE }; @@ -73,5 +77,5 @@ } - if( c->counter >= 100_000 ) c->done = true; + if( c->counter >= N ) c->done = true; return !c->done; }