Changes in / [7a8f62c3:1def117b]

Files:

• libcfa/src/Makefile.am (modified) (1 diff)
• libcfa/src/concurrency/monitor.cfa (modified) (8 diffs)
• libcfa/src/concurrency/monitor.hfa (modified) (1 diff)
• libcfa/src/concurrency/thread.hfa (modified) (1 diff)
• src/Concurrency/Keywords.cc (modified) (1 diff)
• tests/.expect/smart-pointers.txt (deleted)
• tests/Makefile.am (modified) (3 diffs)
• tests/concurrent/.expect/join.txt (added)
• tests/concurrent/.expect/joinerror.sed (added)
• tests/concurrent/join.cfa (added)
• tests/concurrent/joinerror.cfa (added)
• tests/linking/.expect/linkerror.txt (added)
• tests/linking/linkerror.cfa (added)
• tests/pybin/tools.py (modified) (1 diff)
• tests/test.py (modified) (1 diff)

libcfa/src/Makefile.am

@@ -62 +62 @@
         iterator.hfa \
         limits.hfa \
+        memory.hfa \
         parseargs.hfa \
         rational.hfa \

libcfa/src/concurrency/monitor.cfa

@@ -89 +89 @@
         __cfaabi_dbg_print_safe( "Kernel : %10p Entering mon %p (%p)\n", thrd, this, this->owner);
 
-        if( !this->owner ) {
+        if( unlikely(0 != (0x1 & (uintptr_t)this->owner)) ) {
+                abort( "Attempt by thread \"%.256s\" (%p) to access joined monitor %p.", thrd->self_cor.name, thrd, this );
+        }
+        else if( !this->owner ) {
                 // No one has the monitor, just take it
                 __set_owner( this, thrd );
@@ -137 +140 @@
 }
 
-static void __dtor_enter( $monitor * this, fptr_t func ) {
+static void __dtor_enter( $monitor * this, fptr_t func, bool join ) {
         // Lock the monitor spinlock
         lock( this->lock __cfaabi_dbg_ctx2 );
@@ -157 +160 @@
                 return;
         }
-        else if( this->owner == thrd) {
+        else if( this->owner == thrd && !join) {
                 // We already have the monitor... but where about to destroy it so the nesting will fail
                 // Abort!
                 abort( "Attempt to destroy monitor %p by thread \"%.256s\" (%p) in nested mutex.", this, thrd->self_cor.name, thrd );
+        }
+        // SKULLDUGGERY: join will act as a dtor so it would normally trigger to above check
+        // to avoid that it sets the owner to the special value thrd | 1p before exiting
+        else if( this->owner == ($thread*)(1 | (uintptr_t)thrd) ) {
+                // restore the owner and just return
+                __cfaabi_dbg_print_safe( "Kernel : Destroying free mon %p\n", this);
+
+                // No one has the monitor, just take it
+                this->owner = thrd;
+
+                verifyf( kernelTLS.this_thread == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", kernelTLS.this_thread, this->owner, this->recursion, this );
+
+                unlock( this->lock );
+                return;
         }
 
@@ -251 +268 @@
 
 // Leave single monitor for the last time
-void __dtor_leave( $monitor * this ) {
+void __dtor_leave( $monitor * this, bool join ) {
         __cfaabi_dbg_debug_do(
                 if( TL_GET( this_thread ) != this->owner ) {
                         abort( "Destroyed monitor %p has inconsistent owner, expected %p got %p.\n", this, TL_GET( this_thread ), this->owner);
                 }
-                if( this->recursion != 1 ) {
+                if( this->recursion != 1  && !join ) {
                         abort( "Destroyed monitor %p has %d outstanding nested calls.\n", this, this->recursion - 1);
                 }
         )
+
+        this->owner = ($thread*)(1 | (uintptr_t)this->owner);
 }
 
@@ -307 +326 @@
 }
 
+// Join a thread
+forall( dtype T | is_thread(T) )
+T & join( T & this ) {
+        $monitor *    m = get_monitor(this);
+        void (*dtor)(T& mutex this) = ^?{};
+        monitor_dtor_guard_t __guard = { &m, (fptr_t)dtor, true };
+        {
+                return this;
+        }
+}
+
 // Enter multiple monitor
 // relies on the monitor array being sorted
@@ -366 +396 @@
 // Ctor for monitor guard
 // Sorts monitors before entering
-void ?{}( monitor_dtor_guard_t & this, $monitor * m [], fptr_t func ) {
+void ?{}( monitor_dtor_guard_t & this, $monitor * m [], fptr_t func, bool join ) {
         // optimization
         $thread * thrd = TL_GET( this_thread );
@@ -376 +406 @@
         this.prev = thrd->monitors;
 
+        // Save whether we are in a join or not
+        this.join = join;
+
         // Update thread context (needed for conditions)
         (thrd->monitors){m, 1, func};
 
-        __dtor_enter( this.m, func );
+        __dtor_enter( this.m, func, join );
 }
 
@@ -385 +418 @@
 void ^?{}( monitor_dtor_guard_t & this ) {
         // Leave the monitors in order
-        __dtor_leave( this.m );
+        __dtor_leave( this.m, this.join );
 
         // Restore thread context

libcfa/src/concurrency/monitor.hfa

@@ -53 +53 @@
         $monitor *    m;
         __monitor_group_t prev;
+        bool join;
 };
 
-void ?{}( monitor_dtor_guard_t & this, $monitor ** m, void (*func)() );
+void ?{}( monitor_dtor_guard_t & this, $monitor ** m, void (*func)(), bool join );
 void ^?{}( monitor_dtor_guard_t & this );
 

libcfa/src/concurrency/thread.hfa

@@ -106 +106 @@
 void sleep( Duration duration );
 
+//----------
+// join
+forall( dtype T | is_thread(T) )
+T & join( T & this );
+
 // Local Variables: //
 // mode: c //

src/Concurrency/Keywords.cc

@@ -931 +931 @@
                                         {
                                                 new SingleInit( new AddressExpr( new VariableExpr( monitors ) ) ),
-                                                new SingleInit( new CastExpr( new VariableExpr( func ), generic_func->clone(), false ) )
+                                                new SingleInit( new CastExpr( new VariableExpr( func ), generic_func->clone(), false ) ),
+                                                new SingleInit( new ConstantExpr( Constant::from_bool( false ) ) )
                                         },
                                         noDesignators,

tests/Makefile.am

@@ -38 +38 @@
 # since automake doesn't have support for CFA we have to
 AM_CFLAGS = $(if $(test), 2> $(test), ) \
+        -fdebug-prefix-map=$(abspath ${abs_srcdir})= \
+        -fdebug-prefix-map=/tmp= \
         -g \
         -Wall \
@@ -110 +112 @@
 % : %.cfa $(CFACCBIN)
         $(CFACOMPILETEST) -c -o $(abspath ${@}).o
-        $(CFACCLOCAL) $($(shell echo "${@}_FLAGSLD" | sed 's/-\|\//_/g')) $(abspath ${@}).o -o $(abspath ${@})
+        $(CFACCLOCAL) $(if $(test), 2> $(test), ) $($(shell echo "${@}_FLAGSLD" | sed 's/-\|\//_/g')) ${@}.o -o $(abspath ${@})
 
 # implicit rule for c++ test
@@ -137 +139 @@
 # CUSTOM TARGET
 #------------------------------------------------------------------------------
+# tests that just validate syntax
+expression : expression.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -c -fsyntax-only -o $(abspath ${@})
+
 # expected failures
 # use custom target since they require a custom define and custom dependencies

tests/pybin/tools.py

@@ -120 +120 @@
                 return None
 
-        file = open(file, mode)
+        file = open(file, mode, encoding="latin-1") # use latin-1 so all chars mean something.
         exitstack.push(file)
         return file

tests/test.py

@@ -207 +207 @@
                 else:
                         if os.stat(out_file).st_size < 1048576:
-                                with open (out_file, "r") as myfile:
+                                with open (out_file, "r", encoding='latin-1') as myfile:  # use latin-1 so all chars mean something.
                                         error = myfile.read()
                         else: