Changes in libcfa/src/concurrency/kernel.hfa [f6660520:2d8f7b0]

File:

• libcfa/src/concurrency/kernel.hfa (modified) (7 diffs)

libcfa/src/concurrency/kernel.hfa

@@ -40 +40 @@
 void   P (semaphore & this);
 bool   V (semaphore & this);
-bool   V (semaphore & this, unsigned count);
 
 
@@ -136 +135 @@
         // Like head/tail but not seen by the kernel
         volatile uint32_t alloc;
-        volatile uint32_t ready;
 
         __spinlock_t lock;
@@ -146 +144 @@
         void * ring_ptr;
         size_t ring_sz;
-
-        // Statistics
-        #if !defined(__CFA_NO_STATISTICS__)
-                struct {
-                        struct {
-                                unsigned long long int val;
-                                unsigned long long int cnt;
-                        } submit_avg;
-                } stats;
-        #endif
 };
 
@@ -176 +164 @@
         void * ring_ptr;
         size_t ring_sz;
-
-        // Statistics
-        #if !defined(__CFA_NO_STATISTICS__)
-                struct {
-                        struct {
-                                unsigned long long int val;
-                                unsigned long long int cnt;
-                        } completed_avg;
-                } stats;
-        #endif
-};
-
-#if defined(__CFA_IO_POLLING_USER__)
-        struct __io_poller_fast {
-                struct io_ring * ring;
-                $thread thrd;
-        };
-#endif
+};
 
 struct io_ring {
@@ -200 +171 @@
         uint32_t flags;
         int fd;
+        pthread_t poller;
+        void * stack;
+        volatile bool done;
         semaphore submit;
-        volatile bool done;
-        struct {
-                struct {
-                        void * stack;
-                        pthread_t kthrd;
-                } slow;
-                #if defined(__CFA_IO_POLLING_USER__)
-                        __io_poller_fast fast;
-                        __bin_sem_t sem;
-                #endif
-        } poller;
 };
 #endif
@@ -250 +213 @@
                 struct io_ring io;
         #endif
-
-        #if !defined(__CFA_NO_STATISTICS__)
-                bool print_stats;
-        #endif
 };
 extern Duration default_preemption();
@@ -268 +227 @@
 static inline struct processor * active_processor() { return TL_GET( this_processor ); } // UNSAFE
 static inline struct cluster   * active_cluster  () { return TL_GET( this_processor )->cltr; }
-
-#if !defined(__CFA_NO_STATISTICS__)
-        static inline void print_stats_at_exit( cluster & this ) {
-                this.print_stats = true;
-        }
-#endif
 
 // Local Variables: //