Changes in benchmark/readyQ/rq_bench.hpp [56ac392:c4241b6]

File:

• benchmark/readyQ/rq_bench.hpp (modified) (6 diffs)

benchmark/readyQ/rq_bench.hpp

@@ -6 +6 @@
 #include <time.h>                                                                               // timespec
 #include <sys/time.h>                                                                   // timeval
-
-typedef __uint128_t __lehmer64_state_t;
-static inline uint64_t __lehmer64( __lehmer64_state_t & state ) {
-        state *= 0xda942042e4dd58b5;
-        return state >> 64;
-}
 
 enum { TIMEGRAN = 1000000000LL };                                       // nanosecond granularity, except for timeval
@@ -52 +46 @@
         }
 
-uint64_t timeHiRes() {
+uint64_t getTimeNsec() {
         timespec curr;
         clock_gettime( CLOCK_REALTIME, &curr );
@@ -66 +60 @@
         for(;;) {
                 Sleeper::usleep(100000);
-                uint64_t end = timeHiRes();
+                uint64_t end = getTimeNsec();
                 uint64_t delta = end - start;
                 if(is_tty) {
@@ -80 +74 @@
         }
 }
-
-class Fibre;
-int fibre_park();
-int fibre_unpark( Fibre * );
-Fibre * fibre_self();
-
-class __attribute__((aligned(128))) bench_sem {
-        Fibre * volatile ptr = nullptr;
-public:
-        inline bool wait() {
-                static Fibre * const ready  = reinterpret_cast<Fibre *>(1ull);
-                for(;;) {
-                        Fibre * expected = this->ptr;
-                        if(expected == ready) {
-                                if(__atomic_compare_exchange_n(&this->ptr, &expected, nullptr, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) {
-                                        return false;
-                                }
-                        }
-                        else {
-                                /* paranoid */ assert( expected == nullptr );
-                                if(__atomic_compare_exchange_n(&this->ptr, &expected, fibre_self(), false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) {
-                                        fibre_park();
-                                        return true;
-                                }
-                        }
-
-                }
-        }
-
-        inline bool post() {
-                static Fibre * const ready  = reinterpret_cast<Fibre *>(1ull);
-                for(;;) {
-                        Fibre * expected = this->ptr;
-                        if(expected == ready) return false;
-                        if(expected == nullptr) {
-                                if(__atomic_compare_exchange_n(&this->ptr, &expected, ready, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) {
-                                        return false;
-                                }
-                        }
-                        else {
-                                if(__atomic_compare_exchange_n(&this->ptr, &expected, nullptr, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) {
-                                        fibre_unpark( expected );
-                                        return true;
-                                }
-                        }
-                }
-        }
-};
 
 // ==========================================================================================
@@ -242 +188 @@
                 this->help       = help;
                 this->variable   = reinterpret_cast<void*>(&variable);
-                #pragma GCC diagnostic push
-                #pragma GCC diagnostic ignored "-Wcast-function-type"
-                                this->parse_fun  = reinterpret_cast<bool (*)(const char *, void * )>(static_cast<bool (*)(const char *, T & )>(parse));
-                #pragma GCC diagnostic pop
+                this->parse_fun  = reinterpret_cast<bool (*)(const char *, void * )>(static_cast<bool (*)(const char *, T & )>(parse));
         }
 
@@ -254 +197 @@
                 this->help       = help;
                 this->variable   = reinterpret_cast<void*>(&variable);
-                #pragma GCC diagnostic push
-                #pragma GCC diagnostic ignored "-Wcast-function-type"
-                        this->parse_fun  = reinterpret_cast<bool (*)(const char *, void * )>(parse);
-                #pragma GCC diagnostic pop
+                this->parse_fun  = reinterpret_cast<bool (*)(const char *, void * )>(parse);
         }
 };