Changeset 3e2b9c9 for libcfa/src/concurrency/kernel

Timestamp:

Aug 3, 2020, 1:59:13 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

95789be

Parents:

e660761

Message:

More restructuring of translation units
Unclear if it improves compilation time.

Location:

libcfa/src/concurrency/kernel

Files:

• fwd.hfa (modified) (3 diffs)
• startup.cfa (modified) (1 diff)

libcfa/src/concurrency/kernel/fwd.hfa

@@ -14 +14 @@
 //
 
+#pragma once
+
 #include "bits/defs.hfa"
 #include "bits/debug.hfa"
 
-#if !defined(__cforall_thread__)
-#error non-thread source file includes kernel/fwd.hfa
+#ifdef __cforall
+#include "bits/random.hfa"
 #endif
 
@@ -25 +27 @@
 struct cluster;
 
+enum __Preemption_Reason { __NO_PREEMPTION, __ALARM_PREEMPTION, __POLL_PREEMPTION, __MANUAL_PREEMPTION };
+
+#define KERNEL_STORAGE(T,X) __attribute((aligned(__alignof__(T)))) static char storage_##X[sizeof(T)]
+
 #ifdef __cforall
 extern "C" {
-      extern "Cforall" {
+        extern "Cforall" {
                 extern __attribute__((aligned(128))) thread_local struct KernelThreadData {
                         struct $thread    * volatile this_thread;
@@ -45 +51 @@
                         #endif
                 } kernelTLS __attribute__ ((tls_model ( "initial-exec" )));
+
+                static inline uint64_t __tls_rand() {
+                        #if defined(__SIZEOF_INT128__)
+                                return __lehmer64( kernelTLS.rand_seed );
+                        #else
+                                return __xorshift64( kernelTLS.rand_seed );
+                        #endif
+                }
         }
 
-      #ifdef __ARM_ARCH
-            // function prototypes are only really used by these macros on ARM
-            void disable_global_interrupts();
-            void enable_global_interrupts();
+        #ifdef __ARM_ARCH
+                // function prototypes are only really used by these macros on ARM
+                void disable_global_interrupts();
+                void enable_global_interrupts();
 
-            #define TL_GET( member ) ( { __typeof__( kernelTLS.member ) target; \
-                  disable_global_interrupts(); \
-                  target = kernelTLS.member; \
-                  enable_global_interrupts(); \
-                  target; } )
-            #define TL_SET( member, value ) disable_global_interrupts(); \
-                  kernelTLS.member = value; \
-                  enable_global_interrupts();
-      #else
-            #define TL_GET( member ) kernelTLS.member
-            #define TL_SET( member, value ) kernelTLS.member = value;
-      #endif
+                #define TL_GET( member ) ( { __typeof__( kernelTLS.member ) target; \
+                        disable_global_interrupts(); \
+                        target = kernelTLS.member; \
+                        enable_global_interrupts(); \
+                        target; } )
+                #define TL_SET( member, value ) disable_global_interrupts(); \
+                        kernelTLS.member = value; \
+                        enable_global_interrupts();
+        #else
+                #define TL_GET( member ) kernelTLS.member
+                #define TL_SET( member, value ) kernelTLS.member = value;
+        #endif
 
-      extern void disable_interrupts();
-      extern void enable_interrupts_noPoll();
+        extern void disable_interrupts();
+        extern void enable_interrupts_noPoll();
         extern void enable_interrupts( __cfaabi_dbg_ctx_param );
 
-        enum __Preemption_Reason { __NO_PREEMPTION, __ALARM_PREEMPTION, __POLL_PREEMPTION, __MANUAL_PREEMPTION };
+        extern "Cforall" {
+                extern void park( __cfaabi_dbg_ctx_param );
+                extern void unpark( struct $thread * this __cfaabi_dbg_ctx_param2 );
+                static inline struct $thread * active_thread () { return TL_GET( this_thread ); }
 
-      extern "Cforall" {
-            extern void park( __cfaabi_dbg_ctx_param );
-            extern void unpark( struct $thread * this __cfaabi_dbg_ctx_param2 );
-            static inline struct $thread * active_thread () { return TL_GET( this_thread ); }
+                extern bool force_yield( enum __Preemption_Reason );
 
-            extern bool force_yield( enum __Preemption_Reason );
-      }
+                static inline void yield() {
+                        force_yield(__MANUAL_PREEMPTION);
+                }
+
+                // Yield: yield N times
+                static inline void yield( unsigned times ) {
+                        for( times ) {
+                                yield();
+                        }
+                }
+
+                //-----------------------------------------------------------------------
+                // Statics call at the end of each thread to register statistics
+                #if !defined(__CFA_NO_STATISTICS__)
+                        static inline struct __stats_t * __tls_stats() {
+                                /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
+                                /* paranoid */ verify( kernelTLS.this_stats );
+                                return kernelTLS.this_stats;
+                        }
+
+                        #define __STATS__(in_kernel, ...) { \
+                                if( !(in_kernel) ) disable_interrupts(); \
+                                with( *__tls_stats() ) { \
+                                        __VA_ARGS__ \
+                                } \
+                                if( !(in_kernel) ) enable_interrupts( __cfaabi_dbg_ctx ); \
+                        }
+                #else
+                        #define __STATS__(in_kernel, ...)
+                #endif
+        }
 }
 #endif

libcfa/src/concurrency/kernel/startup.cfa

@@ -91 +91 @@
 //-----------------------------------------------------------------------------
 // Kernel storage
-#warning duplicated in preemption.cfa
-#define KERNEL_STORAGE(T,X) __attribute((aligned(__alignof__(T)))) static char storage_##X[sizeof(T)]
 KERNEL_STORAGE(cluster,              mainCluster);
 KERNEL_STORAGE(processor,            mainProcessor);