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

File:

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

libcfa/src/concurrency/kernel_private.hfa

@@ -16 +16 @@
 #pragma once
 
-#if !defined(__cforall_thread__)
-        #error kernel_private.hfa should only be included in libcfathread source
-#endif
-
 #include "kernel.hfa"
 #include "thread.hfa"
@@ -26 +22 @@
 #include "stats.hfa"
 
-extern "C" {
-#if   defined(CFA_HAVE_LINUX_LIBRSEQ)
-        #include <rseq/rseq.h>
-#elif defined(CFA_HAVE_LINUX_RSEQ_H)
-        #include <linux/rseq.h>
-#else
-        #ifndef _GNU_SOURCE
-        #error kernel_private requires gnu_source
-        #endif
-        #include <sched.h>
-#endif
-}
-
 //-----------------------------------------------------------------------------
 // Scheduler
+
+
 extern "C" {
         void disable_interrupts() OPTIONAL_THREAD;
@@ -54 +39 @@
 
 //-----------------------------------------------------------------------------
-// Hardware
-
-#if   defined(CFA_HAVE_LINUX_LIBRSEQ)
-        // No data needed
-#elif defined(CFA_HAVE_LINUX_RSEQ_H)
-        extern "Cforall" {
-                extern __attribute__((aligned(128))) thread_local volatile struct rseq __cfaabi_rseq;
-        }
-#else
-        // No data needed
-#endif
-
-static inline int __kernel_getcpu() {
-        /* paranoid */ verify( ! __preemption_enabled() );
-#if   defined(CFA_HAVE_LINUX_LIBRSEQ)
-        return rseq_current_cpu();
-#elif defined(CFA_HAVE_LINUX_RSEQ_H)
-        int r = __cfaabi_rseq.cpu_id;
-        /* paranoid */ verify( r >= 0 );
-        return r;
-#else
-        return sched_getcpu();
-#endif
-}
-
-//-----------------------------------------------------------------------------
 // Processor
 void main(processorCtx_t *);
@@ -85 +44 @@
 void * __create_pthread( pthread_t *, void * (*)(void *), void * );
 void __destroy_pthread( pthread_t pthread, void * stack, void ** retval );
+
+
 
 extern cluster * mainCluster;