Changes in libcfa/src/concurrency/kernel.hfa [431cd4f:8cd5434]

File:

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

libcfa/src/concurrency/kernel.hfa

@@ -49 +49 @@
 
 // Processor id, required for scheduling threads
-struct __processor_id_t {
-        unsigned id:24;
-
-        #if !defined(__CFA_NO_STATISTICS__)
-                struct __stats_t * stats;
-        #endif
-};
+
 
 coroutine processorCtx_t {
@@ -63 +57 @@
 // Wrapper around kernel threads
 struct __attribute__((aligned(128))) processor {
-        // Main state
-        inline __processor_id_t;
-
         // Cluster from which to get threads
         struct cluster * cltr;
@@ -90 +81 @@
         pthread_t kernel_thread;
 
+        // Unique id for the processor (not per cluster)
+        unsigned unique_id;
+
         struct {
                 $io_context * ctx;
@@ -123 +117 @@
         } init;
 
+        struct KernelThreadData * local_data;
+
         #if !defined(__CFA_NO_STATISTICS__)
                 int print_stats;
@@ -152 +148 @@
 
 // Aligned timestamps which are used by the relaxed ready queue
-struct __attribute__((aligned(128))) __timestamp_t;
-void  ?{}(__timestamp_t & this);
-void ^?{}(__timestamp_t & this);
+struct __attribute__((aligned(128))) __timestamp_t {
+        volatile unsigned long long tv;
+};
+
+static inline void  ?{}(__timestamp_t & this) { this.tv = 0; }
+static inline void ^?{}(__timestamp_t & this) {}
 
 //TODO adjust cache size to ARCHITECTURE
@@ -177 +176 @@
 void  ?{}(__ready_queue_t & this);
 void ^?{}(__ready_queue_t & this);
+#if !defined(__CFA_NO_STATISTICS__)
+        unsigned cnt(const __ready_queue_t & this, unsigned idx);
+#endif
 
 // Idle Sleep