Changes in libcfa/src/concurrency/monitor.cfa [c18bf9e:708ae38]

File:

• libcfa/src/concurrency/monitor.cfa (modified) (18 diffs)

libcfa/src/concurrency/monitor.cfa

@@ -44 +44 @@
 static inline void restore( monitor$ * ctx [], __lock_size_t count, __spinlock_t * locks [], unsigned int /*in */ recursions [], __waitfor_mask_t /*in */ masks [] );
 
-static inline void ?{}(__condition_node_t & this, thread$ * waiting_thread, __lock_size_t count, uintptr_t user_info );
-static inline void ?{}(__condition_criterion_t & this );
-static inline void ?{}(__condition_criterion_t & this, monitor$ * target, __condition_node_t * owner );
-
 static inline void init     ( __lock_size_t count, monitor$ * monitors [], __condition_node_t & waiter, __condition_criterion_t criteria [] );
 static inline void init_push( __lock_size_t count, monitor$ * monitors [], __condition_node_t & waiter, __condition_criterion_t criteria [] );
@@ -247 +243 @@
 
 // Leave single monitor
-static void __leave( monitor$ * this ) {
+void __leave( monitor$ * this ) {
         // Lock the monitor spinlock
         lock( this->lock __cfaabi_dbg_ctx2 );
@@ -282 +278 @@
 
 // Leave single monitor for the last time
-static void __dtor_leave( monitor$ * this, bool join ) {
+void __dtor_leave( monitor$ * this, bool join ) {
         __cfaabi_dbg_debug_do(
                 if( active_thread() != this->owner ) {
@@ -348 +344 @@
 // Ctor for monitor guard
 // Sorts monitors before entering
-void ?{}( monitor_guard_t & this, monitor$ * m [], __lock_size_t count, fptr_t func ) libcfa_public {
+void ?{}( monitor_guard_t & this, monitor$ * m [], __lock_size_t count, fptr_t func ) {
         thread$ * thrd = active_thread();
 
@@ -373 +369 @@
 }
 
-void ?{}( monitor_guard_t & this, monitor$ * m [], __lock_size_t count ) libcfa_public {
+void ?{}( monitor_guard_t & this, monitor$ * m [], __lock_size_t count ) {
         this{ m, count, 0p };
 }
@@ -379 +375 @@
 
 // Dtor for monitor guard
-void ^?{}( monitor_guard_t & this ) libcfa_public {
+void ^?{}( monitor_guard_t & this ) {
         // __cfaabi_dbg_print_safe( "MGUARD : leaving %d\n", this.count);
 
@@ -393 +389 @@
 // Ctor for monitor guard
 // Sorts monitors before entering
-void ?{}( monitor_dtor_guard_t & this, monitor$ * m [], fptr_t func, bool join ) libcfa_public {
+void ?{}( monitor_dtor_guard_t & this, monitor$ * m [], fptr_t func, bool join ) {
         // optimization
         thread$ * thrd = active_thread();
@@ -413 +409 @@
 
 // Dtor for monitor guard
-void ^?{}( monitor_dtor_guard_t & this ) libcfa_public {
+void ^?{}( monitor_dtor_guard_t & this ) {
         // Leave the monitors in order
         __dtor_leave( this.m, this.join );
@@ -423 +419 @@
 //-----------------------------------------------------------------------------
 // Internal scheduling types
-static void ?{}(__condition_node_t & this, thread$ * waiting_thread, __lock_size_t count, uintptr_t user_info ) {
+void ?{}(__condition_node_t & this, thread$ * waiting_thread, __lock_size_t count, uintptr_t user_info ) {
         this.waiting_thread = waiting_thread;
         this.count = count;
@@ -430 +426 @@
 }
 
-static void ?{}(__condition_criterion_t & this ) with( this ) {
+void ?{}(__condition_criterion_t & this ) with( this ) {
         ready  = false;
         target = 0p;
@@ -437 +433 @@
 }
 
-static void ?{}(__condition_criterion_t & this, monitor$ * target, __condition_node_t & owner ) {
+void ?{}(__condition_criterion_t & this, monitor$ * target, __condition_node_t & owner ) {
         this.ready  = false;
         this.target = target;
@@ -446 +442 @@
 //-----------------------------------------------------------------------------
 // Internal scheduling
-void wait( condition & this, uintptr_t user_info = 0 ) libcfa_public {
+void wait( condition & this, uintptr_t user_info = 0 ) {
         brand_condition( this );
 
@@ -500 +496 @@
 }
 
-bool signal( condition & this ) libcfa_public {
+bool signal( condition & this ) {
         if( is_empty( this ) ) { return false; }
 
@@ -542 +538 @@
 }
 
-bool signal_block( condition & this ) libcfa_public {
+bool signal_block( condition & this ) {
         if( !this.blocked.head ) { return false; }
 
@@ -590 +586 @@
 
 // Access the user_info of the thread waiting at the front of the queue
-uintptr_t front( condition & this ) libcfa_public {
+uintptr_t front( condition & this ) {
         verifyf( !is_empty(this),
                 "Attempt to access user data on an empty condition.\n"
@@ -612 +608 @@
 //              setup mask
 //              block
-void __waitfor_internal( const __waitfor_mask_t & mask, int duration ) libcfa_public {
+void __waitfor_internal( const __waitfor_mask_t & mask, int duration ) {
         // This statment doesn't have a contiguous list of monitors...
         // Create one!
@@ -998 +994 @@
 // Can't be accepted since a mutex stmt is effectively an anonymous routine
 // Thus we do not need a monitor group
-void lock( monitor$ * this ) libcfa_public {
+void lock( monitor$ * this ) {
         thread$ * thrd = active_thread();
 
@@ -1050 +1046 @@
 // Leave routine for mutex stmt
 // Is just a wrapper around __leave for the is_lock trait to see
-void unlock( monitor$ * this ) libcfa_public { __leave( this ); }
+void unlock( monitor$ * this ) { __leave( this ); }
 
 // Local Variables: //