Changes in libcfa/src/concurrency/thread.hfa [8c50aed:09f357ec]

File:

• libcfa/src/concurrency/thread.hfa (modified) (2 diffs)

libcfa/src/concurrency/thread.hfa

@@ -31 +31 @@
 };
 
-// define that satisfies the trait without using the thread keyword
-#define DECL_THREAD(X) thread_desc* get_thread(X& this) __attribute__((const)) { return &this.__thrd; } void main(X& this)
-
-// Inline getters for threads/coroutines/monitors
-forall( dtype T | is_thread(T) )
-static inline coroutine_desc* get_coroutine(T & this) __attribute__((const)) { return &get_thread(this)->self_cor; }
+#define DECL_THREAD(X) thread_desc* get_thread(X& this) { return &this.__thrd; } void main(X& this)
 
 forall( dtype T | is_thread(T) )
-static inline monitor_desc  * get_monitor  (T & this) __attribute__((const)) { return &get_thread(this)->self_mon; }
+static inline coroutine_desc* get_coroutine(T & this) {
+        return &get_thread(this)->self_cor;
+}
 
-static inline coroutine_desc* get_coroutine(thread_desc * this) __attribute__((const)) { return &this->self_cor; }
-static inline monitor_desc  * get_monitor  (thread_desc * this) __attribute__((const)) { return &this->self_mon; }
+forall( dtype T | is_thread(T) )
+static inline monitor_desc* get_monitor(T & this) {
+        return &get_thread(this)->self_mon;
+}
 
-//-----------------------------------------------------------------------------
-// forward declarations needed for threads
+static inline coroutine_desc* get_coroutine(thread_desc * this) {
+        return &this->self_cor;
+}
+
+static inline monitor_desc* get_monitor(thread_desc * this) {
+        return &this->self_mon;
+}
+
 extern struct cluster * mainCluster;
 
@@ -83 +88 @@
 void ^?{}( scoped(T)& this );
 
-//-----------------------------------------------------------------------------
-// Thread getters
+void yield();
+void yield( unsigned times );
+
 static inline struct thread_desc * active_thread () { return TL_GET( this_thread ); }
-
-//-----------------------------------------------------------------------------
-// Scheduler API
-
-//----------
-// Park thread: block until corresponding call to unpark, won't block if unpark is already called
-void park( void );
-
-//----------
-// Unpark a thread, if the thread is already blocked, schedule it
-//                  if the thread is not yet block, signal that it should rerun immediately
-void unpark( thread_desc * this );
-
-forall( dtype T | is_thread(T) )
-static inline void unpark( T & this ) { if(!&this) return; unpark( get_thread( this ) );}
-
-//----------
-// Yield: force thread to block and be rescheduled
-bool force_yield( enum __Preemption_Reason );
-
-static inline void yield() {
-        force_yield(__MANUAL_PREEMPTION);
-}
-
-// Yield: yield N times
-static inline void yield( unsigned times ) {
-        for( times ) {
-                yield();
-        }
-}
 
 // Local Variables: //