Changes in / [22a0e87:0026d67]

Files:

• benchmark/io/http/worker.hfa (modified) (1 diff)
• libcfa/src/Makefile.am (modified) (1 diff)
• libcfa/src/concurrency/locks.hfa (modified) (2 diffs)
• libcfa/src/containers/lockfree.hfa (deleted)
• libcfa/src/containers/queueLockFree.hfa (added)
• libcfa/src/containers/stackLockFree.hfa (added)
• libcfa/src/heap.cfa (modified) (2 diffs)
• tests/collections/atomic_mpsc.cfa (modified) (1 diff)

benchmark/io/http/worker.hfa

@@ -2 +2 @@
 
 #include <iofwd.hfa>
-#include <containers/lockfree.hfa>
+#include <queueLockFree.hfa>
 #include <thread.hfa>
 

libcfa/src/Makefile.am

@@ -62 +62 @@
         containers/array.hfa \
         containers/list.hfa \
-        containers/lockfree.hfa \
+        containers/queueLockFree.hfa \
+        containers/stackLockFree.hfa \
         containers/string_sharectx.hfa \
         containers/vector2.hfa \

libcfa/src/concurrency/locks.hfa

@@ -21 +21 @@
 
 #include "bits/weakso_locks.hfa"
-#include "containers/lockfree.hfa"
+#include "containers/queueLockFree.hfa"
 #include "containers/list.hfa"
 
@@ -423 +423 @@
 }
 
-static inline size_t on_wait(simple_owner_lock & this) with(this) {
+static inline size_t on_wait(simple_owner_lock & this) with(this) { 
         lock( lock __cfaabi_dbg_ctx2 );
         /* paranoid */ verifyf( owner != 0p, "Attempt to release lock %p that isn't held", &this );

libcfa/src/heap.cfa

@@ -211 +211 @@
 #if BUCKETLOCK == SPINLOCK
 #elif BUCKETLOCK == LOCKFREE
-#include <containers/lockfree.hfa>
+#include <stackLockFree.hfa>
 #else
         #error undefined lock type for bucket lock
@@ -505 +505 @@
                                 freeLists[j].blockSize = bucketSizes[j];
                         } // for
-
+        
                         heapBuffer = 0p;
                         heapReserve = 0;

tests/collections/atomic_mpsc.cfa

@@ -1 +1 @@
 #include <fstream.hfa>
-#include <containers/lockfree.hfa>
+#include <queueLockFree.hfa>
 #include <thread.hfa>