Changeset a633f6f

Timestamp:

Nov 19, 2021, 11:39:35 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

1757f98, c60e5094

Parents:

b14ec5f

Message:

Fix the new FD change.

Location:

libcfa/src/concurrency

Files:

• kernel.cfa (modified) (1 diff)
• kernel_private.hfa (modified) (3 diffs)

libcfa/src/concurrency/kernel.cfa

@@ -825 +825 @@
                 insert_last(this.actives, proc);
 
-                __atomic_store_n(&this.fd, this.idles`first.idle, __ATOMIC_SEQ_CST);
+                {
+                        int fd = 0;
+                        if(!this.idles`isEmpty) fd = this.idles`first.idle;
+                        __atomic_store_n(&this.fd, fd, __ATOMIC_SEQ_CST);
+                }
+
         unlock( this );
         /* paranoid */ verify( ! __preemption_enabled() );

libcfa/src/concurrency/kernel_private.hfa

@@ -268 +268 @@
         ready_schedule_lock();
 
-        // Simple counting lock, acquired, acquired by incrementing the counter
-        // to an odd number
-        for() {
-                uint64_t l = this.lock;
-                if(
-                        (0 == (l % 2))
-                        && __atomic_compare_exchange_n(&this.lock, &l, l + 1, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)
-                ) return;
-                Pause();
-        }
+        lock( this.lock __cfaabi_dbg_ctx2 );
 
         /* paranoid */ verify( ! __preemption_enabled() );
@@ -289 +280 @@
         ready_schedule_lock();
 
-        // Simple counting lock, acquired, acquired by incrementing the counter
-        // to an odd number
-        uint64_t l = this.lock;
-        if(
-                (0 == (l % 2))
-                && __atomic_compare_exchange_n(&this.lock, &l, l + 1, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)
-        ) {
+        if(try_lock( this.lock __cfaabi_dbg_ctx2 )) {
                 // success
                 /* paranoid */ verify( ! __preemption_enabled() );
@@ -311 +296 @@
         /* paranoid */ verify( ! __preemption_enabled() );
 
-        /* paranoid */ verify( 1 == (this.lock % 2) );
-        // Simple couting lock, release by incrementing to an even number
-        __atomic_fetch_add( &this.lock, 1, __ATOMIC_SEQ_CST );
+        unlock(this.lock);
 
         // Release the global lock, which we acquired when locking