Changeset ad1a8dd

Timestamp:

May 1, 2017, 6:27:29 PM (7 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:

5544465

Parents:

0428aad

Message:

Tentative fix for monitors

File:

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

src/libcfa/concurrency/monitor.c

@@ -130 +130 @@
         this_thread()->current_monitors      = this->prev_mntrs;
         this_thread()->current_monitor_count = this->prev_count;
+}
+
+void debug_break() __attribute__(( noinline ))
+{
+        
 }
 
@@ -171 +176 @@
 
         //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: ");
@@ -345 +357 @@
 
 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;
         }