Changeset 6250a312 for src/libcfa/concurrency

Timestamp:

May 10, 2017, 5:00:47 PM (9 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, stuck-waitfor-destruct, with_gc

Children:

8514fe19, dbfb35d

Parents:

0f9bef3 (diff), 29cf9c8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/libcfa/concurrency

Files:

• monitor (modified) (1 diff)
• monitor.c (modified) (4 diffs)
• thread.c (modified) (1 diff)

src/libcfa/concurrency/monitor

@@ -81 +81 @@
 }
 
+static inline void ^?{}( condition * this ) {
+        free( this->monitors );
+}
+
 void wait( condition * this );
 void signal( condition * this );

src/libcfa/concurrency/monitor.c

@@ -17 +17 @@
 #include "monitor"
 
+#include <stdlib>
+
 #include "kernel_private.h"
 #include "libhdr.h"
@@ -130 +132 @@
         this_thread()->current_monitors      = this->prev_mntrs;
         this_thread()->current_monitor_count = this->prev_count;
+}
+
+void debug_break() __attribute__(( noinline ))
+{
+        
 }
 
@@ -171 +178 @@
 
         //Find the next thread(s) to run
-        unsigned short thread_count = count;
+        unsigned short thread_count = 0;
         thread_desc * threads[ count ];
+        for(int i = 0; i < count; i++) {
+                threads[i] = 0;
+        }
+
+        debug_break();
 
         for( int i = 0; i < count; i++) {
                 thread_desc * new_owner = next_thread( this->monitors[i] );
-                thread_count = insert_unique( threads, i, new_owner );
-        }
+                thread_count = insert_unique( threads, thread_count, new_owner );
+        }
+
+        debug_break();
 
         LIB_DEBUG_PRINT_SAFE("Will unblock: ");
@@ -339 +353 @@
                 LIB_DEBUG_PRINT_SAFE("Branding\n");
                 assertf( thrd->current_monitors != NULL, "No current monitor to brand condition", thrd->current_monitors );
-                this->monitors = thrd->current_monitors;
                 this->monitor_count = thrd->current_monitor_count;
+
+                this->monitors = malloc( this->monitor_count * sizeof( *this->monitors ) );
+                for( int i = 0; i < this->monitor_count; i++ ) {
+                        this->monitors[i] = thrd->current_monitors[i];
+                }
         }
 }
 
 static inline unsigned short insert_unique( thread_desc ** thrds, unsigned short end, thread_desc * val ) {
-        for(int i = 0; i < end; i++) {
+        if( !val ) return end;
+
+        for(int i = 0; i <= end; i++) {
                 if( thrds[i] == val ) return end;
         }

src/libcfa/concurrency/thread.c

@@ -40 +40 @@
         this->next = NULL;
 
-        this->current_monitors      = NULL;
-        this->current_monitor_count = 0;
+        this->current_monitors      = &this->mon;
+        this->current_monitor_count = 1;
 }