Changeset 0cf5b79 for src/libcfa/concurrency/monitor.c

Timestamp:

Nov 20, 2017, 12:12:34 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

fdd3786

Parents:

b7f8cb4

Message:

Added generic containers for runtime.
Moved some internal code to bits folder.
consistently used cforall instead of CFORALL define.

File:

• src/libcfa/concurrency/monitor.c (modified) (17 diffs)

src/libcfa/concurrency/monitor.c

@@ -280 +280 @@
 static inline void enter( __monitor_group_t monitors ) {
         for( __lock_size_t i = 0; i < monitors.size; i++) {
-                __enter_monitor_desc( monitors.list[i], monitors );
+                __enter_monitor_desc( monitors[i], monitors );
         }
 }
@@ -303 +303 @@
 
         // Save previous thread context
-        this.[prev_mntrs, prev_count, prev_func] = this_thread->monitors.[list, size, func];
+        this.prev = this_thread->monitors;
 
         // Update thread context (needed for conditions)
-        this_thread->monitors.[list, size, func] = [m, count, func];
+        (this_thread->monitors){m, count, func};
 
         // LIB_DEBUG_PRINT_SAFE("MGUARD : enter %d\n", count);
@@ -328 +328 @@
 
         // Restore thread context
-        this_thread->monitors.[list, size, func] = this.[prev_mntrs, prev_count, prev_func];
+        this_thread->monitors = this.prev;
 }
 
@@ -338 +338 @@
 
         // Save previous thread context
-        this.[prev_mntrs, prev_count, prev_func] = this_thread->monitors.[list, size, func];
+        this.prev = this_thread->monitors;
 
         // Update thread context (needed for conditions)
-        this_thread->monitors.[list, size, func] = [m, 1, func];
+        (this_thread->monitors){m, 1, func};
 
         __enter_monitor_dtor( this.m, func );
@@ -352 +352 @@
 
         // Restore thread context
-        this_thread->monitors.[list, size, func] = this.[prev_mntrs, prev_count, prev_func];
+        this_thread->monitors = this.prev;
 }
 
@@ -437 +437 @@
 
                 for(int i = 0; i < this.monitor_count; i++) {
-                        if ( this.monitors[i] != this_thrd->monitors.list[i] ) {
-                                abortf( "Signal on condition %p made with different monitor, expected %p got %i", &this, this.monitors[i], this_thrd->monitors.list[i] );
+                        if ( this.monitors[i] != this_thrd->monitors[i] ) {
+                                abortf( "Signal on condition %p made with different monitor, expected %p got %i", &this, this.monitors[i], this_thrd->monitors[i] );
                         }
                 }
@@ -510 +510 @@
                 "Possible cause is not checking if the condition is empty before reading stored data."
         );
-        return this.blocked.head->user_info;
+        return ((typeof(this.blocked.head))this.blocked.head)->user_info;
 }
 
@@ -554 +554 @@
                 if( next ) {
                         *mask.accepted = index;
-                        if( mask.clauses[index].is_dtor ) {
+                        __acceptable_t& accepted = mask[index];
+                        if( accepted.is_dtor ) {
                                 LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel : dtor already there\n");
-                                verifyf( mask.clauses[index].size == 1        , "ERROR: Accepted dtor has more than 1 mutex parameter." );
-
-                                monitor_desc * mon2dtor = mask.clauses[index].list[0];
+                                verifyf( accepted.size == 1,  "ERROR: Accepted dtor has more than 1 mutex parameter." );
+
+                                monitor_desc * mon2dtor = accepted[0];
                                 verifyf( mon2dtor->dtor_node, "ERROR: Accepted monitor has no dtor_node." );
 
@@ -596 +597 @@
 
                         LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel : accepted %d\n", *mask.accepted);
-
                         return;
                 }
@@ -671 +671 @@
 static inline void reset_mask( monitor_desc * this ) {
         this->mask.accepted = NULL;
-        this->mask.clauses = NULL;
+        this->mask.data = NULL;
         this->mask.size = 0;
 }
@@ -697 +697 @@
 
 static inline bool is_accepted( monitor_desc * this, const __monitor_group_t & group ) {
-        __acceptable_t * it = this->mask.clauses; // Optim
+        __acceptable_t * it = this->mask.data; // Optim
         __lock_size_t count = this->mask.size;
 
@@ -820 +820 @@
         if( !this.monitors ) {
                 // LIB_DEBUG_PRINT_SAFE("Branding\n");
-                assertf( thrd->monitors.list != NULL, "No current monitor to brand condition %p", thrd->monitors.list );
+                assertf( thrd->monitors.data != NULL, "No current monitor to brand condition %p", thrd->monitors.data );
                 this.monitor_count = thrd->monitors.size;
 
                 this.monitors = malloc( this.monitor_count * sizeof( *this.monitors ) );
                 for( int i = 0; i < this.monitor_count; i++ ) {
-                        this.monitors[i] = thrd->monitors.list[i];
+                        this.monitors[i] = thrd->monitors[i];
                 }
         }
@@ -832 +832 @@
 static inline [thread_desc *, int] search_entry_queue( const __waitfor_mask_t & mask, monitor_desc * monitors [], __lock_size_t count ) {
 
-        __thread_queue_t & entry_queue = monitors[0]->entry_queue;
+        __queue_t(thread_desc) & entry_queue = monitors[0]->entry_queue;
 
         // For each thread in the entry-queue
@@ -841 +841 @@
                 // For each acceptable check if it matches
                 int i = 0;
-                __acceptable_t * end = mask.clauses + mask.size;
-                for( __acceptable_t * it = mask.clauses; it != end; it++, i++ ) {
+                __acceptable_t * end   = end  (mask);
+                __acceptable_t * begin = begin(mask);
+                for( __acceptable_t * it = begin; it != end; it++, i++ ) {
                         // Check if we have a match
                         if( *it == (*thrd_it)->monitors ) {
@@ -872 +873 @@
         __lock_size_t max = 0;
         for( __lock_size_t i = 0; i < mask.size; i++ ) {
-                max += mask.clauses[i].size;
+                __acceptable_t & accepted = mask[i];
+                max += accepted.size;
         }
         return max;
@@ -880 +882 @@
         __lock_size_t size = 0;
         for( __lock_size_t i = 0; i < mask.size; i++ ) {
-                __libcfa_small_sort( mask.clauses[i].list, mask.clauses[i].size );
-                for( __lock_size_t j = 0; j < mask.clauses[i].size; j++) {
-                        insert_unique( storage, size, mask.clauses[i].list[j] );
+                __acceptable_t & accepted = mask[i];
+                __libcfa_small_sort( accepted.data, accepted.size );
+                for( __lock_size_t j = 0; j < accepted.size; j++) {
+                        insert_unique( storage, size, accepted[j] );
                 }
         }
@@ -888 +891 @@
         __libcfa_small_sort( storage, size );
         return size;
-}
-
-void ?{}( __condition_blocked_queue_t & this ) {
-        this.head = NULL;
-        this.tail = &this.head;
-}
-
-void append( __condition_blocked_queue_t & this, __condition_node_t * c ) {
-        verify(this.tail != NULL);
-        *this.tail = c;
-        this.tail = &c->next;
-}
-
-__condition_node_t * pop_head( __condition_blocked_queue_t & this ) {
-        __condition_node_t * head = this.head;
-        if( head ) {
-                this.head = head->next;
-                if( !head->next ) {
-                        this.tail = &this.head;
-                }
-                head->next = NULL;
-        }
-        return head;
 }