Changeset 11a2d9b

Timestamp:

Oct 2, 2017, 6:02:32 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

21b7161

Parents:

3096ec1 (diff), 617b4b2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

Location:

src

Files:

• Concurrency/Keywords.cc (modified) (9 diffs)
• InitTweak/InitTweak.cc (modified) (1 diff)
• InitTweak/InitTweak.h (modified) (1 diff)
• Parser/ExpressionNode.cc (modified) (2 diffs)
• libcfa/concurrency/invoke.h (modified) (1 diff)
• libcfa/concurrency/monitor (modified) (2 diffs)
• libcfa/concurrency/monitor.c (modified) (6 diffs)
• tests/.expect/64/literals.txt (modified) (1 diff)
• tests/.expect/concurrent/sched-ext-dtor.txt (added)
• tests/Makefile.am (modified) (1 diff)
• tests/Makefile.in (modified) (1 diff)
• tests/coroutine.c (modified) (4 diffs)
• tests/gmp.c (modified) (2 diffs)
• tests/sched-ext-dtor.c (added)

src/Concurrency/Keywords.cc

@@ -196 +196 @@
                 std::list<DeclarationWithType*> findMutexArgs( FunctionDecl* );
                 void validate( DeclarationWithType * );
+                void addDtorStatments( FunctionDecl* func, CompoundStmt *, const std::list<DeclarationWithType * > &);
                 void addStatments( FunctionDecl* func, CompoundStmt *, const std::list<DeclarationWithType * > &);
 
@@ -206 +207 @@
                 StructDecl* monitor_decl = nullptr;
                 StructDecl* guard_decl = nullptr;
+                StructDecl* dtor_guard_decl = nullptr;
 
                 static std::unique_ptr< Type > generic_func;
@@ -229 +231 @@
 
                 void postvisit( FunctionDecl * decl );
+                void previsit ( StructDecl   * decl );
 
                 void addStartStatement( FunctionDecl * decl, DeclarationWithType * param );
@@ -236 +239 @@
                         acceptAll( translationUnit, impl );
                 }
+
+          private :
+                bool thread_ctor_seen = false;
+                StructDecl * thread_decl = nullptr;
         };
 
@@ -403 +410 @@
                 if( mutexArgs.empty() ) return;
 
+                if( CodeGen::isConstructor(decl->name) ) throw SemanticError( "constructors cannot have mutex parameters", decl );
+
+                bool isDtor = CodeGen::isDestructor( decl->name );
+
+                if( isDtor && mutexArgs.size() != 1 ) throw SemanticError( "destructors can only have 1 mutex argument", decl );
+
                 for(auto arg : mutexArgs) {
                         validate( arg );
@@ -412 +425 @@
                 if( !monitor_decl ) throw SemanticError( "mutex keyword requires monitors to be in scope, add #include <monitor>", decl );
                 if( !guard_decl ) throw SemanticError( "mutex keyword requires monitors to be in scope, add #include <monitor>", decl );
-
-                addStatments( decl, body, mutexArgs );
+                if( !dtor_guard_decl ) throw SemanticError( "mutex keyword requires monitors to be in scope, add #include <monitor>", decl );
+
+                if( isDtor ) {
+                        addDtorStatments( decl, body, mutexArgs );
+                }
+                else {
+                        addStatments( decl, body, mutexArgs );
+                }
         }
 
@@ -425 +444 @@
                         assert( !guard_decl );
                         guard_decl = decl;
+                }
+                else if( decl->name == "monitor_dtor_guard_t" ) {
+                        assert( !dtor_guard_decl );
+                        dtor_guard_decl = decl;
                 }
         }
@@ -457 +480 @@
                 //Make sure that typed isn't mutex
                 if( base->get_mutex() ) throw SemanticError( "mutex keyword may only appear once per argument ", arg );
+        }
+
+        void MutexKeyword::addDtorStatments( FunctionDecl* func, CompoundStmt * body, const std::list<DeclarationWithType * > & args ) {
+                Type * arg_type = args.front()->get_type()->clone();
+                arg_type->set_mutex( false );
+
+                ObjectDecl * monitors = new ObjectDecl(
+                        "__monitor",
+                        noStorage,
+                        LinkageSpec::Cforall,
+                        nullptr,
+                        new PointerType(
+                                noQualifiers,
+                                new StructInstType(
+                                        noQualifiers,
+                                        monitor_decl
+                                )
+                        ),
+                        new SingleInit( new UntypedExpr(
+                                new NameExpr( "get_monitor" ),
+                                {  new CastExpr( new VariableExpr( args.front() ), arg_type ) }
+                        ))
+                );
+
+                assert(generic_func);
+
+                //in reverse order :
+                // monitor_guard_t __guard = { __monitors, #, func };
+                body->push_front(
+                        new DeclStmt( noLabels, new ObjectDecl(
+                                "__guard",
+                                noStorage,
+                                LinkageSpec::Cforall,
+                                nullptr,
+                                new StructInstType(
+                                        noQualifiers,
+                                        dtor_guard_decl
+                                ),
+                                new ListInit(
+                                        {
+                                                new SingleInit( new AddressExpr( new VariableExpr( monitors ) ) ),
+                                                new SingleInit( new CastExpr( new VariableExpr( func ), generic_func->clone() ) )
+                                        },
+                                        noDesignators,
+                                        true
+                                )
+                        ))
+                );
+
+                //monitor_desc * __monitors[] = { get_monitor(a), get_monitor(b) };
+                body->push_front( new DeclStmt( noLabels, monitors) );
         }
 
@@ -523 +597 @@
         // General entry routine
         //=============================================================================================
+        void ThreadStarter::previsit( StructDecl * decl ) {
+                if( decl->name == "thread_desc" && decl->body ) {
+                        assert( !thread_decl );
+                        thread_decl = decl;
+                }
+        }
+
         void ThreadStarter::postvisit(FunctionDecl * decl) {
                 if( ! CodeGen::isConstructor(decl->name) ) return;
+
+                Type * typeof_this = InitTweak::getTypeofThis(decl->type);
+                StructInstType * ctored_type = dynamic_cast< StructInstType * >( typeof_this );
+                if( ctored_type && ctored_type->baseStruct == thread_decl ) {
+                        thread_ctor_seen = true;
+                }
 
                 DeclarationWithType * param = decl->get_functionType()->get_parameters().front();
                 auto type  = dynamic_cast< StructInstType * >( InitTweak::getPointerBase( param->get_type() ) );
                 if( type && type->get_baseStruct()->is_thread() ) {
+                        if( !thread_decl || !thread_ctor_seen ) {
+                                throw SemanticError("thread keyword requires threads to be in scope, add #include <thread>");
+                        }
+
                         addStartStatement( decl, param );
                 }

src/InitTweak/InitTweak.cc

@@ -270 +270 @@
         }
 
-        Type * getThisType( FunctionType * ftype ) {
-                assertf( ftype, "getThisType: nullptr ftype" );
-                ObjectDecl * thisParam = getThisParam( ftype );
+        Type * getTypeofThis( FunctionType * ftype ) {
+                assertf( ftype, "getTypeofThis: nullptr ftype" );
+                ObjectDecl * thisParam = getParamThis( ftype );
                 ReferenceType * refType = strict_dynamic_cast< ReferenceType * >( thisParam->type );
                 return refType->base;
         }
 
-        ObjectDecl * getThisParam( FunctionType * ftype ) {
-                assertf( ftype, "getThisParam: nullptr ftype" );
+        ObjectDecl * getParamThis( FunctionType * ftype ) {
+                assertf( ftype, "getParamThis: nullptr ftype" );
                 auto & params = ftype->parameters;
-                assertf( ! params.empty(), "getThisParam: ftype with 0 parameters: %s", toString( ftype ).c_str() );
+                assertf( ! params.empty(), "getParamThis: ftype with 0 parameters: %s", toString( ftype ).c_str() );
                 return strict_dynamic_cast< ObjectDecl * >( params.front() );
         }

src/InitTweak/InitTweak.h

@@ -31 +31 @@
 
         /// returns the base type of the first parameter to a constructor/destructor/assignment function
-        Type * getThisType( FunctionType * ftype );
+        Type * getTypeofThis( FunctionType * ftype );
 
         /// returns the first parameter of a constructor/destructor/assignment function
-        ObjectDecl * getThisParam( FunctionType * ftype );
+        ObjectDecl * getParamThis( FunctionType * ftype );
 
         /// transform Initializer into an argument list that can be passed to a call expression

src/Parser/ExpressionNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Sep 26 11:23:36 2017
-// Update Count     : 780
+// Last Modified On : Wed Sep 27 22:51:55 2017
+// Update Count     : 781
 //
 
@@ -207 +207 @@
 
         assert( 0 <= size && size < 6 );
+        // Constant type is correct for overload resolving.
         ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[Unsigned][size] ), str, v ) );
-        if ( size < 2 ) {                                                                       // hh or h, less than int ?
+        if ( Unsigned && size < 2 ) {                                           // hh or h, less than int ?
                 // int i = -1uh => 65535 not -1, so cast is necessary for unsigned, which unfortunately eliminates warnings for large values.
                 ret = new CastExpr( ret, new BasicType( Type::Qualifiers(), kind[Unsigned][size] ) );

src/libcfa/concurrency/invoke.h

@@ -96 +96 @@
             struct __condition_stack_t signal_stack;  // stack of conditions to run next once we exit the monitor
             unsigned int recursion;                   // monitor routines can be called recursively, we need to keep track of that
-            struct __waitfor_mask_t mask;               // mask used to know if some thread is waiting for something while holding the monitor
+            struct __waitfor_mask_t mask;             // mask used to know if some thread is waiting for something while holding the monitor
+            struct __condition_node_t * dtor_node;    // node used to signal the dtor in a waitfor dtor
       };
 

src/libcfa/concurrency/monitor

@@ -29 +29 @@
 static inline void ?{}(monitor_desc & this) {
         (this.lock){};
-        this.owner = NULL;
         (this.entry_queue){};
         (this.signal_stack){};
-        this.recursion = 0;
+        this.owner         = NULL;
+        this.recursion     = 0;
         this.mask.accepted = NULL;
         this.mask.clauses  = NULL;
         this.mask.size     = 0;
+        this.dtor_node     = NULL;
 }
+
+// static inline int ?<?(monitor_desc* lhs, monitor_desc* rhs) {
+//      return ((intptr_t)lhs) < ((intptr_t)rhs);
+// }
 
 struct monitor_guard_t {
@@ -46 +51 @@
 };
 
-static inline int ?<?(monitor_desc* lhs, monitor_desc* rhs) {
-        return ((intptr_t)lhs) < ((intptr_t)rhs);
-}
-
 void ?{}( monitor_guard_t & this, monitor_desc ** m, int count, void (*func)() );
 void ^?{}( monitor_guard_t & this );
+
+
+struct monitor_dtor_guard_t {
+        monitor_desc * m;
+        monitor_desc ** prev_mntrs;
+        unsigned short  prev_count;
+        fptr_t          prev_func;
+};
+
+void ?{}( monitor_dtor_guard_t & this, monitor_desc ** m, void (*func)() );
+void ^?{}( monitor_dtor_guard_t & this );
 
 //-----------------------------------------------------------------------------

src/libcfa/concurrency/monitor.c

@@ -94 +94 @@
                 }
                 else if( this->owner == thrd) {
-                        // We already have the monitor, just not how many times we took it
+                        // We already have the monitor, just note how many times we took it
                         verify( this->recursion > 0 );
                         this->recursion += 1;
@@ -127 +127 @@
                 unlock( &this->lock );
                 return;
+        }
+
+        static void __enter_monitor_dtor( monitor_desc * this, fptr_t func ) {
+                // Lock the monitor spinlock, lock_yield to reduce contention
+                lock_yield( &this->lock DEBUG_CTX2 );
+                thread_desc * thrd = this_thread;
+
+                LIB_DEBUG_PRINT_SAFE("Kernel : %10p Entering dtor for mon %p (%p)\n", thrd, this, this->owner);
+
+
+                if( !this->owner ) {
+                        LIB_DEBUG_PRINT_SAFE("Kernel : Destroying free mon %p\n", this);
+
+                        // No one has the monitor, just take it
+                        set_owner( this, thrd );
+
+                        unlock( &this->lock );
+                        return;
+                }
+                else if( this->owner == thrd) {
+                        // We already have the monitor... but where about to destroy it so the nesting will fail
+                        // Abort!
+                        abortf("Attempt to destroy monitor %p by thread \"%.256s\" (%p) in nested mutex.");
+                }
+
+                int count = 1;
+                monitor_desc ** monitors = &this;
+                __monitor_group_t group = { &this, 1, func };
+                if( is_accepted( this, group) ) {
+                        LIB_DEBUG_PRINT_SAFE("Kernel :  mon accepts dtor, block and signal it \n");
+
+                        // Wake the thread that is waiting for this
+                        __condition_criterion_t * urgent = pop( &this->signal_stack );
+                        verify( urgent );
+
+                        // Reset mask
+                        reset_mask( this );
+
+                        // Create the node specific to this wait operation
+                        wait_ctx_primed( this_thread, 0 )
+
+                        // Some one else has the monitor, wait for him to finish and then run
+                        BlockInternal( &this->lock, urgent->owner->waiting_thread );
+
+                        // Some one was waiting for us, enter
+                        set_owner( this, thrd );
+                }
+                else {
+                        LIB_DEBUG_PRINT_SAFE("Kernel :  blocking \n");
+
+                        wait_ctx( this_thread, 0 )
+                        this->dtor_node = &waiter;
+
+                        // Some one else has the monitor, wait in line for it
+                        append( &this->entry_queue, thrd );
+                        BlockInternal( &this->lock );
+
+                        // BlockInternal will unlock spinlock, no need to unlock ourselves
+                        return;
+                }
+
+                LIB_DEBUG_PRINT_SAFE("Kernel : Destroying %p\n", this);
+
         }
 
@@ -158 +221 @@
         }
 
+        // Leave single monitor for the last time
+        void __leave_dtor_monitor_desc( monitor_desc * this ) {
+                LIB_DEBUG_DO(
+                        if( this_thread != this->owner ) {
+                                abortf("Destroyed monitor %p has inconsistent owner, expected %p got %p.\n", this, this_thread, this->owner);
+                        }
+                        if( this->recursion != 1 ) {
+                                abortf("Destroyed monitor %p has %d outstanding nested calls.\n", this, this->recursion - 1);
+                        }
+                )
+        }
+
         // Leave the thread monitor
         // last routine called by a thread.
@@ -210 +285 @@
 // Ctor for monitor guard
 // Sorts monitors before entering
-void ?{}( monitor_guard_t & this, monitor_desc ** m, int count, void (*func)() ) {
+void ?{}( monitor_guard_t & this, monitor_desc ** m, int count, fptr_t func ) {
         // Store current array
         this.m = m;
@@ -246 +321 @@
 
         // LIB_DEBUG_PRINT_SAFE("MGUARD : left\n");
+
+        // Restore thread context
+        this_thread->monitors.list = this.prev_mntrs;
+        this_thread->monitors.size = this.prev_count;
+        this_thread->monitors.func = this.prev_func;
+}
+
+
+// Ctor for monitor guard
+// Sorts monitors before entering
+void ?{}( monitor_dtor_guard_t & this, monitor_desc ** m, fptr_t func ) {
+        // Store current array
+        this.m = *m;
+
+        // Save previous thread context
+        this.prev_mntrs = this_thread->monitors.list;
+        this.prev_count = this_thread->monitors.size;
+        this.prev_func  = this_thread->monitors.func;
+
+        // Update thread context (needed for conditions)
+        this_thread->monitors.list = m;
+        this_thread->monitors.size = 1;
+        this_thread->monitors.func = func;
+
+        __enter_monitor_dtor( this.m, func );
+}
+
+
+// Dtor for monitor guard
+void ^?{}( monitor_dtor_guard_t & this ) {
+        // Leave the monitors in order
+        __leave_dtor_monitor_desc( this.m );
 
         // Restore thread context
@@ -448 +555 @@
                         *mask.accepted = index;
                         if( mask.clauses[index].is_dtor ) {
-                                #warning case not implemented
+                                LIB_DEBUG_PRINT_SAFE("Kernel : dtor already there\n");
+                                verifyf( mask.clauses[index].size == 1        , "ERROR: Accepted dtor has more than 1 mutex parameter." );
+
+                                monitor_desc * mon2dtor = mask.clauses[index].list[0];
+                                verifyf( mon2dtor->dtor_node, "ERROR: Accepted monitor has no dtor_node." );
+
+                                __condition_criterion_t * dtor_crit = mon2dtor->dtor_node->criteria;
+                                push( &mon2dtor->signal_stack, dtor_crit );
+
+                                unlock_all( locks, count );
                         }
                         else {

src/tests/.expect/64/literals.txt

@@ -1252 +1252 @@
     ((void)(-((long double )0x.0123456789p09)));
     ((void)__f__F_c__1('a'));
-    ((void)__f__F_Sc__1(((signed char )20)));
+    ((void)__f__F_Sc__1(20));
     ((void)__f__F_Uc__1(((unsigned char )21u)));
-    ((void)__f__F_s__1(((signed short int )22)));
+    ((void)__f__F_s__1(22));
     ((void)__f__F_Us__1(((unsigned short int )23u)));
     ((void)__f__F_Ul__1(((unsigned long int )24)));

src/tests/Makefile.am

@@ -22 +22 @@
 concurrent = yes
 quick_test += coroutine thread monitor
-concurrent_test = coroutine thread monitor multi-monitor sched-int-block sched-int-disjoint sched-int-wait sched-ext-barge sched-ext-else sched-ext-parse sched-ext-statment preempt
+concurrent_test =        \
+        coroutine          \
+        thread             \
+        monitor            \
+        multi-monitor      \
+        preempt            \
+        sched-int-block    \
+        sched-int-disjoint \
+        sched-int-wait     \
+        sched-ext-barge    \
+        sched-ext-dtor     \
+        sched-ext-else     \
+        sched-ext-parse    \
+        sched-ext-recurse  \
+        sched-ext-statment \
+        sched-ext-when
+
 else
 concurrent=no

src/tests/Makefile.in

@@ -320 +320 @@
 @BUILD_CONCURRENCY_TRUE@concurrent = yes
 @BUILD_CONCURRENCY_FALSE@concurrent_test = 
-@BUILD_CONCURRENCY_TRUE@concurrent_test = coroutine thread monitor multi-monitor sched-int-block sched-int-disjoint sched-int-wait sched-ext-barge sched-ext-else sched-ext-parse sched-ext-statment preempt
+@BUILD_CONCURRENCY_TRUE@concurrent_test = \
+@BUILD_CONCURRENCY_TRUE@        coroutine          \
+@BUILD_CONCURRENCY_TRUE@        thread             \
+@BUILD_CONCURRENCY_TRUE@        monitor            \
+@BUILD_CONCURRENCY_TRUE@        multi-monitor      \
+@BUILD_CONCURRENCY_TRUE@        preempt            \
+@BUILD_CONCURRENCY_TRUE@        sched-int-block    \
+@BUILD_CONCURRENCY_TRUE@        sched-int-disjoint \
+@BUILD_CONCURRENCY_TRUE@        sched-int-wait     \
+@BUILD_CONCURRENCY_TRUE@        sched-ext-barge    \
+@BUILD_CONCURRENCY_TRUE@        sched-ext-dtor     \
+@BUILD_CONCURRENCY_TRUE@        sched-ext-else     \
+@BUILD_CONCURRENCY_TRUE@        sched-ext-parse    \
+@BUILD_CONCURRENCY_TRUE@        sched-ext-recurse  \
+@BUILD_CONCURRENCY_TRUE@        sched-ext-statment \
+@BUILD_CONCURRENCY_TRUE@        sched-ext-when
+
 
 # applies to both programs

src/tests/coroutine.c

@@ -10 +10 @@
 // Created On       : Thu Jun  8 07:29:37 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun  8 07:37:12 2017
-// Update Count     : 5
+// Last Modified On : Sun Sep 17 21:38:15 2017
+// Update Count     : 7
 //
 
@@ -18 +18 @@
 
 coroutine Fibonacci {
-        int fn;                                         // used for communication
+        int fn;                                                                                         // used for communication
 };
 
@@ -26 +26 @@
 
 void main( Fibonacci & this ) {
-        int fn1, fn2;                                   // retained between resumes
-        this.fn = 0;                                    // case 0
+        int fn1, fn2;                                                                           // retained between resumes
+        this.fn = 0;                                                                            // case 0
         fn1 = this.fn;
-        suspend();                                              // return to last resume
+        suspend();                                                                                      // restart last resume
 
-        this.fn = 1;                                    // case 1
-        fn2 = fn1;
-        fn1 = this.fn;
-        suspend();                                              // return to last resume
+        this.fn = 1;                                                                            // case 1
+        fn2 = fn1;  fn1 = this.fn;
+        suspend();                                                                                      // restart last resume
 
-        for ( ;; ) {                                    // general case
+        for ( ;; ) {                                                                            // general case
                 this.fn = fn1 + fn2;
-                fn2 = fn1;
-                fn1 = this.fn;
-                suspend();                                      // return to last resume
+                fn2 = fn1;  fn1 = this.fn;
+                suspend();                                                                              // restart last resume
         } // for
 }
 
 int next( Fibonacci & this ) {
-        resume( this );                                 // transfer to last suspend
+        resume( this );                                                                         // restart last suspend
         return this.fn;
 }
@@ -52 +50 @@
         Fibonacci f1, f2;
         for ( int i = 1; i <= 10; i += 1 ) {
-                sout | next( f1 ) | ' ' | next( f2 ) | endl;
+                sout | next( f1 ) | next( f2 ) | endl;
         } // for
 }

src/tests/gmp.c

@@ -10 +10 @@
 // Created On       : Tue Apr 19 08:55:51 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Sep  4 09:51:18 2017
-// Update Count     : 550
+// Last Modified On : Thu Sep 28 18:33:51 2017
+// Update Count     : 555
 // 
 
@@ -97 +97 @@
 
         sout | "Factorial Numbers" | endl;
-        Int fact;
-        fact = 1;                                                                                       // 1st case
+        Int fact = 1;                                                                           // 1st case
         sout | (int)0 | fact | endl;
         for ( unsigned int i = 1; i <= 40; i += 1 ) {