Changeset 6b33e89 for libcfa/src/concurrency/kernel

Timestamp:

Apr 25, 2025, 7:39:09 AM (5 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

65bd3c2

Parents:

b195498

Message:

change backquote call to regular call

Location:

libcfa/src/concurrency/kernel

Files:

• cluster.cfa (modified) (3 diffs)
• private.hfa (modified) (2 diffs)
• startup.cfa (modified) (17 diffs)

libcfa/src/concurrency/kernel/cluster.cfa

@@ -234 +234 @@
 
 static void assign_list(unsigned & valrq, unsigned & valio, dlist(struct processor) & list, unsigned count) {
-        struct processor * it = &list`first;
+        struct processor * it = &first( list );
         for(unsigned i = 0; i < count; i++) {
                 /* paranoid */ verifyf( it, "Unexpected null iterator, at index %u of %u\n", i, count);
@@ -245 +245 @@
                         valio += __shard_factor.io;
                 #endif
-                it = &(*it)`next;
+                it = &next( *it );
         }
 }
@@ -258 +258 @@
 #if defined(CFA_HAVE_LINUX_IO_URING_H)
         static void assign_io(io_context$ ** data, size_t count, dlist(struct processor) & list) {
-                struct processor * it = &list`first;
+                struct processor * it = &first( list );
                 while(it) {
                         /* paranoid */ verifyf( it, "Unexpected null iterator\n");
                         /* paranoid */ verifyf( it->io.ctx->cq.id < count, "Processor %p has id %u above count %zu\n", it, it->rdq.id, count);
                         data[it->io.ctx->cq.id] = it->io.ctx;
-                        it = &(*it)`next;
+                        it = &next( *it );
                 }
         }

libcfa/src/concurrency/kernel/private.hfa

@@ -10 +10 @@
 // Created On       : Mon Feb 13 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar  2 16:04:46 2023
-// Update Count     : 11
+// Last Modified On : Mon Apr 21 18:08:48 2025
+// Update Count     : 12
 //
 
@@ -287 +287 @@
 static inline [unsigned, uint_fast32_t] ready_mutate_register() {
         unsigned id = register_proc_id();
-        uint_fast32_t last = ready_mutate_lock();
-        return [id, last];
+        return [id, ready_mutate_lock()];
 }
 

libcfa/src/concurrency/kernel/startup.cfa

@@ -69 +69 @@
 //-----------------------------------------------------------------------------
 // Start and stop routine for the kernel, declared first to make sure they run first
-static void __kernel_startup (void) __attribute__(( constructor( STARTUP_PRIORITY_KERNEL ) ));
-static void __kernel_shutdown(void) __attribute__(( destructor ( STARTUP_PRIORITY_KERNEL ) ));
+static void __kernel_startup(void) __attribute__(( constructor( STARTUP_PRIORITY_KERNEL ) ));
+static void __kernel_shutdown(void) __attribute__(( destructor( STARTUP_PRIORITY_KERNEL ) ));
 
 //-----------------------------------------------------------------------------
@@ -78 +78 @@
 static void * __invoke_processor(void * arg);
 static void __kernel_first_resume( processor * this );
-static void __kernel_last_resume ( processor * this );
+static void __kernel_last_resume( processor * this );
 static void init(processor & this, const char name[], cluster & _cltr, thread$ * initT);
 static void deinit(processor & this);
@@ -99 +99 @@
 extern void __kernel_alarm_shutdown(void);
 extern void __cfa_io_start( processor * );
-extern void __cfa_io_stop ( processor * );
+extern void __cfa_io_stop( processor * );
 
 //-----------------------------------------------------------------------------
@@ -110 +110 @@
 //-----------------------------------------------------------------------------
 // Kernel storage
-KERNEL_STORAGE(cluster,              mainCluster);
-KERNEL_STORAGE(processor,            mainProcessor);
-KERNEL_STORAGE(thread$,              mainThread);
-KERNEL_STORAGE(__stack_t,            mainThreadCtx);
+KERNEL_STORAGE(cluster, mainCluster);
+KERNEL_STORAGE(processor, mainProcessor);
+KERNEL_STORAGE(thread$, mainThread);
+KERNEL_STORAGE(__stack_t, mainThreadCtx);
 #if !defined(__CFA_NO_STATISTICS__)
 KERNEL_STORAGE(__stats_t, mainProcStats);
 #endif
 
-cluster              * mainCluster libcfa_public;
-processor            * mainProcessor;
-thread$              * mainThread;
+cluster * mainCluster libcfa_public;
+processor * mainProcessor;
+thread$ * mainThread;
 
 extern "C" {
@@ -150 +150 @@
 // Struct to steal stack
 struct current_stack_info_t {
-        __stack_t * storage;  // pointer to stack object
-        void * base;          // base of stack
-        void * limit;         // stack grows towards stack limit
-        void * context;       // address of cfa_context_t
+        __stack_t * storage;                                                            // pointer to stack object
+        void * base;                                                                            // base of stack
+        void * limit;                                                                           // stack grows towards stack limit
+        void * context;                                                                         // address of cfa_context_t
 };
 
@@ -234 +234 @@
         //initialize the global state variables
         __cfaabi_tls.this_processor = mainProcessor;
-        __cfaabi_tls.this_thread    = mainThread;
+        __cfaabi_tls.this_thread = mainThread;
 
         #if !defined( __CFA_NO_STATISTICS__ )
@@ -355 +355 @@
         processor * proc = (processor *) arg;
         __cfaabi_tls.this_processor = proc;
-        __cfaabi_tls.this_thread    = 0p;
+        __cfaabi_tls.this_thread = 0p;
         __cfaabi_tls.preemption_state.[enabled, disable_count] = [false, 1];
         proc->local_data = &__cfaabi_tls;
@@ -477 +477 @@
         stack.storage = info->storage;
         with(*stack.storage) {
-                limit     = info->limit;
-                base      = info->base;
+                limit = info->limit;
+                base = info->base;
         }
         __attribute__((may_alias)) intptr_t * istorage = (intptr_t*) &stack.storage;
@@ -485 +485 @@
         state = Start;
         starter = 0p;
-        last = 0p;
+        this.last = 0p;
         cancellation = 0p;
-    ehm_state.ehm_buffer{};
-    ehm_state.buffer_lock{};
-    ehm_state.ehm_enabled = false;
+        ehm_state.ehm_buffer{};
+        ehm_state.buffer_lock{};
+        ehm_state.ehm_enabled = false;
 }
 
@@ -502 +502 @@
         self_mon_p = &self_mon;
         rdy_link.next = 0p;
-        rdy_link.ts   = MAX;
+        rdy_link.ts = MAX;
         user_link.next = 0p;
         user_link.prev = 0p;
@@ -509 +509 @@
         preferred = ready_queue_new_preferred();
         last_proc = 0p;
-        PRNG_SET_SEED( random_state,  __global_random_mask ? __global_random_prime : __global_random_prime ^ rdtscl() );
+        PRNG_SET_SEED( random_state, __global_random_mask ? __global_random_prime : __global_random_prime ^ rdtscl() );
         #if defined( __CFA_WITH_VERIFY__ )
                 executing = 0p;
@@ -531 +531 @@
         this.name = name;
         this.cltr = &_cltr;
-    __atomic_add_fetch( &_cltr.procs.constructed, 1u, __ATOMIC_RELAXED );
+        __atomic_add_fetch( &_cltr.procs.constructed, 1u, __ATOMIC_RELAXED );
         this.rdq.its = 0;
         this.rdq.itr = 0;
-        this.rdq.id  = 0;
+        this.rdq.id = 0;
         this.rdq.target = MAX;
         this.rdq.last = MAX;
@@ -545 +545 @@
         this.io.ctx = 0p;
         this.io.pending = false;
-        this.io.dirty   = false;
+        this.io.dirty = false;
 
         this.init.thrd = initT;
@@ -599 +599 @@
         __cfadbg_print_safe(runtime_core, "Kernel : core %p signaling termination\n", &this);
 
-    __atomic_sub_fetch( &this.cltr->procs.constructed, 1u, __ATOMIC_RELAXED );
+        __atomic_sub_fetch( &this.cltr->procs.constructed, 1u, __ATOMIC_RELAXED );
 
         __atomic_store_n(&do_terminate, true, __ATOMIC_RELAXED);
@@ -619 +619 @@
 // Cluster
 static void ?{}(__cluster_proc_list & this) {
-        this.fdw   = 0p;
-        this.idle  = 0;
-    this.constructed = 0;
+        this.fdw = 0p;
+        this.idle = 0;
+        this.constructed = 0;
         this.total = 0;
 }
@@ -706 +706 @@
 //-----------------------------------------------------------------------------
 // Global Queues
-static void doregister( cluster     & cltr ) {
-        lock      ( __cfa_dbg_global_clusters.lock __cfaabi_dbg_ctx2);
+static void doregister( cluster & cltr ) {
+        lock( __cfa_dbg_global_clusters.lock __cfaabi_dbg_ctx2);
         push_front( __cfa_dbg_global_clusters.list, cltr );
-        unlock    ( __cfa_dbg_global_clusters.lock );
-}
-
-static void unregister( cluster     & cltr ) {
-        lock  ( __cfa_dbg_global_clusters.lock __cfaabi_dbg_ctx2);
+        unlock( __cfa_dbg_global_clusters.lock );
+}
+
+static void unregister( cluster & cltr ) {
+        lock( __cfa_dbg_global_clusters.lock __cfaabi_dbg_ctx2);
         remove( __cfa_dbg_global_clusters.list, cltr );
         unlock( __cfa_dbg_global_clusters.lock );
@@ -719 +719 @@
 
 void doregister( cluster * cltr, thread$ & thrd ) {
-        lock      (cltr->thread_list_lock __cfaabi_dbg_ctx2);
+        lock(cltr->thread_list_lock __cfaabi_dbg_ctx2);
         cltr->nthreads += 1;
         insert_first(cltr->threads, thrd);
-        unlock    (cltr->thread_list_lock);
+        unlock(cltr->thread_list_lock);
 }
 
 void unregister( cluster * cltr, thread$ & thrd ) {
-        lock  (cltr->thread_list_lock __cfaabi_dbg_ctx2);
+        lock(cltr->thread_list_lock __cfaabi_dbg_ctx2);
         {
                 tytagref( dlink(thread$), dlink(thread$) ) ?`inner( thread$ & this ) = void;