Changes in libcfa/src/concurrency/stats.hfa [d2fadeb:73f4d08]

File:

• libcfa/src/concurrency/stats.hfa (modified) (2 diffs)

libcfa/src/concurrency/stats.hfa

@@ -16 +16 @@
         static inline void __print_stats( struct __stats_t *, int, const char *, const char *, void * ) {}
 #else
-        struct __stats_readyQ_pop_t {
-                // number of attemps at poping something
-                volatile uint64_t attempt;
 
-                // number of successes at poping
-                volatile uint64_t success;
-
-                // number of attempts failed due to the lock being held
-                volatile uint64_t elock;
-
-                // number of attempts failed due to the queue being empty (lock held)
-                volatile uint64_t eempty;
-
-                // number of attempts failed due to the queue looking empty (lock not held)
-                volatile uint64_t espec;
-        };
-
-        struct __attribute__((aligned(64))) __stats_readyQ_t {
-                // Push statistic
+        struct __attribute__((aligned(64))) __stats_readQ_t {
                 struct {
+                        // Push statistic
                         struct {
-                                // number of attemps at pushing something to preferred queues
+                                // number of attemps at pushing something
                                 volatile uint64_t attempt;
 
+                                // number of successes at pushing
+                                volatile uint64_t success;
+
+                                // number of attemps at pushing something to preferred queues
+                                volatile uint64_t local;
+
                                 // number of successes at pushing to preferred queues
+                                volatile uint64_t lsuccess;
+                        } push;
+
+                        struct {
+                                // number of attemps at pushing something
+                                volatile uint64_t attempt;
+
+                                // number of successes at pushing
                                 volatile uint64_t success;
-                        }
-                        // Stats for local queue within cluster
-                        local,
 
-                        // Stats for non-local queues within cluster
-                        share,
+                                // number of attemps at pushing something to preferred queues
+                                volatile uint64_t local;
 
-                        // Stats from outside cluster
-                        extrn;
-                } push;
+                                // number of successes at pushing to preferred queues
+                                volatile uint64_t lsuccess;
+                        } ext;
 
-                // Pop statistic
-                struct {
-                        // pop from local queue
-                        __stats_readyQ_pop_t local;
+                        // Pop statistic
+                        struct {
+                                // number of reads of the mask
+                                // picking an empty __cfa_readyQ_mask_t counts here
+                                // but not as an attempt
+                                volatile uint64_t probe;
 
-                        // pop before looking at local queue
-                        __stats_readyQ_pop_t help;
+                                // number of attemps at poping something
+                                volatile uint64_t attempt;
 
-                        // pop from some other queue
-                        __stats_readyQ_pop_t steal;
+                                // number of successes at poping
+                                volatile uint64_t success;
 
-                        // pop when searching queues sequentially
-                        __stats_readyQ_pop_t search;
-                } pop;
+                                // number of attemps at poping something to preferred queues
+                                volatile uint64_t local;
 
+                                // number of successes at poping to preferred queues
+                                volatile uint64_t lsuccess;
+                        } pop;
+                } pick;
                 struct {
                         volatile uint64_t migration;
@@ -119 +119 @@
 
         struct __attribute__((aligned(128))) __stats_t {
-                __stats_readyQ_t ready;
+                __stats_readQ_t ready;
                 #if defined(CFA_HAVE_LINUX_IO_URING_H)
                         __stats_io_t    io;