Changes in / [dab98b3e:c8c0c7c5]

Files:

• libcfa/src/concurrency/coroutine.cfa (modified) (1 diff)
• libcfa/src/concurrency/invoke.h (modified) (2 diffs)
• libcfa/src/concurrency/kernel.cfa (modified) (3 diffs)
• libcfa/src/concurrency/preemption.cfa (modified) (4 diffs)
• libcfa/src/heap.cfa (modified) (4 diffs)
• tests/linking/withthreads.cfa (modified) (1 diff)

libcfa/src/concurrency/coroutine.cfa

@@ -10 +10 @@
 // Created On       : Mon Nov 28 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Dec  5 14:37:29 2019
-// Update Count     : 15
+// Last Modified On : Sat Nov 30 09:59:36 2019
+// Update Count     : 14
 //
 

libcfa/src/concurrency/invoke.h

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Dec  5 16:26:03 2019
-// Update Count     : 44
+// Last Modified On : Wed Dec  4 08:05:32 2019
+// Update Count     : 43
 //
 
@@ -51 +51 @@
 
                         struct {
+                                void * stack;
                                 volatile unsigned short disable_count;
                                 volatile bool enabled;

libcfa/src/concurrency/kernel.cfa

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Dec  5 16:25:52 2019
-// Update Count     : 52
+// Last Modified On : Tue Dec  3 21:46:54 2019
+// Update Count     : 49
 //
 
@@ -135 +135 @@
         NULL,                                                                                           // cannot use 0p
         NULL,
-        { 1, false, false },
+        { NULL, 1, false, false },
         6u //this should be seeded better but due to a bug calling rdtsc doesn't work
 };
@@ -453 +453 @@
 
         size_t stacksize;
-        // default stack size, normally defined by shell limit
+         // default stack size, normally defined by shell limit
         Abort( pthread_attr_getstacksize( &attr, &stacksize ), "pthread_attr_getstacksize" );
         assert( stacksize >= PTHREAD_STACK_MIN );
 
-        void * stack;
-        __cfaabi_dbg_debug_do(
-                stack = memalign( __page_size, stacksize + __page_size );
-                // pthread has no mechanism to create the guard page in user supplied stack.
-                if ( mprotect( stack, __page_size, PROT_NONE ) == -1 ) {
-                        abort( "mprotect : internal error, mprotect failure, error(%d) %s.", errno, strerror( errno ) );
-                } // if
-        );
-        __cfaabi_dbg_no_debug_do(
-                stack = malloc( stacksize );
-        );
+#ifdef __CFA_DEBUG__
+        void * stack = memalign( __page_size, stacksize + __page_size );
+        // pthread has no mechanism to create the guard page in user supplied stack.
+        if ( mprotect( stack, __page_size, PROT_NONE ) == -1 ) {
+                abort( "mprotect : internal error, mprotect failure, error(%d) %s.", errno, strerror( errno ) );
+        } // if
+#else
+        void * stack = malloc( stacksize );
+#endif
 
         Abort( pthread_attr_setstack( &attr, stack, stacksize ), "pthread_attr_setstack" ); 

libcfa/src/concurrency/preemption.cfa

@@ -10 +10 @@
 // Created On       : Mon Jun 5 14:20:42 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Dec  5 16:34:05 2019
-// Update Count     : 43
+// Last Modified On : Sun Dec  1 22:22:56 2019
+// Update Count     : 41
 //
 
@@ -65 +65 @@
 event_kernel_t * event_kernel;                        // kernel public handle to even kernel
 static pthread_t alarm_thread;                        // pthread handle to alarm thread
-static void * alarm_stack;                                                        // pthread stack for alarm thread
 
 static void ?{}(event_kernel_t & this) with( this ) {
@@ -307 +306 @@
         signal_block( SIGALRM );
 
-        alarm_stack = create_pthread( &alarm_thread, alarm_loop, 0p );
+        kernelTLS.preemption_state.stack = create_pthread( &alarm_thread, alarm_loop, 0p );
 }
 
@@ -327 +326 @@
 
         pthread_join( alarm_thread, 0p );
-        free( alarm_stack );
+        free( kernelTLS.preemption_state.stack );
 
         // Preemption is now fully stopped

libcfa/src/heap.cfa

@@ -10 +10 @@
 // Created On       : Tue Dec 19 21:58:35 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Dec  4 21:42:46 2019
-// Update Count     : 646
+// Last Modified On : Tue Dec  3 13:58:44 2019
+// Update Count     : 642
 //
 
@@ -35 +35 @@
 static bool traceHeap = false;
 
-inline bool traceHeap() { return traceHeap; }
+inline bool traceHeap() {
+        return traceHeap;
+} // traceHeap
 
 bool traceHeapOn() {
@@ -48 +50 @@
         return temp;
 } // traceHeapOff
-
-bool traceHeapTerm() { return false; }
 
 
@@ -694 +694 @@
 static void ^?{}( HeapManager & ) {
         #ifdef __STATISTICS__
-        if ( traceHeapTerm() ) {
-                printStats();
-                // if ( prtfree() ) prtFree( heapManager, true );
-        } // if
+        // if ( traceHeapTerm() ) {
+        //      printStats();
+        //      if ( prtfree() ) prtFree( heapManager, true );
+        // } // if
         #endif // __STATISTICS__
 } // ~HeapManager

tests/linking/withthreads.cfa

@@ -34 +34 @@
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa withthreads.cfa" //
+// compile-command: "cfa nothreads.cfa" //
 // End: //