Changes in libcfa/src/concurrency/kernel_private.hfa [3814957:f558b5f]

File:

• libcfa/src/concurrency/kernel_private.hfa (modified) (3 diffs)

libcfa/src/concurrency/kernel_private.hfa

@@ -30 +30 @@
         #include <rseq/rseq.h>
 #elif defined(CFA_HAVE_LINUX_RSEQ_H)
-        // #include <linux/rseq.h>
+        #include <linux/rseq.h>
 #else
         #ifndef _GNU_SOURCE
@@ -60 +60 @@
 #elif defined(CFA_HAVE_LINUX_RSEQ_H)
         extern "Cforall" {
-                // extern __attribute__((aligned(128))) thread_local volatile struct rseq __cfaabi_rseq;
+                extern __attribute__((aligned(128))) thread_local volatile struct rseq __cfaabi_rseq;
         }
 #else
@@ -69 +69 @@
         /* paranoid */ verify( ! __preemption_enabled() );
 #if   defined(CFA_HAVE_LINUX_LIBRSEQ)
-        return rseq_current_cpu_raw();
+        return rseq_current_cpu();
 #elif defined(CFA_HAVE_LINUX_RSEQ_H)
-        // return __cfaabi_rseq.cpu_id;
+        int r = __cfaabi_rseq.cpu_id;
+        /* paranoid */ verify( r >= 0 );
+        return r;
 #else
         return sched_getcpu();